Fix problems with attribute selections not filtering properly. Changes made to make...

[neighbornote/NeighborNote.git] / src / cx / fbn / nevernote / filters / DateAttributeFilter.java

diff --git a/src/cx/fbn/nevernote/filters/DateAttributeFilter.java b/src/cx/fbn/nevernote/filters/DateAttributeFilter.java
index 4d5ecf6..c3efa6c 100644 (file)
--- a/src/cx/fbn/nevernote/filters/DateAttributeFilter.java
+++ b/src/cx/fbn/nevernote/filters/DateAttributeFilter.java
@@ -22,8 +22,6 @@ package cx.fbn.nevernote.filters;
 import com.trolltech.qt.core.QCoreApplication;\r
 import com.trolltech.qt.core.QDateTime;\r
 \r
-import cx.fbn.nevernote.filters.AttributeFilter;\r
-\r
 public abstract class DateAttributeFilter extends AttributeFilter {\r
        protected boolean checkSince;\r
        public abstract boolean attributeCheck(QDateTime a, QDateTime b);\r
@@ -35,19 +33,21 @@ public abstract class DateAttributeFilter extends AttributeFilter {
                super(n);\r
        }\r
        public abstract String getLabel();\r
-\r
+       \r
        public static class checkToday extends DateAttributeFilter {\r
                public checkToday(boolean since) {\r
                    super();\r
                        checkSince=since; \r
                }\r
                // Check if it was within the last day\r
+               @Override\r
                public boolean attributeCheck(QDateTime noteDate, QDateTime current) {\r
                        if (checkSince)\r
                                return noteDate.daysTo(current) == 0;\r
                        else \r
                                return noteDate.daysTo(current) > 0;\r
                }\r
+               @Override\r
                public String getLabel(){\r
                        return QCoreApplication.translate("DateAttributeFilter", "Today");\r
                }\r
@@ -58,12 +58,14 @@ public abstract class DateAttributeFilter extends AttributeFilter {
                        checkSince=since; \r
                }\r
                // Check if it was within the last two days\r
+               @Override\r
                public boolean attributeCheck(QDateTime noteDate, QDateTime current) {\r
                if (checkSince) \r
                        return noteDate.daysTo(current) <= 1;\r
                else\r
                        return noteDate.daysTo(current) > 1;\r
                }\r
+               @Override\r
                public String getLabel(){\r
                        return QCoreApplication.translate("DateAttributeFilter", "Yesterday");\r
                }\r
@@ -74,12 +76,14 @@ public abstract class DateAttributeFilter extends AttributeFilter {
                        checkSince=since; \r
                }\r
                // Check if it was within the last two days\r
+               @Override\r
                public boolean attributeCheck(QDateTime noteDate, QDateTime current) {\r
                        if (checkSince) \r
                                return noteDate.daysTo(current) <= 7;\r
                        else\r
                                return noteDate.daysTo(current) > 7;\r
                }\r
+               @Override\r
                public String getLabel(){\r
                        return QCoreApplication.translate("DateAttributeFilter", "This Week");\r
                }\r
@@ -90,12 +94,14 @@ public abstract class DateAttributeFilter extends AttributeFilter {
                                checkSince=since; \r
                }\r
                // Check if it was within the last two weeks\r
+               @Override\r
                public boolean attributeCheck(QDateTime noteDate, QDateTime current) {\r
                        if (checkSince) \r
                                return noteDate.daysTo(current) <= 14;\r
                        else\r
                                return noteDate.daysTo(current) > 14;\r
                }\r
+               @Override\r
                public String getLabel(){\r
                        return QCoreApplication.translate("DateAttributeFilter", "Last Week");\r
                }\r
@@ -106,6 +112,7 @@ public abstract class DateAttributeFilter extends AttributeFilter {
                        checkSince=since; \r
                }\r
                // Check if it was within the last month\r
+               @Override\r
                public boolean attributeCheck(QDateTime noteDate, QDateTime current) {\r
                        if (checkSince) {\r
                                if (noteDate.date().year() == current.date().year())\r
@@ -119,6 +126,7 @@ public abstract class DateAttributeFilter extends AttributeFilter {
                                        return noteDate.date().month() - current.date().month() != 0;\r
                        }\r
                }\r
+               @Override\r
                public String getLabel(){\r
                        return QCoreApplication.translate("DateAttributeFilter", "This Month");\r
                }\r
@@ -129,6 +137,7 @@ public abstract class DateAttributeFilter extends AttributeFilter {
                        checkSince=since; \r
                }\r
                // Check if it was within the last two months\r
+               @Override\r
                public boolean attributeCheck(QDateTime noteDate, QDateTime current) {\r
                        int ny = noteDate.date().year();\r
                        int cy = current.date().year();\r
@@ -146,6 +155,7 @@ public abstract class DateAttributeFilter extends AttributeFilter {
                                return cm-nm > 1;\r
                        }\r
                }\r
+               @Override\r
                public String getLabel(){\r
                        return QCoreApplication.translate("DateAttributeFilter", "Last Month");\r
                }\r
@@ -156,6 +166,7 @@ public abstract class DateAttributeFilter extends AttributeFilter {
                        checkSince=since; \r
                }\r
                // Check if it was within this year\r
+               @Override\r
                public boolean attributeCheck(QDateTime noteDate, QDateTime current) {\r
                        int ny = noteDate.date().year();\r
                        int cy = current.date().year();\r
@@ -164,6 +175,7 @@ public abstract class DateAttributeFilter extends AttributeFilter {
                        else\r
                                return cy-ny > 0;\r
                }       \r
+               @Override\r
                public String getLabel(){\r
                        return QCoreApplication.translate("DateAttributeFilter", "This Year");\r
                }\r
@@ -174,6 +186,7 @@ public abstract class DateAttributeFilter extends AttributeFilter {
                        checkSince=since; \r
                }\r
                // Check if it was within the last year\r
+               @Override\r
                public boolean attributeCheck(QDateTime noteDate, QDateTime current) {\r
                        int ny = noteDate.date().year();\r
                        int cy = current.date().year();\r
@@ -182,6 +195,7 @@ public abstract class DateAttributeFilter extends AttributeFilter {
                        else\r
                                return cy-ny > 1;\r
                }\r
+               @Override\r
                public String getLabel(){\r
                        return QCoreApplication.translate("DateAttributeFilter", "Last Year");\r
                }\r