OSDN Git Service

Add the ability to pin notes.
[neighbornote/NeighborNote.git] / src / cx / fbn / nevernote / xml / ExportData.java
index 2601015..a15ad8d 100644 (file)
@@ -39,9 +39,9 @@ import com.trolltech.qt.core.QIODevice;
 import com.trolltech.qt.xml.QXmlStreamWriter;\r
 \r
 import cx.fbn.nevernote.Global;\r
+import cx.fbn.nevernote.evernote.NoteMetadata;\r
 import cx.fbn.nevernote.sql.DatabaseConnection;\r
 import cx.fbn.nevernote.utilities.ApplicationLogger;\r
-import cx.fbn.nevernote.utilities.Pair;\r
 \r
 public class ExportData {\r
        \r
@@ -64,7 +64,7 @@ public class ExportData {
        private final HashMap<String,String>            dirtyNotes;\r
        private final HashMap<String,String>            dirtyLinkedNotebooks;\r
        private final HashMap<Long,String>                      dirtySharedNotebooks;\r
-       private HashMap<String,Integer>                         titleColors;\r
+       private HashMap<String, NoteMetadata>                   noteMeta;\r
        private final boolean                                           fullBackup;\r
        private final DatabaseConnection                        conn;\r
        private QXmlStreamWriter                                        writer;         \r
@@ -148,11 +148,8 @@ public class ExportData {
                dirtyNotes.put(dn.get(i).getGuid(), "");\r
        }\r
        \r
-       List<Pair<String,Integer>> tColors = conn.getNoteTable().getNoteTitleColors();\r
-       titleColors = new HashMap<String,Integer>();\r
-       for (int i=0; i<tColors.size(); i++) {\r
-               titleColors.put(tColors.get(i).getFirst(), tColors.get(i).getSecond());\r
-       }\r
+       noteMeta = conn.getNoteTable().getNoteMetaInformation();\r
+\r
        \r
        searches = conn.getSavedSearchTable().getAll();\r
        \r
@@ -309,8 +306,10 @@ public class ExportData {
                        createTextNode("Dirty", "true");\r
                else\r
                        createTextNode("Dirty", "false");\r
-               if (titleColors.containsKey(note.getGuid()))\r
-                       createTextNode("TitleColor", new String(titleColors.get(note.getGuid()).toString()));\r
+               if (noteMeta.containsKey(note.getGuid())) {\r
+                       Integer color = new Integer(noteMeta.get(note.getGuid()).getColor());\r
+                       createTextNode("TitleColor", color.toString());\r
+               }\r
                exportableNotebooks.put(note.getNotebookGuid(), "");\r
                \r
                if (note.getTagGuidsSize() > 0) {\r