Add notebook specific sorting and alter some NeverNote labels to say NixNote.

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

diff --git a/src/cx/fbn/nevernote/filters/DateAttributeFilterFactory.java b/src/cx/fbn/nevernote/filters/DateAttributeFilterFactory.java
index 59b11bb..775ce3e 100644 (file)
--- a/src/cx/fbn/nevernote/filters/DateAttributeFilterFactory.java
+++ b/src/cx/fbn/nevernote/filters/DateAttributeFilterFactory.java
@@ -1,5 +1,5 @@
 /*\r
- * This file is part of NeverNote \r
+ * This file is part of NixNote \r
  * Copyright 2009,2010 Randy Baumgarte\r
  * Copyright 2010 Hiroshi Miura\r
  * \r
@@ -20,11 +20,9 @@
 \r
 package cx.fbn.nevernote.filters;\r
 \r
+import com.evernote.edam.type.Note;\r
 import com.trolltech.qt.core.QCoreApplication;\r
 import com.trolltech.qt.core.QDateTime;\r
-import com.evernote.edam.type.Note;\r
-\r
-import cx.fbn.nevernote.filters.DateAttributeFilter;\r
 \r
 public class DateAttributeFilterFactory {\r
     private DateAttributeFilterFactory () {};\r
@@ -58,6 +56,7 @@ class checkToday extends DateAttributeFilter {
         super(since, created);\r
     }\r
        // Check if it was within the last day\r
+       @Override\r
        public boolean attributeCheck(Note n) {\r
                QDateTime noteDate, current;\r
                noteDate = noteTime(n);\r
@@ -67,6 +66,7 @@ class checkToday extends DateAttributeFilter {
                else \r
                        return noteDate.daysTo(current) > 0;\r
        }\r
+       @Override\r
        public String getLabel(){\r
                return QCoreApplication.translate("cx.fbn.nevernote.filters.DateAttributeFilter", "Today");\r
        }\r
@@ -78,7 +78,8 @@ class checkYesterday extends DateAttributeFilter {
     }\r
 \r
        // Check if it was within the last two days\r
-    public boolean attributeCheck(Note n) {\r
+    @Override\r
+       public boolean attributeCheck(Note n) {\r
         QDateTime noteDate, current;\r
         noteDate = noteTime(n);\r
         current = currentTime();\r
@@ -87,6 +88,7 @@ class checkYesterday extends DateAttributeFilter {
                else\r
                        return noteDate.daysTo(current) > 1;\r
        }\r
+       @Override\r
        public String getLabel(){\r
                return QCoreApplication.translate("cx.fbn.nevernote.filters.DateAttributeFilter", "Yesterday");\r
        }\r
@@ -98,7 +100,8 @@ class checkThisWeek extends DateAttributeFilter {
     }\r
 \r
        // Check if it was within the last two days\r
-    public boolean attributeCheck(Note n) {\r
+    @Override\r
+       public boolean attributeCheck(Note n) {\r
         QDateTime noteDate, current;\r
         noteDate = noteTime(n);\r
         current = currentTime();\r
@@ -108,6 +111,7 @@ class checkThisWeek extends DateAttributeFilter {
                else\r
                        return noteDate.daysTo(current) > 7;\r
        }\r
+       @Override\r
        public String getLabel(){\r
                return QCoreApplication.translate("cx.fbn.nevernote.filters.DateAttributeFilter", "This Week");\r
        }\r
@@ -119,7 +123,8 @@ class checkLastWeek extends DateAttributeFilter {
     }\r
 \r
        // Check if it was within the last two weeks\r
-    public boolean attributeCheck(Note n) {\r
+    @Override\r
+       public boolean attributeCheck(Note n) {\r
         QDateTime noteDate, current;\r
         noteDate = noteTime(n);\r
         current = currentTime();\r
@@ -129,6 +134,7 @@ class checkLastWeek extends DateAttributeFilter {
                else\r
                        return noteDate.daysTo(current) > 14;\r
        }\r
+       @Override\r
        public String getLabel(){\r
                return QCoreApplication.translate("cx.fbn.nevernote.filters.DateAttributeFilter", "Last Week");\r
        }\r
@@ -140,7 +146,8 @@ class checkMonth extends DateAttributeFilter {
     }\r
 \r
        // Check if it was within the last month\r
-    public boolean attributeCheck(Note n) {\r
+    @Override\r
+       public boolean attributeCheck(Note n) {\r
         QDateTime noteDate, current;\r
         noteDate = noteTime(n);\r
         current = currentTime();\r
@@ -157,6 +164,7 @@ class checkMonth extends DateAttributeFilter {
                                return noteDate.date().month() - current.date().month() != 0;\r
                }\r
        }\r
+       @Override\r
        public String getLabel(){\r
                return QCoreApplication.translate("cx.fbn.nevernote.filters.DateAttributeFilter", "This Month");\r
        }\r
@@ -168,7 +176,8 @@ class checkLastMonth extends DateAttributeFilter {
     }\r
 \r
        // Check if it was within the last two months\r
-    public boolean attributeCheck(Note n) {\r
+    @Override\r
+       public boolean attributeCheck(Note n) {\r
         QDateTime noteDate, current;\r
         noteDate = noteTime(n);\r
         current = currentTime();\r
@@ -189,6 +198,7 @@ class checkLastMonth extends DateAttributeFilter {
                        return cm-nm > 1;\r
                }\r
        }\r
+       @Override\r
        public String getLabel(){\r
                return QCoreApplication.translate("cx.fbn.nevernote.filters.DateAttributeFilter", "Last Month");\r
        }\r
@@ -199,7 +209,8 @@ class checkYear extends DateAttributeFilter {
                super(since,created);\r
        }\r
        // Check if it was within this year\r
-    public boolean attributeCheck(Note n) {\r
+    @Override\r
+       public boolean attributeCheck(Note n) {\r
         QDateTime noteDate, current;\r
         noteDate = noteTime(n);\r
         current = currentTime();\r
@@ -212,6 +223,7 @@ class checkYear extends DateAttributeFilter {
                        return cy-ny > 0;\r
        }       \r
 \r
+       @Override\r
        public String getLabel(){\r
                return QCoreApplication.translate("cx.fbn.nevernote.filters.DateAttributeFilter", "This Year");\r
        }\r
@@ -223,7 +235,8 @@ class checkLastYear extends DateAttributeFilter {
     }\r
 \r
        // Check if it was within the last year\r
-    public boolean attributeCheck(Note n) {\r
+    @Override\r
+       public boolean attributeCheck(Note n) {\r
         QDateTime noteDate, current;\r
         noteDate = noteTime(n);\r
         current = currentTime();\r
@@ -236,6 +249,7 @@ class checkLastYear extends DateAttributeFilter {
                        return cy-ny > 1;\r
        }\r
 \r
+       @Override\r
        public String getLabel(){\r
                return QCoreApplication.translate("cx.fbn.nevernote.filters.DateAttributeFilter", "Last Year");\r
        }\r