removing Java2 mapping

1 files changed, 32 insertions, 36 deletions

diff --git a/java/src/IceGridGUI/LiveDeploymentPane.java b/java/src/IceGridGUI/LiveDeploymentPane.java
index 3267f0b9bb2..27878eb7ee2 100644
--- a/java/src/IceGridGUI/LiveDeploymentPane.java
+++ b/java/src/IceGridGUI/LiveDeploymentPane.java
@@ -6,6 +6,7 @@
 // ICE_LICENSE file included in this distribution.
 //
 // **********************************************************************
+
 package IceGridGUI;
 
 import java.awt.*;
@@ -50,7 +51,7 @@ public class LiveDeploymentPane extends JSplitPane implements Tab
         c.getSaveToRegistryAction().setEnabled(false);
         c.getSaveToFileAction().setEnabled(false);
         c.getDiscardUpdatesAction().setEnabled(false);
-        
+
         c.getBackAction().setEnabled(_previousNodes.size() > 0);
         c.getForwardAction().setEnabled(_nextNodes.size() > 0);
         c.showActions(_currentNode);
@@ -72,11 +73,10 @@ public class LiveDeploymentPane extends JSplitPane implements Tab
         }
     }
 
-
     public void showNode(TreeNodeBase node)
     {
         TreeNode newNode = (TreeNode)node;
-        
+
         if(newNode != _currentNode)
         {
             if(newNode == null)
@@ -94,7 +94,7 @@ public class LiveDeploymentPane extends JSplitPane implements Tab
                         _previousNodes.removeFirst();
                     }
                     _root.getCoordinator().getBackAction().setEnabled(true);
-                }   
+                }
                 _nextNodes.clear();
                 _root.getCoordinator().getForwardAction().setEnabled(false);
                 _currentNode = newNode;
@@ -105,7 +105,6 @@ public class LiveDeploymentPane extends JSplitPane implements Tab
         {
             refresh();
         }
-
     }
 
     public void back()
@@ -113,10 +112,9 @@ public class LiveDeploymentPane 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);
@@ -129,7 +127,7 @@ public class LiveDeploymentPane extends JSplitPane implements Tab
                 _nextNodes.addFirst(_currentNode);
                 _root.getCoordinator().getForwardAction().setEnabled(true);
             }
-            
+
             _currentNode = previousNode;
             _selectionListenerEnabled = false;
             _root.setSelectedNode(_currentNode);
@@ -143,10 +141,9 @@ public class LiveDeploymentPane 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);
@@ -159,7 +156,7 @@ public class LiveDeploymentPane extends JSplitPane implements Tab
                 _previousNodes.add(_currentNode);
                 _root.getCoordinator().getBackAction().setEnabled(true);
             }
-            
+
             _currentNode = nextNode;
             _selectionListenerEnabled = false;
             _root.setSelectedNode(_currentNode);
@@ -168,34 +165,37 @@ public class LiveDeploymentPane extends JSplitPane implements Tab
         }
     }
 
-    
     public void save()
     {
         assert false;
     }
+
     public void saveToRegistry()
     {
         assert false;
     }
+
     public void saveToFile()
     {
         assert false;
     }
+
     public void discardUpdates()
     {
         assert false;
     }
+
     public boolean close()
     {
         return false;
     }
-   
+
     LiveDeploymentPane(Root root)
     {
         super(JSplitPane.HORIZONTAL_SPLIT, true);
         _root = root;
         setBorder(new EmptyBorder(10, 10, 10, 10));
-        
+
         //
         // Tree display
         //
@@ -209,19 +209,18 @@ public class LiveDeploymentPane 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(false);
 
-        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);
-        
+
         _leftPane = new SimpleInternalFrame("Runtime Components");
         _leftPane.setContent(leftScroll);
         _leftPane.setPreferredSize(new Dimension(280, 350));
@@ -263,14 +262,13 @@ public class LiveDeploymentPane extends JSplitPane implements Tab
     private void setEmptyDividerBorder()
     {
         SplitPaneUI splitPaneUI = getUI();
-        if(splitPaneUI instanceof BasicSplitPaneUI) 
+        if(splitPaneUI instanceof BasicSplitPaneUI)
         {
             BasicSplitPaneUI basicUI = (BasicSplitPaneUI)splitPaneUI;
             basicUI.getDivider().setBorder(BorderFactory.createEmptyBorder());
         }
     }
 
-
     private class SelectionListener implements TreeSelectionListener
     {
         public void valueChanged(TreeSelectionEvent e)
@@ -295,27 +293,26 @@ public class LiveDeploymentPane 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();
@@ -333,14 +330,13 @@ public class LiveDeploymentPane extends JSplitPane implements Tab
     private SimpleInternalFrame _leftPane;
     private SimpleInternalFrame _propertiesFrame;
 
-
     //
     // 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 boolean _selectionListenerEnabled = true;
 
     static private final int HISTORY_MAX_SIZE = 20;