Put back serial IDs for cone and torus.

Normand Briere

2019-07-07 46dbce888e7c3eff8969f1ddbe22e144410b67f4

 GroupEditor.java
..
..
@@ -380,6 +380,7 @@
380
380
 		shadowYItem.addActionListener(this);
381
381
                 shadowZItem = menu.add(new MenuItem("Shadow Blue"));
382
382
 		shadowZItem.addActionListener(this);
383
+                
383
384
         if (Globals.ADVANCED)
384
385
         {
385
386
 		menu.add("-");
..
..
@@ -601,6 +602,10 @@
601
602
                 fullButton.setToolTipText("Full-screen window");
602
603
 		fullButton.addActionListener(this);
603
604
                 
605
+		oe.toolbarPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
606
+                screenfitButton.setToolTipText("Screen fit");
607
+		screenfitButton.addActionListener(this);
608
+
604
609
 		oe.toolbarPanel.add(restoreCameraButton = GetButton("icons/eye.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
605
610
                 restoreCameraButton.setToolTipText("Restore viewpoint");
606
611
 		restoreCameraButton.addActionListener(this);
..
..
@@ -633,10 +638,6 @@
633
638
                                 
634
639
                 //oe.toolboxPanel.Return();
635
640
                 
636
-		copyOptionsPanel.add(screenfitButton = GetButton("icons/fit.png", !Grafreed.NIMBUSLAF)); //, oe.aConstraints);
637
-                screenfitButton.setToolTipText("Screen fit");
638
-		screenfitButton.addActionListener(this);
639
-
640
641
 //                copyOptionsPanel.add(trackCB = GetToggleButton("icons/track.png", CameraPane.TRACK)); //, oe.aConstraints);
641
642
 //                trackCB.setToolTipText("Enable tracking");
642
643
 //                                trackCB.addItemListener(this);
..
..
@@ -1214,8 +1215,6 @@
1214
1215
                         }
1215
1216
                     }
1216
1217
                     
1217
-                    String string = (String) object;
1218
-                    
1219
1218
                     System.out.println("Transfer = " + object + "; drop : " + target);
1220
1219
 //                    if( object instanceof java.io.File[])
1221
1220
 //                    {
..
..
@@ -1223,6 +1222,8 @@
1223
1222
 //                        objEditor.DropFile((java.io.File[]) object, true);
1224
1223
 //                        return;
1225
1224
 //                    }
1225
+                    
1226
+                    String string = (String) object;
1226
1227
                     
1227
1228
                     // File path for Mac and Windows
1228
1229
                     if (string.charAt(0) == '/' || string.charAt(1) == ':')
..
..
@@ -1471,6 +1472,9 @@
1471
1472
 		menu.add(animationItem = new CheckboxMenuItem("Animation..."));
1472
1473
 		animationItem.addItemListener(this);
1473
1474
                 animationItem.setState(Globals.ANIMATION);
1475
+                
1476
+		menu.add(archiveItem = new MenuItem("Archive3D..."));
1477
+		archiveItem.addActionListener(this);
1474
1478
                 
1475
1479
 		menu.add("-");
1476
1480
 		parseverticesItem = menu.add(new MenuItem("Multiplicity"));
..
..
@@ -2216,7 +2220,8 @@
2216
2220
 		} else
2217
2221
 		if (source == undoButton)
2218
2222
 		{
2219
-			Undo();
2223
+			if (!Undo())
2224
+                            java.awt.Toolkit.getDefaultToolkit().beep();
2220
2225
 		} else
2221
2226
 		if (source == redoButton)
2222
2227
 		{
..
..
@@ -2224,7 +2229,8 @@
2224
2229
 		} else
2225
2230
 		if (source == saveButton)
2226
2231
 		{
2227
-			Save();
2232
+			if (!Save(true))
2233
+                            java.awt.Toolkit.getDefaultToolkit().beep();
2228
2234
 		} else
2229
2235
 		if (source == oneStepButton)
2230
2236
 		{
..
..
@@ -2233,17 +2239,14 @@
2233
2239
 		} else
2234
2240
 		if (source == screenfitButton)
2235
2241
 		{
2236
-			//Reload(lastConverter, lastFilename, true);
2237
2242
                     ScreenFit();
2238
2243
 		} else
2239
2244
 		if (source == screenfitpointButton)
2240
2245
 		{
2241
-			//Reload(lastConverter, lastFilename, true);
2242
2246
                     ScreenFitPoint();
2243
2247
 		} else
2244
2248
 		if (source == snapobjectButton)
2245
2249
 		{
2246
-			//Reload(lastConverter, lastFilename, true);
2247
2250
                     SnapObject();
2248
2251
 		} else
2249
2252
 //		if (event.getSource() == recompileButton)
..
..
@@ -4731,7 +4734,7 @@
4731
4734
         void refreshContents(boolean cp)
4732
4735
         {
4733
4736
             if (objectPanel.getSelectedIndex() == objectPanel.indexOfTab("Info"))
4734
-            if (!Globals.MOUSEDRAGGED) // && !Globals.TIMERRUNNING)
4737
+            if (!Globals.MOUSEDRAGGED && group.selection != null) // && !Globals.TIMERRUNNING)
4735
4738
             {
4736
4739
                 objEditor.ClearInfo(); // .GetMaterial());
4737
4740