removing Java2 mapping

1 files changed, 35 insertions, 37 deletions

diff --git a/java/src/IceGridGUI/ApplicationPane.java b/java/src/IceGridGUI/ApplicationPane.java
index 4a01b91efd7..f2d987d7349 100644
--- a/java/src/IceGridGUI/ApplicationPane.java
+++ b/java/src/IceGridGUI/ApplicationPane.java
@@ -6,6 +6,7 @@
 // ICE_LICENSE file included in this distribution.
 //
 // **********************************************************************
+
 package IceGridGUI;
 
 import java.awt.*;
@@ -43,14 +44,15 @@ public class ApplicationPane extends JSplitPane implements Tab
         super.updateUI();
         setEmptyDividerBorder();
     }
-    
+
     public void selected()
     {
         Coordinator c = _root.getCoordinator();
 
         c.getCloseApplicationAction().setEnabled(true);
 
-        c.getSaveAction().setEnabled(_root.needsSaving() && (_root.isLive() && c.connectedToMaster() || _root.hasFile()));
+        c.getSaveAction().setEnabled(_root.needsSaving() && (_root.isLive() && c.connectedToMaster() ||
+                                     _root.hasFile()));
         c.getDiscardUpdatesAction().setEnabled(_root.needsSaving() && (_root.isLive() || _root.hasFile()));
 
         if(_root.isLive())
@@ -63,7 +65,6 @@ public class ApplicationPane extends JSplitPane implements Tab
         }
         c.getSaveToFileAction().setEnabled(true);
 
-        
         c.getBackAction().setEnabled(_previousNodes.size() > 0);
         c.getForwardAction().setEnabled(_nextNodes.size() > 0);
         c.showActions(_currentNode);
@@ -87,11 +88,10 @@ public class ApplicationPane extends JSplitPane implements Tab
     public void showNode(TreeNodeBase node)
     {
         TreeNode newNode = (TreeNode)node;
-        
+
         if(newNode != _currentNode)
         {
-            if(_currentNode != null 
-               && _currentNode.isEphemeral() && _root.hasNode(_currentNode))
+            if(_currentNode != null && _currentNode.isEphemeral() && _root.hasNode(_currentNode))
             {
                 _currentNode.destroy();
                 _currentNode = null;
@@ -112,7 +112,7 @@ public class ApplicationPane extends JSplitPane implements Tab
                         _previousNodes.removeFirst();
                     }
                     _root.getCoordinator().getBackAction().setEnabled(true);
-                }   
+                }
                 _nextNodes.clear();
                 _root.getCoordinator().getForwardAction().setEnabled(false);
                 _currentNode = newNode;
@@ -145,10 +145,9 @@ public class ApplicationPane extends JSplitPane implements Tab
         TreeNode previousNode = null;
         do
         {
-            previousNode = (TreeNode)_previousNodes.removeLast();
-        } while(_previousNodes.size() > 0 
-                && (previousNode == _currentNode || !_root.hasNode(previousNode)));
-                
+            previousNode = _previousNodes.removeLast();
+        } while(_previousNodes.size() > 0 && (previousNode == _currentNode || !_root.hasNode(previousNode)));
+
         if(_previousNodes.size() == 0)
         {
             _root.getCoordinator().getBackAction().setEnabled(false);
@@ -161,7 +160,7 @@ public class ApplicationPane extends JSplitPane implements Tab
                 _nextNodes.addFirst(_currentNode);
                 _root.getCoordinator().getForwardAction().setEnabled(true);
             }
-            
+
             _currentNode = previousNode;
             _root.disableSelectionListener();
             _root.setSelectedNode(_currentNode);
@@ -180,10 +179,9 @@ public class ApplicationPane extends JSplitPane implements Tab
         TreeNode nextNode = null;
         do
         {
-            nextNode = (TreeNode)_nextNodes.removeFirst();
-        } while(_nextNodes.size() > 0 
-                && (nextNode == _currentNode || !_root.hasNode(nextNode)));
-        
+            nextNode = _nextNodes.removeFirst();
+        } while(_nextNodes.size() > 0 && (nextNode == _currentNode || !_root.hasNode(nextNode)));
+
         if(_nextNodes.size() == 0)
         {
             _root.getCoordinator().getForwardAction().setEnabled(false);
@@ -196,7 +194,7 @@ public class ApplicationPane extends JSplitPane implements Tab
                 _previousNodes.add(_currentNode);
                 _root.getCoordinator().getBackAction().setEnabled(true);
             }
-            
+
             _currentNode = nextNode;
             _root.disableSelectionListener();
             _root.setSelectedNode(_currentNode);
@@ -227,7 +225,7 @@ public class ApplicationPane extends JSplitPane implements Tab
 
         _root = newRoot;
         _root.setPane(this);
-        
+
         //
         // Tree display
         //
@@ -241,16 +239,15 @@ public class ApplicationPane extends JSplitPane implements Tab
         ToolTipManager.sharedInstance().registerComponent(tree);
         tree.addMouseListener(popupListener);
 
-        tree.getSelectionModel().setSelectionMode
-            (TreeSelectionModel.SINGLE_TREE_SELECTION);
+        tree.getSelectionModel().setSelectionMode(TreeSelectionModel.SINGLE_TREE_SELECTION);
 
         tree.addTreeSelectionListener(new SelectionListener());
 
         tree.setRootVisible(true);
 
-        JScrollPane leftScroll = 
+        JScrollPane leftScroll =
             new JScrollPane(tree,
-                            JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED, 
+                            JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED,
                             JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED);
         leftScroll.setBorder(Borders.EMPTY_BORDER);
 
@@ -271,6 +268,7 @@ public class ApplicationPane extends JSplitPane implements Tab
             _root.save();
         }
     }
+
     public void saveToRegistry()
     {
         if(_currentEditor == null || _currentEditor.save(true))
@@ -278,6 +276,7 @@ public class ApplicationPane extends JSplitPane implements Tab
             _root.saveToRegistry();
         }
     }
+
     public void saveToFile()
     {
         if(_currentEditor == null || _currentEditor.save(true))
@@ -285,10 +284,12 @@ public class ApplicationPane extends JSplitPane implements Tab
             _root.saveToFile();
         }
     }
+
     public void discardUpdates()
     {
         _root.discardUpdates();
     }
+
     public boolean close()
     {
         _root.getCoordinator().getMainPane().remove(this);
@@ -318,19 +319,18 @@ public class ApplicationPane extends JSplitPane implements Tab
         am.put((String)action.getValue(Action.NAME), action);
     }
 
-
     ApplicationPane(Root root)
     {
         super(JSplitPane.HORIZONTAL_SPLIT, true);
         setBorder(new EmptyBorder(10, 10, 10, 10));
-        
+
         _leftPane = new SimpleInternalFrame("Descriptors");
         _leftPane.setPreferredSize(new Dimension(280, 350));
         Coordinator c = root.getCoordinator();
         registerAction(c, TreeNode.COPY);
         registerAction(c, TreeNode.PASTE);
         registerAction(c, TreeNode.DELETE);
-        
+
         //
         // Right pane
         //
@@ -340,7 +340,7 @@ public class ApplicationPane extends JSplitPane implements Tab
         setRightComponent(_propertiesFrame);
 
         setRoot(root);
-    }   
+    }
 
     private void showCurrentNode()
     {
@@ -369,11 +369,10 @@ public class ApplicationPane extends JSplitPane implements Tab
         _propertiesFrame.repaint();
     }
 
-
     private void setEmptyDividerBorder()
     {
         SplitPaneUI splitPaneUI = getUI();
-        if(splitPaneUI instanceof BasicSplitPaneUI) 
+        if(splitPaneUI instanceof BasicSplitPaneUI)
         {
             BasicSplitPaneUI basicUI = (BasicSplitPaneUI)splitPaneUI;
             basicUI.getDivider().setBorder(BorderFactory.createEmptyBorder());
@@ -382,24 +381,24 @@ public class ApplicationPane extends JSplitPane implements Tab
 
     private class PopupListener extends MouseAdapter
     {
-        public void mousePressed(MouseEvent e) 
+        public void mousePressed(MouseEvent e)
         {
             maybeShowPopup(e);
         }
 
-        public void mouseReleased(MouseEvent e) 
+        public void mouseReleased(MouseEvent e)
         {
             maybeShowPopup(e);
         }
 
-        private void maybeShowPopup(MouseEvent e) 
+        private void maybeShowPopup(MouseEvent e)
         {
-            if (e.isPopupTrigger()) 
+            if (e.isPopupTrigger())
             {
                 JTree tree = (JTree)e.getComponent();
 
                 TreePath path = tree.getPathForLocation(e.getX(), e.getY());
-                
+
                 if(path != null)
                 {
                     TreeNode node = (TreeNode)path.getLastPathComponent();
@@ -413,7 +412,6 @@ public class ApplicationPane extends JSplitPane implements Tab
         }
     }
 
-    
     private class SelectionListener implements TreeSelectionListener
     {
         public void valueChanged(TreeSelectionEvent e)
@@ -437,7 +435,7 @@ public class ApplicationPane extends JSplitPane implements Tab
                     if(e.isAddedPath())
                     {
                         TreePath path = e.getPath();
-                        
+
                         if(path == null)
                         {
                             showNode(null);
@@ -477,8 +475,8 @@ public class ApplicationPane extends JSplitPane implements Tab
     //
     // back/forward navigation
     //
-    private java.util.LinkedList _previousNodes = new java.util.LinkedList();
-    private java.util.LinkedList _nextNodes = new java.util.LinkedList();
+    private java.util.LinkedList<TreeNode> _previousNodes = new java.util.LinkedList<TreeNode>();
+    private java.util.LinkedList<TreeNode> _nextNodes = new java.util.LinkedList<TreeNode>();
 
     private TreeNode _currentNode;
     private Editor _currentEditor;