OSDN Git Service

Correct trash counts.
authorRandy Baumgarte <randy@fbn.cx>
Mon, 21 Mar 2011 16:34:16 +0000 (12:34 -0400)
committerRandy Baumgarte <randy@fbn.cx>
Sun, 3 Apr 2011 18:02:52 +0000 (14:02 -0400)
src/cx/fbn/nevernote/NeverNote.java
src/cx/fbn/nevernote/threads/CounterRunner.java
src/cx/fbn/nevernote/utilities/ListManager.java

index 8ac26d2..df7890e 100644 (file)
@@ -2624,7 +2624,9 @@ public class NeverNote extends QMainWindow{
                                                                +"JTidy is copyrighted under the World Wide Web Consortium<br>"
                                                                +"Apache Common Utilities licensed under the Apache License Version 2.0<br>"
                                                                +"Jazzy is licened under the LGPL<br>"
                                                                +"JTidy is copyrighted under the World Wide Web Consortium<br>"
                                                                +"Apache Common Utilities licensed under the Apache License Version 2.0<br>"
                                                                +"Jazzy is licened under the LGPL<br>"
-                                                               +"Java is a registered trademark of Oracle Corporation.<br><hr>"));     
+                                                               +"Java is a registered trademark of Oracle Corporation.<br><hr>"
+                                                               +"Special thanks to:<br>BitRock InstallBuilder for the Windows installer"
+                                                               +"<br>CodeCogs (www.codecogs.com) for the LaTeX image rendering."));
                logger.log(logger.HIGH, "Leaving NeverNote.about");
        }
        // Hide the entire left hand side
                logger.log(logger.HIGH, "Leaving NeverNote.about");
        }
        // Hide the entire left hand side
index 7978804..3531964 100644 (file)
@@ -172,13 +172,13 @@ public class CounterRunner extends QObject implements Runnable {
                        for (int j=0; j<nCounter.size(); j++) {\r
                                if (abortCount)\r
                                        return;\r
                        for (int j=0; j<nCounter.size(); j++) {\r
                                if (abortCount)\r
                                        return;\r
-                               if (nCounter.get(j).getGuid().equals(records.get(i).notebookGuid)) {\r
+                               if (records.get(i).active && nCounter.get(j).getGuid().equals(records.get(i).notebookGuid)) {\r
                                        nCounter.get(j).setCount(nCounter.get(j).getCount()+1);\r
                                        found = true;\r
                                        j=nCounter.size();\r
                                }\r
                        }\r
                                        nCounter.get(j).setCount(nCounter.get(j).getCount()+1);\r
                                        found = true;\r
                                        j=nCounter.size();\r
                                }\r
                        }\r
-                       if (!found) {\r
+                       if (!found && records.get(i).active) {\r
                                NotebookCounter newCounter = new NotebookCounter();\r
                                newCounter.setGuid(records.get(i).notebookGuid);\r
                                newCounter.setCount(1);\r
                                NotebookCounter newCounter = new NotebookCounter();\r
                                newCounter.setGuid(records.get(i).notebookGuid);\r
                                newCounter.setCount(1);\r
@@ -313,6 +313,7 @@ public class CounterRunner extends QObject implements Runnable {
                if (abortCount)\r
                        return;\r
 \r
                if (abortCount)\r
                        return;\r
 \r
+               System.out.println("***"+tCounter);\r
                trashSignal.countChanged.emit(tCounter);\r
                logger.log(logger.EXTREME, "Leaving CounterRunner.countTrashResults()");\r
        }\r
                trashSignal.countChanged.emit(tCounter);\r
                logger.log(logger.EXTREME, "Leaving CounterRunner.countTrashResults()");\r
        }\r
index 1edad42..3ed0039 100644 (file)
@@ -1022,7 +1022,7 @@ public class ListManager  {
        public void reloadTrashCount() {\r
                logger.log(logger.EXTREME, "Entering ListManager.reloadTrashCount");\r
                trashCounterRunner.abortCount = true;\r
        public void reloadTrashCount() {\r
                logger.log(logger.EXTREME, "Entering ListManager.reloadTrashCount");\r
                trashCounterRunner.abortCount = true;\r
-               trashCounterRunner.setNoteIndex(getNoteIndex());\r
+               trashCounterRunner.setNoteIndex(getMasterNoteIndex());\r
                trashCounterRunner.release(CounterRunner.TRASH);\r
                logger.log(logger.EXTREME, "Leaving ListManager.reloadTrashCount");\r
        }       \r
                trashCounterRunner.release(CounterRunner.TRASH);\r
                logger.log(logger.EXTREME, "Leaving ListManager.reloadTrashCount");\r
        }       \r