T29524

diff --git a/source/workspace/EverFolder/.settings/org.eclipse.core.resources.prefs b/source/workspace/EverFolder/.settings/org.eclipse.core.resources.prefs
new file mode 100644 (file)
index 0000000..99f26c0
--- /dev/null
+++ b/source/workspace/EverFolder/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8

diff --git a/source/workspace/EverFolder/src/com/yuji/ef/dao/NodeDaoImpl.java b/source/workspace/EverFolder/src/com/yuji/ef/dao/NodeDaoImpl.java
index 1d9a687..3195dea 100644 (file)
--- a/source/workspace/EverFolder/src/com/yuji/ef/dao/NodeDaoImpl.java
+++ b/source/workspace/EverFolder/src/com/yuji/ef/dao/NodeDaoImpl.java
@@ -50,6 +50,7 @@ public class NodeDaoImpl implements IDao<Node>, NodeDao {
                                + "CHILDREN TEXT," + "STATUS INTEGER," + "SELECTED INTEGER,"
                                 + "FLAG INTEGER"
                                + ");");
+               db.execSQL("CREATE UNIQUE INDEX Node_GUID ON Node(GUID);");
        }
 
        /*
@@ -338,7 +339,12 @@ public class NodeDaoImpl implements IDao<Node>, NodeDao {
                int i = 1;
                SQLiteStatement stmt = insertStmt;
                stmt.bindLong(i++, node.getType());
-               stmt.bindString(i++, CommonUtil.nz(node.getGuid()));
+               if (CommonUtil.isNull(node.getGuid())){
+                       stmt.bindNull(i++);
+               }
+               else {
+                       stmt.bindString(i++, node.getGuid());                   
+               }
                stmt.bindLong(i++, node.getParent());
                stmt.bindString(i++, node.getName());
                stmt.bindString(i++, CommonUtil.nz(node.getChildrenString()));