fourth

Bael · Nov 27, 2011 · 0d2ed19 · 0d2ed19
1 parent 0e28dcf
commit 0d2ed19
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 15 deletions.
diff --git a/bin/core/DataWorker.class b/bin/core/DataWorker.class
diff --git a/bin/core/Persistent.class b/bin/core/Persistent.class
diff --git a/src/Core/Persistent.java b/src/Core/Persistent.java
@@ -35,5 +35,18 @@ public void Save()
 			e.printStackTrace();
 		}
     }
+
+
+    public Persistent LoadData()
+    {
+    	Persistent p = null;
+    	try {
+			p = DataWorker.Instance().LoadObjectById(this.Id, this);
+		} catch (IllegalAccessException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+    	return p;
+    }
 
 }
diff --git a/src/core/DataWorker.java b/src/core/DataWorker.java
@@ -19,6 +19,7 @@ public class DataWorker {
 
     private static DataWorker dataWorker;
     private LogWriter log;
+    private Connection connection;
     public static DataWorker Instance()
     {
         if (dataWorker == null)
@@ -34,14 +35,17 @@ public static DataWorker Init()
     	DataWorker worker = new DataWorker();
     	worker.log = new LogWriter();
     	worker.log.FileName = "c:\\temp\\javaLog.txt";
+
+    	worker.connection = ConnectionManager.Instance().getConnection();
+
     	return worker;
     }
     public void UpdateIndicesOnCreate(Persistent obj)
     {
 
     }
 
-    public void UpdateIndicesOnUpdate(Persistent obj)
+    public void UpdateIndicesOnUpdate(Persistent oldObj, Persistent obj)
     {
 
     }
@@ -148,21 +152,19 @@ public void SetNodeSubscriptField(Field field, Persistent obj, NodeReference nod
 
     public Persistent SaveObject(Persistent obj) throws IllegalAccessException
     {
-
         NodeReference node = null;
         try
         {
-            Connection conn = ConnectionManager.Instance().getConnection();
             String globalName = obj.GetStorageGlobalName();
-            node = conn.createNodeReference(globalName);
+            node = connection.createNodeReference(globalName);
         }
         catch (Exception ex)
         {
             log.WriteToFile(ex.toString(), true);
             throw ex;
         }
 
-
+        Persistent oldObj = null;
         if (obj.Id == 0)
         {
         	node.increment(1);
@@ -171,8 +173,10 @@ public Persistent SaveObject(Persistent obj) throws IllegalAccessException
         }
         else
         {
+        	oldObj = LoadObjectById(obj.Id, obj);
         	//node.setSubscriptCount(0);
-            node.appendSubscript(obj.Id);
+        	//znode .setSubscriptCount((int)obj.Id);
+            //node.appendSubscript(obj.Id);
         }
 
         Class info = obj.getClass();
@@ -184,8 +188,14 @@ public Persistent SaveObject(Persistent obj) throws IllegalAccessException
             field = fields[i];
             SetNodeSubscriptField(field, obj, node);
         }
-
-        UpdateIndicesOnCreate(obj);
+        if (oldObj == null)
+        {
+        	UpdateIndicesOnCreate(obj);
+        }
+        else
+        {
+        	UpdateIndicesOnUpdate(oldObj, obj);
+        }
         return obj;
     }
 
@@ -197,16 +207,16 @@ public void DeleteObjectById(Long id, String globalName)
 
     public Persistent LoadObjectById(Long id, Persistent obj) throws IllegalAccessException
     {
-        NodeReference node = ConnectionManager.Instance().getConnection().createNodeReference(obj.GetStorageGlobalName());
+        NodeReference node = connection.createNodeReference(obj.GetStorageGlobalName());
 
         InitSchema(obj);
 
         node.setSubscriptCount(0);
         node.appendSubscript(id);
         Field field;
         String subscript = "";
-         Object nodeValue = null;
-         do {
+        Object nodeValue = null;
+        do {
             subscript = node.nextSubscript(subscript);
             if (subscript.length() > 0) 
             {
@@ -232,7 +242,7 @@ public Persistent LoadObjectById(Long id, Persistent obj) throws IllegalAccessEx
                     }
                }
             }
-         } while (subscript.length() > 0);
+         }while (subscript.length() > 0);
 
 
         return obj;
@@ -250,9 +260,6 @@ private void InitSchema(Object obj)
         SchemaClassName = classInfo.getName();
         Field[] fields = classInfo.getFields();
 
-
-        ///System.out.println("Step7");
-        ///System.out.println("Access all the fields");
         for (int i = 0; i < fields.length; i++)
         { 
             fieldsMap.put(fields[i].getName(), fields[i]);