Save version table.

Normand Briere

2019-08-16 83d0c2fa0bd2e96448f776144e1a89cdb1bb6998

 ObjEditor.java
..
..
@@ -951,18 +951,24 @@
951
951
         boolean temp = CameraPane.SWITCH;
952
952
         CameraPane.SWITCH = false;
953
953
         
954
-        object.ExtractBigData(versiontable);
954
+        if (Grafreed.grafreed.universe.versiontable == null)
955
+            Grafreed.grafreed.universe.versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
956
+         
957
+        object.ExtractBigData(Grafreed.grafreed.universe.versiontable);
955
958
         // if (copy == client)
956
959
         
957
960
         Object3D versions[] = object.versionlist;
961
+        java.util.Hashtable<java.util.UUID, Object3D> versiontable = object.versiontable; // if Grafreed.grafreed.universe
958
962
         object.versionlist = null;
963
+        object.versiontable = null;
959
964
         
960
965
         //byte[] compress = Compress(copy);
961
966
         Object3D compress = (Object3D)Grafreed.clone(object);
962
967
         
963
968
         object.versionlist = versions;
969
+        object.versiontable = versiontable; // if Grafreed.grafreed.universe
964
970
         
965
-        object.RestoreBigData(versiontable);
971
+        object.RestoreBigData(Grafreed.grafreed.universe.versiontable);
966
972
         
967
973
         CameraPane.SWITCH = temp;
968
974
         
..
..
@@ -1659,14 +1665,14 @@
1659
1665
 
1660
1666
         //JScrollPane tmp = new JScrollPane(ctrlPanel, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
1661
1667
         //tmp.setName("Edit");
1662
-        objectPanel.add(materialPanel);
1663
-        objectPanel.setIconAt(0, GetIcon("icons/material.png"));
1664
-        objectPanel.setToolTipTextAt(0, "Material");
1665
-    
1666
1668
         objectPanel.add(toolboxPanel);
1667
-        objectPanel.setIconAt(1, GetIcon("icons/primitives.png"));
1668
-        objectPanel.setToolTipTextAt(1, "Objects & textures");
1669
+        objectPanel.setIconAt(0, GetIcon("icons/primitives.png"));
1670
+        objectPanel.setToolTipTextAt(0, "Objects & textures");
1669
1671
 
1672
+        objectPanel.add(materialPanel);
1673
+        objectPanel.setIconAt(1, GetIcon("icons/material.png"));
1674
+        objectPanel.setToolTipTextAt(1, "Material");
1675
+    
1670
1676
         objectPanel.add(skyboxPanel);
1671
1677
         objectPanel.setIconAt(2, GetIcon("icons/skybox.jpg"));
1672
1678
         objectPanel.setToolTipTextAt(2, "Backgrounds");
..
..
@@ -3913,7 +3919,7 @@
3913
3919
             //System.out.println("ObjEditor " + event);
3914
3920
             applySelf0(true);
3915
3921
             //parent.applySelf();
3916
-            objEditor.refreshContents();
3922
+     // conflicts with requestFocus       objEditor.refreshContents();
3917
3923
         } else if (source == resetButton)
3918
3924
         {
3919
3925
             CameraPane.fullreset = true;
..
..
@@ -4225,8 +4231,6 @@
4225
4231
         return true;
4226
4232
     }
4227
4233
 
4228
-    java.util.Hashtable<java.util.UUID, Object3D> versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
4229
-    
4230
4234
     void DeleteVersion()
4231
4235
     {
4232
4236
         for (int i = copy.versionindex; i < copy.versionlist.length-1; i++)
..
..
@@ -4234,7 +4238,11 @@
4234
4238
             copy.versionlist[i] = copy.versionlist[i+1];
4235
4239
         }
4236
4240
         
4237
-        CopyChanged();
4241
+        if (copy.versionlist[copy.versionindex] == null)
4242
+            copy.versionindex -= 1;
4243
+        
4244
+        if (copy.versionindex != -1)
4245
+            CopyChanged();
4238
4246
         
4239
4247
         SetVersionStates();
4240
4248
     }
..
..
@@ -4347,7 +4355,7 @@
4347
4355
         boolean temp = CameraPane.SWITCH;
4348
4356
         CameraPane.SWITCH = false;
4349
4357
         
4350
-        copy.ExtractBigData(versiontable);
4358
+        copy.ExtractBigData(Grafreed.grafreed.universe.versiontable);
4351
4359
         
4352
4360
         copy.clear();
4353
4361
         
..
..
@@ -4359,7 +4367,7 @@
4359
4367
             copy.add(obj.get(i));
4360
4368
         }
4361
4369
         
4362
-        copy.RestoreBigData(versiontable);
4370
+        copy.RestoreBigData(Grafreed.grafreed.universe.versiontable);
4363
4371
         
4364
4372
         CameraPane.SWITCH = temp;
4365
4373
         
..
..
@@ -4422,8 +4430,8 @@
4422
4430
         previousVersionButton.setEnabled(copy.versionindex > 0);
4423
4431
         nextVersionButton.setEnabled(copy.versionlist[copy.versionindex + 1] != null);
4424
4432
         
4425
-        deleteVersionButton.setEnabled(//copy.versionindex > 0 &&
4426
-                                        copy.versionlist[copy.versionindex + 1] != null);
4433
+        deleteVersionButton.setEnabled(copy.versionindex != -1);
4434
+                                        //copy.versionlist[copy.versionindex + 1] != null);
4427
4435
         
4428
4436
         muteSlider = true;
4429
4437
         versionSlider.setMinimum(0);
..
..
@@ -4488,7 +4496,7 @@
4488
4496
 
4489
4497
     public boolean Replace()
4490
4498
     {
4491
-        System.err.println("Replace");
4499
+        //System.err.println("Replace");
4492
4500
         
4493
4501
         //cRadio tab = GetCurrentTab();
4494
4502
         
..
..
@@ -5578,6 +5586,7 @@
5578
5586
 
5579
5587
             copy.versionlist = readobj.versionlist;
5580
5588
             copy.versionindex = readobj.versionindex;
5589
+            copy.versiontable = readobj.versiontable;
5581
5590
             
5582
5591
         if (copy.versionlist == null)
5583
5592
         {