Cleanup compiler warning messages and alter backup & restore to handle new database...

[neighbornote/NeighborNote.git] / src / cx / fbn / nevernote / sql / TagTable.java

diff --git a/src/cx/fbn/nevernote/sql/TagTable.java b/src/cx/fbn/nevernote/sql/TagTable.java
index 6457544..102e5cc 100644 (file)
--- a/src/cx/fbn/nevernote/sql/TagTable.java
+++ b/src/cx/fbn/nevernote/sql/TagTable.java
@@ -38,7 +38,6 @@ import cx.fbn.nevernote.utilities.ApplicationLogger;
 public class TagTable {\r
        private final ApplicationLogger logger;\r
        DatabaseConnection db;\r
-       private HashMap<String, QIcon>  icons;\r
 \r
        public TagTable (ApplicationLogger l, DatabaseConnection d) {\r
                logger = l;\r
@@ -366,10 +365,10 @@ public class TagTable {
                NSqlQuery query = new NSqlQuery(db.getConnection());\r
                if (icon == null) {\r
                        if (!query.prepare("update tag set icon=null where guid=:guid"))\r
-                               logger.log(logger.EXTREME, "Error preparing tag icon select.");\r
+                               logger.log(logger.EXTREME, "Error preparing tag icon update.");\r
                } else {\r
                        if (!query.prepare("update tag set icon=:icon where guid=:guid"))\r
-                               logger.log(logger.EXTREME, "Error preparing tag icon select.");\r
+                               logger.log(logger.EXTREME, "Error preparing tag icon update.");\r
                        QBuffer buffer = new QBuffer();\r
                if (!buffer.open(QIODevice.OpenModeFlag.ReadWrite)) {\r
                        logger.log(logger.EXTREME, "Failure to open buffer.  Aborting.");\r
@@ -396,7 +395,7 @@ public class TagTable {
                NSqlQuery query = new NSqlQuery(db.getConnection());\r
        \r
                if (!query.exec("SELECT guid, icon from tag"))\r
-                       logger.log(logger.EXTREME, "Error executing notebook getAllIcons select.");\r
+                       logger.log(logger.EXTREME, "Error executing SavedSearch getAllIcons select.");\r
                while (query.next()) {\r
                        if (query.getBlob(1) != null) {\r
                                String guid = query.valueString(0);\r