diff options
Diffstat (limited to 'java/src')
98 files changed, 1203 insertions, 575 deletions
diff --git a/java/src/IceGridGUI/AdapterObserverI.java b/java/src/IceGridGUI/AdapterObserverI.java index a94f9500967..7b92ad11acb 100644 --- a/java/src/IceGridGUI/AdapterObserverI.java +++ b/java/src/IceGridGUI/AdapterObserverI.java @@ -20,6 +20,7 @@ class AdapterObserverI extends _AdapterObserverDisp _trace = coordinator.traceObservers(); } + @Override public synchronized void adapterInit(final AdapterInfo[] adapters, Ice.Current current) { if(_trace) @@ -42,6 +43,7 @@ class AdapterObserverI extends _AdapterObserverDisp SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { _coordinator.adapterInit(adapters); @@ -49,6 +51,7 @@ class AdapterObserverI extends _AdapterObserverDisp }); } + @Override public void adapterAdded(final AdapterInfo info, Ice.Current current) { if(_trace) @@ -58,6 +61,7 @@ class AdapterObserverI extends _AdapterObserverDisp SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { _coordinator.adapterAdded(info); @@ -65,6 +69,7 @@ class AdapterObserverI extends _AdapterObserverDisp }); } + @Override public void adapterUpdated(final AdapterInfo info, Ice.Current current) { if(_trace) @@ -74,6 +79,7 @@ class AdapterObserverI extends _AdapterObserverDisp SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { _coordinator.adapterUpdated(info); @@ -81,6 +87,7 @@ class AdapterObserverI extends _AdapterObserverDisp }); } + @Override public void adapterRemoved(final String id, Ice.Current current) { if(_trace) @@ -90,6 +97,7 @@ class AdapterObserverI extends _AdapterObserverDisp SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { _coordinator.adapterRemoved(id); diff --git a/java/src/IceGridGUI/AdminRouter.java b/java/src/IceGridGUI/AdminRouter.java index c4db76e8e0f..4d4d9557e88 100644 --- a/java/src/IceGridGUI/AdminRouter.java +++ b/java/src/IceGridGUI/AdminRouter.java @@ -13,6 +13,7 @@ import IceGrid.*; class AdminRouter extends Ice.Blobject { + @Override public boolean ice_invoke(byte[] inParams, Ice.ByteSeqHolder outParams, Ice.Current current) { if(_admin == null) diff --git a/java/src/IceGridGUI/Application/AbstractServerEditor.java b/java/src/IceGridGUI/Application/AbstractServerEditor.java index dfc4e0d7935..9b55bafc5c5 100644 --- a/java/src/IceGridGUI/Application/AbstractServerEditor.java +++ b/java/src/IceGridGUI/Application/AbstractServerEditor.java @@ -10,18 +10,7 @@ package IceGridGUI.Application; import javax.swing.JOptionPane; -import javax.swing.JTextField; -import javax.swing.JToolBar; - -import com.jgoodies.looks.Options; -import com.jgoodies.looks.HeaderStyle; -import com.jgoodies.looks.BorderStyle; -import com.jgoodies.looks.plastic.PlasticLookAndFeel; - -import com.jgoodies.forms.builder.DefaultFormBuilder; - import IceGrid.*; -import IceGridGUI.*; // // Base class for ServerEditor and ServerInstanceEditor @@ -32,12 +21,14 @@ abstract class AbstractServerEditor extends Editor abstract protected void writeDescriptor(); abstract protected boolean isSimpleUpdate(); + @Override protected void buildPropertiesPanel() { super.buildPropertiesPanel(); _propertiesPanel.setName("Server Properties"); } + @Override protected boolean applyUpdate(boolean refresh) { Root root = _target.getRoot(); @@ -90,7 +81,7 @@ abstract class AbstractServerEditor extends Editor // // Success // - _target = (TreeNode)node.findChildWithDescriptor(server.getDescriptor()); + _target = node.findChildWithDescriptor(server.getDescriptor()); root.updated(); if(refresh) diff --git a/java/src/IceGridGUI/Application/Adapter.java b/java/src/IceGridGUI/Application/Adapter.java index cd8132e35ce..63be0308d4b 100644 --- a/java/src/IceGridGUI/Application/Adapter.java +++ b/java/src/IceGridGUI/Application/Adapter.java @@ -43,6 +43,7 @@ class Adapter extends TreeNode implements DescriptorHolder // // Actions // + @Override public boolean[] getAvailableActions() { boolean[] actions = new boolean[ACTION_COUNT]; @@ -63,6 +64,7 @@ class Adapter extends TreeNode implements DescriptorHolder return actions; } + @Override public void copy() { AdapterCopy copy = new AdapterCopy(); @@ -73,11 +75,13 @@ class Adapter extends TreeNode implements DescriptorHolder getCoordinator().getActionsForMenu().get(PASTE).setEnabled(true); } + @Override public void paste() { ((TreeNode)_parent).paste(); } + @Override public Component getTreeCellRendererComponent( JTree tree, Object value, @@ -96,6 +100,7 @@ class Adapter extends TreeNode implements DescriptorHolder return _cellRenderer.getTreeCellRendererComponent(tree, value, sel, expanded, leaf, row, hasFocus); } + @Override public Editor getEditor() { if(_editor == null) @@ -106,11 +111,13 @@ class Adapter extends TreeNode implements DescriptorHolder return _editor; } + @Override protected Editor createEditor() { return new AdapterEditor(); } + @Override public void destroy() { removeProperty(_descriptor.name + ".Endpoints"); @@ -120,16 +127,19 @@ class Adapter extends TreeNode implements DescriptorHolder ((Communicator)_parent).getAdapters().destroyChild(this); } + @Override Object getDescriptor() { return _descriptor; } + @Override public Object saveDescriptor() { return copyDescriptor(_descriptor); } + @Override public void restoreDescriptor(Object savedDescriptor) { AdapterDescriptor ad = (AdapterDescriptor)savedDescriptor; @@ -152,6 +162,7 @@ class Adapter extends TreeNode implements DescriptorHolder _parentProperties = parentProperties; } + @Override void write(XMLWriter writer) throws java.io.IOException { @@ -271,6 +282,7 @@ class Adapter extends TreeNode implements DescriptorHolder "${server}.${service}." + name: "${server}." + name; } + @Override public boolean isEphemeral() { return _ephemeral; diff --git a/java/src/IceGridGUI/Application/AdapterEditor.java b/java/src/IceGridGUI/Application/AdapterEditor.java index 5ee99bfdb2d..007796ad7b2 100644 --- a/java/src/IceGridGUI/Application/AdapterEditor.java +++ b/java/src/IceGridGUI/Application/AdapterEditor.java @@ -19,7 +19,6 @@ import javax.swing.DefaultComboBoxModel; import javax.swing.JButton; import javax.swing.JCheckBox; import javax.swing.JComboBox; -import javax.swing.JComponent; import javax.swing.JOptionPane; import javax.swing.JScrollPane; import javax.swing.JTextArea; @@ -50,6 +49,7 @@ class AdapterEditor extends CommunicatorChildEditor // Action gotoReplicaGroup = new AbstractAction("", Utils.getIcon("/icons/16x16/goto.png")) { + @Override public void actionPerformed(ActionEvent e) { Object obj = _replicaGroupId.getSelectedItem(); @@ -81,6 +81,7 @@ class AdapterEditor extends CommunicatorChildEditor Action checkRegisterProcess = new AbstractAction("Register Process") { + @Override public void actionPerformed(ActionEvent e) { updated(); @@ -97,6 +98,7 @@ class AdapterEditor extends CommunicatorChildEditor Action checkServerLifetime = new AbstractAction("Server Lifetime") { + @Override public void actionPerformed(ActionEvent e) { updated(); @@ -114,16 +116,19 @@ class AdapterEditor extends CommunicatorChildEditor _name.getDocument().addDocumentListener( new DocumentListener() { + @Override public void changedUpdate(DocumentEvent e) { update(); } + @Override public void insertUpdate(DocumentEvent e) { update(); } + @Override public void removeUpdate(DocumentEvent e) { update(); @@ -180,6 +185,7 @@ class AdapterEditor extends CommunicatorChildEditor // From CommunicatorChildEditor // + @Override void writeDescriptor() { AdapterDescriptor descriptor = (AdapterDescriptor)getAdapter().getDescriptor(); @@ -194,6 +200,7 @@ class AdapterEditor extends CommunicatorChildEditor descriptor.allocatables = _allocatableList; } + @Override boolean isSimpleUpdate() { AdapterDescriptor descriptor = (AdapterDescriptor)getAdapter().getDescriptor(); @@ -201,11 +208,13 @@ class AdapterEditor extends CommunicatorChildEditor return descriptor.name.equals(_name.getText().trim()); } + @Override Communicator.ChildList getChildList() { return ((Communicator)_target.getParent()).getAdapters(); } + @Override protected void appendProperties(DefaultFormBuilder builder) { builder.append("Adapter Name" ); @@ -278,12 +287,14 @@ class AdapterEditor extends CommunicatorChildEditor builder.nextLine(); } + @Override protected void buildPropertiesPanel() { super.buildPropertiesPanel(); _propertiesPanel.setName("Adapter Properties"); } + @Override void postUpdate() { // @@ -405,6 +416,7 @@ class AdapterEditor extends CommunicatorChildEditor } } + @Override protected boolean validate() { // @@ -477,6 +489,7 @@ class AdapterEditor extends CommunicatorChildEditor _replicaGroupId.addItemListener(new ItemListener() { + @Override public void itemStateChanged(ItemEvent e) { if(e.getStateChange() == ItemEvent.SELECTED) @@ -610,6 +623,7 @@ class AdapterEditor extends CommunicatorChildEditor private final Object DEFAULT_ADAPTER_ID = new Object() { + @Override public String toString() { return _defaultAdapterId; @@ -644,6 +658,7 @@ class AdapterEditor extends CommunicatorChildEditor static private final Object PUBLISH_ACTUAL = new Object() { + @Override public String toString() { return "Actual endpoints"; @@ -652,6 +667,7 @@ class AdapterEditor extends CommunicatorChildEditor static private final Object NOT_REPLICATED = new Object() { + @Override public String toString() { return "Does not belong to a replica group"; diff --git a/java/src/IceGridGUI/Application/ApplicationEditor.java b/java/src/IceGridGUI/Application/ApplicationEditor.java index 96718444102..2192e20ec43 100644 --- a/java/src/IceGridGUI/Application/ApplicationEditor.java +++ b/java/src/IceGridGUI/Application/ApplicationEditor.java @@ -9,11 +9,6 @@ package IceGridGUI.Application; -import java.awt.event.ActionEvent; - -import javax.swing.AbstractAction; -import javax.swing.Action; -import javax.swing.JButton; import javax.swing.JComponent; import javax.swing.JComboBox; import javax.swing.JOptionPane; @@ -30,6 +25,7 @@ import IceGridGUI.*; @SuppressWarnings("unchecked") class ApplicationEditor extends Editor { + @Override protected boolean applyUpdate(boolean refresh) { Root root = (Root)_target; @@ -115,6 +111,7 @@ class ApplicationEditor extends Editor } + @Override protected void appendProperties(DefaultFormBuilder builder) { builder.append("Name"); @@ -153,6 +150,7 @@ class ApplicationEditor extends Editor builder.nextLine(); } + @Override protected void buildPropertiesPanel() { super.buildPropertiesPanel(); @@ -183,6 +181,7 @@ class ApplicationEditor extends Editor descriptor.distrib.directories = _distribDirs.getList(); } + @Override protected boolean validate() { return check(new String[]{"Name", _name.getText().trim()}); @@ -230,6 +229,7 @@ class ApplicationEditor extends Editor detectUpdates(true); } + @Override Utils.Resolver getDetailResolver() { if(_target.getCoordinator().substitute()) @@ -244,6 +244,7 @@ class ApplicationEditor extends Editor static private final Object NO_DISTRIB = new Object() { + @Override public String toString() { return "None selected"; diff --git a/java/src/IceGridGUI/Application/ArrayMapField.java b/java/src/IceGridGUI/Application/ArrayMapField.java index 43ac6ee97e5..f187607abd8 100644 --- a/java/src/IceGridGUI/Application/ArrayMapField.java +++ b/java/src/IceGridGUI/Application/ArrayMapField.java @@ -9,16 +9,13 @@ package IceGridGUI.Application; -import IceGrid.*; import IceGridGUI.*; import java.awt.event.ActionEvent; import javax.swing.AbstractAction; import javax.swing.Action; -import javax.swing.DefaultCellEditor; import javax.swing.JTable; -import javax.swing.JTextField; import javax.swing.KeyStroke; import javax.swing.event.TableModelEvent; import javax.swing.event.TableModelListener; @@ -57,6 +54,7 @@ public class ArrayMapField extends JTable Action deleteRow = new AbstractAction("Delete selected row(s)") { + @Override public void actionPerformed(ActionEvent e) { if(_editable) @@ -127,6 +125,7 @@ public class ArrayMapField extends JTable _model = new DefaultTableModel(vector, _columnNames) { + @Override public boolean isCellEditable(int row, int column) { return _editable; @@ -135,6 +134,7 @@ public class ArrayMapField extends JTable _model.addTableModelListener(new TableModelListener() { + @Override public void tableChanged(TableModelEvent e) { if(_editable) @@ -174,7 +174,7 @@ public class ArrayMapField extends JTable } @SuppressWarnings("unchecked") java.util.Vector<java.util.Vector<String>> vector = - (java.util.Vector<java.util.Vector<String>>)_model.getDataVector(); + _model.getDataVector(); java.util.TreeMap<String, String[]> result = new java.util.TreeMap<String, String[]>(); diff --git a/java/src/IceGridGUI/Application/Communicator.java b/java/src/IceGridGUI/Application/Communicator.java index 7f486d1a720..f657113b1e8 100644 --- a/java/src/IceGridGUI/Application/Communicator.java +++ b/java/src/IceGridGUI/Application/Communicator.java @@ -22,10 +22,12 @@ import IceGridGUI.*; // abstract class Communicator extends TreeNode implements DescriptorHolder { + @Override public Enumeration children() { return new Enumeration() { + @Override public boolean hasMoreElements() { if(_p.hasNext()) @@ -44,6 +46,7 @@ abstract class Communicator extends TreeNode implements DescriptorHolder return false; } + @Override public Object nextElement() { try @@ -68,11 +71,13 @@ abstract class Communicator extends TreeNode implements DescriptorHolder }; } + @Override public boolean getAllowsChildren() { return true; } + @Override public javax.swing.tree.TreeNode getChildAt(int childIndex) { if(childIndex < 0) @@ -94,6 +99,7 @@ abstract class Communicator extends TreeNode implements DescriptorHolder throw new ArrayIndexOutOfBoundsException(childIndex); } + @Override public int getChildCount() { int result = 0; @@ -104,6 +110,7 @@ abstract class Communicator extends TreeNode implements DescriptorHolder return result; } + @Override public int getIndex(javax.swing.tree.TreeNode node) { int offset = 0; @@ -122,6 +129,7 @@ abstract class Communicator extends TreeNode implements DescriptorHolder return -1; } + @Override public boolean isLeaf() { for(ChildList childList : _childListArray) @@ -138,26 +146,31 @@ abstract class Communicator extends TreeNode implements DescriptorHolder // Actions // + @Override public void newAdapter() { _adapters.newChild(); } + @Override public void newDbEnv() { _dbEnvs.newChild(); } + @Override public void newService() { _services.newChild(); } + @Override public void newServiceFromTemplate() { _services.newServiceFromTemplate(); } + @Override public void paste() { Object descriptor = getCoordinator().getClipboard(); @@ -198,6 +211,7 @@ abstract class Communicator extends TreeNode implements DescriptorHolder return result; } + @Override TreeNode findChildLike(TreeNode other) { if(other instanceof Adapter) @@ -489,6 +503,7 @@ abstract class Communicator extends TreeNode implements DescriptorHolder } } + @Override void newChild() { AdapterDescriptor descriptor = new AdapterDescriptor( @@ -514,6 +529,7 @@ abstract class Communicator extends TreeNode implements DescriptorHolder return new Adapter(Communicator.this, name, ad, null, false); } */ + @Override TreeNode createChild(AdapterDescriptor descriptor) { String name = Utils.substitute(descriptor.name, getResolver()); @@ -574,6 +590,7 @@ abstract class Communicator extends TreeNode implements DescriptorHolder super(true); } + @Override void newChild() { DbEnvDescriptor descriptor = new DbEnvDescriptor( @@ -586,6 +603,7 @@ abstract class Communicator extends TreeNode implements DescriptorHolder } //TreeNode createChild(Object descriptor) + @Override TreeNode createChild(DbEnvDescriptor descriptor) { //DbEnvDescriptor dd = (DbEnvDescriptor)descriptor; @@ -618,6 +636,7 @@ abstract class Communicator extends TreeNode implements DescriptorHolder super(false); } + @Override void newChild() { ServiceDescriptor serviceDescriptor = @@ -690,6 +709,7 @@ abstract class Communicator extends TreeNode implements DescriptorHolder getCoordinator().showActions(child); } + @Override TreeNode createChild(ServiceInstanceDescriptor descriptor) throws UpdateFailedException { @@ -761,6 +781,7 @@ abstract class Communicator extends TreeNode implements DescriptorHolder } } + @Override void tryUpdate(TreeNode child) throws UpdateFailedException { @@ -868,7 +889,7 @@ abstract class Communicator extends TreeNode implements DescriptorHolder ServiceInstance obj = (ServiceInstance)p.next(); if(obj instanceof ServiceInstance) { - ServiceInstance service = (ServiceInstance)obj; + ServiceInstance service = obj; ServiceInstanceDescriptor d = (ServiceInstanceDescriptor)service.getDescriptor(); if(d.template.equals(template)) { diff --git a/java/src/IceGridGUI/Application/CommunicatorChildEditor.java b/java/src/IceGridGUI/Application/CommunicatorChildEditor.java index 62dc9e6aec0..b3e72b8f91d 100644 --- a/java/src/IceGridGUI/Application/CommunicatorChildEditor.java +++ b/java/src/IceGridGUI/Application/CommunicatorChildEditor.java @@ -11,9 +11,6 @@ package IceGridGUI.Application; import javax.swing.JOptionPane; -import IceGrid.*; -import IceGridGUI.*; - abstract class CommunicatorChildEditor extends Editor { abstract void writeDescriptor(); @@ -24,6 +21,7 @@ abstract class CommunicatorChildEditor extends Editor { } + @Override @SuppressWarnings("unchecked") protected boolean applyUpdate(boolean refresh) { diff --git a/java/src/IceGridGUI/Application/CommunicatorSubEditor.java b/java/src/IceGridGUI/Application/CommunicatorSubEditor.java index ad34ac4b425..66d1785e082 100644 --- a/java/src/IceGridGUI/Application/CommunicatorSubEditor.java +++ b/java/src/IceGridGUI/Application/CommunicatorSubEditor.java @@ -9,15 +9,8 @@ package IceGridGUI.Application; -import java.awt.event.ActionEvent; - -import javax.swing.AbstractAction; -import javax.swing.Action; -import javax.swing.JButton; import javax.swing.JScrollPane; import javax.swing.JTextArea; -import javax.swing.JTextField; - import com.jgoodies.forms.builder.DefaultFormBuilder; import com.jgoodies.forms.layout.CellConstraints; diff --git a/java/src/IceGridGUI/Application/DbEnv.java b/java/src/IceGridGUI/Application/DbEnv.java index 21e8e488ea6..7f1743bf678 100644 --- a/java/src/IceGridGUI/Application/DbEnv.java +++ b/java/src/IceGridGUI/Application/DbEnv.java @@ -33,6 +33,7 @@ class DbEnv extends TreeNode implements DescriptorHolder return copy; } + @Override public Component getTreeCellRendererComponent( JTree tree, Object value, @@ -53,6 +54,7 @@ class DbEnv extends TreeNode implements DescriptorHolder // // Actions // + @Override public boolean[] getAvailableActions() { boolean[] actions = new boolean[ACTION_COUNT]; @@ -73,17 +75,20 @@ class DbEnv extends TreeNode implements DescriptorHolder return actions; } + @Override public void copy() { getCoordinator().setClipboard(copyDescriptor(_descriptor)); getCoordinator().getActionsForMenu().get(PASTE).setEnabled(true); } + @Override public void paste() { ((TreeNode)_parent).paste(); } + @Override public Editor getEditor() { if(_editor == null) @@ -94,11 +99,13 @@ class DbEnv extends TreeNode implements DescriptorHolder return _editor; } + @Override protected Editor createEditor() { return new DbEnvEditor(); } + @Override public Object getDescriptor() { return _descriptor; @@ -109,11 +116,13 @@ class DbEnv extends TreeNode implements DescriptorHolder return copyDescriptor(_descriptor); } + @Override public Object saveDescriptor() { return copyDescriptor(_descriptor); } + @Override public void restoreDescriptor(Object savedDescriptor) { DbEnvDescriptor clone = (DbEnvDescriptor)savedDescriptor; @@ -123,11 +132,13 @@ class DbEnv extends TreeNode implements DescriptorHolder _descriptor.properties = clone.properties; } + @Override public void destroy() { ((Communicator)_parent).getDbEnvs().destroyChild(this); } + @Override public boolean isEphemeral() { return _ephemeral; @@ -152,6 +163,7 @@ class DbEnv extends TreeNode implements DescriptorHolder } } + @Override void write(XMLWriter writer) throws java.io.IOException { diff --git a/java/src/IceGridGUI/Application/DbEnvEditor.java b/java/src/IceGridGUI/Application/DbEnvEditor.java index 7c20ab43b3a..f4c6dfcc531 100644 --- a/java/src/IceGridGUI/Application/DbEnvEditor.java +++ b/java/src/IceGridGUI/Application/DbEnvEditor.java @@ -9,11 +9,6 @@ package IceGridGUI.Application; -import java.awt.event.ActionEvent; - -import javax.swing.AbstractAction; -import javax.swing.Action; -import javax.swing.JButton; import javax.swing.JComboBox; import javax.swing.JScrollPane; import javax.swing.JTextArea; @@ -44,6 +39,7 @@ class DbEnvEditor extends CommunicatorChildEditor _properties = new PropertiesField(this); } + @Override void writeDescriptor() { DbEnvDescriptor descriptor = (DbEnvDescriptor)getDbEnv().getDescriptor(); @@ -53,17 +49,20 @@ class DbEnvEditor extends CommunicatorChildEditor descriptor.properties = _properties.getProperties(); } + @Override boolean isSimpleUpdate() { DbEnvDescriptor descriptor = (DbEnvDescriptor)getDbEnv().getDescriptor(); return descriptor.name.equals(_name.getText().trim()); } + @Override Communicator.ChildList getChildList() { return ((Communicator)_target.getParent()).getDbEnvs(); } + @Override protected void appendProperties(DefaultFormBuilder builder) { builder.append("Name" ); @@ -100,12 +99,14 @@ class DbEnvEditor extends CommunicatorChildEditor builder.nextLine(); } + @Override protected void buildPropertiesPanel() { super.buildPropertiesPanel(); _propertiesPanel.setName("Database Environment Properties"); } + @Override protected boolean validate() { return check(new String[]{"Name", _name.getText().trim()}); @@ -189,6 +190,7 @@ class DbEnvEditor extends CommunicatorChildEditor static private final Object NO_DB_HOME = new Object() { + @Override public String toString() { return "Created by the IceGrid Node"; diff --git a/java/src/IceGridGUI/Application/Editor.java b/java/src/IceGridGUI/Application/Editor.java index 4450b5b75c5..48908b6f74b 100644 --- a/java/src/IceGridGUI/Application/Editor.java +++ b/java/src/IceGridGUI/Application/Editor.java @@ -13,28 +13,15 @@ import java.awt.BorderLayout; import java.awt.event.ActionEvent; import javax.swing.AbstractAction; -import javax.swing.Action; import javax.swing.JButton; import javax.swing.JComponent; -import javax.swing.JLabel; import javax.swing.JOptionPane; -import javax.swing.JPanel; -import javax.swing.JScrollPane; -import javax.swing.JToolBar; - -import javax.swing.tree.TreePath; - import javax.swing.event.DocumentEvent; import javax.swing.event.DocumentListener; import com.jgoodies.forms.builder.DefaultFormBuilder; import com.jgoodies.forms.builder.ButtonBarBuilder; import com.jgoodies.forms.factories.Borders; -import com.jgoodies.forms.factories.DefaultComponentFactory; -import com.jgoodies.forms.layout.FormLayout; -import com.jgoodies.forms.util.LayoutStyle; - -import IceGrid.*; import IceGridGUI.*; public class Editor extends EditorBase @@ -99,10 +86,12 @@ public class Editor extends EditorBase root.cancelEdit(); } + @Override protected void appendProperties(DefaultFormBuilder builder) { } + @Override protected void buildPropertiesPanel() { super.buildPropertiesPanel(); @@ -118,6 +107,7 @@ public class Editor extends EditorBase // AbstractAction apply = new AbstractAction("Apply") { + @Override public void actionPerformed(ActionEvent e) { if(validate()) @@ -137,6 +127,7 @@ public class Editor extends EditorBase // AbstractAction discard = new AbstractAction("Discard") { + @Override public void actionPerformed(ActionEvent e) { discardUpdate(); @@ -148,16 +139,19 @@ public class Editor extends EditorBase _updateListener = new DocumentListener() { + @Override public void changedUpdate(DocumentEvent e) { updated(); } + @Override public void insertUpdate(DocumentEvent e) { updated(); } + @Override public void removeUpdate(DocumentEvent e) { updated(); diff --git a/java/src/IceGridGUI/Application/ListTextField.java b/java/src/IceGridGUI/Application/ListTextField.java index 0ebce04fae4..a329cf14439 100644 --- a/java/src/IceGridGUI/Application/ListTextField.java +++ b/java/src/IceGridGUI/Application/ListTextField.java @@ -9,7 +9,6 @@ package IceGridGUI.Application; -import IceGrid.*; import IceGridGUI.*; import javax.swing.JTextField; @@ -30,6 +29,7 @@ public class ListTextField extends JTextField { Utils.Stringifier stringifier = new Utils.Stringifier() { + @Override public String toString(Object obj) { return Utils.substitute((String)obj, resolver); diff --git a/java/src/IceGridGUI/Application/ListTreeNode.java b/java/src/IceGridGUI/Application/ListTreeNode.java index bc6fa5f78cc..d5d6770ee2e 100644 --- a/java/src/IceGridGUI/Application/ListTreeNode.java +++ b/java/src/IceGridGUI/Application/ListTreeNode.java @@ -13,7 +13,6 @@ import javax.swing.tree.DefaultTreeModel; import java.util.Enumeration; -import IceGrid.*; import IceGridGUI.*; // @@ -21,15 +20,18 @@ import IceGridGUI.*; // abstract class ListTreeNode extends TreeNode { + @Override public Enumeration children() { return new Enumeration() { + @Override public boolean hasMoreElements() { return _p.hasNext(); } + @Override public Object nextElement() { return _p.next(); @@ -39,11 +41,13 @@ abstract class ListTreeNode extends TreeNode }; } + @Override public boolean getAllowsChildren() { return true; } + @Override public javax.swing.tree.TreeNode getChildAt(int childIndex) { if(childIndex < 0) @@ -60,21 +64,25 @@ abstract class ListTreeNode extends TreeNode } } + @Override public int getChildCount() { return _children.size(); } + @Override public int getIndex(javax.swing.tree.TreeNode node) { return _children.indexOf(node); } + @Override public boolean isLeaf() { return _children.isEmpty(); } + @Override public Editor getEditor() { if(_editor == null) @@ -84,6 +92,7 @@ abstract class ListTreeNode extends TreeNode return _editor; } + @Override protected Editor createEditor() { assert false; @@ -96,6 +105,7 @@ abstract class ListTreeNode extends TreeNode _editable = new Editable(brandNew); } + @Override void write(XMLWriter writer) throws java.io.IOException { @@ -169,6 +179,7 @@ abstract class ListTreeNode extends TreeNode // class ComboBoxModel extends javax.swing.AbstractListModel implements javax.swing.ComboBoxModel { + @Override public Object getElementAt(int index) { if(_firstItem != null) @@ -188,6 +199,7 @@ abstract class ListTreeNode extends TreeNode } } + @Override public int getSize() { if(_firstItem != null) @@ -200,11 +212,13 @@ abstract class ListTreeNode extends TreeNode } } + @Override public Object getSelectedItem() { return _selectedItem; } + @Override public void setSelectedItem(Object obj) { if(obj != _selectedItem) diff --git a/java/src/IceGridGUI/Application/Node.java b/java/src/IceGridGUI/Application/Node.java index 33c34c1d5a2..6ba82544034 100644 --- a/java/src/IceGridGUI/Application/Node.java +++ b/java/src/IceGridGUI/Application/Node.java @@ -13,14 +13,11 @@ import java.awt.Component; import java.util.Enumeration; import javax.swing.Icon; -import javax.swing.JMenuItem; import javax.swing.JOptionPane; import javax.swing.JPopupMenu; -import javax.swing.JTextField; import javax.swing.JTree; import javax.swing.tree.DefaultTreeModel; -import javax.swing.tree.TreeCellRenderer; import javax.swing.tree.DefaultTreeCellRenderer; import IceGrid.*; @@ -50,10 +47,12 @@ class Node extends TreeNode implements PropertySetParent return copy; } + @Override public Enumeration children() { return new Enumeration() { + @Override public boolean hasMoreElements() { if(!_p.hasNext()) @@ -69,6 +68,7 @@ class Node extends TreeNode implements PropertySetParent return true; } + @Override public Object nextElement() { return _p.next(); @@ -79,11 +79,13 @@ class Node extends TreeNode implements PropertySetParent }; } + @Override public boolean getAllowsChildren() { return true; } + @Override public javax.swing.tree.TreeNode getChildAt(int childIndex) { if(childIndex < 0) @@ -104,11 +106,13 @@ class Node extends TreeNode implements PropertySetParent } } + @Override public int getChildCount() { return _propertySets.size() + _servers.size(); } + @Override public int getIndex(javax.swing.tree.TreeNode node) { if(node instanceof PropertySet) @@ -126,6 +130,7 @@ class Node extends TreeNode implements PropertySetParent } } + @Override public boolean isLeaf() { return _propertySets.isEmpty() && _servers.isEmpty(); @@ -201,6 +206,7 @@ class Node extends TreeNode implements PropertySetParent getRoot().getTreeModel().nodesWereRemoved(this, new int[]{index}, new Object[]{child}); } + @Override public void insertPropertySet(PropertySet child, boolean fireEvent) throws UpdateFailedException { @@ -212,6 +218,7 @@ class Node extends TreeNode implements PropertySetParent } } + @Override public void removePropertySet(PropertySet child) { int index = getIndex(child); @@ -220,16 +227,19 @@ class Node extends TreeNode implements PropertySetParent getRoot().getTreeModel().nodesWereRemoved(this, new int[]{index}, new Object[]{child}); } + @Override public void removeDescriptor(String id) { _descriptor.propertySets.remove(id); } + @Override public Editable getEditable() { return _editable; } + @Override public boolean[] getAvailableActions() { boolean[] actions = new boolean[ACTION_COUNT]; @@ -258,6 +268,7 @@ class Node extends TreeNode implements PropertySetParent return actions; } + @Override public JPopupMenu getPopupMenu() { ApplicationActions actions = getCoordinator().getActionsForPopup(); @@ -274,12 +285,14 @@ class Node extends TreeNode implements PropertySetParent return _popup; } + @Override public void copy() { getCoordinator().setClipboard(copyDescriptor(_descriptor)); getCoordinator().getActionsForMenu().get(PASTE).setEnabled(true); } + @Override public void paste() { Object descriptor = getCoordinator().getClipboard(); @@ -321,20 +334,24 @@ class Node extends TreeNode implements PropertySetParent } } + @Override public void newPropertySet() { newPropertySet(new PropertySetDescriptor(new String[0], new java.util.LinkedList<PropertyDescriptor>())); } + @Override public void newServer() { newServer(PlainServer.newServerDescriptor()); } + @Override public void newServerIceBox() { newServer(PlainServer.newIceBoxDescriptor()); } + @Override public void newServerFromTemplate() { ServerInstanceDescriptor descriptor = @@ -348,6 +365,7 @@ class Node extends TreeNode implements PropertySetParent newServer(descriptor); } + @Override public void destroy() { Nodes nodes = (Nodes)_parent; @@ -364,6 +382,7 @@ class Node extends TreeNode implements PropertySetParent } } + @Override public Component getTreeCellRendererComponent( JTree tree, Object value, @@ -387,6 +406,7 @@ class Node extends TreeNode implements PropertySetParent return _cellRenderer.getTreeCellRendererComponent(tree, value, sel, expanded, leaf, row, hasFocus); } + @Override public Editor getEditor() { if(_editor == null) @@ -397,16 +417,19 @@ class Node extends TreeNode implements PropertySetParent return _editor; } + @Override protected Editor createEditor() { return new NodeEditor(); } + @Override public boolean isEphemeral() { return _ephemeral; } + @Override Object getDescriptor() { return _descriptor; @@ -424,6 +447,7 @@ class Node extends TreeNode implements PropertySetParent _descriptor.variables = copy.variables; } + @Override void write(XMLWriter writer) throws java.io.IOException { @@ -1073,11 +1097,13 @@ class Node extends TreeNode implements PropertySetParent } } + @Override Utils.Resolver getResolver() { return _resolver; } + @Override public void tryAdd(String id, PropertySetDescriptor descriptor) throws UpdateFailedException { @@ -1085,6 +1111,7 @@ class Node extends TreeNode implements PropertySetParent _descriptor.propertySets.put(id, descriptor); } + @Override public void tryRename(String oldId, String oldId2, String newId) throws UpdateFailedException { diff --git a/java/src/IceGridGUI/Application/NodeEditor.java b/java/src/IceGridGUI/Application/NodeEditor.java index 481d0874ba9..d26c32bc8fe 100644 --- a/java/src/IceGridGUI/Application/NodeEditor.java +++ b/java/src/IceGridGUI/Application/NodeEditor.java @@ -9,20 +9,10 @@ package IceGridGUI.Application; -import java.awt.event.ActionEvent; -import java.awt.event.KeyEvent; - -import javax.swing.AbstractAction; -import javax.swing.Action; -import javax.swing.JButton; -import javax.swing.JComponent; -import javax.swing.JLabel; import javax.swing.JOptionPane; import javax.swing.JScrollPane; import javax.swing.JTextArea; import javax.swing.JTextField; -import javax.swing.KeyStroke; - import com.jgoodies.forms.builder.DefaultFormBuilder; import com.jgoodies.forms.layout.CellConstraints; @@ -31,12 +21,14 @@ import IceGridGUI.*; class NodeEditor extends Editor { + @Override protected void buildPropertiesPanel() { super.buildPropertiesPanel(); _propertiesPanel.setName("Node Properties"); } + @Override protected boolean applyUpdate(boolean refresh) { Root root = _target.getRoot(); @@ -145,6 +137,7 @@ class NodeEditor extends Editor } } + @Override Utils.Resolver getDetailResolver() { if(_target.getCoordinator().substitute()) @@ -176,6 +169,7 @@ class NodeEditor extends Editor + "on Windows, IceGrid uses 1.0.<html>"); } + @Override protected void appendProperties(DefaultFormBuilder builder) { builder.append("Name"); @@ -224,6 +218,7 @@ class NodeEditor extends Editor descriptor.loadFactor = _loadFactor.getText().trim(); } + @Override protected boolean validate() { return check(new String[]{"Name", _name.getText().trim()}); diff --git a/java/src/IceGridGUI/Application/Nodes.java b/java/src/IceGridGUI/Application/Nodes.java index c2f6c4168fe..f8fc97f0912 100644 --- a/java/src/IceGridGUI/Application/Nodes.java +++ b/java/src/IceGridGUI/Application/Nodes.java @@ -9,13 +9,8 @@ package IceGridGUI.Application; -import java.awt.Component; - -import javax.swing.JMenuItem; import javax.swing.JOptionPane; import javax.swing.JPopupMenu; -import javax.swing.JTree; - import IceGrid.*; import IceGridGUI.*; @@ -32,6 +27,7 @@ class Nodes extends ListTreeNode return copy; } + @Override public boolean[] getAvailableActions() { boolean[] actions = new boolean[ACTION_COUNT]; @@ -45,6 +41,7 @@ class Nodes extends ListTreeNode return actions; } + @Override public JPopupMenu getPopupMenu() { ApplicationActions actions = getCoordinator().getActionsForPopup(); @@ -57,6 +54,7 @@ class Nodes extends ListTreeNode return _popup; } + @Override public void paste() { Object descriptor = getCoordinator().getClipboard(); @@ -98,6 +96,7 @@ class Nodes extends ListTreeNode newNode(nd); } + @Override public void newNode() { newNode(new NodeDescriptor( @@ -300,6 +299,7 @@ class Nodes extends ListTreeNode _descriptors.remove(nodeName); } + @Override Object getDescriptor() { return _descriptors; diff --git a/java/src/IceGridGUI/Application/ParameterValuesField.java b/java/src/IceGridGUI/Application/ParameterValuesField.java index 18a3e4e48b5..ad4adb5c88c 100644 --- a/java/src/IceGridGUI/Application/ParameterValuesField.java +++ b/java/src/IceGridGUI/Application/ParameterValuesField.java @@ -9,24 +9,16 @@ package IceGridGUI.Application; -import IceGrid.*; import IceGridGUI.*; -import java.awt.event.ActionEvent; - -import javax.swing.AbstractAction; -import javax.swing.Action; import javax.swing.DefaultCellEditor; import javax.swing.JComboBox; import javax.swing.JTable; -import javax.swing.JTextField; -import javax.swing.KeyStroke; import javax.swing.event.TableModelEvent; import javax.swing.event.TableModelListener; import javax.swing.table.DefaultTableCellRenderer; import javax.swing.table.DefaultTableModel; import javax.swing.table.TableCellEditor; -import javax.swing.table.TableColumn; // // A special field used to show/edit parameter values @@ -84,7 +76,7 @@ public class ParameterValuesField extends JTable } else { - row.add(Utils.substitute((String)val, resolver)); + row.add(Utils.substitute(val, resolver)); } vector.add(row); i++; @@ -92,6 +84,7 @@ public class ParameterValuesField extends JTable _model = new DefaultTableModel(vector, _columnNames) { + @Override public boolean isCellEditable(int row, int column) { if(resolver == null) @@ -107,6 +100,7 @@ public class ParameterValuesField extends JTable _model.addTableModelListener(new TableModelListener() { + @Override public void tableChanged(TableModelEvent e) { _editor.updated(); @@ -132,7 +126,7 @@ public class ParameterValuesField extends JTable } java.util.Vector<java.util.Vector<String>> vector = - (java.util.Vector<java.util.Vector<String>>)_model.getDataVector(); + _model.getDataVector(); for(java.util.Vector<String> row : vector) { @@ -156,6 +150,7 @@ public class ParameterValuesField extends JTable return values; } + @Override public TableCellEditor getCellEditor(int row, int column) { if(column == 1) diff --git a/java/src/IceGridGUI/Application/ParametersField.java b/java/src/IceGridGUI/Application/ParametersField.java index 46503d7fa4f..80d68d737ef 100644 --- a/java/src/IceGridGUI/Application/ParametersField.java +++ b/java/src/IceGridGUI/Application/ParametersField.java @@ -9,9 +9,6 @@ package IceGridGUI.Application; -import IceGrid.*; -import IceGridGUI.*; - import java.awt.event.ActionEvent; import javax.swing.AbstractAction; @@ -19,11 +16,9 @@ import javax.swing.Action; import javax.swing.DefaultCellEditor; import javax.swing.JComboBox; import javax.swing.JTable; -import javax.swing.JTextField; import javax.swing.KeyStroke; import javax.swing.event.TableModelEvent; import javax.swing.event.TableModelListener; -import javax.swing.table.DefaultTableCellRenderer; import javax.swing.table.DefaultTableModel; import javax.swing.table.TableCellEditor; import javax.swing.table.TableColumn; @@ -59,6 +54,7 @@ public class ParametersField extends JTable Action deleteRow = new AbstractAction("Delete selected row(s)") { + @Override public void actionPerformed(ActionEvent e) { if(isEditing()) @@ -118,6 +114,7 @@ public class ParametersField extends JTable _model.addTableModelListener(new TableModelListener() { + @Override public void tableChanged(TableModelEvent e) { Object lastKey = _model.getValueAt(_model.getRowCount() - 1 , 0); @@ -149,7 +146,7 @@ public class ParametersField extends JTable } @SuppressWarnings("unchecked") java.util.Vector<java.util.Vector<String>> vector = - (java.util.Vector<java.util.Vector<String>>)_model.getDataVector(); + _model.getDataVector(); for(java.util.Vector<String> row : vector) { diff --git a/java/src/IceGridGUI/Application/PlainServer.java b/java/src/IceGridGUI/Application/PlainServer.java index 2e0d0a83630..774b346fc7a 100644 --- a/java/src/IceGridGUI/Application/PlainServer.java +++ b/java/src/IceGridGUI/Application/PlainServer.java @@ -15,7 +15,6 @@ import javax.swing.Icon; import javax.swing.JPopupMenu; import javax.swing.JTree; -import javax.swing.tree.TreeCellRenderer; import javax.swing.tree.DefaultTreeCellRenderer; import IceGrid.*; @@ -114,6 +113,7 @@ class PlainServer extends Communicator implements Server // // Actions // + @Override public boolean[] getAvailableActions() { boolean[] actions = new boolean[ACTION_COUNT]; @@ -144,6 +144,7 @@ class PlainServer extends Communicator implements Server return actions; } + @Override public JPopupMenu getPopupMenu() { ApplicationActions actions = getCoordinator().getActionsForPopup(); @@ -159,12 +160,14 @@ class PlainServer extends Communicator implements Server return _popup; } + @Override public void copy() { getCoordinator().setClipboard(copyDescriptor(_descriptor)); getCoordinator().getActionsForMenu().get(PASTE).setEnabled(true); } + @Override public Editor getEditor() { if(_editor == null) @@ -175,11 +178,13 @@ class PlainServer extends Communicator implements Server return _editor; } + @Override protected Editor createEditor() { return new PlainServerEditor(); } + @Override public Component getTreeCellRendererComponent( JTree tree, Object value, @@ -211,6 +216,7 @@ class PlainServer extends Communicator implements Server return _cellRenderer.getTreeCellRendererComponent(tree, value, sel, expanded, leaf, row, hasFocus); } + @Override public void destroy() { Node node = (Node)_parent; @@ -228,11 +234,13 @@ class PlainServer extends Communicator implements Server } } + @Override public Object getDescriptor() { return _descriptor; } + @Override public Object saveDescriptor() { ServerDescriptor clone = (ServerDescriptor)_descriptor.clone(); @@ -240,6 +248,7 @@ class PlainServer extends Communicator implements Server return clone; } + @Override public void restoreDescriptor(Object savedDescriptor) { shallowRestore((ServerDescriptor)savedDescriptor, _descriptor); @@ -327,6 +336,7 @@ class PlainServer extends Communicator implements Server } } + @Override void write(XMLWriter writer) throws java.io.IOException { @@ -374,11 +384,13 @@ class PlainServer extends Communicator implements Server } } + @Override boolean isIceBox() { return _descriptor instanceof IceBoxDescriptor; } + @Override public Object rebuild(java.util.List<Editable> editables) throws UpdateFailedException { @@ -433,6 +445,7 @@ class PlainServer extends Communicator implements Server return backup; } + @Override public void restore(Object backupObj) { Editable backup = (Editable)backupObj; @@ -498,26 +511,31 @@ class PlainServer extends Communicator implements Server } } + @Override CommunicatorDescriptor getCommunicatorDescriptor() { return _descriptor; } + @Override Utils.Resolver getResolver() { return _resolver; } + @Override public Editable getEditable() { return _editable; } + @Override Editable getEnclosingEditable() { return _editable; } + @Override public boolean isEphemeral() { return _ephemeral; diff --git a/java/src/IceGridGUI/Application/PlainServerEditor.java b/java/src/IceGridGUI/Application/PlainServerEditor.java index 63da967a368..74070353be0 100644 --- a/java/src/IceGridGUI/Application/PlainServerEditor.java +++ b/java/src/IceGridGUI/Application/PlainServerEditor.java @@ -11,16 +11,17 @@ package IceGridGUI.Application; import com.jgoodies.forms.builder.DefaultFormBuilder; -import IceGrid.*; import IceGridGUI.*; class PlainServerEditor extends AbstractServerEditor { + @Override protected void writeDescriptor() { _subEditor.writeDescriptor(); } + @Override protected boolean isSimpleUpdate() { return _subEditor.isSimpleUpdate(); @@ -34,6 +35,7 @@ class PlainServerEditor extends AbstractServerEditor // // From Editor: // + @Override Utils.Resolver getDetailResolver() { if(_target.getCoordinator().substitute()) @@ -46,16 +48,19 @@ class PlainServerEditor extends AbstractServerEditor } } + @Override protected void appendProperties(DefaultFormBuilder builder) { _subEditor.appendProperties(builder); } + @Override Object getSubDescriptor() { return _target.getDescriptor(); } + @Override protected boolean validate() { return _subEditor.validate(); diff --git a/java/src/IceGridGUI/Application/PlainService.java b/java/src/IceGridGUI/Application/PlainService.java index 3c91e3942f5..fd4305763ec 100644 --- a/java/src/IceGridGUI/Application/PlainService.java +++ b/java/src/IceGridGUI/Application/PlainService.java @@ -29,6 +29,7 @@ class PlainService extends Communicator implements Service, Cloneable return copy; } + @Override public Component getTreeCellRendererComponent( JTree tree, Object value, @@ -52,6 +53,7 @@ class PlainService extends Communicator implements Service, Cloneable // // Actions // + @Override public boolean[] getAvailableActions() { boolean[] actions = new boolean[ACTION_COUNT]; @@ -81,6 +83,7 @@ class PlainService extends Communicator implements Service, Cloneable return actions; } + @Override public JPopupMenu getPopupMenu() { ApplicationActions actions = getCoordinator().getActionsForPopup(); @@ -97,32 +100,38 @@ class PlainService extends Communicator implements Service, Cloneable return _popup; } + @Override public void copy() { getCoordinator().setClipboard(ServiceInstance.copyDescriptor(_descriptor)); getCoordinator().getActionsForMenu().get(PASTE).setEnabled(true); } + @Override public void moveUp() { move(true); } + @Override public void moveDown() { move(false); } + @Override public Object getDescriptor() { return _descriptor; } + @Override public Object saveDescriptor() { return _descriptor.clone(); } + @Override public void restoreDescriptor(Object savedDescriptor) { ServiceInstanceDescriptor sid = (ServiceInstanceDescriptor)savedDescriptor; @@ -133,11 +142,13 @@ class PlainService extends Communicator implements Service, Cloneable _descriptor.descriptor.entry = sid.descriptor.entry; } + @Override public void destroy() { ((Communicator)_parent).getServices().destroyChild(this); } + @Override public Editor getEditor() { if(_editor == null) @@ -148,11 +159,13 @@ class PlainService extends Communicator implements Service, Cloneable return _editor; } + @Override protected Editor createEditor() { return new PlainServiceEditor(); } + @Override Editable getEnclosingEditable() { return ((Communicator)_parent).getEnclosingEditable(); @@ -176,6 +189,7 @@ class PlainService extends Communicator implements Service, Cloneable ((Communicator)_parent).getServices().move(this, up); } + @Override public Object rebuild(java.util.List<Editable> editables) throws UpdateFailedException { @@ -189,7 +203,7 @@ class PlainService extends Communicator implements Service, Cloneable try { - backup = (PlainService)clone(); + backup = clone(); } catch(CloneNotSupportedException e) { @@ -201,6 +215,7 @@ class PlainService extends Communicator implements Service, Cloneable return backup; } + @Override public void restore(Object backupObj) { reset((PlainService)backupObj); @@ -251,6 +266,7 @@ class PlainService extends Communicator implements Service, Cloneable return attributes; } + @Override void write(XMLWriter writer) throws java.io.IOException { @@ -273,16 +289,19 @@ class PlainService extends Communicator implements Service, Cloneable } } + @Override CommunicatorDescriptor getCommunicatorDescriptor() { return _descriptor.descriptor; } + @Override Utils.Resolver getResolver() { return _resolver; } + @Override public boolean isEphemeral() { return _ephemeral; diff --git a/java/src/IceGridGUI/Application/PlainServiceEditor.java b/java/src/IceGridGUI/Application/PlainServiceEditor.java index b5410f0b21d..d99a9bd774c 100644 --- a/java/src/IceGridGUI/Application/PlainServiceEditor.java +++ b/java/src/IceGridGUI/Application/PlainServiceEditor.java @@ -24,6 +24,7 @@ class PlainServiceEditor extends CommunicatorChildEditor // // From Editor: // + @Override Utils.Resolver getDetailResolver() { PlainService service = (PlainService)_target; @@ -37,37 +38,44 @@ class PlainServiceEditor extends CommunicatorChildEditor } } + @Override protected void appendProperties(DefaultFormBuilder builder) { _subEditor.appendProperties(builder); } + @Override protected void buildPropertiesPanel() { super.buildPropertiesPanel(); _propertiesPanel.setName("Service Properties"); } + @Override protected boolean validate() { return _subEditor.validate(); } + @Override void writeDescriptor() { _subEditor.writeDescriptor(); } + @Override boolean isSimpleUpdate() { return _subEditor.isSimpleUpdate(); } + @Override Communicator.ChildList getChildList() { return ((Communicator)_target.getParent()).getServices(); } + @Override Object getSubDescriptor() { ServiceInstanceDescriptor sid = (ServiceInstanceDescriptor)_target.getDescriptor(); diff --git a/java/src/IceGridGUI/Application/PropertiesField.java b/java/src/IceGridGUI/Application/PropertiesField.java index a3f12460837..983b6de1f51 100644 --- a/java/src/IceGridGUI/Application/PropertiesField.java +++ b/java/src/IceGridGUI/Application/PropertiesField.java @@ -16,9 +16,7 @@ import java.awt.event.ActionEvent; import javax.swing.AbstractAction; import javax.swing.Action; -import javax.swing.DefaultCellEditor; import javax.swing.JTable; -import javax.swing.JTextField; import javax.swing.KeyStroke; import javax.swing.event.TableModelEvent; import javax.swing.event.TableModelListener; @@ -51,6 +49,7 @@ public class PropertiesField extends JTable Action deleteRow = new AbstractAction("Delete selected row(s)") { + @Override public void actionPerformed(ActionEvent e) { if(_editable) @@ -185,6 +184,7 @@ public class PropertiesField extends JTable _model = new DefaultTableModel(vector, _columnNames) { + @Override public boolean isCellEditable(int row, int column) { return _editable; @@ -193,6 +193,7 @@ public class PropertiesField extends JTable _model.addTableModelListener(new TableModelListener() { + @Override public void tableChanged(TableModelEvent e) { if(_editable) @@ -226,7 +227,7 @@ public class PropertiesField extends JTable } @SuppressWarnings("unchecked") java.util.Vector<java.util.Vector<String>> vector = - (java.util.Vector<java.util.Vector<String>>)_model.getDataVector(); + _model.getDataVector(); java.util.LinkedList<PropertyDescriptor> result = new java.util.LinkedList<PropertyDescriptor>(_hiddenProperties); diff --git a/java/src/IceGridGUI/Application/PropertySet.java b/java/src/IceGridGUI/Application/PropertySet.java index 1919300d7bd..d7675eace42 100644 --- a/java/src/IceGridGUI/Application/PropertySet.java +++ b/java/src/IceGridGUI/Application/PropertySet.java @@ -26,6 +26,7 @@ class PropertySet extends TreeNode return psd; } + @Override public Component getTreeCellRendererComponent( JTree tree, Object value, @@ -47,6 +48,7 @@ class PropertySet extends TreeNode // // Actions // + @Override public boolean[] getAvailableActions() { boolean[] actions = new boolean[ACTION_COUNT]; @@ -66,6 +68,7 @@ class PropertySet extends TreeNode return actions; } + @Override public void copy() { getCoordinator().setClipboard(copyDescriptor(_descriptor)); @@ -73,11 +76,13 @@ class PropertySet extends TreeNode } + @Override public void paste() { ((TreeNode)_parent).paste(); } + @Override public void destroy() { PropertySetParent parent = (PropertySetParent)_parent; @@ -98,6 +103,7 @@ class PropertySet extends TreeNode } } + @Override public Editor getEditor() { if(_editor == null) @@ -115,6 +121,7 @@ class PropertySet extends TreeNode return _editor; } + @Override protected Editor createEditor() { if(_inServerInstance) @@ -127,6 +134,7 @@ class PropertySet extends TreeNode } } + @Override public boolean isEphemeral() { return _ephemeral; @@ -137,6 +145,7 @@ class PropertySet extends TreeNode return _unsubstitutedId; } + @Override Object getDescriptor() { return _descriptor; @@ -205,6 +214,7 @@ class PropertySet extends TreeNode rebuild(descriptor); } + @Override void write(XMLWriter writer) throws java.io.IOException { diff --git a/java/src/IceGridGUI/Application/PropertySetEditor.java b/java/src/IceGridGUI/Application/PropertySetEditor.java index 16d3e36aabe..70a7e35d3de 100644 --- a/java/src/IceGridGUI/Application/PropertySetEditor.java +++ b/java/src/IceGridGUI/Application/PropertySetEditor.java @@ -9,20 +9,10 @@ package IceGridGUI.Application; -import java.awt.event.ActionEvent; -import java.awt.event.ItemEvent; -import java.awt.event.ItemListener; - -import javax.swing.AbstractAction; -import javax.swing.Action; -import javax.swing.DefaultComboBoxModel; -import javax.swing.JButton; -import javax.swing.JCheckBox; import javax.swing.JComponent; import javax.swing.JLabel; import javax.swing.JOptionPane; import javax.swing.JScrollPane; -import javax.swing.JTextArea; import javax.swing.JTextField; import com.jgoodies.forms.builder.DefaultFormBuilder; @@ -33,6 +23,7 @@ import IceGridGUI.*; class PropertySetEditor extends Editor { + @Override protected boolean applyUpdate(boolean refresh) { PropertySet nps = (PropertySet)_target; @@ -135,6 +126,7 @@ class PropertySetEditor extends Editor } } + @Override Utils.Resolver getDetailResolver() { Root root = _target.getRoot(); @@ -169,7 +161,7 @@ class PropertySetEditor extends Editor { PropertySetDescriptor descriptor = (PropertySetDescriptor)getPropertySet().getDescriptor(); - descriptor.references = (String[])_propertySets.getList().toArray(new String[0]); + descriptor.references = _propertySets.getList().toArray(new String[0]); descriptor.properties = _properties.getProperties(); } @@ -178,6 +170,7 @@ class PropertySetEditor extends Editor return getIdText().equals(_oldId); } + @Override protected void appendProperties(DefaultFormBuilder builder) { builder.append(_idLabel); @@ -204,12 +197,14 @@ class PropertySetEditor extends Editor builder.nextLine(); } + @Override protected void buildPropertiesPanel() { super.buildPropertiesPanel(); _propertiesPanel.setName("Named Property Set"); } + @Override protected boolean validate() { return check(new String[]{_idLabel.getText(), getIdText()}); diff --git a/java/src/IceGridGUI/Application/PropertySetParent.java b/java/src/IceGridGUI/Application/PropertySetParent.java index 75574f70940..39bf95e5204 100644 --- a/java/src/IceGridGUI/Application/PropertySetParent.java +++ b/java/src/IceGridGUI/Application/PropertySetParent.java @@ -10,7 +10,6 @@ package IceGridGUI.Application; import IceGrid.*; -import IceGridGUI.*; interface PropertySetParent { diff --git a/java/src/IceGridGUI/Application/PropertySets.java b/java/src/IceGridGUI/Application/PropertySets.java index fc88f340879..933757a1e81 100644 --- a/java/src/IceGridGUI/Application/PropertySets.java +++ b/java/src/IceGridGUI/Application/PropertySets.java @@ -9,8 +9,6 @@ package IceGridGUI.Application; -import javax.swing.AbstractListModel; -import javax.swing.JMenuItem; import javax.swing.JPopupMenu; import IceGrid.*; @@ -32,6 +30,7 @@ class PropertySets extends ListTreeNode implements PropertySetParent // // Actions // + @Override public boolean[] getAvailableActions() { boolean[] actions = new boolean[ACTION_COUNT]; @@ -46,6 +45,7 @@ class PropertySets extends ListTreeNode implements PropertySetParent return actions; } + @Override public JPopupMenu getPopupMenu() { ApplicationActions actions = getCoordinator().getActionsForPopup(); @@ -58,6 +58,7 @@ class PropertySets extends ListTreeNode implements PropertySetParent return _popup; } + @Override public void newPropertySet() { PropertySetDescriptor descriptor = @@ -65,6 +66,7 @@ class PropertySets extends ListTreeNode implements PropertySetParent newPropertySet(descriptor); } + @Override public void paste() { Object descriptor = getCoordinator().getClipboard(); @@ -144,11 +146,13 @@ class PropertySets extends ListTreeNode implements PropertySetParent } } + @Override Object getDescriptor() { return _descriptors; } + @Override public void tryAdd(String id, PropertySetDescriptor descriptor) throws UpdateFailedException { @@ -157,6 +161,7 @@ class PropertySets extends ListTreeNode implements PropertySetParent _descriptors.put(id, descriptor); } + @Override public void tryRename(String oldId, String oldId2, String newId) throws UpdateFailedException { @@ -187,22 +192,26 @@ class PropertySets extends ListTreeNode implements PropertySetParent _descriptors.put(newId, descriptor); } + @Override public void insertPropertySet(PropertySet nps, boolean fireEvent) throws UpdateFailedException { insertChild(nps, fireEvent); } + @Override public void removePropertySet(PropertySet nps) { removeChild(nps); } + @Override public void removeDescriptor(String id) { _descriptors.remove(id); } + @Override public Editable getEditable() { return super.getEditable(); diff --git a/java/src/IceGridGUI/Application/ReplicaGroup.java b/java/src/IceGridGUI/Application/ReplicaGroup.java index c3eff384b19..e49d98271dc 100644 --- a/java/src/IceGridGUI/Application/ReplicaGroup.java +++ b/java/src/IceGridGUI/Application/ReplicaGroup.java @@ -24,6 +24,7 @@ class ReplicaGroup extends TreeNode return (ReplicaGroupDescriptor)d.clone(); } + @Override public Component getTreeCellRendererComponent( JTree tree, Object value, @@ -45,6 +46,7 @@ class ReplicaGroup extends TreeNode // // Actions // + @Override public boolean[] getAvailableActions() { boolean[] actions = new boolean[ACTION_COUNT]; @@ -64,17 +66,20 @@ class ReplicaGroup extends TreeNode return actions; } + @Override public void copy() { getCoordinator().setClipboard(copyDescriptor(_descriptor)); getCoordinator().getActionsForMenu().get(PASTE).setEnabled(true); } + @Override public void paste() { ((TreeNode)_parent).paste(); } + @Override public void destroy() { ReplicaGroups replicaGroups = (ReplicaGroups)_parent; @@ -88,6 +93,7 @@ class ReplicaGroup extends TreeNode } } + @Override public Editor getEditor() { if(_editor == null) @@ -98,16 +104,19 @@ class ReplicaGroup extends TreeNode return _editor; } + @Override protected Editor createEditor() { return new ReplicaGroupEditor(); } + @Override public boolean isEphemeral() { return _ephemeral; } + @Override Object getDescriptor() { return _descriptor; @@ -154,6 +163,7 @@ class ReplicaGroup extends TreeNode rebuild(descriptor); } + @Override void write(XMLWriter writer) throws java.io.IOException { diff --git a/java/src/IceGridGUI/Application/ReplicaGroupEditor.java b/java/src/IceGridGUI/Application/ReplicaGroupEditor.java index 7d0e38c4b2a..da7e2e07cc1 100644 --- a/java/src/IceGridGUI/Application/ReplicaGroupEditor.java +++ b/java/src/IceGridGUI/Application/ReplicaGroupEditor.java @@ -9,15 +9,9 @@ package IceGridGUI.Application; -import java.awt.event.ActionEvent; import java.awt.event.ItemEvent; import java.awt.event.ItemListener; -import javax.swing.AbstractAction; -import javax.swing.Action; -import javax.swing.DefaultComboBoxModel; -import javax.swing.JButton; -import javax.swing.JCheckBox; import javax.swing.JComboBox; import javax.swing.JLabel; import javax.swing.JOptionPane; @@ -34,6 +28,7 @@ import IceGridGUI.*; @SuppressWarnings("unchecked") class ReplicaGroupEditor extends Editor { + @Override protected boolean applyUpdate(boolean refresh) { ReplicaGroup replicaGroup = (ReplicaGroup)_target; @@ -158,6 +153,7 @@ class ReplicaGroupEditor extends Editor } } + @Override Utils.Resolver getDetailResolver() { Root root = _target.getRoot(); @@ -181,6 +177,7 @@ class ReplicaGroupEditor extends Editor // _loadBalancing.addItemListener(new ItemListener() { + @Override public void itemStateChanged(ItemEvent e) { if(e.getStateChange() == ItemEvent.SELECTED) @@ -264,6 +261,7 @@ class ReplicaGroupEditor extends Editor return descriptor.id.equals(_id.getText().trim()); } + @Override protected void appendProperties(DefaultFormBuilder builder) { builder.append("Replica Group ID"); @@ -312,12 +310,14 @@ class ReplicaGroupEditor extends Editor builder.nextLine(); } + @Override protected void buildPropertiesPanel() { super.buildPropertiesPanel(); _propertiesPanel.setName("Replica Group Properties"); } + @Override protected boolean validate() { // diff --git a/java/src/IceGridGUI/Application/ReplicaGroups.java b/java/src/IceGridGUI/Application/ReplicaGroups.java index f403973c503..9aef88b7426 100644 --- a/java/src/IceGridGUI/Application/ReplicaGroups.java +++ b/java/src/IceGridGUI/Application/ReplicaGroups.java @@ -9,8 +9,6 @@ package IceGridGUI.Application; -import javax.swing.AbstractListModel; -import javax.swing.JMenuItem; import javax.swing.JPopupMenu; import IceGrid.*; @@ -32,6 +30,7 @@ class ReplicaGroups extends ListTreeNode // // Actions // + @Override public boolean[] getAvailableActions() { boolean[] actions = new boolean[ACTION_COUNT]; @@ -46,6 +45,7 @@ class ReplicaGroups extends ListTreeNode return actions; } + @Override public JPopupMenu getPopupMenu() { ApplicationActions actions = getCoordinator().getActionsForPopup(); @@ -58,6 +58,7 @@ class ReplicaGroups extends ListTreeNode return _popup; } + @Override public void newReplicaGroup() { ReplicaGroupDescriptor descriptor = new @@ -72,6 +73,7 @@ class ReplicaGroups extends ListTreeNode newReplicaGroup(descriptor); } + @Override public void paste() { Object descriptor = getCoordinator().getClipboard(); @@ -154,6 +156,7 @@ class ReplicaGroups extends ListTreeNode childrenChanged(updatedChildren); } + @Override Object getDescriptor() { return _descriptors; diff --git a/java/src/IceGridGUI/Application/Root.java b/java/src/IceGridGUI/Application/Root.java index 26c20321bda..31f00581390 100644 --- a/java/src/IceGridGUI/Application/Root.java +++ b/java/src/IceGridGUI/Application/Root.java @@ -22,8 +22,6 @@ import javax.swing.tree.TreePath; import java.io.File; -import java.util.Enumeration; - import IceGrid.*; import IceGridGUI.*; @@ -126,6 +124,7 @@ public class Root extends ListTreeNode return copy; } + @Override public Editor getEditor() { if(_editor == null) @@ -136,6 +135,7 @@ public class Root extends ListTreeNode return _editor; } + @Override protected Editor createEditor() { return new ApplicationEditor(); @@ -245,6 +245,7 @@ public class Root extends ListTreeNode } } + @Override public Component getTreeCellRendererComponent( JTree tree, Object value, @@ -264,6 +265,7 @@ public class Root extends ListTreeNode return _cellRenderer.getTreeCellRendererComponent(tree, value, sel, expanded, leaf, row, hasFocus); } + @Override public boolean[] getAvailableActions() { boolean[] actions = new boolean[ACTION_COUNT]; @@ -289,6 +291,7 @@ public class Root extends ListTreeNode return actions; } + @Override public JPopupMenu getPopupMenu() { ApplicationActions actions = _coordinator.getActionsForPopup(); @@ -308,42 +311,50 @@ public class Root extends ListTreeNode return _popup; } + @Override public void copy() { _coordinator.setClipboard(copyDescriptor(_descriptor)); _coordinator.getActionsForMenu().get(PASTE).setEnabled(true); } + @Override public void paste() { _coordinator.pasteApplication(); } + @Override public void newNode() { _nodes.newNode(); } + @Override public void newPropertySet() { _propertySets.newPropertySet(); } + @Override public void newReplicaGroup() { _replicaGroups.newReplicaGroup(); } + @Override public void newTemplateServer() { _serverTemplates.newTemplateServer(); } + @Override public void newTemplateServerIceBox() { _serverTemplates.newTemplateServerIceBox(); } + @Override public void newTemplateService() { _serviceTemplates.newTemplateService(); @@ -407,6 +418,7 @@ public class Root extends ListTreeNode JOptionPane.ERROR_MESSAGE); } + @Override public void run() { _coordinator.getMainFrame().setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR)); @@ -425,6 +437,7 @@ public class Root extends ListTreeNode Ice.Callback cb = new Ice.Callback() { + @Override public void completed(Ice.AsyncResult result) { try @@ -446,6 +459,7 @@ public class Root extends ListTreeNode SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { commit(); @@ -464,6 +478,7 @@ public class Root extends ListTreeNode SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { _skipUpdates--; @@ -527,6 +542,7 @@ public class Root extends ListTreeNode Callback_Admin_addApplication cb = new Callback_Admin_addApplication() { + @Override public void response() { if(_traceSaveToRegistry) @@ -537,6 +553,7 @@ public class Root extends ListTreeNode SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { commit(); @@ -548,6 +565,7 @@ public class Root extends ListTreeNode }); } + @Override public void exception(final Ice.UserException e) { if(_traceSaveToRegistry) @@ -558,6 +576,7 @@ public class Root extends ListTreeNode SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { handleFailure(prefix, "Add failed", @@ -567,6 +586,7 @@ public class Root extends ListTreeNode }); } + @Override public void exception(final Ice.LocalException e) { if(_traceSaveToRegistry) @@ -577,6 +597,7 @@ public class Root extends ListTreeNode SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { handleFailure(prefix, "Add failed", @@ -602,6 +623,7 @@ public class Root extends ListTreeNode Ice.Callback cb = new Ice.Callback() { + @Override public void completed(Ice.AsyncResult result) { try @@ -623,6 +645,7 @@ public class Root extends ListTreeNode SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { commit(); @@ -664,6 +687,7 @@ public class Root extends ListTreeNode SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { if(_live) @@ -970,11 +994,13 @@ public class Root extends ListTreeNode _serviceTemplates.commit(); } + @Override public boolean isEphemeral() { return false; } + @Override public void destroy() { if(!_live && _file == null) @@ -1143,6 +1169,7 @@ public class Root extends ListTreeNode return _treeModel; } + @Override public Coordinator getCoordinator() { return _coordinator; @@ -1244,6 +1271,7 @@ public class Root extends ListTreeNode return result; } + @Override Object getDescriptor() { return _descriptor; @@ -1265,6 +1293,7 @@ public class Root extends ListTreeNode _descriptor.description = clone.description; } + @Override public void write(XMLWriter writer) throws java.io.IOException { @@ -1389,12 +1418,12 @@ public class Root extends ListTreeNode TemplateDescriptor findServerTemplateDescriptor(String templateName) { - return (TemplateDescriptor)_descriptor.serverTemplates.get(templateName); + return _descriptor.serverTemplates.get(templateName); } TemplateDescriptor findServiceTemplateDescriptor(String templateName) { - return (TemplateDescriptor)_descriptor.serviceTemplates.get(templateName); + return _descriptor.serviceTemplates.get(templateName); } ServerTemplates getServerTemplates() @@ -1440,11 +1469,13 @@ public class Root extends ListTreeNode return true; } + @Override public Root getRoot() { return this; } + @Override Utils.Resolver getResolver() { return _resolver; diff --git a/java/src/IceGridGUI/Application/ServerInstance.java b/java/src/IceGridGUI/Application/ServerInstance.java index 8fd0136e2de..fc76d2181b2 100644 --- a/java/src/IceGridGUI/Application/ServerInstance.java +++ b/java/src/IceGridGUI/Application/ServerInstance.java @@ -15,7 +15,6 @@ import javax.swing.Icon; import javax.swing.JPopupMenu; import javax.swing.JTree; -import javax.swing.tree.TreeCellRenderer; import javax.swing.tree.DefaultTreeCellRenderer; import IceGrid.*; @@ -34,6 +33,7 @@ class ServerInstance extends ListTreeNode implements Server, PropertySetParent // // Overrides ListTreeNode // + @Override public boolean getAllowsChildren() { return _isIceBox; @@ -42,6 +42,7 @@ class ServerInstance extends ListTreeNode implements Server, PropertySetParent // // Actions // + @Override public boolean[] getAvailableActions() { boolean[] actions = new boolean[ACTION_COUNT]; @@ -71,12 +72,14 @@ class ServerInstance extends ListTreeNode implements Server, PropertySetParent return actions; } + @Override public void copy() { getCoordinator().setClipboard(copyDescriptor(_descriptor)); getCoordinator().getActionsForMenu().get(PASTE).setEnabled(true); } + @Override public void paste() { if(_isIceBox) @@ -92,11 +95,13 @@ class ServerInstance extends ListTreeNode implements Server, PropertySetParent ((TreeNode)_parent).paste(); } + @Override public void newPropertySet() { newPropertySet(new PropertySetDescriptor(new String[0], new java.util.LinkedList<PropertyDescriptor>())); } + @Override public JPopupMenu getPopupMenu() { if(_isIceBox) @@ -116,6 +121,7 @@ class ServerInstance extends ListTreeNode implements Server, PropertySetParent } } + @Override public Editor getEditor() { if(_editor == null) @@ -126,11 +132,13 @@ class ServerInstance extends ListTreeNode implements Server, PropertySetParent return _editor; } + @Override protected Editor createEditor() { return new ServerInstanceEditor(); } + @Override public Component getTreeCellRendererComponent( JTree tree, Object value, @@ -158,6 +166,7 @@ class ServerInstance extends ListTreeNode implements Server, PropertySetParent return _cellRenderer.getTreeCellRendererComponent(tree, value, sel, expanded, leaf, row, hasFocus); } + @Override public void destroy() { Node node = (Node)_parent; @@ -175,16 +184,19 @@ class ServerInstance extends ListTreeNode implements Server, PropertySetParent } } + @Override public Object getDescriptor() { return _descriptor; } + @Override public Object saveDescriptor() { return _descriptor.clone(); } + @Override public void restoreDescriptor(Object savedDescriptor) { ServerInstanceDescriptor copy = (ServerInstanceDescriptor)savedDescriptor; @@ -220,6 +232,7 @@ class ServerInstance extends ListTreeNode implements Server, PropertySetParent } } + @Override void write(XMLWriter writer) throws java.io.IOException { @@ -278,6 +291,7 @@ class ServerInstance extends ListTreeNode implements Server, PropertySetParent java.util.Map<String, String> parameterValues; } + @Override public Object rebuild(java.util.List<Editable> editables) throws UpdateFailedException { @@ -341,6 +355,7 @@ class ServerInstance extends ListTreeNode implements Server, PropertySetParent return backup; } + @Override public void restore(Object backupObj) { Backup backup = (Backup)backupObj; @@ -370,6 +385,7 @@ class ServerInstance extends ListTreeNode implements Server, PropertySetParent } } + @Override public void tryAdd(String unsubstitutedId, PropertySetDescriptor descriptor) throws UpdateFailedException { @@ -382,6 +398,7 @@ class ServerInstance extends ListTreeNode implements Server, PropertySetParent _editable.markModified(); } + @Override public void tryRename(String oldId, String oldUnresolvedId, String newUnsubstitutedId) throws UpdateFailedException { @@ -416,22 +433,26 @@ class ServerInstance extends ListTreeNode implements Server, PropertySetParent _descriptor.servicePropertySets.put(newUnsubstitutedId, descriptor); } + @Override public void insertPropertySet(PropertySet nps, boolean fireEvent) throws UpdateFailedException { insertChild(nps, fireEvent); } + @Override public void removePropertySet(PropertySet nps) { removeChild(nps); } + @Override public void removeDescriptor(String unsubstitutedId) { _descriptor.servicePropertySets.remove(unsubstitutedId); } + @Override public Editable getEditable() { return _editable; @@ -459,7 +480,7 @@ class ServerInstance extends ListTreeNode implements Server, PropertySetParent if(d.template.length() > 0) { TemplateDescriptor templateDescriptor = - (TemplateDescriptor)getRoot().findServiceTemplateDescriptor(d.template); + getRoot().findServiceTemplateDescriptor(d.template); assert templateDescriptor != null; Utils.Resolver serviceResolver = new Utils.Resolver(_resolver, d.parameterValues, @@ -516,16 +537,19 @@ class ServerInstance extends ListTreeNode implements Server, PropertySetParent getRoot().setSelectedNode(ps); } + @Override Utils.Resolver getResolver() { return _resolver; } + @Override public boolean isEphemeral() { return _ephemeral; } + @Override public String toString() { if(_ephemeral) diff --git a/java/src/IceGridGUI/Application/ServerInstanceEditor.java b/java/src/IceGridGUI/Application/ServerInstanceEditor.java index 1baf054f431..0401daf4567 100644 --- a/java/src/IceGridGUI/Application/ServerInstanceEditor.java +++ b/java/src/IceGridGUI/Application/ServerInstanceEditor.java @@ -16,8 +16,6 @@ import javax.swing.Action; import javax.swing.JButton; import javax.swing.JComboBox; import javax.swing.JScrollPane; -import javax.swing.JTextField; - import javax.swing.event.ListDataEvent; import javax.swing.event.ListDataListener; @@ -30,6 +28,7 @@ import IceGridGUI.*; @SuppressWarnings("unchecked") class ServerInstanceEditor extends AbstractServerEditor { + @Override protected void writeDescriptor() { ServerInstanceDescriptor descriptor = getDescriptor(); @@ -38,13 +37,14 @@ class ServerInstanceEditor extends AbstractServerEditor descriptor.template = t.getId(); descriptor.parameterValues = _parameters.getValues(); - descriptor.propertySet.references = (String[])_propertySets.getList().toArray(new String[0]); + descriptor.propertySet.references = _propertySets.getList().toArray(new String[0]); descriptor.propertySet.properties = _properties.getProperties(); ((ServerInstance)_target).isIceBox( ((TemplateDescriptor)t.getDescriptor()).descriptor instanceof IceBoxDescriptor); } + @Override protected boolean isSimpleUpdate() { ServerInstanceDescriptor descriptor = getDescriptor(); @@ -63,6 +63,7 @@ class ServerInstanceEditor extends AbstractServerEditor Action gotoTemplate = new AbstractAction( "", Utils.getIcon("/icons/16x16/goto.png")) { + @Override public void actionPerformed(ActionEvent e) { TreeNode t = (TreeNode)_template.getSelectedItem(); @@ -92,6 +93,7 @@ class ServerInstanceEditor extends AbstractServerEditor // From Editor: // + @Override Utils.Resolver getDetailResolver() { if(_target.getCoordinator().substitute()) @@ -104,6 +106,7 @@ class ServerInstanceEditor extends AbstractServerEditor } } + @Override protected void appendProperties(DefaultFormBuilder builder) { builder.append("Template", _template); @@ -171,6 +174,7 @@ class ServerInstanceEditor extends AbstractServerEditor ListDataListener templateListener = new ListDataListener() { + @Override public void contentsChanged(ListDataEvent e) { updated(); @@ -187,10 +191,12 @@ class ServerInstanceEditor extends AbstractServerEditor td.parameterDefaults, null); } + @Override public void intervalAdded(ListDataEvent e) { } + @Override public void intervalRemoved(ListDataEvent e) { } diff --git a/java/src/IceGridGUI/Application/ServerInstancePropertySetEditor.java b/java/src/IceGridGUI/Application/ServerInstancePropertySetEditor.java index da166ea538d..4292cd868ae 100644 --- a/java/src/IceGridGUI/Application/ServerInstancePropertySetEditor.java +++ b/java/src/IceGridGUI/Application/ServerInstancePropertySetEditor.java @@ -14,7 +14,6 @@ import javax.swing.JComboBox; import javax.swing.JComponent; import javax.swing.JTextField; -import IceGrid.*; import IceGridGUI.*; class ServerInstancePropertySetEditor extends PropertySetEditor @@ -28,17 +27,20 @@ class ServerInstancePropertySetEditor extends PropertySetEditor idTextField.getDocument().addDocumentListener(_updateListener); } + @Override protected void buildPropertiesPanel() { super.buildPropertiesPanel(); _propertiesPanel.setName("Service Instance Property Set"); } + @Override protected JComponent getIdComponent() { return _id; } + @Override protected String getIdText() { if(_id.getSelectedItem() == null) @@ -51,6 +53,7 @@ class ServerInstancePropertySetEditor extends PropertySetEditor } } + @Override @SuppressWarnings("unchecked") protected void showId(String unsubstitutedId, Utils.Resolver resolver) { diff --git a/java/src/IceGridGUI/Application/ServerSubEditor.java b/java/src/IceGridGUI/Application/ServerSubEditor.java index 0c5b54c9b79..6c3f079c202 100644 --- a/java/src/IceGridGUI/Application/ServerSubEditor.java +++ b/java/src/IceGridGUI/Application/ServerSubEditor.java @@ -13,7 +13,6 @@ import java.awt.event.ActionEvent; import javax.swing.AbstractAction; import javax.swing.Action; -import javax.swing.JButton; import javax.swing.JCheckBox; import javax.swing.JComboBox; import javax.swing.JComponent; @@ -86,6 +85,7 @@ class ServerSubEditor extends CommunicatorSubEditor Action allocatable = new AbstractAction("Allocatable") { + @Override public void actionPerformed(ActionEvent e) { _mainEditor.updated(); @@ -99,6 +99,7 @@ class ServerSubEditor extends CommunicatorSubEditor Action appDistrib = new AbstractAction("Depends on the application distribution") { + @Override public void actionPerformed(ActionEvent e) { _mainEditor.updated(); @@ -127,6 +128,7 @@ class ServerSubEditor extends CommunicatorSubEditor return (ServerDescriptor)_mainEditor.getSubDescriptor(); } + @Override void appendProperties(DefaultFormBuilder builder) { builder.append("Server ID"); @@ -355,6 +357,7 @@ class ServerSubEditor extends CommunicatorSubEditor static private final Object NO_DISTRIB = new Object() { + @Override public String toString() { return "None selected"; diff --git a/java/src/IceGridGUI/Application/ServerTemplate.java b/java/src/IceGridGUI/Application/ServerTemplate.java index 6da4c72c1bf..896fb30705a 100644 --- a/java/src/IceGridGUI/Application/ServerTemplate.java +++ b/java/src/IceGridGUI/Application/ServerTemplate.java @@ -10,14 +10,7 @@ package IceGridGUI.Application; import java.awt.Component; -import java.awt.event.ActionEvent; - -import javax.swing.AbstractAction; -import javax.swing.Action; import javax.swing.Icon; -import javax.swing.JButton; -import javax.swing.JComponent; -import javax.swing.JMenuItem; import javax.swing.JPopupMenu; import javax.swing.JTree; @@ -37,6 +30,7 @@ class ServerTemplate extends Communicator return copy; } + @Override public Component getTreeCellRendererComponent( JTree tree, Object value, @@ -82,6 +76,7 @@ class ServerTemplate extends Communicator // // Actions // + @Override public boolean[] getAvailableActions() { boolean[] actions = new boolean[ACTION_COUNT]; @@ -113,12 +108,14 @@ class ServerTemplate extends Communicator return actions; } + @Override public void copy() { getCoordinator().setClipboard(copyDescriptor(_templateDescriptor)); getCoordinator().getActionsForMenu().get(PASTE).setEnabled(true); } + @Override public JPopupMenu getPopupMenu() { ApplicationActions actions = getCoordinator().getActionsForPopup(); @@ -134,6 +131,7 @@ class ServerTemplate extends Communicator return _popup; } + @Override public Editor getEditor() { if(_editor == null) @@ -144,11 +142,13 @@ class ServerTemplate extends Communicator return _editor; } + @Override protected Editor createEditor() { return new ServerTemplateEditor(); } + @Override public void destroy() { ServerTemplates serverTemplates = (ServerTemplates)_parent; @@ -167,21 +167,25 @@ class ServerTemplate extends Communicator } } + @Override public boolean isEphemeral() { return _ephemeral; } + @Override public Object getDescriptor() { return _templateDescriptor; } + @Override CommunicatorDescriptor getCommunicatorDescriptor() { return _templateDescriptor.descriptor; } + @Override public Object saveDescriptor() { // @@ -192,6 +196,7 @@ class ServerTemplate extends Communicator return clone; } + @Override public void restoreDescriptor(Object savedDescriptor) { TemplateDescriptor clone = (TemplateDescriptor)savedDescriptor; @@ -230,6 +235,7 @@ class ServerTemplate extends Communicator } } + @Override void write(XMLWriter writer) throws java.io.IOException { @@ -286,6 +292,7 @@ class ServerTemplate extends Communicator } } + @Override boolean isIceBox() { return _templateDescriptor.descriptor instanceof IceBoxDescriptor; @@ -333,11 +340,13 @@ class ServerTemplate extends Communicator return _editable; } + @Override Editable getEnclosingEditable() { return _editable; } + @Override java.util.List<? extends TemplateInstance> findInstances() { return getRoot().findServerInstances(_id); diff --git a/java/src/IceGridGUI/Application/ServerTemplateEditor.java b/java/src/IceGridGUI/Application/ServerTemplateEditor.java index 57aa9829af0..f6f45252dc8 100644 --- a/java/src/IceGridGUI/Application/ServerTemplateEditor.java +++ b/java/src/IceGridGUI/Application/ServerTemplateEditor.java @@ -18,17 +18,20 @@ class ServerTemplateEditor extends TemplateEditor _subEditor = new ServerSubEditor(this); } + @Override void writeDescriptor() { super.writeDescriptor(); _subEditor.writeDescriptor(); } + @Override boolean isSimpleUpdate() { return super.isSimpleUpdate() && _subEditor.isSimpleUpdate(); } + @Override protected void appendProperties(DefaultFormBuilder builder) { super.appendProperties(builder); @@ -37,12 +40,14 @@ class ServerTemplateEditor extends TemplateEditor _subEditor.appendProperties(builder); } + @Override protected void buildPropertiesPanel() { super.buildPropertiesPanel(); _propertiesPanel.setName("Server Template Properties"); } + @Override protected boolean validate() { return super.validate() && _subEditor.validate(); diff --git a/java/src/IceGridGUI/Application/ServerTemplates.java b/java/src/IceGridGUI/Application/ServerTemplates.java index 4237e0fc46c..5e2458ae29f 100644 --- a/java/src/IceGridGUI/Application/ServerTemplates.java +++ b/java/src/IceGridGUI/Application/ServerTemplates.java @@ -9,7 +9,6 @@ package IceGridGUI.Application; -import javax.swing.JMenuItem; import javax.swing.JPopupMenu; import IceGrid.*; @@ -31,6 +30,7 @@ class ServerTemplates extends Templates // // Actions // + @Override public boolean[] getAvailableActions() { boolean[] actions = new boolean[ACTION_COUNT]; @@ -46,6 +46,7 @@ class ServerTemplates extends Templates return actions; } + @Override public JPopupMenu getPopupMenu() { ApplicationActions actions = getCoordinator().getActionsForPopup(); @@ -59,6 +60,7 @@ class ServerTemplates extends Templates return _popup; } + @Override public void newTemplateServer() { newServerTemplate(new TemplateDescriptor( @@ -67,6 +69,7 @@ class ServerTemplates extends Templates new java.util.TreeMap<String, String>())); } + @Override public void newTemplateServerIceBox() { newServerTemplate(new TemplateDescriptor( @@ -75,6 +78,7 @@ class ServerTemplates extends Templates new java.util.TreeMap<String, String>())); } + @Override public void paste() { Object descriptor = getCoordinator().getClipboard(); @@ -107,6 +111,7 @@ class ServerTemplates extends Templates // // Variable resolution does not make sense for templates / template children // + @Override Utils.Resolver getResolver() { return null; @@ -180,6 +185,7 @@ class ServerTemplates extends Templates getRoot().setSelectedNode(t); } + @Override void tryAdd(String newId, TemplateDescriptor descriptor) throws UpdateFailedException { @@ -251,6 +257,7 @@ class ServerTemplates extends Templates _descriptors.remove(id); } + @Override Object getDescriptor() { return _descriptors; diff --git a/java/src/IceGridGUI/Application/ServiceInstance.java b/java/src/IceGridGUI/Application/ServiceInstance.java index aecc6fe7d26..aa21a9ce37d 100644 --- a/java/src/IceGridGUI/Application/ServiceInstance.java +++ b/java/src/IceGridGUI/Application/ServiceInstance.java @@ -28,7 +28,7 @@ class ServiceInstance extends TreeNode implements Service, Cloneable if(copy.descriptor != null) { - copy.descriptor = PlainService.copyDescriptor((ServiceDescriptor)copy.descriptor); + copy.descriptor = PlainService.copyDescriptor(copy.descriptor); } return copy; } @@ -44,6 +44,7 @@ class ServiceInstance extends TreeNode implements Service, Cloneable return copy; } + @Override public Component getTreeCellRendererComponent( JTree tree, Object value, @@ -65,6 +66,7 @@ class ServiceInstance extends TreeNode implements Service, Cloneable // // Actions // + @Override public boolean[] getAvailableActions() { boolean[] actions = new boolean[ACTION_COUNT]; @@ -88,6 +90,7 @@ class ServiceInstance extends TreeNode implements Service, Cloneable return actions; } + @Override public JPopupMenu getPopupMenu() { ApplicationActions actions = getCoordinator().getActionsForPopup(); @@ -101,32 +104,38 @@ class ServiceInstance extends TreeNode implements Service, Cloneable return _popup; } + @Override public void copy() { getCoordinator().setClipboard(copyDescriptor(_descriptor)); getCoordinator().getActionsForMenu().get(PASTE).setEnabled(true); } + @Override public void paste() { ((TreeNode)_parent).paste(); } + @Override public void moveUp() { move(true); } + @Override public void moveDown() { move(false); } + @Override public Object getDescriptor() { return _descriptor; } + @Override public Object saveDescriptor() { // @@ -137,6 +146,7 @@ class ServiceInstance extends TreeNode implements Service, Cloneable return saved; } + @Override public void restoreDescriptor(Object savedDescriptor) { ServiceInstanceDescriptor sd = (ServiceInstanceDescriptor)savedDescriptor; @@ -145,11 +155,13 @@ class ServiceInstance extends TreeNode implements Service, Cloneable _descriptor.propertySet = sd.propertySet; } + @Override public void destroy() { ((Communicator)_parent).getServices().destroyChild(this); } + @Override public Editor getEditor() { if(_editor == null) @@ -160,11 +172,13 @@ class ServiceInstance extends TreeNode implements Service, Cloneable return _editor; } + @Override protected Editor createEditor() { return new ServiceInstanceEditor(); } + @Override public String toString() { if(_displayString != null) @@ -206,6 +220,7 @@ class ServiceInstance extends TreeNode implements Service, Cloneable ServiceInstance clone; } + @Override public Object rebuild(java.util.List<Editable> editables) throws UpdateFailedException { @@ -264,6 +279,7 @@ class ServiceInstance extends TreeNode implements Service, Cloneable return backup; } + @Override public void restore(Object backupObj) { Backup backup = (Backup)backupObj; @@ -308,6 +324,7 @@ class ServiceInstance extends TreeNode implements Service, Cloneable _ephemeral = true; } + @Override void write(XMLWriter writer) throws java.io.IOException { @@ -332,11 +349,13 @@ class ServiceInstance extends TreeNode implements Service, Cloneable } } + @Override Utils.Resolver getResolver() { return _resolver; } + @Override public boolean isEphemeral() { return _ephemeral; diff --git a/java/src/IceGridGUI/Application/ServiceInstanceEditor.java b/java/src/IceGridGUI/Application/ServiceInstanceEditor.java index 654f19dd39f..9edbfe39927 100644 --- a/java/src/IceGridGUI/Application/ServiceInstanceEditor.java +++ b/java/src/IceGridGUI/Application/ServiceInstanceEditor.java @@ -16,8 +16,6 @@ import javax.swing.Action; import javax.swing.JButton; import javax.swing.JComboBox; import javax.swing.JScrollPane; -import javax.swing.JTextField; - import javax.swing.event.ListDataEvent; import javax.swing.event.ListDataListener; @@ -38,6 +36,7 @@ class ServiceInstanceEditor extends CommunicatorChildEditor Action gotoTemplate = new AbstractAction( "", Utils.getIcon("/icons/16x16/goto.png")) { + @Override public void actionPerformed(ActionEvent e) { TreeNode t = (TreeNode)_template.getSelectedItem(); @@ -65,6 +64,7 @@ class ServiceInstanceEditor extends CommunicatorChildEditor // // From Editor: // + @Override Utils.Resolver getDetailResolver() { ServiceInstance service = (ServiceInstance)_target; @@ -78,16 +78,18 @@ class ServiceInstanceEditor extends CommunicatorChildEditor } } + @Override void writeDescriptor() { ServiceInstanceDescriptor descriptor = getDescriptor(); descriptor.template = ((ServiceTemplate)_template.getSelectedItem()).getId(); descriptor.parameterValues = _parameters.getValues(); - descriptor.propertySet.references = (String[])_propertySets.getList().toArray(new String[0]); + descriptor.propertySet.references = _propertySets.getList().toArray(new String[0]); descriptor.propertySet.properties = _properties.getProperties(); } + @Override boolean isSimpleUpdate() { ServiceInstanceDescriptor descriptor = getDescriptor(); @@ -96,11 +98,13 @@ class ServiceInstanceEditor extends CommunicatorChildEditor return descriptor.template.equals(t.getId()) && descriptor.parameterValues.equals(_parameters.getValues()); } + @Override Communicator.ChildList getChildList() { return ((Communicator)_target.getParent()).getServices(); } + @Override protected void appendProperties(DefaultFormBuilder builder) { builder.append("Template", _template); @@ -143,6 +147,7 @@ class ServiceInstanceEditor extends CommunicatorChildEditor builder.nextLine(); } + @Override protected void buildPropertiesPanel() { super.buildPropertiesPanel(); @@ -180,6 +185,7 @@ class ServiceInstanceEditor extends CommunicatorChildEditor ListDataListener templateListener = new ListDataListener() { + @Override public void contentsChanged(ListDataEvent e) { updated(); @@ -196,10 +202,12 @@ class ServiceInstanceEditor extends CommunicatorChildEditor td.parameterDefaults, null); } + @Override public void intervalAdded(ListDataEvent e) { } + @Override public void intervalRemoved(ListDataEvent e) { } diff --git a/java/src/IceGridGUI/Application/ServiceSubEditor.java b/java/src/IceGridGUI/Application/ServiceSubEditor.java index d6e7c3015d3..37ad5ada3c8 100644 --- a/java/src/IceGridGUI/Application/ServiceSubEditor.java +++ b/java/src/IceGridGUI/Application/ServiceSubEditor.java @@ -9,10 +9,6 @@ package IceGridGUI.Application; -import java.awt.event.ActionEvent; - -import javax.swing.AbstractAction; -import javax.swing.Action; import javax.swing.JTextField; import com.jgoodies.forms.builder.DefaultFormBuilder; @@ -43,6 +39,7 @@ class ServiceSubEditor extends CommunicatorSubEditor return (ServiceDescriptor)_mainEditor.getSubDescriptor(); } + @Override void appendProperties(DefaultFormBuilder builder) { builder.append("Service Name"); diff --git a/java/src/IceGridGUI/Application/ServiceTemplate.java b/java/src/IceGridGUI/Application/ServiceTemplate.java index 11e2d73f3b2..b8210f000ec 100644 --- a/java/src/IceGridGUI/Application/ServiceTemplate.java +++ b/java/src/IceGridGUI/Application/ServiceTemplate.java @@ -10,7 +10,6 @@ package IceGridGUI.Application; import java.awt.Component; -import javax.swing.JMenuItem; import javax.swing.JPopupMenu; import javax.swing.JTree; import javax.swing.tree.DefaultTreeCellRenderer; @@ -28,6 +27,7 @@ class ServiceTemplate extends Communicator return copy; } + @Override public Component getTreeCellRendererComponent( JTree tree, Object value, @@ -50,6 +50,7 @@ class ServiceTemplate extends Communicator // // Actions // + @Override public boolean[] getAvailableActions() { boolean[] actions = new boolean[ACTION_COUNT]; @@ -78,12 +79,14 @@ class ServiceTemplate extends Communicator return actions; } + @Override public void copy() { getCoordinator().setClipboard(copyDescriptor(_templateDescriptor)); getCoordinator().getActionsForMenu().get(PASTE).setEnabled(true); } + @Override public JPopupMenu getPopupMenu() { ApplicationActions actions = getCoordinator().getActionsForPopup(); @@ -97,6 +100,7 @@ class ServiceTemplate extends Communicator return _popup; } + @Override public Editor getEditor() { if(_editor == null) @@ -107,6 +111,7 @@ class ServiceTemplate extends Communicator return _editor; } + @Override protected Editor createEditor() { return new ServiceTemplateEditor(); @@ -129,6 +134,7 @@ class ServiceTemplate extends Communicator _templateDescriptor = descriptor; } + @Override void write(XMLWriter writer) throws java.io.IOException { @@ -177,21 +183,25 @@ class ServiceTemplate extends Communicator _editable.commit(); } + @Override public Object getDescriptor() { return _templateDescriptor; } + @Override CommunicatorDescriptor getCommunicatorDescriptor() { return _templateDescriptor.descriptor; } + @Override public boolean isEphemeral() { return _ephemeral; } + @Override public void destroy() { ServiceTemplates serviceTemplates = (ServiceTemplates)_parent; @@ -210,6 +220,7 @@ class ServiceTemplate extends Communicator } } + @Override java.util.List<? extends TemplateInstance> findInstances() { return getRoot().findServiceInstances(_id); @@ -220,11 +231,13 @@ class ServiceTemplate extends Communicator return _editable; } + @Override Editable getEnclosingEditable() { return _editable; } + @Override public Object saveDescriptor() { // @@ -235,6 +248,7 @@ class ServiceTemplate extends Communicator return clone; } + @Override public void restoreDescriptor(Object savedDescriptor) { TemplateDescriptor clone = (TemplateDescriptor)savedDescriptor; diff --git a/java/src/IceGridGUI/Application/ServiceTemplateEditor.java b/java/src/IceGridGUI/Application/ServiceTemplateEditor.java index 16ea4c939fc..7dba325e896 100644 --- a/java/src/IceGridGUI/Application/ServiceTemplateEditor.java +++ b/java/src/IceGridGUI/Application/ServiceTemplateEditor.java @@ -18,17 +18,20 @@ class ServiceTemplateEditor extends TemplateEditor _subEditor = new ServiceSubEditor(this); } + @Override void writeDescriptor() { super.writeDescriptor(); _subEditor.writeDescriptor(); } + @Override boolean isSimpleUpdate() { return super.isSimpleUpdate() && _subEditor.isSimpleUpdate(); } + @Override protected void appendProperties(DefaultFormBuilder builder) { super.appendProperties(builder); @@ -37,12 +40,14 @@ class ServiceTemplateEditor extends TemplateEditor _subEditor.appendProperties(builder); } + @Override protected void buildPropertiesPanel() { super.buildPropertiesPanel(); _propertiesPanel.setName("Service Template Properties"); } + @Override protected boolean validate() { return super.validate() && _subEditor.validate(); diff --git a/java/src/IceGridGUI/Application/ServiceTemplates.java b/java/src/IceGridGUI/Application/ServiceTemplates.java index 4ce7b8880b1..a4a3412afc7 100644 --- a/java/src/IceGridGUI/Application/ServiceTemplates.java +++ b/java/src/IceGridGUI/Application/ServiceTemplates.java @@ -9,11 +9,6 @@ package IceGridGUI.Application; -import java.awt.event.ActionEvent; - -import javax.swing.AbstractAction; -import javax.swing.Action; -import javax.swing.JMenuItem; import javax.swing.JPopupMenu; import IceGrid.*; @@ -35,6 +30,7 @@ class ServiceTemplates extends Templates // // Actions // + @Override public boolean[] getAvailableActions() { boolean[] actions = new boolean[ACTION_COUNT]; @@ -49,6 +45,7 @@ class ServiceTemplates extends Templates return actions; } + @Override public JPopupMenu getPopupMenu() { ApplicationActions actions = getCoordinator().getActionsForPopup(); @@ -61,6 +58,7 @@ class ServiceTemplates extends Templates return _popup; } + @Override public void newTemplateService() { ServiceDescriptor sd = new ServiceDescriptor( @@ -76,6 +74,7 @@ class ServiceTemplates extends Templates new java.util.TreeMap<String, String>())); } + @Override public void paste() { Object descriptor = getCoordinator().getClipboard(); @@ -99,6 +98,7 @@ class ServiceTemplates extends Templates // // Variable resolution does not make sense for templates / template children // + @Override Utils.Resolver getResolver() { return null; @@ -120,6 +120,7 @@ class ServiceTemplates extends Templates getRoot().setSelectedNode(t); } + @Override void tryAdd(String newId, TemplateDescriptor descriptor) throws UpdateFailedException { @@ -194,6 +195,7 @@ class ServiceTemplates extends Templates _descriptors.remove(id); } + @Override Object getDescriptor() { return _descriptors; diff --git a/java/src/IceGridGUI/Application/SimpleMapField.java b/java/src/IceGridGUI/Application/SimpleMapField.java index f4ece384f8d..7a9bbda1389 100644 --- a/java/src/IceGridGUI/Application/SimpleMapField.java +++ b/java/src/IceGridGUI/Application/SimpleMapField.java @@ -9,16 +9,13 @@ package IceGridGUI.Application; -import IceGrid.*; import IceGridGUI.*; import java.awt.event.ActionEvent; import javax.swing.AbstractAction; import javax.swing.Action; -import javax.swing.DefaultCellEditor; import javax.swing.JTable; -import javax.swing.JTextField; import javax.swing.KeyStroke; import javax.swing.event.TableModelEvent; import javax.swing.event.TableModelListener; @@ -52,6 +49,7 @@ public class SimpleMapField extends JTable Action deleteRow = new AbstractAction("Delete selected row(s)") { + @Override public void actionPerformed(ActionEvent e) { if(_editable) @@ -115,6 +113,7 @@ public class SimpleMapField extends JTable _model = new DefaultTableModel(vector, _columnNames) { + @Override public boolean isCellEditable(int row, int column) { return _editable; @@ -123,6 +122,7 @@ public class SimpleMapField extends JTable _model.addTableModelListener(new TableModelListener() { + @Override public void tableChanged(TableModelEvent e) { if(_editable) @@ -157,7 +157,7 @@ public class SimpleMapField extends JTable } @SuppressWarnings("unchecked") java.util.Vector<java.util.Vector<String>> vector = - (java.util.Vector<java.util.Vector<String>>)_model.getDataVector(); + _model.getDataVector(); java.util.TreeMap<String, String> result = new java.util.TreeMap<String, String>(); diff --git a/java/src/IceGridGUI/Application/TemplateEditor.java b/java/src/IceGridGUI/Application/TemplateEditor.java index f09a899491c..3a5117291ba 100644 --- a/java/src/IceGridGUI/Application/TemplateEditor.java +++ b/java/src/IceGridGUI/Application/TemplateEditor.java @@ -9,11 +9,6 @@ package IceGridGUI.Application; -import java.awt.event.ActionEvent; - -import javax.swing.AbstractAction; -import javax.swing.Action; -import javax.swing.JButton; import javax.swing.JOptionPane; import javax.swing.JScrollPane; import javax.swing.JTextField; @@ -22,7 +17,6 @@ import com.jgoodies.forms.builder.DefaultFormBuilder; import com.jgoodies.forms.layout.CellConstraints; import IceGrid.*; -import IceGridGUI.*; class TemplateEditor extends Editor { @@ -39,6 +33,7 @@ class TemplateEditor extends Editor return (TemplateDescriptor)_target.getDescriptor(); } + @Override Object getSubDescriptor() { return getDescriptor().descriptor; @@ -61,6 +56,7 @@ class TemplateEditor extends Editor return descriptor.parameters.equals(parameters) && descriptor.parameterDefaults.equals(defaultValues); } + @Override protected void appendProperties(DefaultFormBuilder builder) { builder.append("Template ID"); @@ -83,6 +79,7 @@ class TemplateEditor extends Editor builder.nextLine(); } + @Override protected boolean validate() { return check(new String[]{"Template ID", _template.getText().trim()}); @@ -97,6 +94,7 @@ class TemplateEditor extends Editor _parameters.set(descriptor.parameters, descriptor.parameterDefaults); } + @Override protected boolean applyUpdate(boolean refresh) { Root root = _target.getRoot(); diff --git a/java/src/IceGridGUI/Application/Templates.java b/java/src/IceGridGUI/Application/Templates.java index d451b65f2fb..2394ed71dcb 100644 --- a/java/src/IceGridGUI/Application/Templates.java +++ b/java/src/IceGridGUI/Application/Templates.java @@ -9,10 +9,7 @@ package IceGridGUI.Application; -import javax.swing.JOptionPane; - import IceGrid.*; -import IceGridGUI.*; abstract class Templates extends ListTreeNode { diff --git a/java/src/IceGridGUI/Application/TreeNode.java b/java/src/IceGridGUI/Application/TreeNode.java index 7f5f2f97ec8..f67e46d887f 100644 --- a/java/src/IceGridGUI/Application/TreeNode.java +++ b/java/src/IceGridGUI/Application/TreeNode.java @@ -9,10 +9,6 @@ package IceGridGUI.Application; -import javax.swing.JOptionPane; -import javax.swing.JPopupMenu; -import javax.swing.SwingUtilities; - import java.util.Enumeration; import IceGrid.*; diff --git a/java/src/IceGridGUI/Application/UpdateFailedException.java b/java/src/IceGridGUI/Application/UpdateFailedException.java index fd78c621b28..d81d5802fc0 100644 --- a/java/src/IceGridGUI/Application/UpdateFailedException.java +++ b/java/src/IceGridGUI/Application/UpdateFailedException.java @@ -21,6 +21,7 @@ public class UpdateFailedException extends Exception _message = message; } + @Override public String toString() { return _message; diff --git a/java/src/IceGridGUI/ApplicationActions.java b/java/src/IceGridGUI/ApplicationActions.java index edefed76750..4abd75f6261 100644 --- a/java/src/IceGridGUI/ApplicationActions.java +++ b/java/src/IceGridGUI/ApplicationActions.java @@ -9,15 +9,9 @@ package IceGridGUI; -import java.awt.Toolkit; import java.awt.event.ActionEvent; -import java.awt.event.KeyEvent; - import javax.swing.AbstractAction; import javax.swing.Action; -import javax.swing.KeyStroke; - -import IceGrid.*; import IceGridGUI.Application.*; // @@ -54,10 +48,9 @@ public class ApplicationActions ApplicationActions(boolean popup) { - final int MENU_MASK = Toolkit.getDefaultToolkit().getMenuShortcutKeyMask(); - _array[TreeNode.NEW_ADAPTER] = new AbstractAction(popup ? "New Adapter" : "Adapter") { + @Override public void actionPerformed(ActionEvent e) { if(apply(_target)) @@ -69,6 +62,7 @@ public class ApplicationActions _array[TreeNode.NEW_DBENV] = new AbstractAction(popup ? "New Database Environment" : "Database Environment") { + @Override public void actionPerformed(ActionEvent e) { if(apply(_target)) @@ -80,6 +74,7 @@ public class ApplicationActions _array[TreeNode.NEW_NODE] = new AbstractAction(popup ? "New Node" : "Node") { + @Override public void actionPerformed(ActionEvent e) { if(apply(_target)) @@ -91,6 +86,7 @@ public class ApplicationActions _array[TreeNode.NEW_PROPERTY_SET] = new AbstractAction(popup ? "New Property Set" : "Property Set") { + @Override public void actionPerformed(ActionEvent e) { if(apply(_target)) @@ -102,6 +98,7 @@ public class ApplicationActions _array[TreeNode.NEW_REPLICA_GROUP] = new AbstractAction(popup ? "New Replica Group" : "Replica Group" ) { + @Override public void actionPerformed(ActionEvent e) { if(apply(_target)) @@ -113,6 +110,7 @@ public class ApplicationActions _array[TreeNode.NEW_SERVER] = new AbstractAction(popup ? "New Server" : "Server") { + @Override public void actionPerformed(ActionEvent e) { if(apply(_target)) @@ -124,6 +122,7 @@ public class ApplicationActions _array[TreeNode.NEW_SERVER_ICEBOX] = new AbstractAction(popup ? "New IceBox Server" : "IceBox Server") { + @Override public void actionPerformed(ActionEvent e) { if(apply(_target)) @@ -136,6 +135,7 @@ public class ApplicationActions _array[TreeNode.NEW_SERVER_FROM_TEMPLATE] = new AbstractAction( popup ? "New Server from Template" : "Server from Template") { + @Override public void actionPerformed(ActionEvent e) { if(apply(_target)) @@ -148,6 +148,7 @@ public class ApplicationActions _array[TreeNode.NEW_SERVICE] = new AbstractAction(popup ? "New Service" : "Service") { + @Override public void actionPerformed(ActionEvent e) { if(apply(_target)) @@ -160,6 +161,7 @@ public class ApplicationActions _array[TreeNode.NEW_SERVICE_FROM_TEMPLATE] = new AbstractAction( popup ? "New Service from Template" : "Service from Template") { + @Override public void actionPerformed(ActionEvent e) { if(apply(_target)) @@ -171,6 +173,7 @@ public class ApplicationActions _array[TreeNode.NEW_TEMPLATE_SERVER] = new AbstractAction(popup ? "New Server Template" : "Server Template") { + @Override public void actionPerformed(ActionEvent e) { if(apply(_target)) @@ -183,6 +186,7 @@ public class ApplicationActions _array[TreeNode.NEW_TEMPLATE_SERVER_ICEBOX] = new AbstractAction( popup ? "New IceBox Server Template" : "IceBox Server Template") { + @Override public void actionPerformed(ActionEvent e) { if(apply(_target)) @@ -195,6 +199,7 @@ public class ApplicationActions _array[TreeNode.NEW_TEMPLATE_SERVICE] = new AbstractAction(popup ? "New Service Template" : "Service Template") { + @Override public void actionPerformed(ActionEvent e) { if(apply(_target)) @@ -206,6 +211,7 @@ public class ApplicationActions _array[TreeNode.COPY] = new AbstractAction("Copy") { + @Override public void actionPerformed(ActionEvent e) { _target.copy(); @@ -214,6 +220,7 @@ public class ApplicationActions _array[TreeNode.PASTE] = new AbstractAction("Paste") { + @Override public void actionPerformed(ActionEvent e) { if(apply(_target)) @@ -225,6 +232,7 @@ public class ApplicationActions _array[TreeNode.DELETE] = new AbstractAction("Delete") { + @Override public void actionPerformed(ActionEvent e) { _target.delete(); @@ -233,6 +241,7 @@ public class ApplicationActions _array[TreeNode.SHOW_VARS] = new AbstractAction("Show Variables") { + @Override public void actionPerformed(ActionEvent e) { _target.getCoordinator().showVars(); @@ -246,6 +255,7 @@ public class ApplicationActions _array[TreeNode.SUBSTITUTE_VARS] = new AbstractAction("Substitute Variables") { + @Override public void actionPerformed(ActionEvent e) { _target.getCoordinator().substituteVars(); @@ -258,6 +268,7 @@ public class ApplicationActions _array[TreeNode.MOVE_UP] = new AbstractAction("Move Up") { + @Override public void actionPerformed(ActionEvent e) { if(apply(_target)) @@ -269,6 +280,7 @@ public class ApplicationActions _array[TreeNode.MOVE_DOWN] = new AbstractAction("Move Down") { + @Override public void actionPerformed(ActionEvent e) { if(apply(_target)) diff --git a/java/src/IceGridGUI/ApplicationObserverI.java b/java/src/IceGridGUI/ApplicationObserverI.java index 85d712df471..feaf4306b88 100644 --- a/java/src/IceGridGUI/ApplicationObserverI.java +++ b/java/src/IceGridGUI/ApplicationObserverI.java @@ -52,6 +52,7 @@ class ApplicationObserverI extends _ApplicationObserverDisp } } + @Override public synchronized void applicationInit(int serial, java.util.List<ApplicationInfo> applications, Ice.Current current) { @@ -84,6 +85,7 @@ class ApplicationObserverI extends _ApplicationObserverDisp notify(); } + @Override public void applicationAdded(final int serial, final ApplicationInfo info, Ice.Current current) { if(_trace) @@ -95,6 +97,7 @@ class ApplicationObserverI extends _ApplicationObserverDisp SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { _coordinator.applicationAdded(serial, info); @@ -102,6 +105,7 @@ class ApplicationObserverI extends _ApplicationObserverDisp }); } + @Override public void applicationRemoved(final int serial, final String name, final Ice.Current current) { if(_trace) @@ -113,6 +117,7 @@ class ApplicationObserverI extends _ApplicationObserverDisp SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { _coordinator.applicationRemoved(serial, name); @@ -120,6 +125,7 @@ class ApplicationObserverI extends _ApplicationObserverDisp }); } + @Override public void applicationUpdated(final int serial, final ApplicationUpdateInfo info, Ice.Current current) { if(_trace) @@ -131,6 +137,7 @@ class ApplicationObserverI extends _ApplicationObserverDisp SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { _coordinator.applicationUpdated(serial, info); diff --git a/java/src/IceGridGUI/ApplicationPane.java b/java/src/IceGridGUI/ApplicationPane.java index 30d1fdb72b9..52e5d9076b4 100644 --- a/java/src/IceGridGUI/ApplicationPane.java +++ b/java/src/IceGridGUI/ApplicationPane.java @@ -10,14 +10,10 @@ package IceGridGUI; import java.awt.*; -import java.awt.event.WindowAdapter; -import java.awt.event.WindowEvent; -import java.awt.event.ActionEvent; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import javax.swing.*; -import javax.swing.border.AbstractBorder; import javax.swing.border.EmptyBorder; import javax.swing.event.TreeSelectionEvent; import javax.swing.event.TreeSelectionListener; @@ -27,24 +23,22 @@ import javax.swing.tree.TreeCellRenderer; import javax.swing.tree.TreePath; import javax.swing.tree.TreeSelectionModel; -import com.jgoodies.looks.Options; -import com.jgoodies.looks.plastic.PlasticLookAndFeel; -import com.jgoodies.looks.windows.WindowsLookAndFeel; import com.jgoodies.forms.factories.Borders; -import IceGrid.*; import IceGridGUI.Application.Editor; import IceGridGUI.Application.Root; import IceGridGUI.Application.TreeNode; public class ApplicationPane extends JSplitPane implements Tab { + @Override public void updateUI() { super.updateUI(); setEmptyDividerBorder(); } + @Override public void selected() { Coordinator c = _root.getCoordinator(); @@ -73,6 +67,7 @@ public class ApplicationPane extends JSplitPane implements Tab c.showActions(_currentNode); } + @Override public void refresh() { if(_currentNode != null) @@ -88,6 +83,7 @@ public class ApplicationPane extends JSplitPane implements Tab } } + @Override public void showNode(TreeNodeBase node) { TreeNode newNode = (TreeNode)node; @@ -135,6 +131,7 @@ public class ApplicationPane extends JSplitPane implements Tab } } + @Override public void back() { // @@ -172,6 +169,7 @@ public class ApplicationPane extends JSplitPane implements Tab } } + @Override public void forward() { if(_currentEditor != null && !_currentEditor.save(false)) @@ -250,8 +248,8 @@ public class ApplicationPane extends JSplitPane implements Tab JScrollPane leftScroll = new JScrollPane(tree, - JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED, - JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED); + ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, + ScrollPaneConstants.HORIZONTAL_SCROLLBAR_AS_NEEDED); leftScroll.setBorder(Borders.EMPTY); _leftPane.setContent(leftScroll); @@ -264,6 +262,7 @@ public class ApplicationPane extends JSplitPane implements Tab } } + @Override public void save() { if(_currentEditor == null || _currentEditor.save(true)) @@ -272,6 +271,7 @@ public class ApplicationPane extends JSplitPane implements Tab } } + @Override public void saveToRegistry(boolean restart) { if(_currentEditor == null || _currentEditor.save(true)) @@ -280,6 +280,7 @@ public class ApplicationPane extends JSplitPane implements Tab } } + @Override public void saveToFile() { if(_currentEditor == null || _currentEditor.save(true)) @@ -288,11 +289,13 @@ public class ApplicationPane extends JSplitPane implements Tab } } + @Override public void discardUpdates() { _root.discardUpdates(); } + @Override public boolean close() { _root.getCoordinator().getMainPane().remove(this); @@ -319,7 +322,7 @@ public class ApplicationPane extends JSplitPane implements Tab javax.swing.InputMap im = _leftPane.getInputMap(); im.put((KeyStroke)action.getValue(Action.ACCELERATOR_KEY), (String)action.getValue(Action.NAME)); - am.put((String)action.getValue(Action.NAME), action); + am.put(action.getValue(Action.NAME), action); } ApplicationPane(Root root) @@ -384,11 +387,13 @@ public class ApplicationPane extends JSplitPane implements Tab private class PopupListener extends MouseAdapter { + @Override public void mousePressed(MouseEvent e) { maybeShowPopup(e); } + @Override public void mouseReleased(MouseEvent e) { maybeShowPopup(e); @@ -417,6 +422,7 @@ public class ApplicationPane extends JSplitPane implements Tab private class SelectionListener implements TreeSelectionListener { + @Override public void valueChanged(TreeSelectionEvent e) { if(_root.isSelectionListenerEnabled()) diff --git a/java/src/IceGridGUI/CellRenderer.java b/java/src/IceGridGUI/CellRenderer.java index dae3b0e68b7..4e319329755 100644 --- a/java/src/IceGridGUI/CellRenderer.java +++ b/java/src/IceGridGUI/CellRenderer.java @@ -16,6 +16,7 @@ import javax.swing.tree.DefaultTreeCellRenderer; class CellRenderer implements TreeCellRenderer { + @Override public Component getTreeCellRendererComponent( JTree tree, Object value, diff --git a/java/src/IceGridGUI/Coordinator.java b/java/src/IceGridGUI/Coordinator.java index 778eeadd628..a1aa6994eb6 100644 --- a/java/src/IceGridGUI/Coordinator.java +++ b/java/src/IceGridGUI/Coordinator.java @@ -16,7 +16,6 @@ import java.util.Enumeration; import java.util.Collection; import java.awt.*; import java.awt.event.*; -import java.awt.image.*; import java.io.BufferedReader; import java.io.InputStreamReader; import java.io.File; @@ -24,7 +23,6 @@ import java.io.FileInputStream; import java.io.FileOutputStream; import javax.swing.*; -import javax.swing.text.Keymap; import javax.swing.border.EmptyBorder; import javax.swing.filechooser.FileFilter; import javax.swing.text.JTextComponent; @@ -36,21 +34,12 @@ import com.jgoodies.looks.plastic.PlasticLookAndFeel; import com.jgoodies.forms.builder.DefaultFormBuilder; import com.jgoodies.forms.builder.ButtonBarBuilder; import com.jgoodies.forms.factories.Borders; -import com.jgoodies.forms.factories.DefaultComponentFactory; import com.jgoodies.forms.layout.FormLayout; -import com.jgoodies.forms.layout.CellConstraints; import com.jgoodies.forms.util.LayoutStyle; -import java.security.Key; import java.security.KeyStore; import java.security.cert.Certificate; -import java.security.cert.CertificateFactory; import java.security.cert.X509Certificate; -import java.security.MessageDigest; - -import javax.security.auth.x500.X500Principal; - -import Ice.LocatorFinderPrx; import Ice.LocatorFinderPrxHelper; import IceGrid.*; @@ -89,11 +78,13 @@ public class Coordinator add(_connectedLabel, BorderLayout.LINE_END); } + @Override public void setText(String text) { _text.setText(text); } + @Override public void setConnected(boolean connected) { if(connected) @@ -118,6 +109,7 @@ public class Coordinator setEnabled(false); } + @Override public void actionPerformed(ActionEvent e) { if(_target != null) @@ -126,6 +118,7 @@ public class Coordinator } } + @Override public void propertyChange(java.beans.PropertyChangeEvent e) { // @@ -171,6 +164,7 @@ public class Coordinator super(name); } + @Override public void actionPerformed(ActionEvent e) { if(_target != null) @@ -193,6 +187,7 @@ public class Coordinator private class FocusListener implements java.beans.PropertyChangeListener { + @Override public void propertyChange(java.beans.PropertyChangeEvent e) { Object o = e.getNewValue(); @@ -605,12 +600,14 @@ public class Coordinator _clientProxy = proxy; } + @Override public Ice.ObjectPrx getClientProxy(Ice.Current current) { return _clientProxy; } + @Override public Ice.ObjectPrx getServerProxy(Ice.Current current) { @@ -618,11 +615,14 @@ public class Coordinator } /** @deprecated **/ + @Deprecated + @Override public void addProxy(Ice.ObjectPrx proxy, Ice.Current current) { } + @Override public Ice.ObjectPrx[] addProxies(Ice.ObjectPrx[] proxies, Ice.Current current) { @@ -939,6 +939,7 @@ public class Coordinator JOptionPane.ERROR_MESSAGE); } + @Override public void run() { getMainFrame().setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR)); @@ -947,6 +948,7 @@ public class Coordinator final String prefix = "Deleting application '" + name + "'..."; Callback_Admin_removeApplication cb = new Callback_Admin_removeApplication() { + @Override public void response() { if(_traceSaveToRegistry) @@ -956,6 +958,7 @@ public class Coordinator SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { release(); @@ -964,6 +967,7 @@ public class Coordinator }); } + @Override public void exception(final Ice.UserException e) { if(_traceSaveToRegistry) @@ -973,6 +977,7 @@ public class Coordinator SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { handleFailure(prefix, "Delete failed", @@ -982,6 +987,7 @@ public class Coordinator }); } + @Override public void exception(final Ice.LocalException e) { if(_traceSaveToRegistry) @@ -991,6 +997,7 @@ public class Coordinator SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { handleFailure(prefix, "Delete failed", @@ -1272,11 +1279,9 @@ public class Coordinator // // Keep certificates arround for connection retry // - _trasientCert = null; + _transientCert = null; _liveDeploymentRoot.clear(); - AdminSessionPrx session = null; - destroyCommunicator(); Ice.InitializationData initData = _initData; @@ -1385,6 +1390,7 @@ public class Coordinator return _decision; } + @Override public void run() { @@ -1410,6 +1416,7 @@ public class Coordinator private TrustDecision _decision = TrustDecision.No; } + @Override public boolean verify(IceSSL.NativeConnectionInfo info) { if(!(info.nativeCerts[0] instanceof X509Certificate)) @@ -1430,14 +1437,14 @@ public class Coordinator // // Compare the server certificate with a previous accepted certificate if - // any, the trasient certificate is reset by Coordinator.login, and is only - // ussefull in case the connection is retry, because a timeout or ACM closed - // it while the certificate verifier was waiting for the user decission. + // any, the transient certificate is reset by Coordinator.login, and is only + // useful in case the connection is retry, because a timeout or ACM closed + // it while the certificate verifier was waiting for the user decision. // // This avoids to show the dialog again if the user already granted the cert for // this login operation. // - if(_trasientCert != null && _trasientCert.equals(cert)) + if(_transientCert != null && _transientCert.equals(cert)) { return true; } @@ -1447,9 +1454,9 @@ public class Coordinator // try { - for(Enumeration e = _trustedServerKeyStore.aliases(); e.hasMoreElements() ;) + for(Enumeration<String> e = _trustedServerKeyStore.aliases(); e.hasMoreElements() ;) { - String alias = e.nextElement().toString(); + String alias = e.nextElement(); if(!_trustedServerKeyStore.isCertificateEntry(alias)) { continue; @@ -1478,6 +1485,7 @@ public class Coordinator { SwingUtilities.invokeAndWait(new Runnable() { + @Override public void run() { JOptionPane.showMessageDialog(parent, ex.toString(), "Error loading keystore", @@ -1516,12 +1524,11 @@ public class Coordinator // try { - Collection altNames = cert.getSubjectAlternativeNames(); + Collection<java.util.List<?>> altNames = cert.getSubjectAlternativeNames(); if(altNames != null) { - for(Object o : altNames) + for(java.util.List<?> l : altNames) { - java.util.List l = (java.util.List)o; Integer kind = (Integer)l.get(0); if(kind != 2 && kind != 7) { @@ -1546,9 +1553,9 @@ public class Coordinator // try { - for(Enumeration e = _trustedCaKeyStore.aliases(); e.hasMoreElements() ;) + for(Enumeration<String> e = _trustedCaKeyStore.aliases(); e.hasMoreElements() ;) { - String alias = e.nextElement().toString(); + String alias = e.nextElement(); if(!_trustedCaKeyStore.isCertificateEntry(alias)) { continue; @@ -1575,6 +1582,7 @@ public class Coordinator { SwingUtilities.invokeAndWait(new Runnable() { + @Override public void run() { JOptionPane.showMessageDialog(parent, ex.toString(), "Error loading keystore", @@ -1604,7 +1612,7 @@ public class Coordinator if(decision == TrustDecision.YesThisTime) { - _trasientCert = (X509Certificate) info.nativeCerts[0]; + _transientCert = (X509Certificate) info.nativeCerts[0]; return true; } else if(decision == TrustDecision.YesAlways) @@ -1635,6 +1643,7 @@ public class Coordinator { SwingUtilities.invokeAndWait(new Runnable() { + @Override public void run() { JOptionPane.showMessageDialog(parent, ex.toString(), "Error saving certificate", @@ -1673,6 +1682,7 @@ public class Coordinator { SwingUtilities.invokeAndWait(new Runnable() { + @Override public void run() { JOptionPane.showMessageDialog(parent, ex.toString(), @@ -1803,6 +1813,7 @@ public class Coordinator final ConnectionCallback cb = new ConnectionCallback(); new Thread(new Runnable() { + @Override public void run() { try @@ -1840,6 +1851,7 @@ public class Coordinator { SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { JOptionPane.showMessageDialog( @@ -1867,6 +1879,7 @@ public class Coordinator { SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { JOptionPane.showMessageDialog( @@ -1894,6 +1907,7 @@ public class Coordinator } SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { cb.loginSuccess(); @@ -1904,6 +1918,7 @@ public class Coordinator { SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { String msg = e.reason; @@ -1933,6 +1948,7 @@ public class Coordinator { SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { JOptionPane.showMessageDialog(parent, "Could not create session: " @@ -1948,7 +1964,8 @@ public class Coordinator { SwingUtilities.invokeLater(new Runnable() { - public void run() + @Override + public void run() { JOptionPane.showMessageDialog( getMainFrame(), @@ -1963,6 +1980,7 @@ public class Coordinator { SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { JOptionPane.showMessageDialog(parent, @@ -2032,6 +2050,7 @@ public class Coordinator new Thread(new Runnable() { + @Override public void run() { synchronized(Coordinator.this) @@ -2061,6 +2080,7 @@ public class Coordinator { SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { JOptionPane.showMessageDialog( @@ -2081,7 +2101,8 @@ public class Coordinator { SwingUtilities.invokeLater(new Runnable() { - public void run() + @Override + public void run() { JOptionPane.showMessageDialog( getMainFrame(), @@ -2096,6 +2117,7 @@ public class Coordinator { SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { JOptionPane.showMessageDialog( @@ -2172,6 +2194,7 @@ public class Coordinator { SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { String msg = e.reason; @@ -2205,6 +2228,7 @@ public class Coordinator { SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { JOptionPane.showMessageDialog(parent, @@ -2221,6 +2245,7 @@ public class Coordinator { SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { if(JOptionPane.showConfirmDialog( @@ -2249,6 +2274,7 @@ public class Coordinator SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { cb.loginSuccess(); @@ -2277,14 +2303,17 @@ public class Coordinator Glacier2.Callback_Router_destroySession cb = new Glacier2.Callback_Router_destroySession() { + @Override public void response() { } + @Override public void exception(Ice.LocalException ex) { } + @Override public void exception(Ice.UserException ex) { } @@ -2607,6 +2636,7 @@ public class Coordinator _shutdownHook = new Thread("Shutdown hook") { + @Override public void run() { destroyIceGridAdmin(); @@ -2630,11 +2660,13 @@ public class Coordinator _saveXMLChooser.addChoosableFileFilter(new FileFilter() { + @Override public boolean accept(File f) { return f.isDirectory() || f.getName().endsWith(".xml"); } + @Override public String getDescription() { return ".xml files"; @@ -2645,6 +2677,7 @@ public class Coordinator _saveLogChooser.addChoosableFileFilter(new FileFilter() { + @Override public boolean accept(File f) { return f.isDirectory() || @@ -2654,6 +2687,7 @@ public class Coordinator f.getName().endsWith(".txt"); } + @Override public String getDescription() { return ".out .err .log .txt files"; @@ -2673,6 +2707,7 @@ public class Coordinator // _newApplication = new AbstractAction("Application") { + @Override public void actionPerformed(ActionEvent e) { newApplication(); @@ -2682,6 +2717,7 @@ public class Coordinator _newApplicationWithDefaultTemplates = new AbstractAction("Application with Default Templates from Registry") { + @Override public void actionPerformed(ActionEvent e) { newApplicationWithDefaultTemplates(); @@ -2691,6 +2727,7 @@ public class Coordinator _login = new AbstractAction("Login...") { + @Override public void actionPerformed(ActionEvent e) { _sessionKeeper.connectionManager(); @@ -2700,6 +2737,7 @@ public class Coordinator _logout = new AbstractAction("Logout") { + @Override public void actionPerformed(ActionEvent e) { if(_graphViews.size() > 0) @@ -2726,6 +2764,7 @@ public class Coordinator _acquireExclusiveWriteAccess = new AbstractAction("Acquire Exclusive Write Access") { + @Override public void actionPerformed(ActionEvent e) { try @@ -2746,6 +2785,7 @@ public class Coordinator _releaseExclusiveWriteAccess = new AbstractAction("Release Exclusive Write Access") { + @Override public void actionPerformed(ActionEvent e) { releaseExclusiveWriteAccess(); @@ -2759,6 +2799,7 @@ public class Coordinator _newGraph = new AbstractAction("Metrics Graph") { + @Override public void actionPerformed(ActionEvent e) { createGraphView(); @@ -2768,6 +2809,7 @@ public class Coordinator _showLiveDeploymentFilters = new AbstractAction("Filter live deployment") { + @Override public void actionPerformed(ActionEvent e) { @@ -2811,6 +2853,7 @@ public class Coordinator _openApplicationFromFile = new AbstractAction("Application from File") { + @Override public void actionPerformed(ActionEvent e) { int result = _openChooser.showOpenDialog(_mainFrame); @@ -2850,6 +2893,7 @@ public class Coordinator _openApplicationFromRegistry = new AbstractAction("Application from Registry") { + @Override public void actionPerformed(ActionEvent e) { Object[] applicationNames = _liveDeploymentRoot.getApplicationNames(); @@ -2890,6 +2934,7 @@ public class Coordinator _closeApplication = new AbstractAction("Close Application") { + @Override public void actionPerformed(ActionEvent e) { Tab tab = getCurrentTab(); @@ -2916,6 +2961,7 @@ public class Coordinator _save = new AbstractAction("Save") { + @Override public void actionPerformed(ActionEvent e) { try @@ -2936,6 +2982,7 @@ public class Coordinator _saveToRegistry = new AbstractAction("Save to Registry (Servers may restart)") { + @Override public void actionPerformed(ActionEvent e) { getCurrentTab().saveToRegistry(true); @@ -2947,6 +2994,7 @@ public class Coordinator _saveToRegistryWithoutRestart = new AbstractAction("Save to Registry (No server restart)") { + @Override public void actionPerformed(ActionEvent e) { getCurrentTab().saveToRegistry(false); @@ -2957,6 +3005,7 @@ public class Coordinator _saveToFile = new AbstractAction("Save to File") { + @Override public void actionPerformed(ActionEvent e) { try @@ -2975,6 +3024,7 @@ public class Coordinator _discardUpdates = new AbstractAction("Discard Updates") { + @Override public void actionPerformed(ActionEvent e) { getCurrentTab().discardUpdates(); @@ -2985,6 +3035,7 @@ public class Coordinator _certificateManager = new AbstractAction("Certificate Manager...") { + @Override public void actionPerformed(ActionEvent e) { SessionKeeper.CertificateManagerDialog d = _sessionKeeper.certificateManager(getMainFrame()); @@ -2998,6 +3049,7 @@ public class Coordinator _exit = new AbstractAction("Exit") { + @Override public void actionPerformed(ActionEvent e) { exit(0); @@ -3007,6 +3059,7 @@ public class Coordinator _back = new AbstractAction("Go Back to the Previous Node") { + @Override public void actionPerformed(ActionEvent e) { getCurrentTab().back(); @@ -3017,6 +3070,7 @@ public class Coordinator _forward = new AbstractAction("Go to the Next Node") { + @Override public void actionPerformed(ActionEvent e) { getCurrentTab().forward(); @@ -3027,6 +3081,7 @@ public class Coordinator _helpContents = new AbstractAction("Contents") { + @Override public void actionPerformed(ActionEvent e) { helpContents(); @@ -3035,6 +3090,7 @@ public class Coordinator _about = new AbstractAction("About") { + @Override public void actionPerformed(ActionEvent e) { about(); @@ -3043,6 +3099,7 @@ public class Coordinator _patchApplication = new AbstractAction("Patch Distribution") { + @Override public void actionPerformed(ActionEvent e) { Object[] applicationNames = _liveDeploymentRoot.getPatchableApplicationNames(); @@ -3074,6 +3131,7 @@ public class Coordinator _showApplicationDetails = new AbstractAction("Show details") { + @Override public void actionPerformed(ActionEvent e) { Object[] applicationNames = _liveDeploymentRoot.getApplicationNames(); @@ -3109,6 +3167,7 @@ public class Coordinator _removeApplicationFromRegistry = new AbstractAction("Remove from Registry") { + @Override public void actionPerformed(ActionEvent e) { Object[] applicationNames = _liveDeploymentRoot.getApplicationNames(); @@ -3182,7 +3241,7 @@ public class Coordinator _mainFrame.getContentPane().add(new ToolBar(), BorderLayout.PAGE_START); - _mainFrame.getContentPane().add((StatusBarI)_statusBar, BorderLayout.PAGE_END); + _mainFrame.getContentPane().add(_statusBar, BorderLayout.PAGE_END); java.awt.KeyboardFocusManager kbm = java.awt.KeyboardFocusManager.getCurrentKeyboardFocusManager(); kbm.addPropertyChangeListener("permanentFocusOwner", new FocusListener()); @@ -3195,6 +3254,7 @@ public class Coordinator new java.util.concurrent.ScheduledThreadPoolExecutor(1, new java.util.concurrent.ThreadFactory() { + @Override public Thread newThread(Runnable r) { Thread t = new Thread(r); @@ -3236,7 +3296,7 @@ public class Coordinator try { - Constructor ctor = c1.getConstructor(new Class[] { Coordinator.class, String.class }); + Constructor<?> ctor = c1.getConstructor(new Class[] { Coordinator.class, String.class }); view = (IGraphView)ctor.newInstance(new Object[] { Coordinator.this, title.toString() }); _graphViews.add(view); } @@ -3786,6 +3846,7 @@ public class Coordinator JButton yesAlwaysButton = new JButton(new AbstractAction("Yes, Always Trust") { + @Override public void actionPerformed(ActionEvent e) { _decision = TrustDecision.YesAlways; @@ -3795,6 +3856,7 @@ public class Coordinator JButton yesButton = new JButton(new AbstractAction("Yes, Just This Time") { + @Override public void actionPerformed(ActionEvent e) { _decision = TrustDecision.YesThisTime; @@ -3804,6 +3866,7 @@ public class Coordinator JButton noButton = new JButton(new AbstractAction("No") { + @Override public void actionPerformed(ActionEvent e) { _decision = TrustDecision.No; @@ -3955,11 +4018,9 @@ public class Coordinator private String _fileParser; private boolean _connected; - private X509Certificate _trasientCert; + private X509Certificate _transientCert; private java.util.List<IGraphView> _graphViews = new java.util.ArrayList<IGraphView>(); private java.util.concurrent.ScheduledExecutorService _executor; - - static private final int HISTORY_MAX_SIZE = 20; } diff --git a/java/src/IceGridGUI/EditorBase.java b/java/src/IceGridGUI/EditorBase.java index 1d894017f88..6b045e67454 100644 --- a/java/src/IceGridGUI/EditorBase.java +++ b/java/src/IceGridGUI/EditorBase.java @@ -15,14 +15,13 @@ import javax.swing.JComponent; import javax.swing.JPanel; import javax.swing.JScrollPane; import javax.swing.JToolBar; +import javax.swing.ScrollPaneConstants; import com.jgoodies.forms.builder.DefaultFormBuilder; import com.jgoodies.forms.factories.Borders; import com.jgoodies.forms.layout.FormLayout; import com.jgoodies.forms.util.LayoutStyle; -import IceGrid.*; - // // Base class for all editors // @@ -71,8 +70,8 @@ public abstract class EditorBase JScrollPane scrollPane = new JScrollPane(contents, - JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED, - JScrollPane.HORIZONTAL_SCROLLBAR_NEVER); + ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, + ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); scrollPane.setBorder(Borders.DIALOG); diff --git a/java/src/IceGridGUI/Fallback.java b/java/src/IceGridGUI/Fallback.java index 3e27436ce4c..31293f94386 100644 --- a/java/src/IceGridGUI/Fallback.java +++ b/java/src/IceGridGUI/Fallback.java @@ -13,6 +13,7 @@ import javax.swing.JOptionPane; public class Fallback extends javax.swing.JApplet { + @Override public void start() { try @@ -52,6 +53,7 @@ public class Fallback extends javax.swing.JApplet { Runtime.getRuntime().addShutdownHook(new Thread() { + @Override public void run() { while(true) diff --git a/java/src/IceGridGUI/LiveActions.java b/java/src/IceGridGUI/LiveActions.java index f70af2baae1..147a5946814 100644 --- a/java/src/IceGridGUI/LiveActions.java +++ b/java/src/IceGridGUI/LiveActions.java @@ -13,7 +13,6 @@ import java.awt.event.ActionEvent; import javax.swing.AbstractAction; import javax.swing.Action; -import IceGrid.*; import IceGridGUI.LiveDeployment.*; // @@ -30,6 +29,7 @@ public class LiveActions putValue(Action.SHORT_DESCRIPTION, "Send " + _name); } + @Override public void actionPerformed(ActionEvent e) { _target.signal(_name); @@ -67,6 +67,7 @@ public class LiveActions { _array[TreeNode.START] = new AbstractAction("Start", Utils.getIcon("/icons/16x16/start.png")) { + @Override public void actionPerformed(ActionEvent e) { _target.start(); @@ -76,6 +77,7 @@ public class LiveActions _array[TreeNode.STOP] = new AbstractAction("Stop", Utils.getIcon("/icons/16x16/stop.png")) { + @Override public void actionPerformed(ActionEvent e) { _target.stop(); @@ -86,6 +88,7 @@ public class LiveActions _array[TreeNode.ENABLE] = new AbstractAction("Enable", Utils.getIcon("/icons/16x16/enable.png")) { + @Override public void actionPerformed(ActionEvent e) { _target.enable(); @@ -95,6 +98,7 @@ public class LiveActions _array[TreeNode.DISABLE] = new AbstractAction("Disable", Utils.getIcon("/icons/16x16/disable.png")) { + @Override public void actionPerformed(ActionEvent e) { _target.disable(); @@ -112,6 +116,7 @@ public class LiveActions _array[TreeNode.WRITE_MESSAGE] = new AbstractAction("Write Message") { + @Override public void actionPerformed(ActionEvent e) { _target.writeMessage(); @@ -122,6 +127,7 @@ public class LiveActions _array[TreeNode.RETRIEVE_STDOUT] = new AbstractAction("Retrieve stdout") { + @Override public void actionPerformed(ActionEvent e) { _target.retrieveOutput(true); @@ -131,6 +137,7 @@ public class LiveActions _array[TreeNode.RETRIEVE_STDERR] = new AbstractAction("Retrieve stderr") { + @Override public void actionPerformed(ActionEvent e) { _target.retrieveOutput(false); @@ -140,6 +147,7 @@ public class LiveActions _array[TreeNode.RETRIEVE_LOG] = new AbstractAction("Retrieve Log") { + @Override public void actionPerformed(ActionEvent e) { _target.retrieveLog(); @@ -149,6 +157,7 @@ public class LiveActions _array[TreeNode.SHUTDOWN_NODE] = new AbstractAction("Shutdown") { + @Override public void actionPerformed(ActionEvent e) { _target.shutdownNode(); @@ -157,6 +166,7 @@ public class LiveActions _array[TreeNode.SHUTDOWN_REGISTRY] = new AbstractAction("Shutdown") { + @Override public void actionPerformed(ActionEvent e) { _target.shutdownRegistry(); @@ -165,6 +175,7 @@ public class LiveActions _array[TreeNode.PATCH_SERVER] = new AbstractAction("Patch Distribution") { + @Override public void actionPerformed(ActionEvent e) { _target.patchServer(); @@ -173,6 +184,7 @@ public class LiveActions _array[TreeNode.ADD_OBJECT] = new AbstractAction("Add Well-known Object") { + @Override public void actionPerformed(ActionEvent e) { _target.addObject(); @@ -181,6 +193,7 @@ public class LiveActions _array[TreeNode.OPEN_DEFINITION] = new AbstractAction("Open Definition") { + @Override public void actionPerformed(ActionEvent e) { _target.openDefinition(); @@ -189,6 +202,7 @@ public class LiveActions _array[TreeNode.ENABLE_METRICS_VIEW] = new AbstractAction("Enable Metrics View") { + @Override public void actionPerformed(ActionEvent e) { _target.enableMetricsView(true); @@ -197,6 +211,7 @@ public class LiveActions _array[TreeNode.DISABLE_METRICS_VIEW] = new AbstractAction("Disable Metrics View") { + @Override public void actionPerformed(ActionEvent e) { _target.enableMetricsView(false); diff --git a/java/src/IceGridGUI/LiveDeployment/Adapter.java b/java/src/IceGridGUI/LiveDeployment/Adapter.java index f70a40c5b80..d169c653477 100644 --- a/java/src/IceGridGUI/LiveDeployment/Adapter.java +++ b/java/src/IceGridGUI/LiveDeployment/Adapter.java @@ -14,16 +14,12 @@ import java.awt.Component; import javax.swing.Icon; import javax.swing.JTree; import javax.swing.tree.DefaultTreeCellRenderer; -import javax.swing.tree.TreeModel; -import javax.swing.tree.TreePath; - -import java.util.Enumeration; - import IceGrid.*; import IceGridGUI.*; class Adapter extends TreeNode { + @Override public Editor getEditor() { if(_editor == null) @@ -34,6 +30,7 @@ class Adapter extends TreeNode return _editor; } + @Override public Component getTreeCellRendererComponent( JTree tree, Object value, diff --git a/java/src/IceGridGUI/LiveDeployment/AdapterEditor.java b/java/src/IceGridGUI/LiveDeployment/AdapterEditor.java index 3c5de9630be..2c19d4ea883 100644 --- a/java/src/IceGridGUI/LiveDeployment/AdapterEditor.java +++ b/java/src/IceGridGUI/LiveDeployment/AdapterEditor.java @@ -9,14 +9,7 @@ package IceGridGUI.LiveDeployment; -import javax.swing.AbstractAction; -import javax.swing.Action; -import javax.swing.DefaultComboBoxModel; -import javax.swing.JButton; import javax.swing.JCheckBox; -import javax.swing.JComboBox; -import javax.swing.JComponent; -import javax.swing.JFrame; import javax.swing.JScrollPane; import javax.swing.JTextArea; import javax.swing.JTextField; @@ -73,7 +66,7 @@ class AdapterEditor extends Editor // getId() returns the name of the adapter! _endpoints.setText(resolver.substitute(properties.get(adapter.getId() + ".Endpoints"))); _publishedEndpoints.setText( - resolver.substitute((String)properties.get(adapter.getId() + ".PublishedEndpoints"))); + resolver.substitute(properties.get(adapter.getId() + ".PublishedEndpoints"))); _registerProcess.setSelected(descriptor.registerProcess); _serverLifetime.setSelected(descriptor.serverLifetime); @@ -82,6 +75,7 @@ class AdapterEditor extends Editor _allocatables.setObjects(descriptor.allocatables, resolver); } + @Override protected void appendProperties(DefaultFormBuilder builder) { builder.appendSeparator("Runtime Status"); @@ -158,6 +152,7 @@ class AdapterEditor extends Editor builder.nextLine(); } + @Override protected void buildPropertiesPanel() { super.buildPropertiesPanel(); diff --git a/java/src/IceGridGUI/LiveDeployment/ApplicationDetailsDialog.java b/java/src/IceGridGUI/LiveDeployment/ApplicationDetailsDialog.java index 340d0995e01..8784f8812a2 100644 --- a/java/src/IceGridGUI/LiveDeployment/ApplicationDetailsDialog.java +++ b/java/src/IceGridGUI/LiveDeployment/ApplicationDetailsDialog.java @@ -9,23 +9,11 @@ package IceGridGUI.LiveDeployment; -import java.awt.BorderLayout; import java.awt.Container; -import java.awt.Dimension; -import java.awt.Frame; - -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; - -import javax.swing.BoxLayout; -import javax.swing.JButton; -import javax.swing.JComboBox; -import javax.swing.JComponent; import javax.swing.JDialog; import javax.swing.JFrame; -import javax.swing.JPanel; -import javax.swing.JScrollPane; import javax.swing.JTextField; +import javax.swing.WindowConstants; import com.jgoodies.forms.builder.DefaultFormBuilder; import com.jgoodies.forms.factories.Borders; @@ -39,7 +27,7 @@ class ApplicationDetailsDialog extends JDialog ApplicationDetailsDialog(final Root root) { super(root.getCoordinator().getMainFrame(), "Application Details - IceGrid Admin", true); - setDefaultCloseOperation(JDialog.HIDE_ON_CLOSE); + setDefaultCloseOperation(WindowConstants.HIDE_ON_CLOSE); _mainFrame = root.getCoordinator().getMainFrame(); _name.setEditable(false); diff --git a/java/src/IceGridGUI/LiveDeployment/CommunicatorEditor.java b/java/src/IceGridGUI/LiveDeployment/CommunicatorEditor.java index d8ec8402e83..19a8b63def2 100644 --- a/java/src/IceGridGUI/LiveDeployment/CommunicatorEditor.java +++ b/java/src/IceGridGUI/LiveDeployment/CommunicatorEditor.java @@ -33,6 +33,7 @@ class CommunicatorEditor extends Editor _properties.setSortedMap(properties); } + @Override protected void appendProperties(DefaultFormBuilder builder) { builder.append("Description"); diff --git a/java/src/IceGridGUI/LiveDeployment/DbEnv.java b/java/src/IceGridGUI/LiveDeployment/DbEnv.java index abce9740976..2788f3ee5ad 100644 --- a/java/src/IceGridGUI/LiveDeployment/DbEnv.java +++ b/java/src/IceGridGUI/LiveDeployment/DbEnv.java @@ -12,15 +12,12 @@ package IceGridGUI.LiveDeployment; import java.awt.Component; import javax.swing.JTree; import javax.swing.tree.DefaultTreeCellRenderer; -import javax.swing.tree.TreeModel; -import javax.swing.tree.TreePath; -import java.util.Enumeration; - import IceGrid.*; import IceGridGUI.*; class DbEnv extends TreeNode { + @Override public Component getTreeCellRendererComponent( JTree tree, Object value, @@ -38,6 +35,7 @@ class DbEnv extends TreeNode return _cellRenderer.getTreeCellRendererComponent(tree, value, sel, expanded, leaf, row, hasFocus); } + @Override public Editor getEditor() { if(_editor == null) diff --git a/java/src/IceGridGUI/LiveDeployment/DbEnvEditor.java b/java/src/IceGridGUI/LiveDeployment/DbEnvEditor.java index 3ed982b5e37..03a9596db66 100644 --- a/java/src/IceGridGUI/LiveDeployment/DbEnvEditor.java +++ b/java/src/IceGridGUI/LiveDeployment/DbEnvEditor.java @@ -10,13 +10,9 @@ package IceGridGUI.LiveDeployment; import javax.swing.JScrollPane; -import javax.swing.JTable; import javax.swing.JTextArea; import javax.swing.JTextField; -import javax.swing.table.DefaultTableModel; -import javax.swing.table.DefaultTableCellRenderer; - import com.jgoodies.forms.builder.DefaultFormBuilder; import com.jgoodies.forms.layout.CellConstraints; @@ -50,6 +46,7 @@ class DbEnvEditor extends Editor _properties.setProperties(descriptor.properties, resolver); } + @Override protected void appendProperties(DefaultFormBuilder builder) { builder.append("Description"); @@ -83,6 +80,7 @@ class DbEnvEditor extends Editor builder.nextLine(); } + @Override protected void buildPropertiesPanel() { super.buildPropertiesPanel(); diff --git a/java/src/IceGridGUI/LiveDeployment/Editor.java b/java/src/IceGridGUI/LiveDeployment/Editor.java index 5b738929102..7ed53021c5a 100644 --- a/java/src/IceGridGUI/LiveDeployment/Editor.java +++ b/java/src/IceGridGUI/LiveDeployment/Editor.java @@ -10,7 +10,6 @@ package IceGridGUI.LiveDeployment; import IceGridGUI.*; -import IceGrid.*; public abstract class Editor extends EditorBase { diff --git a/java/src/IceGridGUI/LiveDeployment/GraphView.java b/java/src/IceGridGUI/LiveDeployment/GraphView.java index 3d006331e2a..e42c20b9b5e 100644 --- a/java/src/IceGridGUI/LiveDeployment/GraphView.java +++ b/java/src/IceGridGUI/LiveDeployment/GraphView.java @@ -13,27 +13,19 @@ import java.util.Map; import java.util.List; import java.util.Stack; import java.util.HashMap; -import java.util.ArrayList; - import java.util.Date; import java.util.TimeZone; - import java.text.DateFormat; import java.text.SimpleDateFormat; - import java.awt.datatransfer.DataFlavor; import java.awt.datatransfer.Transferable; import java.awt.datatransfer.UnsupportedFlavorException; - import java.awt.BorderLayout; import java.awt.Component; -import java.awt.Container; import java.awt.Dimension; - import java.awt.Frame; import java.awt.Color; import java.awt.Rectangle; - import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.awt.event.WindowAdapter; @@ -47,17 +39,12 @@ import javax.swing.BorderFactory; import javax.swing.border.Border; import javax.swing.DefaultCellEditor; import javax.swing.DefaultListCellRenderer; - -import javax.swing.event.ChangeEvent; -import javax.swing.event.ChangeListener; import javax.swing.event.TableModelEvent; import javax.swing.event.ListSelectionListener; import javax.swing.event.ListSelectionEvent; - import javax.swing.JButton; import javax.swing.JCheckBox; import javax.swing.JComboBox; -import javax.swing.JComponent; import javax.swing.JColorChooser; import javax.swing.colorchooser.AbstractColorChooserPanel; import javax.swing.JDialog; @@ -77,50 +64,37 @@ import javax.swing.KeyStroke; import javax.swing.ListCellRenderer; import javax.swing.SwingUtilities; import javax.swing.SpinnerNumberModel; -import javax.swing.SwingConstants; import javax.swing.JSplitPane; - -import javax.swing.ListSelectionModel; -import javax.swing.table.DefaultTableModel; +import javax.swing.WindowConstants; import javax.swing.table.TableCellEditor; import javax.swing.table.TableCellRenderer; import java.text.DecimalFormat; import javafx.application.Platform; - import javafx.embed.swing.JFXPanel; - import javafx.scene.chart.LineChart; import javafx.scene.chart.NumberAxis; import javafx.scene.chart.XYChart; - import javafx.scene.Scene; - import javafx.scene.input.MouseEvent; import javafx.event.EventHandler; import javafx.scene.input.MouseButton; - import javafx.scene.input.DragEvent; import javafx.scene.input.TransferMode; import javafx.scene.input.DataFormat; import javafx.scene.input.Dragboard; - import javafx.util.StringConverter; import com.jgoodies.forms.layout.FormLayout; import com.jgoodies.forms.builder.DefaultFormBuilder; import com.jgoodies.forms.factories.Borders; -import com.jgoodies.forms.builder.ButtonBarBuilder; -import com.jgoodies.forms.layout.CellConstraints; import com.jgoodies.looks.Options; import com.jgoodies.looks.HeaderStyle; import com.jgoodies.looks.BorderStyle; import com.jgoodies.looks.plastic.PlasticLookAndFeel; -import IceGrid.*; import IceGridGUI.*; - import IceGridGUI.LiveDeployment.MetricsViewEditor.MetricsViewInfo; import IceGridGUI.LiveDeployment.MetricsViewEditor.MetricsCell; import IceGridGUI.LiveDeployment.MetricsViewEditor.MetricsViewTransferableData; @@ -241,9 +215,10 @@ public class GraphView extends JFrame implements MetricsFieldContext, Coordinato // Platform.setImplicitExit(false); setIconImage(Utils.getIcon("/icons/16x16/metrics_graph.png").getImage()); - setDefaultCloseOperation(JFrame.DO_NOTHING_ON_CLOSE); + setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE); addWindowListener(new WindowAdapter() { + @Override public void windowClosing(WindowEvent e) { close(); @@ -255,6 +230,7 @@ public class GraphView extends JFrame implements MetricsFieldContext, Coordinato // Action preferences = new AbstractAction("Preferences") { + @Override public void actionPerformed(ActionEvent event) { // @@ -335,6 +311,7 @@ public class GraphView extends JFrame implements MetricsFieldContext, Coordinato _legendTable = new JTable(_legendModel) { //Implement table cell tool tips. + @Override public String getToolTipText(java.awt.event.MouseEvent e) { if(convertColumnIndexToModel(columnAtPoint(e.getPoint())) == 6) @@ -364,6 +341,7 @@ public class GraphView extends JFrame implements MetricsFieldContext, Coordinato // final Action delete = new AbstractAction("Delete") { + @Override public void actionPerformed(ActionEvent event) { int[] selectedRows = _legendTable.getSelectedRows(); @@ -445,6 +423,7 @@ public class GraphView extends JFrame implements MetricsFieldContext, Coordinato _legendTable.getSelectionModel().addListSelectionListener(new ListSelectionListener() { + @Override public void valueChanged(ListSelectionEvent e) { if(!e.getValueIsAdjusting()) @@ -557,6 +536,7 @@ public class GraphView extends JFrame implements MetricsFieldContext, Coordinato scene.setOnDragOver( new EventHandler<DragEvent>() { + @Override public void handle(DragEvent event) { Dragboard db = event.getDragboard(); @@ -575,6 +555,7 @@ public class GraphView extends JFrame implements MetricsFieldContext, Coordinato scene.setOnDragDropped( new EventHandler<DragEvent>() { + @Override public void handle(DragEvent event) { boolean success = false; @@ -630,74 +611,6 @@ public class GraphView extends JFrame implements MetricsFieldContext, Coordinato } } - private void removeRows(MetricsViewInfo info) - { - // - // Remove rows from series hash maps - // - Map<String, Map<String, Map<String, MetricsRow>>> j = _series.remove(info); - if(j == null) - { - return; - } - - final List<MetricsRow> rows = new ArrayList<MetricsRow>(); - for(Map.Entry<String, Map<String, Map<String, MetricsRow>>> i : j.entrySet()) - { - for(Map.Entry<String, Map<String, MetricsRow>> k : i.getValue().entrySet()) - { - for(Map.Entry<String, MetricsRow> l : k.getValue().entrySet()) - { - rows.add(l.getValue()); - } - } - } - - int rowIndexes[] = new int[rows.size()]; - for(int i = 0; i < rows.size(); ++i) - { - rowIndexes[i] = _legendModel.getRowIndex(rows.get(i)); - } - _legendModel.removeRows(rowIndexes); - - // - // Remove series from the chart, in JavaFx thread. - // - enqueueJFX(new Runnable() - { - @Override - public void run() - { - for(MetricsRow row : rows) - { - String seriesClass = getSeriesClass(row.series.peek()); - if(seriesClass != null) - { - _styles.remove(seriesClass); - } - // - // Don't remove the XYChart.Series object here, to avoid the series style classes - // to be reasign by JavaFX. - // - // _chart.getData().remove(row.series); - for(int i = 0; i < row.series.size(); ++i) - { - XYChart.Series<Number, Number> series = row.series.get(i); - if(series == null || series.getData() == null) - { - continue; - } - - while(series.getData().size() > 0) - { - series.getData().remove(0); - } - } - } - } - }); - } - private boolean showInfo() { try @@ -803,6 +716,7 @@ public class GraphView extends JFrame implements MetricsFieldContext, Coordinato return true; } + @Override public void close() { storePreferences(); @@ -812,6 +726,7 @@ public class GraphView extends JFrame implements MetricsFieldContext, Coordinato dispose(); } + @Override public void addSeries(final MetricsViewTransferableData data) { // @@ -882,6 +797,7 @@ public class GraphView extends JFrame implements MetricsFieldContext, Coordinato // enqueueSwing(new Runnable() { + @Override public void run() { int i = _legendModel.getRowIndex(row); @@ -901,6 +817,7 @@ public class GraphView extends JFrame implements MetricsFieldContext, Coordinato // enqueueSwing(new Runnable() { + @Override public void run() { _legendModel.addRow(row); @@ -964,6 +881,7 @@ public class GraphView extends JFrame implements MetricsFieldContext, Coordinato // enqueueSwing(new Runnable() { + @Override public void run() { int i = _legendModel.getRowIndex(row); @@ -1091,6 +1009,7 @@ public class GraphView extends JFrame implements MetricsFieldContext, Coordinato // enqueueSwing(new Runnable() { + @Override public void run() { _legendModel.fireTableChanged( @@ -1154,6 +1073,7 @@ public class GraphView extends JFrame implements MetricsFieldContext, Coordinato { _refreshFuture = _coordinator.getExecutor().scheduleAtFixedRate(new Runnable() { + @Override public void run() { java.util.Set<MetricsViewInfo> metrics = null; @@ -1166,17 +1086,20 @@ public class GraphView extends JFrame implements MetricsFieldContext, Coordinato { IceMX.Callback_MetricsAdmin_getMetricsView cb = new IceMX.Callback_MetricsAdmin_getMetricsView() { + @Override public void response(final java.util.Map<java.lang.String, IceMX.Metrics[]> data, long timestamp) { addData(m, data, timestamp); } + @Override public void exception(final Ice.LocalException e) { addData(m, null, 0); } + @Override public void exception(final Ice.UserException e) { addData(m, null, 0); @@ -1205,6 +1128,7 @@ public class GraphView extends JFrame implements MetricsFieldContext, Coordinato } } + @Override public synchronized int getRefreshPeriod() { return _refreshPeriod; @@ -1313,22 +1237,26 @@ public class GraphView extends JFrame implements MetricsFieldContext, Coordinato class LegendTableModel extends javax.swing.table.AbstractTableModel { + @Override public String getColumnName(int col) { return _columnNames[col]; } + @Override public int getRowCount() { return _rows.size(); } + @Override public int getColumnCount() { return _columnNames.length; } - public Class getColumnClass(int columnIndex) + @Override + public Class<?> getColumnClass(int columnIndex) { switch(columnIndex) { @@ -1391,6 +1319,7 @@ public class GraphView extends JFrame implements MetricsFieldContext, Coordinato } } + @Override public Object getValueAt(int rowIndex, int columnIndex) { if(rowIndex > _rows.size() || columnIndex > _columnNames.length) @@ -1459,6 +1388,7 @@ public class GraphView extends JFrame implements MetricsFieldContext, Coordinato } } + @Override public boolean isCellEditable(int row, int col) { if(col < _columnNames.length && (_columnNames[col].equals("Show") || @@ -1473,6 +1403,7 @@ public class GraphView extends JFrame implements MetricsFieldContext, Coordinato } } + @Override public void setValueAt(final Object value, int rowIndex, int columnIndex) { if(isCellEditable(rowIndex, columnIndex)) @@ -1691,6 +1622,7 @@ public class GraphView extends JFrame implements MetricsFieldContext, Coordinato private void enqueueJFX(final Runnable runnable) { _queue.submit(new Runnable() { + @Override public void run() { Platform.runLater(new Runnable() @@ -1716,6 +1648,7 @@ public class GraphView extends JFrame implements MetricsFieldContext, Coordinato private void enqueueSwing(final Runnable runnable) { _queue.submit(new Runnable() { + @Override public void run() { SwingUtilities.invokeLater(new Runnable() @@ -1738,6 +1671,7 @@ public class GraphView extends JFrame implements MetricsFieldContext, Coordinato }); } + @SuppressWarnings("rawtypes") static class DecimalRenderer extends DefaultListCellRenderer { public DecimalRenderer(ListCellRenderer renderer) @@ -1791,6 +1725,7 @@ public class GraphView extends JFrame implements MetricsFieldContext, Coordinato } + @Override public void actionPerformed(ActionEvent e) { if(EDIT.equals(e.getActionCommand())) @@ -1807,11 +1742,13 @@ public class GraphView extends JFrame implements MetricsFieldContext, Coordinato } } + @Override public Object getCellEditorValue() { return _currentColor; } + @Override public Component getTableCellEditorComponent(JTable table, Object value, boolean isSelected, int row, int column) { @@ -1838,6 +1775,7 @@ public class GraphView extends JFrame implements MetricsFieldContext, Coordinato setOpaque(true); //MUST do this for background to show up. } + @Override public Component getTableCellRendererComponent(JTable table, Object color, boolean isSelected, boolean hasFocus, int row, int column) { @@ -1882,7 +1820,6 @@ public class GraphView extends JFrame implements MetricsFieldContext, Coordinato private String[] _dateFormats = new String[]{"HH:mm:ss", "mm:ss"}; private String _dateFormat = _dateFormats[0]; private final TimeFormatter _timeFormater = new TimeFormatter(_dateFormat); - private final Object _monitor = new Object(); private LineChart<Number, Number> _chart; private NumberAxis _xAxis; @@ -1909,9 +1846,6 @@ public class GraphView extends JFrame implements MetricsFieldContext, Coordinato Map<String, MetricsRow>>>> _series = new HashMap<MetricsViewInfo, Map<String, Map<String, Map<String, MetricsRow>>>>(); - private final static String MetricsCellFlavor = - "application/x-icegridadmin-metrics-cells; class=java.io.InputStream"; - private final static String[] DefaultColors = new String[] { "#FF0000", // Red @@ -1962,6 +1896,7 @@ public class GraphView extends JFrame implements MetricsFieldContext, Coordinato private final java.util.concurrent.ExecutorService _queue = java.util.concurrent.Executors.newSingleThreadExecutor( new java.util.concurrent.ThreadFactory() { + @Override public Thread newThread(Runnable r) { Thread t = new Thread(r); diff --git a/java/src/IceGridGUI/LiveDeployment/ListArrayTreeNode.java b/java/src/IceGridGUI/LiveDeployment/ListArrayTreeNode.java index 8566ec3b057..92421951d96 100644 --- a/java/src/IceGridGUI/LiveDeployment/ListArrayTreeNode.java +++ b/java/src/IceGridGUI/LiveDeployment/ListArrayTreeNode.java @@ -11,18 +11,17 @@ package IceGridGUI.LiveDeployment; import java.util.Enumeration; -import IceGrid.*; -import IceGridGUI.*; - // // A TreeNode that holds an array of list of children // abstract class ListArrayTreeNode extends TreeNode { + @Override public Enumeration children() { return new Enumeration() { + @Override public boolean hasMoreElements() { if(_p.hasNext()) @@ -41,6 +40,7 @@ abstract class ListArrayTreeNode extends TreeNode return false; } + @Override public Object nextElement() { try @@ -65,11 +65,13 @@ abstract class ListArrayTreeNode extends TreeNode }; } + @Override public boolean getAllowsChildren() { return true; } + @Override public javax.swing.tree.TreeNode getChildAt(int childIndex) { if(childIndex < 0) @@ -91,6 +93,7 @@ abstract class ListArrayTreeNode extends TreeNode throw new ArrayIndexOutOfBoundsException(childIndex); } + @Override public int getChildCount() { int result = 0; @@ -101,6 +104,7 @@ abstract class ListArrayTreeNode extends TreeNode return result; } + @Override public int getIndex(javax.swing.tree.TreeNode node) { int offset = 0; @@ -119,6 +123,7 @@ abstract class ListArrayTreeNode extends TreeNode return -1; } + @Override public boolean isLeaf() { for(java.util.List l : _childrenArray) diff --git a/java/src/IceGridGUI/LiveDeployment/ListTreeNode.java b/java/src/IceGridGUI/LiveDeployment/ListTreeNode.java index d043c234770..9c9f8da2f25 100644 --- a/java/src/IceGridGUI/LiveDeployment/ListTreeNode.java +++ b/java/src/IceGridGUI/LiveDeployment/ListTreeNode.java @@ -11,23 +11,23 @@ package IceGridGUI.LiveDeployment; import java.util.Enumeration; -import IceGrid.*; -import IceGridGUI.*; - // // An TreeNode that holds a list of children // abstract class ListTreeNode extends TreeNode { + @Override public Enumeration children() { return new Enumeration() { + @Override public boolean hasMoreElements() { return _p.hasNext(); } + @Override public Object nextElement() { return _p.next(); @@ -37,11 +37,13 @@ abstract class ListTreeNode extends TreeNode }; } + @Override public boolean getAllowsChildren() { return true; } + @Override public javax.swing.tree.TreeNode getChildAt(int childIndex) { if(childIndex < 0) @@ -50,7 +52,7 @@ abstract class ListTreeNode extends TreeNode } else if(childIndex < _children.size()) { - return (javax.swing.tree.TreeNode)_children.get(childIndex); + return _children.get(childIndex); } else { @@ -58,16 +60,19 @@ abstract class ListTreeNode extends TreeNode } } + @Override public int getChildCount() { return _children.size(); } + @Override public int getIndex(javax.swing.tree.TreeNode node) { return _children.indexOf(node); } + @Override public boolean isLeaf() { return _children.isEmpty(); diff --git a/java/src/IceGridGUI/LiveDeployment/MetricsView.java b/java/src/IceGridGUI/LiveDeployment/MetricsView.java index 0ce60746390..2840f21de09 100644 --- a/java/src/IceGridGUI/LiveDeployment/MetricsView.java +++ b/java/src/IceGridGUI/LiveDeployment/MetricsView.java @@ -14,20 +14,15 @@ import java.awt.Component; import javax.swing.Icon; import javax.swing.JTree; import javax.swing.tree.DefaultTreeCellRenderer; -import javax.swing.tree.TreeModel; -import javax.swing.tree.TreePath; import javax.swing.SwingUtilities; import javax.swing.JOptionPane; import javax.swing.JPopupMenu; -import java.util.Map; -import java.util.Enumeration; - -import IceGrid.*; import IceGridGUI.*; class MetricsView extends TreeNode { + @Override public Editor getEditor() { return _editor; @@ -36,6 +31,7 @@ class MetricsView extends TreeNode // // Actions // + @Override public boolean[] getAvailableActions() { boolean[] actions = new boolean[IceGridGUI.LiveDeployment.TreeNode.ACTION_COUNT]; @@ -44,6 +40,7 @@ class MetricsView extends TreeNode return actions; } + @Override public Component getTreeCellRendererComponent( JTree tree, Object value, @@ -75,6 +72,7 @@ class MetricsView extends TreeNode _enabled = enabled; } + @Override public void enableMetricsView(boolean enabled) { IceMX.MetricsAdminPrx metricsAdmin = getMetricsAdmin(); @@ -84,10 +82,12 @@ class MetricsView extends TreeNode { IceMX.Callback_MetricsAdmin_enableMetricsView cb = new IceMX.Callback_MetricsAdmin_enableMetricsView() { + @Override public void response() { SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { _enabled = true; @@ -105,11 +105,13 @@ class MetricsView extends TreeNode }); } + @Override public void exception(final Ice.LocalException e) { MetricsViewEditor.stopRefresh(); SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { if(e instanceof Ice.ObjectNotExistException || @@ -131,11 +133,13 @@ class MetricsView extends TreeNode }); } + @Override public void exception(final Ice.UserException e) { MetricsViewEditor.stopRefresh(); SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { e.printStackTrace(); @@ -152,10 +156,12 @@ class MetricsView extends TreeNode { IceMX.Callback_MetricsAdmin_disableMetricsView cb = new IceMX.Callback_MetricsAdmin_disableMetricsView() { + @Override public void response() { SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { _enabled = false; @@ -174,11 +180,13 @@ class MetricsView extends TreeNode }); } + @Override public void exception(final Ice.LocalException e) { MetricsViewEditor.stopRefresh(); SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { if(e instanceof Ice.ObjectNotExistException || @@ -200,11 +208,13 @@ class MetricsView extends TreeNode }); } + @Override public void exception(final Ice.UserException e) { MetricsViewEditor.stopRefresh(); SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { e.printStackTrace(); @@ -235,6 +245,7 @@ class MetricsView extends TreeNode return _admin; } + @Override public JPopupMenu getPopupMenu() { LiveActions la = getCoordinator().getLiveActionsForPopup(); @@ -274,11 +285,13 @@ class MetricsView extends TreeNode { IceMX.Callback_MetricsAdmin_getMetricsView cb = new IceMX.Callback_MetricsAdmin_getMetricsView() { + @Override public void response(final java.util.Map<java.lang.String, IceMX.Metrics[]> data, final long timestamp) { SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { _editor.show(MetricsView.this, data, timestamp); @@ -286,11 +299,13 @@ class MetricsView extends TreeNode }); } + @Override public void exception(final Ice.LocalException e) { MetricsViewEditor.stopRefresh(); SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { if(e instanceof Ice.ObjectNotExistException || @@ -316,11 +331,13 @@ class MetricsView extends TreeNode }); } + @Override public void exception(final Ice.UserException e) { MetricsViewEditor.stopRefresh(); SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { e.printStackTrace(); @@ -340,7 +357,7 @@ class MetricsView extends TreeNode } catch(Ice.LocalException e) { - _editor.stopRefresh(); + MetricsViewEditor.stopRefresh(); JOptionPane.showMessageDialog(getCoordinator().getMainFrame(), "Error: " + e.toString(), "Error", JOptionPane.ERROR_MESSAGE); } diff --git a/java/src/IceGridGUI/LiveDeployment/MetricsViewEditor.java b/java/src/IceGridGUI/LiveDeployment/MetricsViewEditor.java index a1e02833a58..05e7ebf3963 100644 --- a/java/src/IceGridGUI/LiveDeployment/MetricsViewEditor.java +++ b/java/src/IceGridGUI/LiveDeployment/MetricsViewEditor.java @@ -20,12 +20,7 @@ import java.awt.Dimension; import java.awt.event.ActionEvent; import java.awt.event.MouseEvent; import java.awt.event.MouseAdapter; -import java.awt.event.MouseListener; import java.awt.event.ActionListener; -import java.awt.event.WindowAdapter; -import java.awt.event.WindowEvent; -import java.awt.event.ComponentEvent; -import java.awt.event.ComponentAdapter; import java.awt.BorderLayout; import java.util.List; @@ -41,12 +36,7 @@ import java.text.DecimalFormat; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; -import javax.swing.AbstractAction; -import javax.swing.Action; -import javax.swing.DefaultComboBoxModel; import javax.swing.JButton; -import javax.swing.AbstractCellEditor; -import javax.swing.DefaultCellEditor; import javax.swing.JOptionPane; import javax.swing.BorderFactory; @@ -58,8 +48,6 @@ import javax.swing.event.TreeSelectionListener; import javax.swing.tree.TreePath; import javax.swing.ListSelectionModel; import javax.swing.JComponent; -import javax.swing.JFrame; -import javax.swing.SwingConstants; import javax.swing.JScrollPane; import javax.swing.JSplitPane; import javax.swing.JTable; @@ -71,20 +59,11 @@ import javax.swing.JMenuItem; import javax.swing.JPopupMenu; import javax.swing.JPanel; -import javax.swing.table.TableColumnModel; import javax.swing.table.DefaultTableCellRenderer; -import javax.swing.table.DefaultTableColumnModel; import javax.swing.table.DefaultTableModel; import javax.swing.table.TableCellRenderer; -import javax.swing.table.TableCellEditor; -import javax.swing.table.TableColumn; -import javax.swing.table.TableRowSorter; import javax.swing.table.JTableHeader; -import com.jgoodies.forms.builder.DefaultFormBuilder; -import com.jgoodies.forms.layout.CellConstraints; - -import IceGrid.*; import IceGridGUI.*; public class MetricsViewEditor extends Editor implements MetricsFieldContext @@ -128,6 +107,7 @@ public class MetricsViewEditor extends Editor implements MetricsFieldContext _format = new DecimalFormat(format); } + @Override public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) @@ -189,6 +169,7 @@ public class MetricsViewEditor extends Editor implements MetricsFieldContext private static class SelectionListener implements TreeSelectionListener { + @Override public void valueChanged(TreeSelectionEvent e) { // @@ -258,6 +239,7 @@ public class MetricsViewEditor extends Editor implements MetricsFieldContext } } + @Override public int getRefreshPeriod() { return _refreshPeriod; @@ -268,6 +250,7 @@ public class MetricsViewEditor extends Editor implements MetricsFieldContext assert(_refreshFuture == null); _refreshFuture = node.getCoordinator().getExecutor().scheduleAtFixedRate(new Runnable() { + @Override public void run() { node.fetchMetricsView(); @@ -483,6 +466,7 @@ public class MetricsViewEditor extends Editor implements MetricsFieldContext } } + @Override public Object getTransferData(DataFlavor flavor) throws UnsupportedFlavorException { if(!isDataFlavorSupported(flavor)) @@ -492,11 +476,13 @@ public class MetricsViewEditor extends Editor implements MetricsFieldContext return _data; } + @Override public DataFlavor[] getTransferDataFlavors() { return _flavors; } + @Override public boolean isDataFlavorSupported(DataFlavor flavor) { return _flavors[0].equals(flavor); @@ -677,10 +663,12 @@ public class MetricsViewEditor extends Editor implements MetricsFieldContext // //Implement table header tool tips. // + @Override protected JTableHeader createDefaultTableHeader() { return new JTableHeader(columnModel) { + @Override public String getToolTipText(MouseEvent e) { int index = columnModel.getColumn(columnModel.getColumnIndexAtX(e.getPoint().x)).getModelIndex(); @@ -732,6 +720,7 @@ public class MetricsViewEditor extends Editor implements MetricsFieldContext JMenuItem newGraph = new JMenuItem("New Metrics Graph"); newGraph.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { Coordinator.IGraphView view = node.getCoordinator().createGraphView(); @@ -751,6 +740,7 @@ public class MetricsViewEditor extends Editor implements MetricsFieldContext addToGraph.add(item); item.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { view.addSeries(new MetricsViewTransferableData(new MetricsViewInfo(node), @@ -904,6 +894,7 @@ public class MetricsViewEditor extends Editor implements MetricsFieldContext return null; } + @Override protected JComponent createPropertiesPanel() { JSplitPane current = null; @@ -990,6 +981,7 @@ public class MetricsViewEditor extends Editor implements MetricsFieldContext return splitPane; } + @Override protected void buildPropertiesPanel() { super.buildPropertiesPanel(); @@ -1041,11 +1033,13 @@ public class MetricsViewEditor extends Editor implements MetricsFieldContext _fields.put(_fields.size(), field); } + @Override public boolean isCellEditable(int row, int column) { return false; } + @Override public Class getColumnClass(int index) { return _fields.get(index).getColumnClass(); @@ -1149,21 +1143,25 @@ public class MetricsViewEditor extends Editor implements MetricsFieldContext _objectField = objectField; } + @Override public MetricsView getMetricsNode() { return _node; } + @Override public String getMetricsName() { return _metricsName; } + @Override public String getFieldName() { return _fieldName; } + @Override public String getColumnName() { return _columnName == null ? _fieldName : _columnName; @@ -1174,6 +1172,7 @@ public class MetricsViewEditor extends Editor implements MetricsFieldContext _columnName = columnName; } + @Override public String getColumnToolTip() { return _columnToolTip; @@ -1184,21 +1183,25 @@ public class MetricsViewEditor extends Editor implements MetricsFieldContext _columnToolTip = columnToolTip; } + @Override public MetricsField createField() { return MetricsViewEditor.createField(_node, _prefix, _metricsName, _fieldName, _objectField, _context); } + @Override public String getPropertyPrefix() { return _prefix; } + @Override public MetricsFieldContext getContext() { return _context; } + @Override public void setContext(MetricsFieldContext context) { _context = context; @@ -1249,6 +1252,7 @@ public class MetricsViewEditor extends Editor implements MetricsFieldContext } } + @Override public Class getColumnClass() { return _columnClass; @@ -1259,11 +1263,13 @@ public class MetricsViewEditor extends Editor implements MetricsFieldContext _cellRenderer = new FormatedNumberRenderer(format); } + @Override public TableCellRenderer getCellRenderer() { return _cellRenderer; } + @Override public Object getValue(IceMX.Metrics m, long timestamp) { try @@ -1298,11 +1304,13 @@ public class MetricsViewEditor extends Editor implements MetricsFieldContext _cellRenderer = new FormatedNumberRenderer(format); } + @Override public Class getColumnClass() { return Float.class; } + @Override public TableCellRenderer getCellRenderer() { return _cellRenderer; @@ -1313,6 +1321,7 @@ public class MetricsViewEditor extends Editor implements MetricsFieldContext _scaleFactor = Double.parseDouble(scaleFactor); } + @Override public Object getValue(IceMX.Metrics m2, long timestamp) { IceMX.Metrics m1 = _deltas.get(m2.id); @@ -1359,11 +1368,13 @@ public class MetricsViewEditor extends Editor implements MetricsFieldContext _cellRenderer = new FormatedNumberRenderer(format); } + @Override public Class getColumnClass() { return Double.class; } + @Override public TableCellRenderer getCellRenderer() { return _cellRenderer; @@ -1379,6 +1390,7 @@ public class MetricsViewEditor extends Editor implements MetricsFieldContext _scaleFactor = Double.parseDouble(scaleFactor); } + @Override public Object getValue(IceMX.Metrics m, long timestamp) { DeltaMeasurement d1 = _deltas.get(m.id); @@ -1450,7 +1462,7 @@ public class MetricsViewEditor extends Editor implements MetricsFieldContext } else { - last = (double)((d2.value - d1.value) / (double)((d2.timestamp - d1.timestamp) / _scaleFactor)); + last = (double)((d2.value - d1.value) / ((d2.timestamp - d1.timestamp) / _scaleFactor)); } } _last.put(m.id, last); @@ -1471,16 +1483,19 @@ public class MetricsViewEditor extends Editor implements MetricsFieldContext super(node, prefix, metricsName, fieldName, field); } + @Override public Class getColumnClass() { return JButton.class; } + @Override public TableCellRenderer getCellRenderer() { return _cellRenderer; } + @Override public Object getValue(final IceMX.Metrics m, long timestamp) { JButton button = new JButton(Integer.toString(m.failures)); @@ -1488,6 +1503,7 @@ public class MetricsViewEditor extends Editor implements MetricsFieldContext { button.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { final DefaultTableModel model = new DefaultTableModel(); @@ -1521,10 +1537,12 @@ public class MetricsViewEditor extends Editor implements MetricsFieldContext IceMX.Callback_MetricsAdmin_getMetricsFailures cb = new IceMX.Callback_MetricsAdmin_getMetricsFailures() { + @Override public void response(final IceMX.MetricsFailures data) { SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { for(Map.Entry<String, Integer> entry : data.failures.entrySet()) @@ -1541,10 +1559,12 @@ public class MetricsViewEditor extends Editor implements MetricsFieldContext }); } + @Override public void exception(final Ice.LocalException e) { SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { getMetricsNode().getCoordinator().getMainFrame().setCursor( @@ -1569,10 +1589,12 @@ public class MetricsViewEditor extends Editor implements MetricsFieldContext }); } + @Override public void exception(final Ice.UserException e) { SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { getMetricsNode().getCoordinator().getMainFrame().setCursor( @@ -1615,16 +1637,19 @@ public class MetricsViewEditor extends Editor implements MetricsFieldContext super(node, prefix, metricsName, fieldName, field); } + @Override public Class getColumnClass() { return JButton.class; } + @Override public TableCellRenderer getCellRenderer() { return _cellRenderer; } + @Override public Object getValue(final IceMX.Metrics m, final long timestamp) { try @@ -1636,6 +1661,7 @@ public class MetricsViewEditor extends Editor implements MetricsFieldContext { button.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent event) { final TableModel model = new TableModel(getMetricsName()); @@ -1671,10 +1697,12 @@ public class MetricsViewEditor extends Editor implements MetricsFieldContext // //Implement table header tool tips. // + @Override protected JTableHeader createDefaultTableHeader() { return new JTableHeader(columnModel) { + @Override public String getToolTipText(MouseEvent e) { int index = columnModel.getColumn(columnModel.getColumnIndexAtX( diff --git a/java/src/IceGridGUI/LiveDeployment/Node.java b/java/src/IceGridGUI/LiveDeployment/Node.java index 079d69344ff..5170055c3bc 100644 --- a/java/src/IceGridGUI/LiveDeployment/Node.java +++ b/java/src/IceGridGUI/LiveDeployment/Node.java @@ -13,18 +13,12 @@ import java.awt.Component; import java.awt.Cursor; import javax.swing.Icon; -import javax.swing.JOptionPane; import javax.swing.JPopupMenu; import javax.swing.JTree; import javax.swing.SwingUtilities; import javax.swing.tree.DefaultTreeCellRenderer; -import javax.swing.tree.TreeModel; -import javax.swing.tree.TreePath; - import java.text.NumberFormat; -import java.util.Enumeration; - import IceGrid.*; import IceGridGUI.*; @@ -33,6 +27,7 @@ class Node extends ListTreeNode // // Actions // + @Override public boolean[] getAvailableActions() { boolean[] actions = new boolean[IceGridGUI.LiveDeployment.TreeNode.ACTION_COUNT]; @@ -42,10 +37,12 @@ class Node extends ListTreeNode return actions; } + @Override public void retrieveOutput(final boolean stdout) { getRoot().openShowLogDialog(new ShowLogDialog.FileIteratorFactory() { + @Override public FileIteratorPrx open(int count) throws FileNotAvailableException, NodeNotExistException, NodeUnreachableException { @@ -62,11 +59,13 @@ class Node extends ListTreeNode return result; } + @Override public String getTitle() { return "Node " + _id + " " + (stdout ? "stdout" : "stderr"); } + @Override public String getDefaultFilename() { return _id + (stdout ? ".out" : ".err"); @@ -74,6 +73,7 @@ class Node extends ListTreeNode }); } + @Override public void shutdownNode() { final String prefix = "Shutting down node '" + _id + "'..."; @@ -84,16 +84,19 @@ class Node extends ListTreeNode // // Called by another thread! // + @Override public void response() { amiSuccess(prefix); } + @Override public void exception(Ice.UserException e) { amiFailure(prefix, "Failed to shutdown " + _id, e); } + @Override public void exception(Ice.LocalException e) { amiFailure(prefix, "Failed to shutdown " + _id, @@ -119,6 +122,7 @@ class Node extends ListTreeNode } } + @Override public JPopupMenu getPopupMenu() { LiveActions la = getCoordinator().getLiveActionsForPopup(); @@ -136,6 +140,7 @@ class Node extends ListTreeNode return _popup; } + @Override public Editor getEditor() { if(_editor == null) @@ -146,6 +151,7 @@ class Node extends ListTreeNode return _editor; } + @Override public Component getTreeCellRendererComponent( JTree tree, Object value, @@ -244,7 +250,7 @@ class Node extends ListTreeNode if(appData != null) { NodeDescriptor descriptor = appData.descriptor; - PropertySetDescriptor result = (PropertySetDescriptor)descriptor.propertySets.get(name); + PropertySetDescriptor result = descriptor.propertySets.get(name); if(result != null) { return result; @@ -313,7 +319,7 @@ class Node extends ListTreeNode void update(ApplicationDescriptor appDesc, NodeUpdateDescriptor update, boolean variablesChanged, java.util.Set<String> serviceTemplates, java.util.Set<String> serverTemplates) { - ApplicationData data = (ApplicationData)_map.get(appDesc.name); + ApplicationData data = _map.get(appDesc.name); if(data == null) { @@ -678,6 +684,7 @@ class Node extends ListTreeNode { Callback_Admin_getNodeLoad cb = new Callback_Admin_getNodeLoad() { + @Override public void response(LoadInfo loadInfo) { NumberFormat format; @@ -701,6 +708,7 @@ class Node extends ListTreeNode SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { _editor.setLoad(load, Node.this); @@ -708,10 +716,12 @@ class Node extends ListTreeNode }); } + @Override public void exception(final Ice.UserException e) { SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { if(e instanceof IceGrid.NodeNotExistException) @@ -732,10 +742,12 @@ class Node extends ListTreeNode }); } + @Override public void exception(final Ice.LocalException e) { SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { _editor.setLoad("Error: " + e.toString(), Node.this); @@ -777,7 +789,7 @@ class Node extends ListTreeNode // Find template // TemplateDescriptor templateDescriptor = - (TemplateDescriptor)application.serverTemplates.get(instanceDescriptor.template); + application.serverTemplates.get(instanceDescriptor.template); assert templateDescriptor != null; ServerDescriptor serverDescriptor = (ServerDescriptor)templateDescriptor.descriptor; diff --git a/java/src/IceGridGUI/LiveDeployment/NodeEditor.java b/java/src/IceGridGUI/LiveDeployment/NodeEditor.java index 0f20d12843d..9f8b58e8003 100644 --- a/java/src/IceGridGUI/LiveDeployment/NodeEditor.java +++ b/java/src/IceGridGUI/LiveDeployment/NodeEditor.java @@ -22,7 +22,6 @@ import com.jgoodies.forms.builder.DefaultFormBuilder; import com.jgoodies.forms.layout.CellConstraints; import IceGrid.*; -import IceGridGUI.*; class NodeEditor extends Editor { @@ -35,6 +34,7 @@ class NodeEditor extends Editor Action refresh = new AbstractAction("Refresh") { + @Override public void actionPerformed(ActionEvent e) { _target.showLoad(); @@ -97,6 +97,7 @@ class NodeEditor extends Editor // } + @Override protected void appendProperties(DefaultFormBuilder builder) { builder.appendSeparator("System Information"); @@ -134,6 +135,7 @@ class NodeEditor extends Editor builder.nextLine(); } + @Override protected void buildPropertiesPanel() { super.buildPropertiesPanel(); diff --git a/java/src/IceGridGUI/LiveDeployment/ObjectDialog.java b/java/src/IceGridGUI/LiveDeployment/ObjectDialog.java index 8aace6265f2..47516374d64 100644 --- a/java/src/IceGridGUI/LiveDeployment/ObjectDialog.java +++ b/java/src/IceGridGUI/LiveDeployment/ObjectDialog.java @@ -9,11 +9,7 @@ package IceGridGUI.LiveDeployment; -import java.awt.BorderLayout; import java.awt.Container; -import java.awt.Dimension; -import java.awt.Frame; - import java.awt.event.ActionEvent; import java.awt.event.ActionListener; @@ -23,10 +19,10 @@ import javax.swing.JComboBox; import javax.swing.JComponent; import javax.swing.JDialog; import javax.swing.JFrame; -import javax.swing.JPanel; import javax.swing.JScrollPane; import javax.swing.JTextArea; import javax.swing.JTextField; +import javax.swing.WindowConstants; import com.jgoodies.forms.builder.DefaultFormBuilder; import com.jgoodies.forms.builder.ButtonBarBuilder; @@ -43,7 +39,7 @@ class ObjectDialog extends JDialog super(root.getCoordinator().getMainFrame(), (readOnly ? "" : "New ") + "Dynamic Well-Known Object - IceGrid Admin", true); - setDefaultCloseOperation(JDialog.HIDE_ON_CLOSE); + setDefaultCloseOperation(WindowConstants.HIDE_ON_CLOSE); _mainFrame = root.getCoordinator().getMainFrame(); _proxy.setLineWrap(true); @@ -95,6 +91,7 @@ class ObjectDialog extends JDialog JButton okButton = new JButton("OK"); ActionListener okListener = new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { if(_proxy.isEditable()) @@ -122,6 +119,7 @@ class ObjectDialog extends JDialog JButton cancelButton = new JButton("Cancel"); ActionListener cancelListener = new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { setVisible(false); @@ -169,6 +167,7 @@ class ObjectDialog extends JDialog static private final Object QUERY_OBJECT = new Object() { + @Override public String toString() { return "Query object to retrieve type"; diff --git a/java/src/IceGridGUI/LiveDeployment/RegistryEditor.java b/java/src/IceGridGUI/LiveDeployment/RegistryEditor.java index 51aaaf5b43a..a3940cc0c67 100644 --- a/java/src/IceGridGUI/LiveDeployment/RegistryEditor.java +++ b/java/src/IceGridGUI/LiveDeployment/RegistryEditor.java @@ -10,15 +10,10 @@ package IceGridGUI.LiveDeployment; import java.awt.event.ActionEvent; -import java.awt.event.ActionEvent; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; -import java.awt.event.MouseListener; - import javax.swing.AbstractAction; import javax.swing.Action; -import javax.swing.JButton; -import javax.swing.JLabel; import javax.swing.JMenuItem; import javax.swing.JOptionPane; import javax.swing.JPopupMenu; @@ -40,6 +35,7 @@ class RegistryEditor extends Editor Action openDefinition = new AbstractAction("Open definition") { + @Override public void actionPerformed(ActionEvent e) { int selectedRow = _applications.getSelectedRow(); @@ -58,6 +54,7 @@ class RegistryEditor extends Editor Action showDetails = new AbstractAction("Show details") { + @Override public void actionPerformed(ActionEvent e) { int selectedRow = _applications.getSelectedRow(); @@ -71,6 +68,7 @@ class RegistryEditor extends Editor final Action patch = new AbstractAction("Patch distribution") { + @Override public void actionPerformed(ActionEvent e) { int selectedRow = _applications.getSelectedRow(); @@ -84,6 +82,7 @@ class RegistryEditor extends Editor Action removeApplication = new AbstractAction("Remove from registry") { + @Override public void actionPerformed(ActionEvent e) { int selectedRow = _applications.getSelectedRow(); @@ -121,6 +120,7 @@ class RegistryEditor extends Editor _applications.addMouseListener(new MouseAdapter() { + @Override public void mouseClicked(MouseEvent e) { if(e.getClickCount() == 2) @@ -134,11 +134,13 @@ class RegistryEditor extends Editor } } + @Override public void mousePressed(MouseEvent e) { maybeShowPopup(e); } + @Override public void mouseReleased(MouseEvent e) { maybeShowPopup(e); @@ -160,6 +162,7 @@ class RegistryEditor extends Editor Action deleteObject = new AbstractAction("Remove selected object") { + @Override public void actionPerformed(ActionEvent e) { if(_target.getCoordinator().connectedToMaster()) @@ -179,6 +182,7 @@ class RegistryEditor extends Editor Action showObject = new AbstractAction("Show details") { + @Override public void actionPerformed(ActionEvent e) { int selectedRow = _objects.getSelectedRow(); @@ -193,6 +197,7 @@ class RegistryEditor extends Editor Action addObject = new AbstractAction("Add a new well-known object") { + @Override public void actionPerformed(ActionEvent e) { if(_target.getCoordinator().connectedToMaster()) @@ -219,6 +224,7 @@ class RegistryEditor extends Editor _objects.addMouseListener(new MouseAdapter() { + @Override public void mouseClicked(MouseEvent e) { if(e.getClickCount() == 2) @@ -233,11 +239,13 @@ class RegistryEditor extends Editor } } + @Override public void mousePressed(MouseEvent e) { maybeShowPopup(e); } + @Override public void mouseReleased(MouseEvent e) { maybeShowPopup(e); @@ -256,6 +264,7 @@ class RegistryEditor extends Editor Action deleteAdapter = new AbstractAction("Remove selected adapter") { + @Override public void actionPerformed(ActionEvent e) { if(_target.getCoordinator().connectedToMaster()) @@ -279,11 +288,13 @@ class RegistryEditor extends Editor _adapters.addMouseListener(new MouseAdapter() { + @Override public void mousePressed(MouseEvent e) { maybeShowPopup(e); } + @Override public void mouseReleased(MouseEvent e) { maybeShowPopup(e); @@ -299,6 +310,7 @@ class RegistryEditor extends Editor }); } + @Override protected void appendProperties(DefaultFormBuilder builder) { CellConstraints cc = new CellConstraints(); @@ -377,6 +389,7 @@ class RegistryEditor extends Editor builder.nextLine(); } + @Override protected void buildPropertiesPanel() { super.buildPropertiesPanel(); diff --git a/java/src/IceGridGUI/LiveDeployment/Root.java b/java/src/IceGridGUI/LiveDeployment/Root.java index 0542c07d737..3c580e3bb5a 100644 --- a/java/src/IceGridGUI/LiveDeployment/Root.java +++ b/java/src/IceGridGUI/LiveDeployment/Root.java @@ -19,11 +19,6 @@ import javax.swing.JTree; import javax.swing.tree.DefaultTreeCellRenderer; import javax.swing.tree.DefaultTreeModel; -import javax.swing.tree.TreePath; - -import javax.swing.JComponent; - -import java.util.Enumeration; import java.util.prefs.Preferences; import IceGrid.*; @@ -58,6 +53,7 @@ public class Root extends ListArrayTreeNode fireTreeStructureChanged(this, path, childIndices, children); } + @Override public int getChildCount(Object parent) { @@ -78,6 +74,7 @@ public class Root extends ListArrayTreeNode return q; } + @Override public Object getChild(Object parent, int index) { if(!filterEnabled()) @@ -171,6 +168,7 @@ public class Root extends ListArrayTreeNode _tree.addTreeWillExpandListener(new javax.swing.event.TreeWillExpandListener() { + @Override public void treeWillExpand(javax.swing.event.TreeExpansionEvent event) { // @@ -187,6 +185,7 @@ public class Root extends ListArrayTreeNode } } + @Override public void treeWillCollapse(javax.swing.event.TreeExpansionEvent event) throws javax.swing.tree.ExpandVetoException { @@ -200,6 +199,7 @@ public class Root extends ListArrayTreeNode loadLogPrefs(); } + @Override public boolean[] getAvailableActions() { boolean[] actions = new boolean[IceGridGUI.LiveDeployment.TreeNode.ACTION_COUNT]; @@ -210,6 +210,7 @@ public class Root extends ListArrayTreeNode return actions; } + @Override public void shutdownRegistry() { final String prefix = "Shutting down registry '" + _replicaName + "'..."; @@ -220,16 +221,19 @@ public class Root extends ListArrayTreeNode // // Called by another thread! // + @Override public void response() { amiSuccess(prefix); } + @Override public void exception(Ice.UserException e) { amiFailure(prefix, "Failed to shutdown " + _replicaName, e); } + @Override public void exception(Ice.LocalException e) { amiFailure(prefix, "Failed to shutdown " + _replicaName, @@ -299,6 +303,7 @@ public class Root extends ListArrayTreeNode return r; } + @Override public Editor getEditor() { if(_editor == null) @@ -309,6 +314,7 @@ public class Root extends ListArrayTreeNode return _editor; } + @Override public Component getTreeCellRendererComponent( JTree tree, Object value, @@ -389,17 +395,20 @@ public class Root extends ListArrayTreeNode // // Called by another thread! // + @Override public void response() { amiSuccess(prefix); } + @Override public void exception(Ice.UserException e) { amiFailure(prefix, "Failed to patch '" + applicationName + "'", e); } + @Override public void exception(Ice.LocalException e) { amiFailure(prefix, "Failed to patch '" + @@ -746,6 +755,7 @@ public class Root extends ListArrayTreeNode } } + @Override public JPopupMenu getPopupMenu() { LiveActions la = _coordinator.getLiveActionsForPopup(); @@ -780,11 +790,13 @@ public class Root extends ListArrayTreeNode return _treeModel; } + @Override public Coordinator getCoordinator() { return _coordinator; } + @Override public String toString() { return _label; @@ -810,6 +822,7 @@ public class Root extends ListArrayTreeNode return true; } + @Override public void addObject() { _addObjectDialog.showDialog(); @@ -820,6 +833,7 @@ public class Root extends ListArrayTreeNode _showObjectDialog.showDialog(proxy, type); } + @Override Root getRoot() { return this; @@ -944,16 +958,19 @@ public class Root extends ListArrayTreeNode // // Called by another thread! // + @Override public void response() { amiSuccess(prefix); } + @Override public void exception(Ice.UserException e) { amiFailure(prefix, "Failed to remove object '" + strIdentity + "'", e); } + @Override public void exception(Ice.LocalException e) { amiFailure(prefix, "Failed to remove object '" + strIdentity + "'", @@ -986,16 +1003,19 @@ public class Root extends ListArrayTreeNode // // Called by another thread! // + @Override public void response() { amiSuccess(prefix); } + @Override public void exception(Ice.UserException e) { amiFailure(prefix, "Failed to remove adapter '" + adapterId + "'", e); } + @Override public void exception(Ice.LocalException e) { amiFailure(prefix, "Failed to remove adapter '" + adapterId + "'", @@ -1018,10 +1038,12 @@ public class Root extends ListArrayTreeNode } } + @Override public void retrieveOutput(final boolean stdout) { getRoot().openShowLogDialog(new ShowLogDialog.FileIteratorFactory() { + @Override public FileIteratorPrx open(int count) throws FileNotAvailableException, RegistryNotExistException, RegistryUnreachableException { @@ -1039,11 +1061,13 @@ public class Root extends ListArrayTreeNode return result; } + @Override public String getTitle() { return "Registry " + _label + " " + (stdout ? "stdout" : "stderr"); } + @Override public String getDefaultFilename() { return _replicaName + (stdout ? ".out" : ".err"); @@ -1053,8 +1077,8 @@ public class Root extends ListArrayTreeNode PropertySetDescriptor findNamedPropertySet(String name, String applicationName) { - ApplicationInfo app = (ApplicationInfo)_infoMap.get(applicationName); - return (PropertySetDescriptor)app.descriptor.propertySets.get(name); + ApplicationInfo app = _infoMap.get(applicationName); + return app.descriptor.propertySets.get(name); } void openShowLogDialog(ShowLogDialog.FileIteratorFactory factory) diff --git a/java/src/IceGridGUI/LiveDeployment/Server.java b/java/src/IceGridGUI/LiveDeployment/Server.java index 02bee2354ed..0d1542258c0 100644 --- a/java/src/IceGridGUI/LiveDeployment/Server.java +++ b/java/src/IceGridGUI/LiveDeployment/Server.java @@ -19,10 +19,6 @@ import javax.swing.JPopupMenu; import javax.swing.JTree; import javax.swing.SwingUtilities; import javax.swing.tree.DefaultTreeCellRenderer; -import javax.swing.tree.TreeModel; -import javax.swing.tree.TreePath; -import java.util.Enumeration; - import IceGrid.*; import IceGridGUI.*; @@ -31,6 +27,7 @@ public class Server extends ListArrayTreeNode // // Actions // + @Override public boolean[] getAvailableActions() { boolean[] actions = new boolean[IceGridGUI.LiveDeployment.TreeNode.ACTION_COUNT]; @@ -69,6 +66,7 @@ public class Server extends ListArrayTreeNode return actions; } + @Override public void start() { final String prefix = "Starting server '" + _id + "'..."; @@ -79,16 +77,19 @@ public class Server extends ListArrayTreeNode // // Called by another thread! // + @Override public void response() { amiSuccess(prefix); } + @Override public void exception(Ice.UserException e) { amiFailure(prefix, "Failed to start " + _id, e); } + @Override public void exception(Ice.LocalException e) { amiFailure(prefix, "Failed to start " + _id, e.toString()); @@ -110,6 +111,7 @@ public class Server extends ListArrayTreeNode } } + @Override public void stop() { final String prefix = "Stopping server '" + _id + "'..."; @@ -120,17 +122,20 @@ public class Server extends ListArrayTreeNode // // Called by another thread! // + @Override public void response() { amiSuccess(prefix); rebuild(Server.this, false); } + @Override public void exception(Ice.UserException e) { amiFailure(prefix, "Failed to stop " + _id, e); } + @Override public void exception(Ice.LocalException e) { amiFailure(prefix, "Failed to stop " + _id, e.toString()); @@ -152,16 +157,19 @@ public class Server extends ListArrayTreeNode } } + @Override public void enable() { enableServer(true); } + @Override public void disable() { enableServer(false); } + @Override public void writeMessage() { if(_writeMessageDialog == null) @@ -171,10 +179,12 @@ public class Server extends ListArrayTreeNode _writeMessageDialog.showDialog(_id); } + @Override public void retrieveOutput(final boolean stdout) { getRoot().openShowLogDialog(new ShowLogDialog.FileIteratorFactory() { + @Override public FileIteratorPrx open(int count) throws FileNotAvailableException, ServerNotExistException, NodeUnreachableException, DeploymentException @@ -192,11 +202,13 @@ public class Server extends ListArrayTreeNode return result; } + @Override public String getTitle() { return "Server " + _id + " " + (stdout ? "stdout" : "stderr"); } + @Override public String getDefaultFilename() { return _id + (stdout ? ".out" : ".err"); @@ -204,6 +216,7 @@ public class Server extends ListArrayTreeNode }); } + @Override public void retrieveLog() { assert _serverDescriptor.logs.length > 0; @@ -237,6 +250,7 @@ public class Server extends ListArrayTreeNode getRoot().openShowLogDialog(new ShowLogDialog.FileIteratorFactory() { + @Override public FileIteratorPrx open(int count) throws FileNotAvailableException, ServerNotExistException, NodeUnreachableException, DeploymentException @@ -245,11 +259,13 @@ public class Server extends ListArrayTreeNode return session.openServerLog(_id, fPath, count); } + @Override public String getTitle() { return "Server " + _id + " " + new java.io.File(fPath).getName(); } + @Override public String getDefaultFilename() { return new java.io.File(fPath).getName(); @@ -258,6 +274,7 @@ public class Server extends ListArrayTreeNode } } + @Override public void signal(final String s) { final String prefix = "Sending '" + s + "' to server '" + _id + "'..."; @@ -268,16 +285,19 @@ public class Server extends ListArrayTreeNode // // Called by another thread! // + @Override public void response() { amiSuccess(prefix); } + @Override public void exception(Ice.UserException e) { amiFailure(prefix, "Failed to deliver signal " + s + " to " + _id, e); } + @Override public void exception(Ice.LocalException e) { amiFailure(prefix, "Failed to deliver signal " + s + " to " + _id, e.toString()); @@ -294,6 +314,7 @@ public class Server extends ListArrayTreeNode } } + @Override public void patchServer() { String message = _serverDescriptor.applicationDistrib ? @@ -322,16 +343,19 @@ public class Server extends ListArrayTreeNode // // Called by another thread! // + @Override public void response() { amiSuccess(prefix); } + @Override public void exception(Ice.UserException e) { amiFailure(prefix, "Failed to patch " + _id, e); } + @Override public void exception(Ice.LocalException e) { amiFailure(prefix, "Failed to patch " + _id, e.toString()); @@ -366,16 +390,19 @@ public class Server extends ListArrayTreeNode // // Called by another thread! // + @Override public void response() { amiSuccess(prefix); } + @Override public void exception(Ice.UserException e) { amiFailure(prefix, "Failed to " + action + " " + _id, e); } + @Override public void exception(Ice.LocalException e) { amiFailure(prefix, "Failed to " + action + " " + _id, e.toString()); @@ -414,10 +441,12 @@ public class Server extends ListArrayTreeNode IceMX.MetricsAdminPrxHelper.uncheckedCast(admin.ice_facet("Metrics")); IceMX.Callback_MetricsAdmin_getMetricsViewNames cb = new IceMX.Callback_MetricsAdmin_getMetricsViewNames() { + @Override public void response(final String[] enabledViews, final String[] disabledViews) { SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { for(String name : enabledViews) @@ -433,10 +462,12 @@ public class Server extends ListArrayTreeNode }); } + @Override public void exception(final Ice.LocalException e) { SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { _metricsRetrieved = false; @@ -483,10 +514,12 @@ public class Server extends ListArrayTreeNode { Ice.Callback_PropertiesAdmin_getPropertiesForPrefix cb = new Ice.Callback_PropertiesAdmin_getPropertiesForPrefix() { + @Override public void response(final java.util.Map<String, String> properties) { SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { _editor.setRuntimeProperties((java.util.SortedMap<String, String>)properties, @@ -495,10 +528,12 @@ public class Server extends ListArrayTreeNode }); } + @Override public void exception(final Ice.LocalException e) { SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { if(e instanceof Ice.ObjectNotExistException) @@ -535,6 +570,7 @@ public class Server extends ListArrayTreeNode } } + @Override public void openDefinition() { ApplicationPane app = getCoordinator().openLiveApplication(_application.name); @@ -544,6 +580,7 @@ public class Server extends ListArrayTreeNode } } + @Override public JPopupMenu getPopupMenu() { LiveActions la = getCoordinator().getLiveActionsForPopup(); @@ -585,6 +622,7 @@ public class Server extends ListArrayTreeNode return _popup; } + @Override public Editor getEditor() { if(_editor == null) @@ -595,6 +633,7 @@ public class Server extends ListArrayTreeNode return _editor; } + @Override public Component getTreeCellRendererComponent( JTree tree, Object value, @@ -939,6 +978,7 @@ public class Server extends ListArrayTreeNode { IceBox.ServiceObserver servant = new IceBox._ServiceObserverDisp() { + @Override public void servicesStarted(final String[] services, Ice.Current current) { final java.util.Set<String> serviceSet = @@ -946,6 +986,7 @@ public class Server extends ListArrayTreeNode SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { for(Service service: _services) @@ -961,6 +1002,7 @@ public class Server extends ListArrayTreeNode }); } + @Override public void servicesStopped(final String[] services, Ice.Current current) { final java.util.Set<String> serviceSet = @@ -968,6 +1010,7 @@ public class Server extends ListArrayTreeNode SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { for(Service service: _services) @@ -1008,11 +1051,13 @@ public class Server extends ListArrayTreeNode IceBox.Callback_ServiceManager_addObserver cb = new IceBox.Callback_ServiceManager_addObserver() { + @Override public void response() { // all is good } + @Override public void exception(Ice.LocalException e) { JOptionPane.showMessageDialog( @@ -1213,7 +1258,7 @@ public class Server extends ListArrayTreeNode if(descriptor.template.length() > 0) { TemplateDescriptor templateDescriptor - = (TemplateDescriptor)_application.serviceTemplates.get(descriptor.template); + = _application.serviceTemplates.get(descriptor.template); assert templateDescriptor != null; @@ -1236,7 +1281,7 @@ public class Server extends ListArrayTreeNode serviceResolver.put("service", serviceName); } - PropertySetDescriptor serverInstancePSDescriptor = (PropertySetDescriptor)_servicePropertySets.get(serviceName); + PropertySetDescriptor serverInstancePSDescriptor = _servicePropertySets.get(serviceName); _services.add(new Service(this, serviceName, serviceResolver, descriptor, serviceDescriptor, serverInstancePSDescriptor)); diff --git a/java/src/IceGridGUI/LiveDeployment/ServerEditor.java b/java/src/IceGridGUI/LiveDeployment/ServerEditor.java index ed466c28942..900920d8c21 100644 --- a/java/src/IceGridGUI/LiveDeployment/ServerEditor.java +++ b/java/src/IceGridGUI/LiveDeployment/ServerEditor.java @@ -33,6 +33,7 @@ import IceGridGUI.*; class ServerEditor extends CommunicatorEditor { + @Override public JToolBar getToolBar() { if(_toolBar == null) @@ -69,6 +70,7 @@ class ServerEditor extends CommunicatorEditor Action refresh = new AbstractAction("Refresh") { + @Override public void actionPerformed(ActionEvent e) { _buildId.setText("Retrieving..."); @@ -81,6 +83,7 @@ class ServerEditor extends CommunicatorEditor Action gotoApplication = new AbstractAction("", Utils.getIcon("/icons/16x16/goto.png")) { + @Override public void actionPerformed(ActionEvent e) { _target.openDefinition(); @@ -165,6 +168,7 @@ class ServerEditor extends CommunicatorEditor Ice.StringHolder toolTipHolder = new Ice.StringHolder(); Utils.Stringifier stringifier = new Utils.Stringifier() { + @Override public String toString(Object obj) { return resolver.substitute((String)obj); @@ -240,6 +244,7 @@ class ServerEditor extends CommunicatorEditor // } + @Override protected void appendProperties(DefaultFormBuilder builder) { builder.appendSeparator("Runtime Status"); @@ -341,6 +346,7 @@ class ServerEditor extends CommunicatorEditor builder.nextLine(); } + @Override protected void buildPropertiesPanel() { super.buildPropertiesPanel(); diff --git a/java/src/IceGridGUI/LiveDeployment/Service.java b/java/src/IceGridGUI/LiveDeployment/Service.java index 917d776df37..e4c9d5e7367 100644 --- a/java/src/IceGridGUI/LiveDeployment/Service.java +++ b/java/src/IceGridGUI/LiveDeployment/Service.java @@ -16,10 +16,6 @@ import javax.swing.JPopupMenu; import javax.swing.JTree; import javax.swing.SwingUtilities; import javax.swing.tree.DefaultTreeCellRenderer; -import javax.swing.tree.TreeModel; -import javax.swing.tree.TreePath; -import java.util.Enumeration; - import IceGrid.*; import IceGridGUI.*; @@ -28,6 +24,7 @@ public class Service extends ListArrayTreeNode // // Actions // + @Override public boolean[] getAvailableActions() { boolean[] actions = new boolean[IceGridGUI.LiveDeployment.TreeNode.ACTION_COUNT]; @@ -55,6 +52,7 @@ public class Service extends ListArrayTreeNode return actions; } + @Override public void start() { Ice.ObjectPrx serverAdmin = ((Server)_parent).getServerAdmin(); @@ -69,11 +67,13 @@ public class Service extends ListArrayTreeNode // // Called by another thread! // + @Override public void response() { amiSuccess(prefix); } + @Override public void exception(Ice.UserException e) { if(e instanceof IceBox.AlreadyStartedException) @@ -86,6 +86,7 @@ public class Service extends ListArrayTreeNode } } + @Override public void exception(Ice.LocalException e) { amiFailure(prefix, "Failed to start service " + _id, e.toString()); @@ -106,6 +107,7 @@ public class Service extends ListArrayTreeNode } } + @Override public void stop() { Ice.ObjectPrx serverAdmin = ((Server)_parent).getServerAdmin(); @@ -120,11 +122,13 @@ public class Service extends ListArrayTreeNode // // Called by another thread! // + @Override public void response() { amiSuccess(prefix); } + @Override public void exception(Ice.UserException e) { if(e instanceof IceBox.AlreadyStoppedException) @@ -137,6 +141,7 @@ public class Service extends ListArrayTreeNode } } + @Override public void exception(Ice.LocalException e) { amiFailure(prefix, "Failed to stop service " + _id, e.toString()); @@ -157,6 +162,7 @@ public class Service extends ListArrayTreeNode } } + @Override public void retrieveLog() { assert _serviceDescriptor.logs.length > 0; @@ -190,6 +196,7 @@ public class Service extends ListArrayTreeNode getRoot().openShowLogDialog(new ShowLogDialog.FileIteratorFactory() { + @Override public FileIteratorPrx open(int count) throws FileNotAvailableException, ServerNotExistException, NodeUnreachableException, DeploymentException @@ -198,11 +205,13 @@ public class Service extends ListArrayTreeNode return session.openServerLog(_parent.getId(), fPath, count); } + @Override public String getTitle() { return "Service " + _parent.getId() + "/" + _id + " " + new java.io.File(fPath).getName(); } + @Override public String getDefaultFilename() { return new java.io.File(fPath).getName(); @@ -211,6 +220,7 @@ public class Service extends ListArrayTreeNode } } + @Override public Component getTreeCellRendererComponent( JTree tree, Object value, @@ -242,6 +252,7 @@ public class Service extends ListArrayTreeNode return _cellRenderer.getTreeCellRendererComponent(tree, value, sel, expanded, leaf, row, hasFocus); } + @Override public Editor getEditor() { if(_editor == null) @@ -252,6 +263,7 @@ public class Service extends ListArrayTreeNode return _editor; } + @Override public JPopupMenu getPopupMenu() { LiveActions la = getCoordinator().getLiveActionsForPopup(); @@ -367,10 +379,12 @@ public class Service extends ListArrayTreeNode { Ice.Callback_PropertiesAdmin_getPropertiesForPrefix cb = new Ice.Callback_PropertiesAdmin_getPropertiesForPrefix() { + @Override public void response(final java.util.Map<String, String> properties) { SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { _editor.setRuntimeProperties((java.util.SortedMap<String, String>)properties, @@ -379,10 +393,12 @@ public class Service extends ListArrayTreeNode }); } + @Override public void exception(final Ice.LocalException e) { SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { if(e instanceof Ice.ObjectNotExistException) @@ -500,10 +516,12 @@ public class Service extends ListArrayTreeNode IceMX.Callback_MetricsAdmin_getMetricsViewNames cb = new IceMX.Callback_MetricsAdmin_getMetricsViewNames() { + @Override public void response(final String[] enabledViews, final String[] disabledViews) { SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { for(String name : enabledViews) @@ -519,10 +537,12 @@ public class Service extends ListArrayTreeNode }); } + @Override public void exception(final Ice.LocalException e) { SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { _metricsRetrieved = false; diff --git a/java/src/IceGridGUI/LiveDeployment/ServiceEditor.java b/java/src/IceGridGUI/LiveDeployment/ServiceEditor.java index 42530adcb5c..d43a1dec103 100644 --- a/java/src/IceGridGUI/LiveDeployment/ServiceEditor.java +++ b/java/src/IceGridGUI/LiveDeployment/ServiceEditor.java @@ -32,6 +32,7 @@ import IceGridGUI.*; class ServiceEditor extends CommunicatorEditor { + @Override public JToolBar getToolBar() { if(_toolBar == null) @@ -51,6 +52,7 @@ class ServiceEditor extends CommunicatorEditor Action refresh = new AbstractAction("Refresh") { + @Override public void actionPerformed(ActionEvent e) { _buildId.setText("Retrieving..."); @@ -96,6 +98,7 @@ class ServiceEditor extends CommunicatorEditor } } + @Override protected void appendProperties(DefaultFormBuilder builder) { builder.appendSeparator("Runtime Status"); @@ -132,6 +135,7 @@ class ServiceEditor extends CommunicatorEditor builder.nextLine(); } + @Override protected void buildPropertiesPanel() { super.buildPropertiesPanel(); @@ -159,7 +163,7 @@ class ServiceEditor extends CommunicatorEditor { _properties.setSortedMap(map); - String buildString = (String)map.get("BuildId"); + String buildString = map.get("BuildId"); if(buildString == null) { _buildId.setText(""); diff --git a/java/src/IceGridGUI/LiveDeployment/ShowLogDialog.java b/java/src/IceGridGUI/LiveDeployment/ShowLogDialog.java index 89564c92363..a102ebcfb2d 100644 --- a/java/src/IceGridGUI/LiveDeployment/ShowLogDialog.java +++ b/java/src/IceGridGUI/LiveDeployment/ShowLogDialog.java @@ -9,33 +9,27 @@ package IceGridGUI.LiveDeployment; -import java.awt.Cursor; import java.awt.BorderLayout; -import java.awt.Container; -import java.awt.Dimension; -import java.awt.Frame; - import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; import java.awt.event.KeyEvent; import javax.swing.AbstractAction; import javax.swing.Action; import javax.swing.ButtonGroup; -import javax.swing.JComponent; import javax.swing.JDialog; import javax.swing.JFileChooser; import javax.swing.JMenu; import javax.swing.JMenuBar; import javax.swing.JOptionPane; -import javax.swing.JPanel; import javax.swing.JRadioButtonMenuItem; import javax.swing.JScrollPane; import javax.swing.JTextArea; import javax.swing.JToggleButton; import javax.swing.JToolBar; import javax.swing.KeyStroke; +import javax.swing.ScrollPaneConstants; import javax.swing.SwingUtilities; +import javax.swing.WindowConstants; import com.jgoodies.looks.BorderStyle; import com.jgoodies.looks.HeaderStyle; @@ -70,6 +64,7 @@ class ShowLogDialog extends JDialog { SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { for(int i = 0; i < lines.length; ++i) @@ -137,6 +132,7 @@ class ShowLogDialog extends JDialog SwingUtilities.invokeLater( new Runnable() { + @Override public void run() { if(_textArea.getText() == null || _textArea.getText().length() == 0) @@ -157,6 +153,7 @@ class ShowLogDialog extends JDialog }); } + @Override public void run() { // @@ -187,6 +184,7 @@ class ShowLogDialog extends JDialog SwingUtilities.invokeLater( new Runnable() { + @Override public void run() { if(isVisible()) @@ -280,6 +278,7 @@ class ShowLogDialog extends JDialog SwingUtilities.invokeLater( new Runnable() { + @Override public void run() { stopReading(); @@ -299,6 +298,7 @@ class ShowLogDialog extends JDialog SwingUtilities.invokeLater( new Runnable() { + @Override public void run() { stopReading(); @@ -402,6 +402,7 @@ class ShowLogDialog extends JDialog Action save = new AbstractAction("Save As...") { + @Override public void actionPerformed(ActionEvent e) { JFileChooser fileChooser = _root.getCoordinator().getSaveLogChooser(); @@ -474,6 +475,7 @@ class ShowLogDialog extends JDialog fileMenu.add(new AbstractAction("Close") { + @Override public void actionPerformed(ActionEvent e) { close(true); @@ -485,6 +487,7 @@ class ShowLogDialog extends JDialog Action copy = new AbstractAction("Copy") { + @Override public void actionPerformed(ActionEvent e) { _textArea.copy(); @@ -498,6 +501,7 @@ class ShowLogDialog extends JDialog editMenu.addSeparator(); Action selectAll = new AbstractAction("Select All") { + @Override public void actionPerformed(ActionEvent e) { _textArea.grabFocus(); @@ -511,6 +515,7 @@ class ShowLogDialog extends JDialog editMenu.addSeparator(); editMenu.add(new AbstractAction("Preferences...") { + @Override public void actionPerformed(ActionEvent e) { new ShowLogPrefsDialog(ShowLogDialog.this); @@ -561,9 +566,10 @@ class ShowLogDialog extends JDialog _factory = factory; _root = root; - setDefaultCloseOperation(JDialog.DO_NOTHING_ON_CLOSE); + setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE); addWindowListener(new java.awt.event.WindowAdapter() { + @Override public void windowClosing(java.awt.event.WindowEvent e) { close(true); @@ -572,6 +578,7 @@ class ShowLogDialog extends JDialog _pause = new AbstractAction("Pause") { + @Override public void actionPerformed(ActionEvent e) { pause(); @@ -580,6 +587,7 @@ class ShowLogDialog extends JDialog _play = new AbstractAction("Play") { + @Override public void actionPerformed(ActionEvent e) { play(); @@ -588,6 +596,7 @@ class ShowLogDialog extends JDialog _stop = new AbstractAction("Stop") { + @Override public void actionPerformed(ActionEvent e) { stopReading(); @@ -598,8 +607,8 @@ class ShowLogDialog extends JDialog getContentPane().add(new ToolBar(), BorderLayout.PAGE_START); JScrollPane scrollPane = new JScrollPane(_textArea, - JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED, - JScrollPane.HORIZONTAL_SCROLLBAR_NEVER); + ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, + ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); getContentPane().add(scrollPane); diff --git a/java/src/IceGridGUI/LiveDeployment/ShowLogPrefsDialog.java b/java/src/IceGridGUI/LiveDeployment/ShowLogPrefsDialog.java index 5524c475b0a..1b450d5fdf2 100644 --- a/java/src/IceGridGUI/LiveDeployment/ShowLogPrefsDialog.java +++ b/java/src/IceGridGUI/LiveDeployment/ShowLogPrefsDialog.java @@ -17,8 +17,8 @@ import javax.swing.JButton; import javax.swing.JComponent; import javax.swing.JDialog; import javax.swing.JOptionPane; -import javax.swing.JPanel; import javax.swing.JTextField; +import javax.swing.WindowConstants; import com.jgoodies.forms.builder.DefaultFormBuilder; import com.jgoodies.forms.builder.ButtonBarBuilder; @@ -26,15 +26,12 @@ import com.jgoodies.forms.factories.Borders; import com.jgoodies.forms.layout.FormLayout; import com.jgoodies.forms.util.LayoutStyle; -import IceGrid.*; -import IceGridGUI.*; - class ShowLogPrefsDialog extends JDialog { ShowLogPrefsDialog(final ShowLogDialog sld) { super(sld, "Preferences - IceGrid Admin", true); - setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE); + setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE); final JTextField maxLinesField = new JTextField(10); maxLinesField.setText(Integer.toString(sld.getMaxLines())); @@ -59,6 +56,7 @@ class ShowLogPrefsDialog extends JDialog JButton okButton = new JButton("OK"); ActionListener okListener = new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { try @@ -84,6 +82,7 @@ class ShowLogPrefsDialog extends JDialog JButton cancelButton = new JButton("Cancel"); ActionListener cancelListener = new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { dispose(); diff --git a/java/src/IceGridGUI/LiveDeployment/Slave.java b/java/src/IceGridGUI/LiveDeployment/Slave.java index e7e88a07b01..652775efbb5 100644 --- a/java/src/IceGridGUI/LiveDeployment/Slave.java +++ b/java/src/IceGridGUI/LiveDeployment/Slave.java @@ -12,13 +12,9 @@ package IceGridGUI.LiveDeployment; import java.awt.Component; import java.awt.Cursor; -import javax.swing.Icon; import javax.swing.JPopupMenu; import javax.swing.JTree; import javax.swing.tree.DefaultTreeCellRenderer; -import javax.swing.tree.TreeModel; -import javax.swing.tree.TreePath; - import IceGrid.*; import IceGridGUI.*; @@ -27,6 +23,7 @@ class Slave extends TreeNode // // Actions // + @Override public boolean[] getAvailableActions() { boolean[] actions = new boolean[IceGridGUI.LiveDeployment.TreeNode.ACTION_COUNT]; @@ -36,6 +33,7 @@ class Slave extends TreeNode return actions; } + @Override public void shutdownRegistry() { final String prefix = "Shutting down registry '" + _id + "'..."; @@ -46,16 +44,19 @@ class Slave extends TreeNode // // Called by another thread! // + @Override public void response() { amiSuccess(prefix); } + @Override public void exception(Ice.UserException e) { amiFailure(prefix, "Failed to shutdown " + _id, e); } + @Override public void exception(Ice.LocalException e) { amiFailure(prefix, "Failed to shutdown " + _id, @@ -79,10 +80,12 @@ class Slave extends TreeNode } } + @Override public void retrieveOutput(final boolean stdout) { getRoot().openShowLogDialog(new ShowLogDialog.FileIteratorFactory() { + @Override public FileIteratorPrx open(int count) throws FileNotAvailableException, RegistryNotExistException, RegistryUnreachableException { @@ -100,11 +103,13 @@ class Slave extends TreeNode return result; } + @Override public String getTitle() { return "Registry " + _title + " " + (stdout ? "stdout" : "stderr"); } + @Override public String getDefaultFilename() { return _id + (stdout ? ".out" : ".err"); @@ -112,6 +117,7 @@ class Slave extends TreeNode }); } + @Override public JPopupMenu getPopupMenu() { LiveActions la = getCoordinator().getLiveActionsForPopup(); @@ -129,6 +135,7 @@ class Slave extends TreeNode return _popup; } + @Override public Editor getEditor() { if(_editor == null) @@ -139,6 +146,7 @@ class Slave extends TreeNode return _editor; } + @Override public Component getTreeCellRendererComponent( JTree tree, Object value, diff --git a/java/src/IceGridGUI/LiveDeployment/SlaveEditor.java b/java/src/IceGridGUI/LiveDeployment/SlaveEditor.java index 43b1a9ce200..25d3081ae51 100644 --- a/java/src/IceGridGUI/LiveDeployment/SlaveEditor.java +++ b/java/src/IceGridGUI/LiveDeployment/SlaveEditor.java @@ -14,7 +14,6 @@ import javax.swing.JTextField; import com.jgoodies.forms.builder.DefaultFormBuilder; import IceGrid.*; -import IceGridGUI.*; class SlaveEditor extends Editor { @@ -28,6 +27,7 @@ class SlaveEditor extends Editor _hostname.setText(info.hostname); } + @Override protected void appendProperties(DefaultFormBuilder builder) { builder.append("Hostname" ); @@ -35,6 +35,7 @@ class SlaveEditor extends Editor builder.nextLine(); } + @Override protected void buildPropertiesPanel() { super.buildPropertiesPanel(); diff --git a/java/src/IceGridGUI/LiveDeployment/TableField.java b/java/src/IceGridGUI/LiveDeployment/TableField.java index 9ac1a4dea03..405bb90553f 100644 --- a/java/src/IceGridGUI/LiveDeployment/TableField.java +++ b/java/src/IceGridGUI/LiveDeployment/TableField.java @@ -12,16 +12,7 @@ package IceGridGUI.LiveDeployment; import IceGrid.*; import IceGridGUI.*; -import java.awt.event.ActionEvent; - -import javax.swing.AbstractAction; -import javax.swing.Action; -import javax.swing.DefaultCellEditor; import javax.swing.JTable; -import javax.swing.JTextField; -import javax.swing.KeyStroke; -import javax.swing.event.TableModelEvent; -import javax.swing.event.TableModelListener; import javax.swing.table.DefaultTableCellRenderer; import javax.swing.table.DefaultTableModel; @@ -56,6 +47,7 @@ public class TableField extends JTable { _model = new DefaultTableModel() { + @Override public boolean isCellEditable(int row, int column) { return false; diff --git a/java/src/IceGridGUI/LiveDeployment/TreeNode.java b/java/src/IceGridGUI/LiveDeployment/TreeNode.java index 8c613c69a3d..43a477268a1 100644 --- a/java/src/IceGridGUI/LiveDeployment/TreeNode.java +++ b/java/src/IceGridGUI/LiveDeployment/TreeNode.java @@ -12,7 +12,6 @@ package IceGridGUI.LiveDeployment; import javax.swing.SwingUtilities; import javax.swing.JOptionPane; -import IceGrid.*; import IceGridGUI.*; public abstract class TreeNode extends TreeNodeBase @@ -136,6 +135,7 @@ public abstract class TreeNode extends TreeNodeBase { SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { getCoordinator().getStatusBar().setText(prefix + "done."); @@ -201,6 +201,7 @@ public abstract class TreeNode extends TreeNodeBase { SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { failure(prefix, title, message); diff --git a/java/src/IceGridGUI/LiveDeployment/WriteMessageDialog.java b/java/src/IceGridGUI/LiveDeployment/WriteMessageDialog.java index 242cb688105..7645fb1435f 100644 --- a/java/src/IceGridGUI/LiveDeployment/WriteMessageDialog.java +++ b/java/src/IceGridGUI/LiveDeployment/WriteMessageDialog.java @@ -9,33 +9,27 @@ package IceGridGUI.LiveDeployment; -import java.awt.Cursor; -import java.awt.BorderLayout; import java.awt.Container; -import java.awt.Dimension; -import java.awt.Frame; - import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import javax.swing.ButtonGroup; import javax.swing.BoxLayout; import javax.swing.JButton; -import javax.swing.JComboBox; import javax.swing.JComponent; import javax.swing.JDialog; import javax.swing.JFrame; import javax.swing.JOptionPane; -import javax.swing.JPanel; import javax.swing.JRadioButton; import javax.swing.JScrollPane; import javax.swing.JTextArea; +import javax.swing.ScrollPaneConstants; import javax.swing.SwingUtilities; +import javax.swing.WindowConstants; import com.jgoodies.forms.builder.DefaultFormBuilder; import com.jgoodies.forms.builder.ButtonBarBuilder; import com.jgoodies.forms.factories.Borders; -import com.jgoodies.forms.layout.CellConstraints; import com.jgoodies.forms.layout.FormLayout; import com.jgoodies.forms.util.LayoutStyle; @@ -47,7 +41,7 @@ class WriteMessageDialog extends JDialog WriteMessageDialog(final Root root) { super(root.getCoordinator().getMainFrame(), "Write Message - IceGrid Admin", true); - setDefaultCloseOperation(JDialog.HIDE_ON_CLOSE); + setDefaultCloseOperation(WindowConstants.HIDE_ON_CLOSE); _mainFrame = root.getCoordinator().getMainFrame(); @@ -61,6 +55,7 @@ class WriteMessageDialog extends JDialog JButton okButton = new JButton("OK"); ActionListener okListener = new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { final Coordinator c = root.getCoordinator(); @@ -87,10 +82,12 @@ class WriteMessageDialog extends JDialog Ice.Callback_Process_writeMessage cb = new Ice.Callback_Process_writeMessage() { + @Override public void response() { SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { c.getStatusBar().setText(prefix + "done."); @@ -98,10 +95,12 @@ class WriteMessageDialog extends JDialog }); } + @Override public void exception(final Ice.LocalException e) { SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { handleFailure("Communication exception: " + e.toString()); @@ -147,6 +146,7 @@ class WriteMessageDialog extends JDialog JButton cancelButton = new JButton("Cancel"); ActionListener cancelListener = new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { setVisible(false); @@ -162,8 +162,8 @@ class WriteMessageDialog extends JDialog _message.setLineWrap(true); JScrollPane scrollPane = new JScrollPane(_message, - JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED, - JScrollPane.HORIZONTAL_SCROLLBAR_NEVER); + ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, + ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); builder.append(scrollPane, 3); builder.nextLine(); builder.append(_stdOut); diff --git a/java/src/IceGridGUI/LiveDeploymentPane.java b/java/src/IceGridGUI/LiveDeploymentPane.java index 15fda0e34a9..eda638a63e2 100644 --- a/java/src/IceGridGUI/LiveDeploymentPane.java +++ b/java/src/IceGridGUI/LiveDeploymentPane.java @@ -10,14 +10,10 @@ package IceGridGUI; import java.awt.*; -import java.awt.event.WindowAdapter; -import java.awt.event.WindowEvent; -import java.awt.event.ActionEvent; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import javax.swing.*; -import javax.swing.border.AbstractBorder; import javax.swing.border.EmptyBorder; import javax.swing.event.TreeSelectionEvent; import javax.swing.event.TreeSelectionListener; @@ -26,25 +22,22 @@ import javax.swing.plaf.basic.BasicSplitPaneUI; import javax.swing.tree.TreeCellRenderer; import javax.swing.tree.TreeSelectionModel; import javax.swing.tree.TreePath; -import javax.swing.event.TreeWillExpandListener; -import javax.swing.event.TreeExpansionEvent; - import com.jgoodies.forms.factories.Borders; -import IceGrid.*; import IceGridGUI.LiveDeployment.Editor; import IceGridGUI.LiveDeployment.Root; import IceGridGUI.LiveDeployment.TreeNode; -import IceGridGUI.LiveDeployment.Server; public class LiveDeploymentPane extends JSplitPane implements Tab { + @Override public void updateUI() { super.updateUI(); setEmptyDividerBorder(); } + @Override public void selected() { Coordinator c = _root.getCoordinator(); @@ -65,6 +58,7 @@ public class LiveDeploymentPane extends JSplitPane implements Tab c.showActions(_currentNode); } + @Override public void refresh() { if(_currentNode != null) @@ -81,6 +75,7 @@ public class LiveDeploymentPane extends JSplitPane implements Tab } } + @Override public void showNode(TreeNodeBase node) { TreeNode newNode = (TreeNode)node; @@ -115,6 +110,7 @@ public class LiveDeploymentPane extends JSplitPane implements Tab } } + @Override public void back() { TreeNode previousNode = null; @@ -144,6 +140,7 @@ public class LiveDeploymentPane extends JSplitPane implements Tab } } + @Override public void forward() { TreeNode nextNode = null; @@ -173,26 +170,31 @@ public class LiveDeploymentPane extends JSplitPane implements Tab } } + @Override public void save() { assert false; } + @Override public void saveToRegistry(boolean restart) { assert false; } + @Override public void saveToFile() { assert false; } + @Override public void discardUpdates() { assert false; } + @Override public boolean close() { return false; @@ -225,8 +227,8 @@ public class LiveDeploymentPane extends JSplitPane implements Tab JScrollPane leftScroll = new JScrollPane(tree, - JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED, - JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED); + ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, + ScrollPaneConstants.HORIZONTAL_SCROLLBAR_AS_NEEDED); leftScroll.setBorder(Borders.EMPTY); _leftPane = new SimpleInternalFrame("Runtime Components"); @@ -279,6 +281,7 @@ public class LiveDeploymentPane extends JSplitPane implements Tab private class SelectionListener implements TreeSelectionListener { + @Override public void valueChanged(TreeSelectionEvent e) { if(_selectionListenerEnabled) @@ -303,11 +306,13 @@ public class LiveDeploymentPane extends JSplitPane implements Tab private class PopupListener extends MouseAdapter { + @Override public void mousePressed(MouseEvent e) { maybeShowPopup(e); } + @Override public void mouseReleased(MouseEvent e) { maybeShowPopup(e); diff --git a/java/src/IceGridGUI/Logger.java b/java/src/IceGridGUI/Logger.java index affad493c74..7e914d17502 100644 --- a/java/src/IceGridGUI/Logger.java +++ b/java/src/IceGridGUI/Logger.java @@ -23,6 +23,7 @@ public class Logger extends Ice.LoggerI _mainFrame = mainFrame; } + @Override public void warning(final String message) { @@ -35,6 +36,7 @@ public class Logger extends Ice.LoggerI } SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { JOptionPane.showMessageDialog( @@ -46,11 +48,13 @@ public class Logger extends Ice.LoggerI }); } + @Override public void error(final String message) { SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { JOptionPane.showMessageDialog( diff --git a/java/src/IceGridGUI/Main.java b/java/src/IceGridGUI/Main.java index a2662a56ddb..a6617acee37 100644 --- a/java/src/IceGridGUI/Main.java +++ b/java/src/IceGridGUI/Main.java @@ -9,17 +9,14 @@ package IceGridGUI; -import java.awt.Dimension; -import java.awt.FlowLayout; import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; -import javax.swing.Icon; import javax.swing.JFrame; import javax.swing.JOptionPane; - import javax.swing.SwingUtilities; import javax.swing.UIManager; +import javax.swing.WindowConstants; import java.util.prefs.Preferences; @@ -54,6 +51,7 @@ public class Main extends JFrame SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { try @@ -84,9 +82,10 @@ public class Main extends JFrame setIconImage(icon.getImage()); } - setDefaultCloseOperation(JFrame.DO_NOTHING_ON_CLOSE); + setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE); addWindowListener(new WindowAdapter() { + @Override public void windowClosing(WindowEvent e) { if(_coordinator != null) diff --git a/java/src/IceGridGUI/MainPane.java b/java/src/IceGridGUI/MainPane.java index d36cc1129d4..2a7dffccc96 100644 --- a/java/src/IceGridGUI/MainPane.java +++ b/java/src/IceGridGUI/MainPane.java @@ -9,8 +9,6 @@ package IceGridGUI; -import java.awt.Component; - import javax.swing.*; import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeListener; @@ -24,6 +22,7 @@ public class MainPane extends JTabbedPane super.addTab(computeTitle(root.getId()), getIcon(root), application); } + @Override public void setTitleAt(int index, String title) { super.setTitleAt(index, computeTitle(title)); @@ -93,6 +92,7 @@ public class MainPane extends JTabbedPane addChangeListener(new ChangeListener() { + @Override public void stateChanged(ChangeEvent evt) { Tab tab = (Tab)getSelectedComponent(); diff --git a/java/src/IceGridGUI/NodeObserverI.java b/java/src/IceGridGUI/NodeObserverI.java index 772fcec7e36..8bb9d9dddf9 100644 --- a/java/src/IceGridGUI/NodeObserverI.java +++ b/java/src/IceGridGUI/NodeObserverI.java @@ -20,6 +20,7 @@ class NodeObserverI extends _NodeObserverDisp _trace = _coordinator.traceObservers(); } + @Override public void nodeInit(final NodeDynamicInfo[] nodes, Ice.Current current) { if(_trace) @@ -41,6 +42,7 @@ class NodeObserverI extends _NodeObserverDisp SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { for(NodeDynamicInfo node : nodes) @@ -51,6 +53,7 @@ class NodeObserverI extends _NodeObserverDisp }); } + @Override public void nodeUp(final NodeDynamicInfo nodeInfo, Ice.Current current) { if(_trace) @@ -60,6 +63,7 @@ class NodeObserverI extends _NodeObserverDisp SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { _coordinator.nodeUp(nodeInfo); @@ -67,6 +71,7 @@ class NodeObserverI extends _NodeObserverDisp }); } + @Override public void nodeDown(final String nodeName, Ice.Current current) { if(_trace) @@ -76,6 +81,7 @@ class NodeObserverI extends _NodeObserverDisp SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { _coordinator.nodeDown(nodeName); @@ -83,6 +89,7 @@ class NodeObserverI extends _NodeObserverDisp }); } + @Override public void updateServer(final String node, final ServerDynamicInfo updatedInfo, Ice.Current current) { if(_trace) @@ -94,6 +101,7 @@ class NodeObserverI extends _NodeObserverDisp SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { _coordinator.updateServer(node, updatedInfo); @@ -101,6 +109,7 @@ class NodeObserverI extends _NodeObserverDisp }); } + @Override public void updateAdapter(final String node, final AdapterDynamicInfo updatedInfo, Ice.Current current) { if(_trace) @@ -113,6 +122,7 @@ class NodeObserverI extends _NodeObserverDisp SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { _coordinator.updateAdapter(node, updatedInfo); diff --git a/java/src/IceGridGUI/ObjectObserverI.java b/java/src/IceGridGUI/ObjectObserverI.java index 73d7e030426..2d721d0769d 100644 --- a/java/src/IceGridGUI/ObjectObserverI.java +++ b/java/src/IceGridGUI/ObjectObserverI.java @@ -20,6 +20,7 @@ class ObjectObserverI extends _ObjectObserverDisp _trace = coordinator.traceObservers(); } + @Override public synchronized void objectInit(final ObjectInfo[] objects, Ice.Current current) { if(_trace) @@ -42,6 +43,7 @@ class ObjectObserverI extends _ObjectObserverDisp SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { _coordinator.objectInit(objects); @@ -49,6 +51,7 @@ class ObjectObserverI extends _ObjectObserverDisp }); } + @Override public void objectAdded(final ObjectInfo info, Ice.Current current) { if(_trace) @@ -58,6 +61,7 @@ class ObjectObserverI extends _ObjectObserverDisp SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { _coordinator.objectAdded(info); @@ -65,6 +69,7 @@ class ObjectObserverI extends _ObjectObserverDisp }); } + @Override public void objectUpdated(final ObjectInfo info, Ice.Current current) { if(_trace) @@ -74,6 +79,7 @@ class ObjectObserverI extends _ObjectObserverDisp SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { _coordinator.objectUpdated(info); @@ -81,6 +87,7 @@ class ObjectObserverI extends _ObjectObserverDisp }); } + @Override public void objectRemoved(final Ice.Identity id, Ice.Current current) { if(_trace) @@ -90,6 +97,7 @@ class ObjectObserverI extends _ObjectObserverDisp SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { _coordinator.objectRemoved(id); diff --git a/java/src/IceGridGUI/RegistryObserverI.java b/java/src/IceGridGUI/RegistryObserverI.java index 4a01f29db04..5013a4cd0c5 100644 --- a/java/src/IceGridGUI/RegistryObserverI.java +++ b/java/src/IceGridGUI/RegistryObserverI.java @@ -20,6 +20,7 @@ class RegistryObserverI extends _RegistryObserverDisp _trace = _coordinator.traceObservers(); } + @Override public void registryInit(final RegistryInfo[] registryInfos, Ice.Current current) { if(_trace) @@ -43,6 +44,7 @@ class RegistryObserverI extends _RegistryObserverDisp SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { for(RegistryInfo info : registryInfos) @@ -53,6 +55,7 @@ class RegistryObserverI extends _RegistryObserverDisp }); } + @Override public void registryUp(final RegistryInfo registryInfo, Ice.Current current) { if(_trace) @@ -62,6 +65,7 @@ class RegistryObserverI extends _RegistryObserverDisp SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { _coordinator.registryUp(registryInfo); @@ -69,6 +73,7 @@ class RegistryObserverI extends _RegistryObserverDisp }); } + @Override public void registryDown(final String registryName, Ice.Current current) { if(_trace) @@ -78,6 +83,7 @@ class RegistryObserverI extends _RegistryObserverDisp SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { _coordinator.registryDown(registryName); diff --git a/java/src/IceGridGUI/SessionKeeper.java b/java/src/IceGridGUI/SessionKeeper.java index 1841005bcc0..2fd50db7f0f 100644 --- a/java/src/IceGridGUI/SessionKeeper.java +++ b/java/src/IceGridGUI/SessionKeeper.java @@ -9,7 +9,6 @@ package IceGridGUI; import javax.swing.*; -import javax.swing.border.TitledBorder; import javax.swing.border.EmptyBorder; import javax.swing.event.DocumentListener; import javax.swing.event.DocumentEvent; @@ -20,35 +19,25 @@ import javax.swing.filechooser.FileFilter; import java.io.FileInputStream; import java.io.FileOutputStream; -import java.io.InputStream; import java.io.File; import java.awt.Container; -import java.awt.Frame; import java.awt.Component; import java.awt.Cursor; import java.awt.Dimension; import java.awt.event.ActionEvent; -import java.awt.event.ItemEvent; import java.awt.event.ActionListener; -import java.awt.event.ItemListener; import java.awt.CardLayout; import java.awt.BorderLayout; import java.awt.Insets; -import java.awt.event.KeyEvent; import java.awt.event.MouseEvent; import java.awt.event.MouseAdapter; import java.awt.event.ComponentAdapter; import java.awt.event.ComponentEvent; -import java.awt.event.WindowAdapter; -import java.awt.event.WindowEvent; - import com.jgoodies.forms.builder.DefaultFormBuilder; import com.jgoodies.forms.builder.ButtonBarBuilder; import com.jgoodies.forms.factories.Borders; -import com.jgoodies.forms.factories.DefaultComponentFactory; import com.jgoodies.forms.layout.FormLayout; import com.jgoodies.forms.layout.CellConstraints; -import com.jgoodies.forms.layout.Sizes; import com.jgoodies.forms.util.LayoutStyle; import java.util.prefs.Preferences; @@ -66,13 +55,9 @@ import java.security.cert.CertificateFactory; import java.security.cert.X509Certificate; import java.security.MessageDigest; -import javax.security.auth.x500.X500Principal; -import javax.net.ssl.KeyManagerFactory; import javax.naming.ldap.LdapName; import javax.naming.ldap.Rdn; -import Ice.LocatorFinderPrxHelper; -import Ice.Instrumentation._DispatchObserverOperationsNC; import IceGrid.*; // @@ -86,6 +71,7 @@ public class SessionKeeper private class LookupReplyI extends _LookupReplyDisp { + @Override public synchronized void foundLocator(LocatorPrx locator, Ice.Current curr) { @@ -149,6 +135,7 @@ public class SessionKeeper { SwingUtilities.invokeAndWait(new Runnable() { + @Override public void run() { logout(true); @@ -210,6 +197,7 @@ public class SessionKeeper { SwingUtilities.invokeAndWait(new Runnable() { + @Override public void run() { logout(true); @@ -242,6 +230,7 @@ public class SessionKeeper { SwingUtilities.invokeAndWait(new Runnable() { + @Override public void run() { logout(true); @@ -277,11 +266,13 @@ public class SessionKeeper _session.ice_getConnection().setCallback( new Ice.ConnectionCallback() { + @Override public void heartbeat(Ice.Connection con) { } + @Override public void closed(Ice.Connection con) { @@ -295,6 +286,7 @@ public class SessionKeeper SwingUtilities.invokeLater( new Runnable() { + @Override public void run() { sessionLost("Failed to contact the IceGrid registry: " + ex.toString()); @@ -311,6 +303,7 @@ public class SessionKeeper { SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { sessionLost("Failed to contact the IceGrid registry: " + e.toString()); @@ -318,26 +311,23 @@ public class SessionKeeper }); } + @Override public void run() { _session.begin_keepAlive(new Callback_AdminSession_keepAlive() { + @Override public void response() { } + @Override public void exception(Ice.LocalException ex) { error(ex); } - - public void - exception(Ice.UserException ex) - { - error(ex); - } }); } }, sessionTimeout / 2, sessionTimeout / 2, java.util.concurrent.TimeUnit.SECONDS); @@ -355,6 +345,7 @@ public class SessionKeeper { SwingUtilities.invokeAndWait(new Runnable() { + @Override public void run() { logout(true); @@ -542,6 +533,7 @@ public class SessionKeeper { SwingUtilities.invokeAndWait(new Runnable() { + @Override public void run() { ApplicationObserverI applicationObserverServant = new ApplicationObserverI( @@ -633,7 +625,7 @@ public class SessionKeeper private static JScrollPane createStrippedScrollPane(Component component) { JScrollPane scrollPane = new JScrollPane(component); - scrollPane.setHorizontalScrollBarPolicy(JScrollPane.HORIZONTAL_SCROLLBAR_NEVER); + scrollPane.setHorizontalScrollBarPolicy(ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER); return scrollPane; } @@ -650,6 +642,7 @@ public class SessionKeeper load(); } + @Override public synchronized String toString() { @@ -680,6 +673,7 @@ public class SessionKeeper return name; } + @Override public int compareTo(ConnectionInfo other) { return _instanceName.compareTo(other._instanceName); @@ -1152,11 +1146,13 @@ public class SessionKeeper _field = field; } + @Override public void focusGained(java.awt.event.FocusEvent fe) { _field.setCaretPosition(_field.getDocument().getLength()); } + @Override public void focusLost(java.awt.event.FocusEvent fe) { @@ -1210,6 +1206,7 @@ public class SessionKeeper _directConnection = new JRadioButton(new AbstractAction("Direct Connection") { + @Override public void actionPerformed(ActionEvent e) { validatePanel(); @@ -1219,6 +1216,7 @@ public class SessionKeeper group.add(_directConnection); _routedConnection = new JRadioButton(new AbstractAction("Routed Connection") { + @Override public void actionPerformed(ActionEvent e) { validatePanel(); @@ -1247,7 +1245,8 @@ public class SessionKeeper _directDiscoveryEndpointList.addListSelectionListener(new ListSelectionListener() { - public void valueChanged(ListSelectionEvent event) + @Override + public void valueChanged(ListSelectionEvent event) { validatePanel(); } @@ -1258,7 +1257,8 @@ public class SessionKeeper ButtonGroup group = new ButtonGroup(); _directDiscoveryDiscoveredEndpoint = new JRadioButton(new AbstractAction("Discovered Endpoints") { - public void actionPerformed(ActionEvent e) + @Override + public void actionPerformed(ActionEvent e) { _directDiscoveryEndpointList.setEnabled(true); validatePanel(); @@ -1269,7 +1269,8 @@ public class SessionKeeper _directDiscoveryManualEndpoint = new JRadioButton(new AbstractAction("Manual Endpoint") { - public void actionPerformed(ActionEvent e) + @Override + public void actionPerformed(ActionEvent e) { _directDiscoveryEndpointList.setEnabled(false); validatePanel(); @@ -1312,6 +1313,7 @@ public class SessionKeeper _directDefaultEndpoints = new JRadioButton( new AbstractAction("A hostname and a port number?") { + @Override public void actionPerformed(ActionEvent e) { validatePanel(); @@ -1321,6 +1323,7 @@ public class SessionKeeper group.add(_directDefaultEndpoints); _directCustomEndpoints = new JRadioButton(new AbstractAction("An endpoint string?") { + @Override public void actionPerformed(ActionEvent e) { validatePanel(); @@ -1347,6 +1350,7 @@ public class SessionKeeper _routedDefaultEndpoints = new JRadioButton( new AbstractAction("A hostname and a port number?") { + @Override public void actionPerformed(ActionEvent e) { validatePanel(); @@ -1356,6 +1360,7 @@ public class SessionKeeper group.add(_routedDefaultEndpoints); _routedCustomEndpoints = new JRadioButton(new AbstractAction("An endpoint string?") { + @Override public void actionPerformed(ActionEvent e) { validatePanel(); @@ -1382,16 +1387,19 @@ public class SessionKeeper _directDefaultEndpointHost = new JTextField(20); _directDefaultEndpointHost.getDocument().addDocumentListener(new DocumentListener() { + @Override public void changedUpdate(DocumentEvent e) { validatePanel(); _directDefaultEndpointHost.requestFocusInWindow(); } + @Override public void removeUpdate(DocumentEvent e) { validatePanel(); _directDefaultEndpointHost.requestFocusInWindow(); } + @Override public void insertUpdate(DocumentEvent e) { validatePanel(); @@ -1406,16 +1414,19 @@ public class SessionKeeper _directDefaultEndpointPort.addFocusListener(new FocusListener(_directDefaultEndpointPort)); _directDefaultEndpointPort.getDocument().addDocumentListener(new DocumentListener() { + @Override public void changedUpdate(DocumentEvent e) { validatePanel(); _directDefaultEndpointPort.requestFocusInWindow(); } + @Override public void removeUpdate(DocumentEvent e) { validatePanel(); _directDefaultEndpointPort.requestFocusInWindow(); } + @Override public void insertUpdate(DocumentEvent e) { validatePanel(); @@ -1429,6 +1440,7 @@ public class SessionKeeper ButtonGroup group = new ButtonGroup(); _directDefaultEndpointTCP = new JRadioButton(new AbstractAction("TCP") { + @Override public void actionPerformed(ActionEvent e) { } @@ -1437,6 +1449,7 @@ public class SessionKeeper _directDefaultEndpointSSL = new JRadioButton(new AbstractAction("SSL") { + @Override public void actionPerformed(ActionEvent e) { } @@ -1465,16 +1478,19 @@ public class SessionKeeper _routedDefaultEndpointHost.addFocusListener(new FocusListener(_routedDefaultEndpointHost)); _routedDefaultEndpointHost.getDocument().addDocumentListener(new DocumentListener() { + @Override public void changedUpdate(DocumentEvent e) { validatePanel(); _routedDefaultEndpointHost.requestFocusInWindow(); } + @Override public void removeUpdate(DocumentEvent e) { validatePanel(); _routedDefaultEndpointHost.requestFocusInWindow(); } + @Override public void insertUpdate(DocumentEvent e) { validatePanel(); @@ -1489,16 +1505,19 @@ public class SessionKeeper _routedDefaultEndpointPort.addFocusListener(new FocusListener(_routedDefaultEndpointPort)); _routedDefaultEndpointPort.getDocument().addDocumentListener(new DocumentListener() { + @Override public void changedUpdate(DocumentEvent e) { validatePanel(); _routedDefaultEndpointPort.requestFocusInWindow(); } + @Override public void removeUpdate(DocumentEvent e) { validatePanel(); _routedDefaultEndpointPort.requestFocusInWindow(); } + @Override public void insertUpdate(DocumentEvent e) { validatePanel(); @@ -1513,6 +1532,7 @@ public class SessionKeeper ButtonGroup group = new ButtonGroup(); _routedDefaultEndpointTCP = new JRadioButton(new AbstractAction("TCP") { + @Override public void actionPerformed(ActionEvent e) { validatePanel(); @@ -1522,6 +1542,7 @@ public class SessionKeeper _routedDefaultEndpointSSL = new JRadioButton(new AbstractAction("SSL") { + @Override public void actionPerformed(ActionEvent e) { } @@ -1550,14 +1571,17 @@ public class SessionKeeper _directCustomEndpointValue.addFocusListener(new FocusListener(_directCustomEndpointValue)); _directCustomEndpointValue.getDocument().addDocumentListener(new DocumentListener() { + @Override public void changedUpdate(DocumentEvent e) { validatePanel(); } + @Override public void removeUpdate(DocumentEvent e) { validatePanel(); } + @Override public void insertUpdate(DocumentEvent e) { validatePanel(); @@ -1582,14 +1606,17 @@ public class SessionKeeper _routedCustomEndpointValue.addFocusListener(new FocusListener(_routedCustomEndpointValue)); _routedCustomEndpointValue.getDocument().addDocumentListener(new DocumentListener() { + @Override public void changedUpdate(DocumentEvent e) { validatePanel(); } + @Override public void removeUpdate(DocumentEvent e) { validatePanel(); } + @Override public void insertUpdate(DocumentEvent e) { validatePanel(); @@ -1614,6 +1641,7 @@ public class SessionKeeper _x509CertificateNoButton = new JRadioButton(new AbstractAction("No") { + @Override public void actionPerformed(ActionEvent e) { _x509CertificateDefault = false; @@ -1625,6 +1653,7 @@ public class SessionKeeper group.add(_x509CertificateNoButton); _x509CertificateYesButton = new JRadioButton(new AbstractAction("Yes") { + @Override public void actionPerformed(ActionEvent e) { _x509CertificateDefault = false; @@ -1645,6 +1674,7 @@ public class SessionKeeper _directCertificateAliases = new JComboBox(); _directCertificateAliases.addActionListener (new ActionListener () { + @Override public void actionPerformed(ActionEvent e) { validatePanel(); @@ -1653,6 +1683,7 @@ public class SessionKeeper _directImportCertificate = new JButton(new AbstractAction("Import...") { + @Override public void actionPerformed(ActionEvent e) { CertificateManagerDialog d = certificateManager(ConnectionWizardDialog.this); @@ -1682,8 +1713,6 @@ public class SessionKeeper DefaultFormBuilder builder = new DefaultFormBuilder(layout); builder.rowGroupingEnabled(true); - ButtonGroup group = new ButtonGroup(); - builder.append("<html><b>Alias:</b></html>", alias); builder.append("", new JLabel("<html><p>Your X.509 certificate for SSL authentication.</p></html>")); @@ -1709,6 +1738,7 @@ public class SessionKeeper _routedCertificateAliases = new JComboBox(); _routedCertificateAliases.addActionListener (new ActionListener () { + @Override public void actionPerformed(ActionEvent e) { validatePanel(); @@ -1717,6 +1747,7 @@ public class SessionKeeper _routedImportCertificate = new JButton(new AbstractAction("Import...") { + @Override public void actionPerformed(ActionEvent e) { CertificateManagerDialog d = certificateManager(ConnectionWizardDialog.this); @@ -1746,8 +1777,6 @@ public class SessionKeeper DefaultFormBuilder builder = new DefaultFormBuilder(layout); builder.rowGroupingEnabled(true); - ButtonGroup group = new ButtonGroup(); - builder.append("<html><b>Alias:</b></html>", alias); builder.append("", new JLabel("<html><p>Your X.509 certificate for SSL authentication.</p></html>")); @@ -1780,6 +1809,7 @@ public class SessionKeeper _usernamePasswordAuthButton = new JRadioButton( new AbstractAction("Log in with a username and password") { + @Override public void actionPerformed(ActionEvent e) { validatePanel(); @@ -1789,6 +1819,7 @@ public class SessionKeeper group.add(_usernamePasswordAuthButton); _certificateAuthButton = new JRadioButton(new AbstractAction("Log in with my X.509 certificate") { + @Override public void actionPerformed(ActionEvent e) { validatePanel(); @@ -1810,21 +1841,22 @@ public class SessionKeeper builder.border(Borders.DIALOG); builder.rowGroupingEnabled(true); - ButtonGroup group = new ButtonGroup(); - _directUsername = new JTextField(); _directUsername.getDocument().addDocumentListener(new DocumentListener() { + @Override public void changedUpdate(DocumentEvent e) { validatePanel(); _directUsername.requestFocusInWindow(); } + @Override public void removeUpdate(DocumentEvent e) { validatePanel(); _directUsername.requestFocusInWindow(); } + @Override public void insertUpdate(DocumentEvent e) { validatePanel(); @@ -1848,21 +1880,22 @@ public class SessionKeeper builder.border(Borders.DIALOG); builder.rowGroupingEnabled(true); - ButtonGroup group = new ButtonGroup(); - _routedUsername = new JTextField(); _routedUsername.getDocument().addDocumentListener(new DocumentListener() { + @Override public void changedUpdate(DocumentEvent e) { validatePanel(); _routedUsername.requestFocusInWindow(); } + @Override public void removeUpdate(DocumentEvent e) { validatePanel(); _routedUsername.requestFocusInWindow(); } + @Override public void insertUpdate(DocumentEvent e) { validatePanel(); @@ -1882,6 +1915,7 @@ public class SessionKeeper _backButton = new JButton(); AbstractAction backAction = new AbstractAction("< Back") { + @Override public void actionPerformed(ActionEvent e) { if(_wizardSteps.size() <= 1) @@ -1906,6 +1940,7 @@ public class SessionKeeper _nextButton = new JButton(); AbstractAction nextAction = new AbstractAction("Next >") { + @Override public void actionPerformed(ActionEvent e) { _nextButton.setEnabled(false); @@ -1936,11 +1971,12 @@ public class SessionKeeper null); final JDialog searchingDialog = messagePane.createDialog(ConnectionWizardDialog.this, "Please wait..."); - searchingDialog.setDefaultCloseOperation(JDialog.DO_NOTHING_ON_CLOSE); + searchingDialog.setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE); new Thread(new Runnable() { - public void run() + @Override + public void run() { // Search for endpoints Ice.Properties properties = _coordinator.getCommunicator().getProperties(); @@ -2046,7 +2082,8 @@ public class SessionKeeper } SwingUtilities.invokeLater(new Runnable() { - public void run() + @Override + public void run() { searchingDialog.dispose(); _cardLayout.show(_cardPanel, @@ -2363,9 +2400,9 @@ public class SessionKeeper _finishButton = new JButton(); AbstractAction finishAction = new AbstractAction("Finish") { + @Override public void actionPerformed(ActionEvent e) { - boolean secureEndpoints = false; ConnectionInfo inf = getConfiguration(); if(inf == null) { @@ -2534,6 +2571,7 @@ public class SessionKeeper _cancelButton = new JButton(); AbstractAction cancelAction = new AbstractAction("Cancel") { + @Override public void actionPerformed(ActionEvent e) { dispose(); @@ -3103,7 +3141,6 @@ public class SessionKeeper private JButton _backButton; private JButton _nextButton; private JButton _finishButton; - private JButton _connectButton; private JButton _cancelButton; // Connection type components @@ -3316,6 +3353,7 @@ public class SessionKeeper JButton closeButton = new JButton("Close"); closeButton.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { dispose(); @@ -3328,15 +3366,6 @@ public class SessionKeeper pack(); setResizable(false); } - - void showDialog() - { - if(isVisible() == false) - { - setLocationRelativeTo(_coordinator.getMainFrame()); - setVisible(true); - } - } } @@ -3345,7 +3374,7 @@ public class SessionKeeper ConnectionManagerDialog() { super(_coordinator.getMainFrame(), "Saved Connections - IceGrid Admin", true); - setDefaultCloseOperation(JDialog.HIDE_ON_CLOSE); + setDefaultCloseOperation(WindowConstants.HIDE_ON_CLOSE); JPanel connectionActionPanel = null; { @@ -3357,6 +3386,7 @@ public class SessionKeeper _newConnectionButton.setToolTipText("Configure a new connection with IceGrid registry"); _newConnectionButton.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { JDialog dialog = new ConnectionWizardDialog(ConnectionManagerDialog.this); @@ -3373,6 +3403,7 @@ public class SessionKeeper _viewConnectionButton.setEnabled(false); _viewConnectionButton.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { Object obj = _connectionList.getSelectedValue(); @@ -3395,6 +3426,7 @@ public class SessionKeeper _editConnectionButton.setEnabled(false); _editConnectionButton.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { Object obj = _connectionList.getSelectedValue(); @@ -3417,6 +3449,7 @@ public class SessionKeeper _setDefaultConnectionButton.setEnabled(false); _setDefaultConnectionButton.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { _connectionListModel.setDefault(); @@ -3430,6 +3463,7 @@ public class SessionKeeper _removeConnectionButton.setEnabled(false); _removeConnectionButton.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { int index = _connectionList.getSelectedIndex(); @@ -3498,6 +3532,7 @@ public class SessionKeeper class ConnectionListRenderer extends DefaultListCellRenderer { + @Override public Component getListCellRendererComponent(JList list, Object value, int index, boolean selected, boolean hasFocus) @@ -3517,6 +3552,7 @@ public class SessionKeeper } _connectionList = new JList(_connectionListModel) { + @Override public String getToolTipText(MouseEvent evt) { int index = locationToIndex(evt.getPoint()); @@ -3537,6 +3573,7 @@ public class SessionKeeper _connectionList.setVisibleRowCount(7); _connectionList.addListSelectionListener(new ListSelectionListener() { + @Override public void valueChanged(ListSelectionEvent event) { if(!event.getValueIsAdjusting()) @@ -3562,6 +3599,7 @@ public class SessionKeeper _connectionList.addMouseListener( new MouseAdapter() { + @Override public void mouseClicked(MouseEvent e) { if(e.getClickCount() == 2 && e.getButton() == MouseEvent.BUTTON1) @@ -3600,6 +3638,7 @@ public class SessionKeeper _connectButton = new JButton("Connect"); _connectButton.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { Object obj = _connectionList.getSelectedValue(); @@ -3616,6 +3655,7 @@ public class SessionKeeper JButton closeButton = new JButton("Close"); closeButton.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { setVisible(false); @@ -3749,7 +3789,7 @@ public class SessionKeeper keyStore.load(new FileInputStream(_coordinator.getDataDirectory() + File.separator + "MyCerts.jks"), null); if(keyStore.isKeyEntry(alias)) { - Key key = keyStore.getKey(alias, new char[]{}); + keyStore.getKey(alias, new char[]{}); } } catch(java.security.UnrecoverableKeyException ex) @@ -3770,7 +3810,7 @@ public class SessionKeeper keyStore.load(new FileInputStream(_coordinator.getDataDirectory() + File.separator + "MyCerts.jks"), null); if(keyStore.isKeyEntry(alias)) { - Key key = keyStore.getKey(alias, password); + keyStore.getKey(alias, password); } } catch(Exception ex) @@ -3832,11 +3872,13 @@ public class SessionKeeper final String columnNames[] = new String[]{"Alias", "Subject", "Issuer"}; _tableModel = new AbstractTableModel() { + @Override public String getColumnName(int col) { return columnNames[col].toString(); } + @Override public int getRowCount() { if(_aliases == null) @@ -3846,11 +3888,13 @@ public class SessionKeeper return _aliases.size(); } + @Override public int getColumnCount() { return columnNames.length; } + @Override public Object getValueAt(int row, int col) { if(_aliases == null) @@ -3885,11 +3929,13 @@ public class SessionKeeper return ""; } + @Override public boolean isCellEditable(int row, int col) { return false; } + @Override public void setValueAt(Object value, int row, int col) { } @@ -3906,6 +3952,7 @@ public class SessionKeeper _importButton = new JButton(); AbstractAction importAction = new AbstractAction("Import") { + @Override public void actionPerformed(ActionEvent e) { String defaultPath = _coordinator.getPrefs().node("Configurations").get("importDirectory", ""); @@ -3913,6 +3960,7 @@ public class SessionKeeper chooser.setFileFilter(new FileFilter() { //Accept all directories and *.pfx, *.p12 files. + @Override public boolean accept(File f) { if(f.isDirectory()) @@ -3928,6 +3976,7 @@ public class SessionKeeper return false; } + @Override public String getDescription() { return "PKCS12 Files (*.pfx, *.p12)"; @@ -3937,6 +3986,7 @@ public class SessionKeeper chooser.setFileFilter(new FileFilter() { //Accept all directories and *.pem, *.crt files. + @Override public boolean accept(File f) { if(f.isDirectory()) @@ -3952,6 +4002,7 @@ public class SessionKeeper return false; } + @Override public String getDescription() { return "PEM Files (*.pem, *.crt)"; @@ -3961,6 +4012,7 @@ public class SessionKeeper chooser.setFileFilter(new FileFilter() { //Accept all directories and *.jks files. + @Override public boolean accept(File f) { if(f.isDirectory()) @@ -3975,6 +4027,7 @@ public class SessionKeeper return false; } + @Override public String getDescription() { return "Java Key Store Files (*.jks)"; @@ -4116,6 +4169,7 @@ public class SessionKeeper _viewButton = new JButton(); AbstractAction viewAction = new AbstractAction("View") { + @Override public void actionPerformed(ActionEvent e) { int index = _certificatesTable.getSelectionModel().getMinSelectionIndex(); @@ -4146,6 +4200,7 @@ public class SessionKeeper _removeButton = new JButton(); AbstractAction removeAction = new AbstractAction("Remove") { + @Override public void actionPerformed(ActionEvent e) { int index = _certificatesTable.getSelectionModel().getMinSelectionIndex(); @@ -4192,9 +4247,9 @@ public class SessionKeeper java.io.FileNotFoundException, java.io.IOException { - for(Enumeration aliases = keyStore.aliases(); aliases.hasMoreElements(); ) + for(Enumeration<String> aliases = keyStore.aliases(); aliases.hasMoreElements(); ) { - String alias = aliases.nextElement().toString(); + String alias = aliases.nextElement(); if(keyStore.isKeyEntry(alias)) { char[] password = null; @@ -4303,9 +4358,9 @@ public class SessionKeeper } _aliases = new java.util.Vector<String>(); - for(Enumeration e = _keyStore.aliases(); e.hasMoreElements() ;) + for(Enumeration<String> e = _keyStore.aliases(); e.hasMoreElements() ;) { - _aliases.add(e.nextElement().toString()); + _aliases.add(e.nextElement()); } _tableModel.fireTableStructureChanged(); } @@ -4468,15 +4523,22 @@ public class SessionKeeper StringBuilder sb = new StringBuilder(digest.length * 2); Formatter formatter = new Formatter(sb); - for(int i = 0; i < digest.length;) + try { - formatter.format("%02x", digest[i]); - i++; - if(i < digest.length) + for(int i = 0; i < digest.length;) { - sb.append(":"); + formatter.format("%02x", digest[i]); + i++; + if(i < digest.length) + { + sb.append(":"); + } } } + finally + { + formatter.close(); + } sha1Fingerprint = sb.toString().toUpperCase(); } @@ -4495,15 +4557,22 @@ public class SessionKeeper StringBuilder sb = new StringBuilder(digest.length * 2); Formatter formatter = new Formatter(sb); - for(int i = 0; i < digest.length;) + try { - formatter.format("%02x", digest[i]); - i++; - if(i < digest.length) + for(int i = 0; i < digest.length;) { - sb.append(":"); + formatter.format("%02x", digest[i]); + i++; + if(i < digest.length) + { + sb.append(":"); + } } } + finally + { + formatter.close(); + } md5Fingerprint = sb.toString().toUpperCase(); } builder.append(new JLabel("<html><b>MD5 Fingerprint:</b></html>"), @@ -4524,12 +4593,11 @@ public class SessionKeeper builder.addSeparator("Subject Alternate Names"); builder.nextLine(); - Collection altNames = cert.getSubjectAlternativeNames(); + Collection<List<?>> altNames = cert.getSubjectAlternativeNames(); if(altNames != null) { - for(Object o : altNames) + for(List<?> l : altNames) { - java.util.List l = (java.util.List)o; Integer kind = (Integer)l.get(0); String value = l.get(1).toString(); if(kind == 2) @@ -4566,6 +4634,7 @@ public class SessionKeeper JButton closeButton = new JButton("Close"); closeButton.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { dispose(); @@ -4612,6 +4681,7 @@ public class SessionKeeper JButton closeButton = new JButton("Close"); closeButton.addActionListener(new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { setVisible(false); @@ -4662,7 +4732,6 @@ public class SessionKeeper } } - private String _dataDir; private JTabbedPane _tabs; private KeyStorePanel _identityCertificatesPanel; private KeyStorePanel _serverCertificatesPanel; @@ -4672,7 +4741,6 @@ public class SessionKeeper SessionKeeper(Coordinator coordinator) { _coordinator = coordinator; - _loginPrefs = coordinator.getPrefs().node("Connection"); } void connectionManager() @@ -4716,7 +4784,7 @@ public class SessionKeeper public AuthDialog(JDialog parent, String title) { super(parent, title, true); - setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE); + setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE); } public void showDialog() @@ -4766,16 +4834,19 @@ public class SessionKeeper _password.getPassword().length > 0); _password.getDocument().addDocumentListener(new DocumentListener() { + @Override public void changedUpdate(DocumentEvent e) { _storePassword.setEnabled(_password.getPassword() != null && _password.getPassword().length > 0); } + @Override public void removeUpdate(DocumentEvent e) { _storePassword.setEnabled(_password.getPassword() != null && _password.getPassword().length > 0); } + @Override public void insertUpdate(DocumentEvent e) { _storePassword.setEnabled(_password.getPassword() != null && @@ -4802,16 +4873,19 @@ public class SessionKeeper _keyPassword.getPassword().length > 0); _keyPassword.getDocument().addDocumentListener(new DocumentListener() { + @Override public void changedUpdate(DocumentEvent e) { _storeKeyPassword.setEnabled(_keyPassword.getPassword() != null && _keyPassword.getPassword().length > 0); } + @Override public void removeUpdate(DocumentEvent e) { _storeKeyPassword.setEnabled(_keyPassword.getPassword() != null && _keyPassword.getPassword().length > 0); } + @Override public void insertUpdate(DocumentEvent e) { _storeKeyPassword.setEnabled(_keyPassword.getPassword() != null && @@ -4828,6 +4902,7 @@ public class SessionKeeper JButton okButton = new JButton(); AbstractAction okAction = new AbstractAction("OK") { + @Override public void actionPerformed(ActionEvent e) { if(_session != null) @@ -4866,6 +4941,7 @@ public class SessionKeeper JButton cancelButton = new JButton(); AbstractAction cancelAction = new AbstractAction("Cancel") { + @Override public void actionPerformed(ActionEvent e) { dispose(); @@ -4947,16 +5023,19 @@ public class SessionKeeper _storeKeyPassword.setEnabled(false); _keyPassword.getDocument().addDocumentListener(new DocumentListener() { + @Override public void changedUpdate(DocumentEvent e) { _storeKeyPassword.setEnabled(_keyPassword.getPassword() != null && _keyPassword.getPassword().length > 0); } + @Override public void removeUpdate(DocumentEvent e) { _storeKeyPassword.setEnabled(_keyPassword.getPassword() != null && _keyPassword.getPassword().length > 0); } + @Override public void insertUpdate(DocumentEvent e) { _storeKeyPassword.setEnabled(_keyPassword.getPassword() != null && @@ -4971,6 +5050,7 @@ public class SessionKeeper JButton okButton = new JButton(); AbstractAction okAction = new AbstractAction("OK") { + @Override public void actionPerformed(ActionEvent e) { if(_session != null) @@ -5001,6 +5081,7 @@ public class SessionKeeper JButton cancelButton = new JButton(); AbstractAction cancelAction = new AbstractAction("Cancel") { + @Override public void actionPerformed(ActionEvent e) { dispose(); @@ -5092,6 +5173,7 @@ public class SessionKeeper // new Thread(new Runnable() { + @Override public void run() { try @@ -5102,6 +5184,7 @@ public class SessionKeeper { SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { _connectionManagerDialog.setCursor(oldCursor); @@ -5112,6 +5195,7 @@ public class SessionKeeper SwingUtilities.invokeLater(new Runnable() { + @Override public void run() { _connectionManagerDialog.setCursor(oldCursor); @@ -5183,16 +5267,19 @@ public class SessionKeeper _password.getPassword().length > 0); _password.getDocument().addDocumentListener(new DocumentListener() { + @Override public void changedUpdate(DocumentEvent e) { _storePassword.setEnabled(_password.getPassword() != null && _password.getPassword().length > 0); } + @Override public void removeUpdate(DocumentEvent e) { _storePassword.setEnabled(_password.getPassword() != null && _password.getPassword().length > 0); } + @Override public void insertUpdate(DocumentEvent e) { _storePassword.setEnabled(_password.getPassword() != null && @@ -5223,16 +5310,19 @@ public class SessionKeeper _keyPassword.getPassword().length > 0); _keyPassword.getDocument().addDocumentListener(new DocumentListener() { + @Override public void changedUpdate(DocumentEvent e) { _storeKeyPassword.setEnabled(_keyPassword.getPassword() != null && _keyPassword.getPassword().length > 0); } + @Override public void removeUpdate(DocumentEvent e) { _storeKeyPassword.setEnabled(_keyPassword.getPassword() != null && _keyPassword.getPassword().length > 0); } + @Override public void insertUpdate(DocumentEvent e) { _storeKeyPassword.setEnabled(_keyPassword.getPassword() != null && @@ -5248,6 +5338,7 @@ public class SessionKeeper JButton okButton = new JButton(new AbstractAction("OK") { + @Override public void actionPerformed(ActionEvent e) { if(_session != null) @@ -5287,6 +5378,7 @@ public class SessionKeeper JButton editConnectionButton = new JButton(new AbstractAction("Edit Connection") { + @Override public void actionPerformed(ActionEvent e) { info.load(); @@ -5301,6 +5393,7 @@ public class SessionKeeper JButton cancelButton = new JButton(new AbstractAction("Cancel") { + @Override public void actionPerformed(ActionEvent e) { info.load(); @@ -5410,8 +5503,7 @@ public class SessionKeeper private static AuthDialog _authDialog; private final Coordinator _coordinator; - private Preferences _loginPrefs; - + private Session _session; private boolean _connectedToMaster = false; private String _replicaName = ""; diff --git a/java/src/IceGridGUI/SimpleInternalFrame.java b/java/src/IceGridGUI/SimpleInternalFrame.java index 8f3b017ac55..14b0a514911 100644 --- a/java/src/IceGridGUI/SimpleInternalFrame.java +++ b/java/src/IceGridGUI/SimpleInternalFrame.java @@ -319,6 +319,7 @@ public class SimpleInternalFrame extends JPanel { * Updates the UI. In addition to the superclass behavior, we need * to update the header component. */ + @Override public void updateUI() { super.updateUI(); if (titleLabel != null) { @@ -388,8 +389,10 @@ public class SimpleInternalFrame extends JPanel { private static final Insets INSETS = new Insets(1, 1, 1, 0); + @Override public Insets getBorderInsets(Component c) { return INSETS; } + @Override public void paintBorder(Component c, Graphics g, int x, int y, int w, int h) { @@ -408,8 +411,10 @@ public class SimpleInternalFrame extends JPanel { private static final Insets INSETS = new Insets(1, 1, 3, 3); + @Override public Insets getBorderInsets(Component c) { return INSETS; } + @Override public void paintBorder(Component c, Graphics g, int x, int y, int w, int h) { @@ -457,6 +462,7 @@ public class SimpleInternalFrame extends JPanel { setBackground(background); } + @Override public void paintComponent(Graphics g) { super.paintComponent(g); if (!isOpaque()) { diff --git a/java/src/IceGridGUI/TreeNodeBase.java b/java/src/IceGridGUI/TreeNodeBase.java index 22ad2dfc906..0da28bb420a 100644 --- a/java/src/IceGridGUI/TreeNodeBase.java +++ b/java/src/IceGridGUI/TreeNodeBase.java @@ -29,15 +29,18 @@ public class TreeNodeBase implements javax.swing.tree.TreeNode, TreeCellRenderer return _parent.getCoordinator(); } - public Enumeration children() + @Override + public Enumeration<Object> children() { - return new Enumeration() + return new Enumeration<Object>() { + @Override public boolean hasMoreElements() { return false; } + @Override public Object nextElement() { throw new java.util.NoSuchElementException(); @@ -45,36 +48,43 @@ public class TreeNodeBase implements javax.swing.tree.TreeNode, TreeCellRenderer }; } + @Override public boolean getAllowsChildren() { return false; } + @Override public javax.swing.tree.TreeNode getChildAt(int childIndex) { return null; } + @Override public int getChildCount() { return 0; } + @Override public int getIndex(javax.swing.tree.TreeNode node) { return -1; } + @Override public javax.swing.tree.TreeNode getParent() { return _parent; } + @Override public boolean isLeaf() { return true; } + @Override public Component getTreeCellRendererComponent( JTree tree, Object value, @@ -87,6 +97,7 @@ public class TreeNodeBase implements javax.swing.tree.TreeNode, TreeCellRenderer return null; } + @Override public String toString() { return _id; @@ -161,7 +172,7 @@ public class TreeNodeBase implements javax.swing.tree.TreeNode, TreeCellRenderer protected boolean insertSortedChild(TreeNodeBase newChild, java.util.List c, DefaultTreeModel treeModel) { @SuppressWarnings("unchecked") - java.util.List<TreeNodeBase> children = (java.util.List<TreeNodeBase>)c; + java.util.List<TreeNodeBase> children = c; String id = newChild.getId(); int i; @@ -190,9 +201,9 @@ public class TreeNodeBase implements javax.swing.tree.TreeNode, TreeCellRenderer protected String insertSortedChildren(java.util.List nc, java.util.List ic, DefaultTreeModel treeModel) { @SuppressWarnings("unchecked") - java.util.List<TreeNodeBase> newChildren = (java.util.List<TreeNodeBase>)nc; + java.util.List<TreeNodeBase> newChildren = nc; @SuppressWarnings("unchecked") - java.util.List<TreeNodeBase> intoChildren = (java.util.List<TreeNodeBase>)ic; + java.util.List<TreeNodeBase> intoChildren = ic; TreeNodeBase[] children = newChildren.toArray(new TreeNodeBase[0]); java.util.Arrays.sort(children, _childComparator); @@ -266,7 +277,7 @@ public class TreeNodeBase implements javax.swing.tree.TreeNode, TreeCellRenderer protected void removeSortedChildren(String[] childIds, java.util.List fc, DefaultTreeModel treeModel) { @SuppressWarnings("unchecked") - java.util.List<TreeNodeBase> fromChildren = (java.util.List<TreeNodeBase>)fc; + java.util.List<TreeNodeBase> fromChildren = fc; if(childIds.length == 0) { @@ -274,7 +285,7 @@ public class TreeNodeBase implements javax.swing.tree.TreeNode, TreeCellRenderer } assert fromChildren.size() > 0; - String[] ids = (String[])childIds.clone(); + String[] ids = childIds.clone(); java.util.Arrays.sort(ids); Object[] childrenToRemove = new Object[ids.length]; @@ -311,7 +322,7 @@ public class TreeNodeBase implements javax.swing.tree.TreeNode, TreeCellRenderer protected void childrenChanged(java.util.List c, DefaultTreeModel treeModel) { @SuppressWarnings("unchecked") - java.util.List<TreeNodeBase> children = (java.util.List<TreeNodeBase>)c; + java.util.List<TreeNodeBase> children = c; for(TreeNodeBase child : children) { @@ -329,7 +340,7 @@ public class TreeNodeBase implements javax.swing.tree.TreeNode, TreeCellRenderer protected TreeNodeBase find(String id, java.util.List il) { @SuppressWarnings("unchecked") - java.util.List<TreeNodeBase> inList = (java.util.List<TreeNodeBase>)il; + java.util.List<TreeNodeBase> inList = il; for(TreeNodeBase node : inList) { @@ -346,6 +357,7 @@ public class TreeNodeBase implements javax.swing.tree.TreeNode, TreeCellRenderer protected java.util.Comparator<TreeNodeBase> _childComparator = new java.util.Comparator<TreeNodeBase>() { + @Override public int compare(TreeNodeBase o1, TreeNodeBase o2) { return o1.getId().compareTo(o2.getId()); diff --git a/java/src/IceGridGUI/Utils.java b/java/src/IceGridGUI/Utils.java index 3cb5cc24231..3126875cb96 100644 --- a/java/src/IceGridGUI/Utils.java +++ b/java/src/IceGridGUI/Utils.java @@ -71,6 +71,7 @@ public class Utils dialog.getRootPane().registerKeyboardAction( new ActionListener() { + @Override public void actionPerformed(ActionEvent e) { dialog.dispose(); @@ -209,6 +210,7 @@ public class Utils Stringifier stringifier = new Stringifier() { + @Override public String toString(Object obj) { return (String)obj; @@ -231,6 +233,7 @@ public class Utils { Stringifier stringifier = new Stringifier() { + @Override public String toString(Object obj) { @SuppressWarnings("unchecked") |