removing Java2 mapping

1 files changed, 35 insertions, 45 deletions

diff --git a/java/src/IceGridGUI/Application/ServiceInstanceEditor.java b/java/src/IceGridGUI/Application/ServiceInstanceEditor.java
index b9d13ce41f4..84cad7157ba 100644
--- a/java/src/IceGridGUI/Application/ServiceInstanceEditor.java
+++ b/java/src/IceGridGUI/Application/ServiceInstanceEditor.java
@@ -6,6 +6,7 @@
 // ICE_LICENSE file included in this distribution.
 //
 // **********************************************************************
+
 package IceGridGUI.Application;
 
 import java.awt.event.ActionEvent;
@@ -36,7 +37,7 @@ class ServiceInstanceEditor extends CommunicatorChildEditor
         Action gotoTemplate = new AbstractAction(
             "", Utils.getIcon("/icons/16x16/goto.png"))
             {
-                public void actionPerformed(ActionEvent e) 
+                public void actionPerformed(ActionEvent e)
                 {
                     TreeNode t = (TreeNode)_template.getSelectedItem();
                     if(t != null)
@@ -45,8 +46,7 @@ class ServiceInstanceEditor extends CommunicatorChildEditor
                     }
                 }
             };
-        gotoTemplate.putValue(Action.SHORT_DESCRIPTION, 
-                              "Goto this service template");
+        gotoTemplate.putValue(Action.SHORT_DESCRIPTION, "Goto this service template");
         _templateButton = new JButton(gotoTemplate);
 
         _parameters = new ParameterValuesField(this);
@@ -83,18 +83,16 @@ class ServiceInstanceEditor extends CommunicatorChildEditor
         descriptor.template = ((ServiceTemplate)_template.getSelectedItem()).getId();
         descriptor.parameterValues = _parameters.getValues();
 
-        descriptor.propertySet.references = 
-            (String[])_propertySets.getList().toArray(new String[0]);
+        descriptor.propertySet.references = (String[])_propertySets.getList().toArray(new String[0]);
         descriptor.propertySet.properties = _properties.getProperties();
-    }       
-    
+    }
+
     boolean isSimpleUpdate()
     {
         ServiceInstanceDescriptor descriptor = getDescriptor();
         ServiceTemplate t = (ServiceTemplate)_template.getSelectedItem();
-        
-        return descriptor.template.equals(t.getId())
-            && descriptor.parameterValues.equals(_parameters.getValues());
+
+        return descriptor.template.equals(t.getId()) && descriptor.parameterValues.equals(_parameters.getValues());
     }
 
     Communicator.ChildList getChildList()
@@ -103,11 +101,11 @@ class ServiceInstanceEditor extends CommunicatorChildEditor
     }
 
     protected void appendProperties(DefaultFormBuilder builder)
-    { 
+    {
         builder.append("Template", _template);
         builder.append(_templateButton);
         builder.nextLine();
-        
+
         builder.append("Parameters");
         builder.nextLine();
         builder.append("");
@@ -120,11 +118,10 @@ class ServiceInstanceEditor extends CommunicatorChildEditor
         builder.nextRow(-6);
         JScrollPane scrollPane = new JScrollPane(_parameters);
         CellConstraints cc = new CellConstraints();
-        builder.add(scrollPane, 
-                    cc.xywh(builder.getColumn(), builder.getRow(), 3, 7));
+        builder.add(scrollPane, cc.xywh(builder.getColumn(), builder.getRow(), 3, 7));
         builder.nextRow(6);
         builder.nextLine();
-        
+
         builder.append("Property Sets");
         builder.append(_propertySets, 3);
         builder.nextLine();
@@ -140,8 +137,7 @@ class ServiceInstanceEditor extends CommunicatorChildEditor
 
         builder.nextRow(-6);
         scrollPane = new JScrollPane(_properties);
-        builder.add(scrollPane, 
-                    cc.xywh(builder.getColumn(), builder.getRow(), 3, 7));
+        builder.add(scrollPane, cc.xywh(builder.getColumn(), builder.getRow(), 3, 7));
         builder.nextRow(6);
         builder.nextLine();
     }
@@ -156,46 +152,41 @@ class ServiceInstanceEditor extends CommunicatorChildEditor
     {
         detectUpdates(false);
         _target = service;
-        
+
         //
         // If it's not a template instance, it's shown using
         // ServiceEditor.show()
         //
         assert getDescriptor().template.length() > 0;
 
-        ServiceInstanceDescriptor descriptor = 
-            (ServiceInstanceDescriptor)service.getDescriptor();
+        ServiceInstanceDescriptor descriptor = (ServiceInstanceDescriptor)service.getDescriptor();
         Coordinator coordinator = service.getCoordinator();
         boolean isEditable = service.isEphemeral() || !coordinator.substitute();
 
-        Utils.Resolver resolver = isEditable ? null :
-            ((TreeNode)service.getParent()).getResolver();
-        
+        Utils.Resolver resolver = isEditable ? null : ((TreeNode)service.getParent()).getResolver();
+
         //
         // Need to make control enabled before changing it
         //
         _template.setEnabled(true);
 
-        ServiceTemplates serviceTemplates =
-            service.getRoot().getServiceTemplates();
+        ServiceTemplates serviceTemplates = service.getRoot().getServiceTemplates();
         _template.setModel(serviceTemplates.createComboBoxModel());
 
-        ServiceTemplate t = (ServiceTemplate)
-            serviceTemplates.findChild(descriptor.template);
+        ServiceTemplate t = (ServiceTemplate)serviceTemplates.findChild(descriptor.template);
         assert t != null;
         _template.setSelectedItem(t);
-        
+
         ListDataListener templateListener = new ListDataListener()
             {
                 public void contentsChanged(ListDataEvent e)
                 {
                     updated();
-                    
-                    ServiceTemplate t = 
-                        (ServiceTemplate)_template.getModel().getSelectedItem();
-                    
+
+                    ServiceTemplate t = (ServiceTemplate)_template.getModel().getSelectedItem();
+
                     TemplateDescriptor td = (TemplateDescriptor)t.getDescriptor();
-                    
+
                     //
                     // Replace parameters but keep existing values
                     //
@@ -205,28 +196,27 @@ class ServiceInstanceEditor extends CommunicatorChildEditor
                 }
 
                 public void intervalAdded(ListDataEvent e)
-                {}
-         
+                {
+                }
+
                 public void intervalRemoved(ListDataEvent e)
-                {}
+                {
+                }
             };
 
         _template.getModel().addListDataListener(templateListener);
         _template.setEnabled(isEditable);
-        
+
         TemplateDescriptor td = (TemplateDescriptor)t.getDescriptor();
-        _parameters.set(td.parameters, descriptor.parameterValues, 
-                        td.parameterDefaults, resolver);
-        
-        _propertySets.setList(java.util.Arrays.asList(descriptor.propertySet.references),
-                              getDetailResolver());
+        _parameters.set(td.parameters, descriptor.parameterValues, td.parameterDefaults, resolver);
+
+        _propertySets.setList(java.util.Arrays.asList(descriptor.propertySet.references), getDetailResolver());
         _propertySets.setEditable(isEditable);
 
-        _properties.setProperties(descriptor.propertySet.properties, null, null, 
-                                  getDetailResolver(), isEditable);
+        _properties.setProperties(descriptor.propertySet.properties, null, null, getDetailResolver(), isEditable);
 
         _applyButton.setEnabled(service.isEphemeral());
-        _discardButton.setEnabled(service.isEphemeral());         
+        _discardButton.setEnabled(service.isEphemeral());
         detectUpdates(true);
         if(service.isEphemeral())
         {