blame | history | patch | commit | commitdiff
Normand Briere
2019-07-18 d7a17c35c443e2cb6c09eaa3cfeaf590a571faa1 
 ObjEditor.java
....@@ -282,6 +282,12 @@
282282         client = inClient;
283283         copy = client;
284284 
285
+        if (copy.versions == null)
286
+        {
287
+            copy.versions = new byte[100][];
288
+            copy.versionindex = -1;
289
+        }
290
+        
285291         // "this" is not called: SetupUI2(objEditor);
286292     }
287293 
....@@ -295,6 +301,12 @@
295301         client = inClient;
296302         copy = client;
297303 
304
+        if (copy.versions == null)
305
+        {
306
+            copy.versions = new byte[100][];
307
+            copy.versionindex = -1;
308
+        }
309
+        
298310         SetupUI2(callee.GetEditor());
299311     }
300312 
....@@ -309,7 +321,7 @@
309321         //localCopy.parent = null;
310322 
311323         frame = new JFrame();
312
-                frame.setUndecorated(true);
324
+                frame.setUndecorated(false);
313325         objEditor = this;
314326         this.callee = callee;
315327 
....@@ -327,6 +339,12 @@
327339         copy = localCopy;
328340         copy.editWindow = this;
329341 
342
+        if (copy.versions == null)
343
+        {
344
+            copy.versions = new byte[100][];
345
+            copy.versionindex = -1;
346
+        }
347
+        
330348         SetupMenu();
331349 
332350         //SetupName(objEditor); // new
....@@ -350,7 +368,7 @@
350368         frame.setMenuBar(menuBar = new MenuBar());
351369         menuBar.add(fileMenu = new Menu("File"));
352370         fileMenu.add(newItem = new MenuItem("New"));
353
-        fileMenu.add(loadItem = new MenuItem("Open..."));
371
+        fileMenu.add(openItem = new MenuItem("Open..."));
354372         
355373                 //oe.menuBar.add(menu = new Menu("Include"));
356374         Menu menu = new Menu("Import");
....@@ -382,7 +400,7 @@
382400         }
383401 
384402         newItem.addActionListener(this);
385
-        loadItem.addActionListener(this);
403
+        openItem.addActionListener(this);
386404         saveItem.addActionListener(this);
387405         saveAsItem.addActionListener(this);
388406         exportAsItem.addActionListener(this);
....@@ -449,7 +467,7 @@
449467 // TEXTAREA           infoarea.setLineWrap(true);
450468 // TEXTAREA           infoarea.setWrapStyleWord(true);
451469         infoPanel = new JScrollPane(infoarea, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); //AS_NEEDED);
452
-        //infoPanel.setPreferredSize(new Dimension(50, 200));
470
+        infoPanel.setPreferredSize(new Dimension(1, 1));
453471         infoPanel.setName("Info");
454472         //infoPanel.setLayout(new BorderLayout());
455473         //infoPanel.add(createTextPane());
....@@ -699,8 +717,8 @@
699717         }
700718     }
701719 
702
-static GraphicsDevice device = GraphicsEnvironment
703
-        .getLocalGraphicsEnvironment().getScreenDevices()[0];
720
+//static GraphicsDevice device = GraphicsEnvironment
721
+//        .getLocalGraphicsEnvironment().getScreenDevices()[0];
704722 
705723     Rectangle keeprect;
706724         cRadio radio;
....@@ -741,10 +759,11 @@
741759             else
742760             {
743761                 keeprect = frame.getBounds();
744
-                Rectangle rect = GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds();
745
-                Dimension rect2 = frame.getToolkit().getScreenSize();
746
-                frame.setBounds(0, rect2.height - rect.height, rect.width, rect.height);
762
+//                Rectangle rect = GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds();
763
+//                Dimension rect2 = frame.getToolkit().getScreenSize();
764
+//                frame.setBounds(0, rect2.height - rect.height, rect.width, rect.height);
747765 //                frame.setState(Frame.MAXIMIZED_BOTH);
766
+                frame.setBounds(frame.getGraphicsConfiguration().getBounds());
748767             }
749768             
750769             maximized ^= true;
....@@ -758,12 +777,17 @@
758777         
759778         void ToggleFullScreen()
760779         {
780
+GraphicsDevice device = frame.getGraphicsConfiguration().getDevice();
781
+
761782                 cameraView.ToggleFullScreen();
762783                 
763784                 if (!CameraPane.FULLSCREEN)
764785                 {
765786                     device.setFullScreenWindow(null);
787
+                    frame.dispose();
788
+                frame.setUndecorated(false);
766789             frame.validate();
790
+                    frame.setVisible(true);
767791                     
768792                     //frame.setVisible(false);
769793 //                frame.removeNotify();
....@@ -774,7 +798,7 @@
774798 // X                   frame.getContentPane().remove(/*"Center",*/bigThree);
775799 // X                   framePanel.add(bigThree);
776800 // X                   frame.getContentPane().add(/*"Center",*/framePanel);
777
-                    framePanel.setDividerLocation(1);
801
+                    framePanel.setDividerLocation(46);
778802                     
779803                     //frame.setVisible(true);
780804                     radio.layout = keepButton;
....@@ -789,8 +813,12 @@
789813 //                frame.setBounds(0, 0, frame.getToolkit().getScreenSize().width,
790814 //                        frame.getToolkit().getScreenSize().height);
791815                     //frame.setVisible(false);
816
+                    
817
+            frame.dispose();
818
+                frame.setUndecorated(true);
792819                     device.setFullScreenWindow(frame);
793820             frame.validate();
821
+                    frame.setVisible(true);
794822 //                frame.removeNotify();
795823 //                frame.setUndecorated(true);
796824 //                frame.addNotify();
....@@ -805,6 +833,28 @@
805833                 }
806834             frame.validate();
807835         }
836
+
837
+    private byte[] CompressCopy()
838
+    {
839
+        boolean temp = CameraPane.SWITCH;
840
+        CameraPane.SWITCH = false;
841
+        
842
+        copy.ExtractBigData(versiontable);
843
+        // if (copy == client)
844
+        
845
+        byte[] versions[] = copy.versions;
846
+        copy.versions = null;
847
+        
848
+        byte[] compress = Compress(copy);
849
+        
850
+        copy.versions = versions;
851
+        
852
+        copy.RestoreBigData(versiontable);
853
+        
854
+        CameraPane.SWITCH = temp;
855
+        
856
+        return compress;
857
+    }
808858 
809859     private JTextPane createTextPane()
810860     {
....@@ -1164,10 +1214,11 @@
11641214         randomCB = AddCheckBox(setupPanel2, "Random", copy.random);
11651215         randomCB.setToolTipText("Randomly Rewind (or Go back and forth)");
11661216 
1217
+        link2masterCB = AddCheckBox(setupPanel2, "Support", copy.link2master);
1218
+        link2masterCB.setToolTipText("Attach to support");
1219
+        
11671220         if (Globals.ADVANCED)
11681221         {
1169
-                link2masterCB = AddCheckBox(setupPanel2, "Supp", copy.link2master);
1170
-                link2masterCB.setToolTipText("Attach to support");
11711222                 speedupCB = AddCheckBox(setupPanel2, "Speed", copy.speedup);
11721223                 speedupCB.setToolTipText("Option motion capture");
11731224         }
....@@ -1483,7 +1534,10 @@
14831534 //        north.add(ctrlPanel, BorderLayout.NORTH);
14841535 //        objectPanel.add(north);
14851536         objectPanel.add(editPanel);
1486
-        objectPanel.add(infoPanel);
1537
+        
1538
+        //if (Globals.ADVANCED)
1539
+            objectPanel.add(infoPanel);
1540
+        
14871541         objectPanel.add(toolboxPanel);
14881542 
14891543         /*
....@@ -1592,9 +1646,9 @@
15921646 //		aConstraints.gridheight = 1;
15931647 
15941648         framePanel = new JSplitPane(JSplitPane.VERTICAL_SPLIT, toolbarPanel, bigThree);
1595
-        framePanel.setContinuousLayout(true);
1596
-        framePanel.setOneTouchExpandable(true);
1597
-        framePanel.setDividerLocation(0.8);
1649
+        framePanel.setContinuousLayout(false);
1650
+        framePanel.setOneTouchExpandable(false);
1651
+        //.setDividerLocation(0.8);
15981652         //framePanel.setDividerSize(15);
15991653         //framePanel.setResizeWeight(0.15);
16001654         framePanel.setName("Frame");
....@@ -1613,12 +1667,13 @@
16131667 
16141668         frame.setSize(1280, 860);
16151669         
1616
-        frame.validate();
1617
-        frame.setVisible(true);
1618
-
16191670                     cameraView.requestFocusInWindow();
16201671                     
16211672         gridPanel.setDividerLocation(1.0);
1673
+        
1674
+        frame.validate();
1675
+
1676
+        frame.setVisible(true);
16221677 
16231678         frame.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
16241679         frame.addWindowListener(new WindowAdapter()
....@@ -1965,8 +2020,9 @@
19652020             // 3D models
19662021             if (filename.endsWith(".3ds") || filename.endsWith(".3DS"))
19672022             {
1968
-                lastConverter = new com.jmex.model.converters.MaxToJme();
1969
-                LoadFile(filename, lastConverter);
2023
+                //lastConverter = new com.jmex.model.converters.MaxToJme();
2024
+                //LoadFile(filename, lastConverter);
2025
+                LoadObjFile(filename); // New 3ds loader
19702026                 continue;
19712027             }
19722028             if (filename.endsWith(".dae") || filename.endsWith(".DAE"))
....@@ -2692,6 +2748,7 @@
26922748                 LA.matXRotate(((Object3D) group.get(group.size() - 1)).toParent, -Math.PI / 2);
26932749                 LA.matXRotate(((Object3D) group.get(group.size() - 1)).fromParent, Math.PI / 2);
26942750             }
2751
+            
26952752             //cJME.count++;
26962753             //cJME.count %= 12;
26972754             if (gc)
....@@ -2875,6 +2932,7 @@
28752932             }
28762933         }
28772934     }
2935
+    
28782936     cFileSystemPane FSPane;
28792937 
28802938     void SetMaterial(cMaterial mat, Object3D.cVector2[] others)
....@@ -2928,6 +2986,7 @@
29282986                 }
29292987             }
29302988         }
2989
+        
29312990         freezematerial = false;
29322991     }
29332992 
....@@ -3380,9 +3439,9 @@
33803439         {
33813440             Close();
33823441             //return true;
3383
-        } else if (source == loadItem)
3442
+        } else if (source == openItem)
33843443         {
3385
-            load();
3444
+            Open();
33863445             //return true;
33873446         } else if (source == newItem)
33883447         {
....@@ -3407,6 +3466,10 @@
34073466         {
34083467             generatePOV();
34093468             //return true;
3469
+        } else if (event.getSource() == archiveItem)
3470
+        {
3471
+            cTools.Archive(frame);
3472
+            return;
34103473         } else if (source == zBufferItem)
34113474         {
34123475             try
....@@ -3458,8 +3521,8 @@
34583521         try
34593522         {
34603523             ByteArrayOutputStream baos = new ByteArrayOutputStream();
3461
-            java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
3462
-            ObjectOutputStream out = new ObjectOutputStream(zstream);
3524
+//            java.util.zip.GZIPOutputStream zstream = new java.util.zip.GZIPOutputStream(baos);
3525
+            ObjectOutputStream out = new ObjectOutputStream(baos); //zstream);
34633526 
34643527         Object3D parent = o.parent;
34653528         o.parent = null;
....@@ -3470,10 +3533,14 @@
34703533         
34713534             out.flush();
34723535 
3473
-            zstream.close();
3536
+            baos //zstream
3537
+                    .close();
34743538             out.close();
34753539             
3476
-            return baos.toByteArray();
3540
+            byte[] bytes = baos.toByteArray();
3541
+            
3542
+        System.out.println("save #bytes = " + bytes.length);
3543
+            return bytes;
34773544         } catch (Exception e)
34783545         {
34793546             System.err.println(e);
....@@ -3483,13 +3550,16 @@
34833550 
34843551     static public Object Uncompress(byte[] bytes)
34853552     {
3486
-        System.out.println("#bytes = " + bytes.length);
3553
+        System.out.println("restore #bytes = " + bytes.length);
34873554         try
34883555         {
34893556             ByteArrayInputStream bais = new ByteArrayInputStream(bytes);
3490
-            java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
3491
-            ObjectInputStream in = new ObjectInputStream(istream);
3557
+            //java.util.zip.GZIPInputStream istream = new java.util.zip.GZIPInputStream(bais);
3558
+            ObjectInputStream in = new ObjectInputStream(bais); // istream);
34923559             Object obj = in.readObject();
3560
+            
3561
+            bais //istream
3562
+                    .close();
34933563             in.close();
34943564             
34953565             return obj;
....@@ -3544,33 +3614,67 @@
35443614         return null;
35453615     }
35463616     
3547
-    java.util.Hashtable<java.util.UUID, Object3D> hashtable = new java.util.Hashtable<java.util.UUID, Object3D>();
35483617     
35493618     public void Save()
3619
+    {
3620
+        //Save(true);
3621
+        Replace();
3622
+    }
3623
+    
3624
+    private boolean Equal(byte[] compress, byte[] name)
3625
+    {
3626
+        if (compress.length != name.length)
3627
+        {
3628
+            return false;
3629
+        }
3630
+        
3631
+        for (int i=compress.length; --i>=0;)
3632
+        {
3633
+            if (compress[i] != name[i])
3634
+                return false;
3635
+        }
3636
+        
3637
+        return true;
3638
+    }
3639
+
3640
+    java.util.Hashtable<java.util.UUID, Object3D> versiontable = new java.util.Hashtable<java.util.UUID, Object3D>();
3641
+    
3642
+    public boolean Save(boolean user)
35503643     {
35513644         System.err.println("Save");
35523645         
35533646         cRadio tab = GetCurrentTab();
35543647         
3555
-        boolean temp = CameraPane.SWITCH;
3556
-        CameraPane.SWITCH = false;
3648
+        byte[] compress = CompressCopy();
35573649         
3558
-        copy.ExtractBigData(hashtable);
3650
+        boolean thesame = false;
35593651         
3560
-        byte[] compress = Compress(copy);
3652
+        // Quick heuristic using length. Works only when stream is compressed.
3653
+        if (copy.versionindex > 0 && copy.versions[copy.versionindex-1] != null && Equal(compress, copy.versions[copy.versionindex-1]))
3654
+        {
3655
+            thesame = true;
3656
+        }
35613657         
35623658         //EditorFrame.m_MainFrame.requestFocusInWindow();
3563
-        tab.graphs[tab.undoindex++] = compress;
3659
+        if (!thesame)
3660
+        {
3661
+            //tab.user[tab.versionindex] = user;
3662
+            //boolean increment = true; // tab.graphs[tab.versionindex] == null;
3663
+            
3664
+            copy.versions[++copy.versionindex] = compress;
3665
+            
3666
+            // if (increment)
3667
+            //     tab.versionindex++;
3668
+        }
35643669 
3565
-        copy.RestoreBigData(hashtable);
3670
+        //copy.RestoreBigData(versiontable);
35663671 
3567
-        CameraPane.SWITCH = temp;
3568
-        
35693672         //assert(hashtable.isEmpty());
35703673         
3571
-        for (int i = tab.undoindex; i < tab.graphs.length; i++)
3674
+        for (int i = copy.versionindex+1; i < copy.versions.length; i++)
35723675         {
3573
-            tab.graphs[i] = null;
3676
+            //tab.user[i] = false;
3677
+            copy.versions[i] = null;
35743678         }
35753679 
35763680         SetUndoStates();
....@@ -3580,7 +3684,7 @@
35803684         {
35813685             try
35823686             {
3583
-                FileOutputStream ostream = new FileOutputStream("save" + tab.undoindex);
3687
+                FileOutputStream ostream = new FileOutputStream("save" + copy.versionindex);
35843688                 ObjectOutputStream p = new ObjectOutputStream(ostream);
35853689 
35863690                 p.writeObject(copy);
....@@ -3593,6 +3697,8 @@
35933697                 e.printStackTrace();
35943698             }
35953699         }
3700
+        
3701
+        return !thesame;
35963702     }
35973703 
35983704     void CopyChanged(Object3D obj)
....@@ -3602,7 +3708,7 @@
36023708         boolean temp = CameraPane.SWITCH;
36033709         CameraPane.SWITCH = false;
36043710         
3605
-        copy.ExtractBigData(hashtable);
3711
+        copy.ExtractBigData(versiontable);
36063712         
36073713         copy.clear();
36083714         
....@@ -3611,7 +3717,7 @@
36113717             copy.add(obj.get(i));
36123718         }
36133719         
3614
-        copy.RestoreBigData(hashtable);
3720
+        copy.RestoreBigData(versiontable);
36153721         
36163722         CameraPane.SWITCH = temp;
36173723         
....@@ -3639,52 +3745,129 @@
36393745     }
36403746     
36413747     cButton undoButton;
3748
+    cButton restoreButton;
3749
+    cButton replaceButton;
36423750     cButton redoButton;
36433751         
3752
+    boolean muteSlider;
3753
+    
3754
+    int VersionCount()
3755
+    {
3756
+        int count = 0;
3757
+        
3758
+        for (int i = copy.versions.length; --i >= 0;)
3759
+        {
3760
+            if (copy.versions[i] != null)
3761
+                count++;
3762
+        }
3763
+        
3764
+        return count;
3765
+    }
3766
+    
36443767     void SetUndoStates()
36453768     {
36463769         cRadio tab = GetCurrentTab();
36473770         
3648
-        undoButton.setEnabled(tab.undoindex > 0);
3649
-        redoButton.setEnabled(tab.graphs[tab.undoindex + 1] != null);
3771
+        restoreButton.setEnabled(copy.versionindex != -1);
3772
+        replaceButton.setEnabled(copy.versionindex != -1);
3773
+        
3774
+        undoButton.setEnabled(copy.versionindex > 0);
3775
+        redoButton.setEnabled(copy.versions[copy.versionindex + 1] != null);
3776
+        
3777
+        muteSlider = true;
3778
+        versionSlider.setMaximum(VersionCount() - 1);
3779
+        versionSlider.setInteger(copy.versionindex);
3780
+        muteSlider = false;
36503781     }
36513782     
3652
-    public void Undo()
3783
+    public boolean Undo()
36533784     {
3785
+        // Option?
3786
+        Replace();
3787
+        
36543788         System.err.println("Undo");
36553789         
36563790         cRadio tab = GetCurrentTab();
36573791         
3658
-        if (tab.undoindex == 0)
3792
+        if (copy.versionindex == 0)
36593793         {
36603794             java.awt.Toolkit.getDefaultToolkit().beep();
3661
-            return;
3795
+            return false;
36623796         }
36633797 
3664
-        if (tab.graphs[tab.undoindex] == null)
3798
+//        if (tab.graphs[tab.versionindex] == null) // || !tab.user[tab.versionindex])
3799
+//        {
3800
+//            if (Save(false))
3801
+//                tab.versionindex -= 1;
3802
+//            else
3803
+//            {
3804
+//                if (tab.versionindex <= 0)
3805
+//                    return false;
3806
+//                else
3807
+//                    tab.versionindex -= 1;
3808
+//            }
3809
+//        }
3810
+
3811
+        copy.versionindex -= 1;
3812
+
3813
+        CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
3814
+        
3815
+        return true;
3816
+    }
3817
+
3818
+    public boolean Restore()
3819
+    {
3820
+        System.err.println("Restore");
3821
+        
3822
+        cRadio tab = GetCurrentTab();
3823
+        
3824
+        if (copy.versionindex == -1 || copy.versions[copy.versionindex] == null)
36653825         {
3666
-            Save();
3667
-            tab.undoindex -= 1;
3826
+            java.awt.Toolkit.getDefaultToolkit().beep();
3827
+            return false;
36683828         }
36693829 
3670
-        tab.undoindex -= 1;
3830
+        CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
3831
+        
3832
+        return true;
3833
+    }
36713834 
3672
-        CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
3835
+    public boolean Replace()
3836
+    {
3837
+        System.err.println("Replace");
3838
+        
3839
+        cRadio tab = GetCurrentTab();
3840
+        
3841
+        if (copy.versionindex == -1 || copy.versions[copy.versionindex] == null)
3842
+        {
3843
+            // No version yet. OK. java.awt.Toolkit.getDefaultToolkit().beep();
3844
+            return false;
3845
+        }
3846
+
3847
+        copy.versions[copy.versionindex] = CompressCopy();
3848
+        
3849
+        return true;
36733850     }
36743851 
36753852     public void Redo()
36763853     {
3854
+        // Option?
3855
+        Replace();
3856
+        
36773857         cRadio tab = GetCurrentTab();
36783858         
3679
-        if (tab.graphs[tab.undoindex + 1] == null)
3859
+        if (copy.versions[copy.versionindex + 1] == null)
36803860         {
36813861             java.awt.Toolkit.getDefaultToolkit().beep();
36823862             return;
36833863         }
36843864 
3685
-        tab.undoindex += 1;
3865
+        copy.versionindex += 1;
36863866 
3687
-        CopyChanged((Object3D)Uncompress(tab.graphs[tab.undoindex]));
3867
+        CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex]));
3868
+        
3869
+        //if (!tab.user[tab.versionindex])
3870
+        //    tab.graphs[tab.versionindex] = null;
36883871     }
36893872 
36903873         void ImportGFD()
....@@ -3980,9 +4163,25 @@
39804163         //copy.Touch();
39814164     }
39824165 
4166
+    cNumberSlider versionSlider;
4167
+    
39834168     public void stateChanged(ChangeEvent e)
39844169     {
39854170         //    assert(false);
4171
+        if (e.getSource() == versionSlider)
4172
+        {
4173
+            if (muteSlider)
4174
+                return;
4175
+            
4176
+            int version = versionSlider.getInteger();
4177
+            
4178
+            if (copy.versions[version] != null)
4179
+            {
4180
+                CopyChanged((Object3D)Uncompress(copy.versions[copy.versionindex = version]));
4181
+            }
4182
+            
4183
+            return;
4184
+        }
39864185 
39874186         if (freezematerial)
39884187         {
....@@ -4331,7 +4530,7 @@
43314530 
43324531     void makeSomething(Object3D thing, boolean resetmodel) // deselect)
43334532     {
4334
-        if (Globals.SAVEONMAKE) // && resetmodel)
4533
+        if (Globals.REPLACEONMAKE) // && resetmodel)
43354534             Save();
43364535         //Tween.set(thing, 0).target(1).start(tweenManager);
43374536         //Tween.to(thing, 0, 0.5f).target(0).start(tweenManager);
....@@ -4647,8 +4846,8 @@
46474846         
46484847         if (readobj != null)
46494848         {
4650
-        if (Globals.SAVEONMAKE)
4651
-            Save();
4849
+        //if (Globals.SAVEONMAKE) // A new object cannot share meshes
4850
+        //    Save();
46524851             try
46534852             {
46544853                 //readobj.deepCopySelf(copy);
....@@ -4703,13 +4902,24 @@
47034902                 c.addChild(csg);
47044903             }
47054904 
4905
+            copy.versions = readobj.versions;
4906
+            copy.versionindex = readobj.versionindex;
4907
+            
4908
+        if (copy.versions == null)
4909
+        {
4910
+            copy.versions = new byte[100][];
4911
+            copy.versionindex = -1;
4912
+        }
4913
+        
4914
+            //? SetUndoStates();
4915
+            
47064916             ResetModel();
47074917             copy.HardTouch(); // recompile?
47084918             refreshContents();
47094919         }
47104920     }
47114921 
4712
-    void load() // throws ClassNotFoundException
4922
+    void Open() // throws ClassNotFoundException
47134923     {
47144924         if (Grafreed.standAlone)
47154925         {
....@@ -4994,7 +5204,7 @@
49945204     MenuBar menuBar;
49955205     Menu fileMenu;
49965206     MenuItem newItem;
4997
-    MenuItem loadItem;
5207
+    MenuItem openItem;
49985208     MenuItem saveItem;
49995209     MenuItem saveAsItem;
50005210     MenuItem exportAsItem;
....@@ -5017,6 +5227,7 @@
50175227     CheckboxMenuItem toggleSwitchItem;
50185228     CheckboxMenuItem toggleRootItem;
50195229     CheckboxMenuItem animationItem;
5230
+    MenuItem archiveItem;
50205231     CheckboxMenuItem toggleHandleItem;
50215232     CheckboxMenuItem togglePaintItem;
50225233     JSplitPane mainPanel;