diff options
Diffstat (limited to 'java/src')
29 files changed, 0 insertions, 53 deletions
diff --git a/java/src/Glacier2/src/main/java/com/zeroc/Glacier2/Application.java b/java/src/Glacier2/src/main/java/com/zeroc/Glacier2/Application.java index 464f0ca7e01..09e0de80884 100644 --- a/java/src/Glacier2/src/main/java/com/zeroc/Glacier2/Application.java +++ b/java/src/Glacier2/src/main/java/com/zeroc/Glacier2/Application.java @@ -107,7 +107,6 @@ public abstract class Application extends com.zeroc.Ice.Application public abstract int runWithSession(String[] args) throws RestartSessionException; - /** * Called when the session refresh thread detects that the session has been * destroyed. A subclass can override this method to take action after the diff --git a/java/src/Ice/src/main/java/com/zeroc/Ice/LoggerI.java b/java/src/Ice/src/main/java/com/zeroc/Ice/LoggerI.java index 62de4757b52..a8cb8af9ca9 100644 --- a/java/src/Ice/src/main/java/com/zeroc/Ice/LoggerI.java +++ b/java/src/Ice/src/main/java/com/zeroc/Ice/LoggerI.java @@ -108,7 +108,6 @@ public class LoggerI implements Logger write(s, true); } - @Override public String getPrefix() diff --git a/java/src/Ice/src/main/java/com/zeroc/Ice/ObjectAdapterI.java b/java/src/Ice/src/main/java/com/zeroc/Ice/ObjectAdapterI.java index 3b9dfd5343f..d7ff266e1ba 100644 --- a/java/src/Ice/src/main/java/com/zeroc/Ice/ObjectAdapterI.java +++ b/java/src/Ice/src/main/java/com/zeroc/Ice/ObjectAdapterI.java @@ -161,7 +161,6 @@ public final class ObjectAdapterI implements ObjectAdapter } } - @Override public void deactivate() diff --git a/java/src/Ice/src/main/java/com/zeroc/Ice/SysLoggerI.java b/java/src/Ice/src/main/java/com/zeroc/Ice/SysLoggerI.java index 13a905c7a49..2ba7b74c17c 100644 --- a/java/src/Ice/src/main/java/com/zeroc/Ice/SysLoggerI.java +++ b/java/src/Ice/src/main/java/com/zeroc/Ice/SysLoggerI.java @@ -163,7 +163,6 @@ public final class SysLoggerI implements Logger log(LOG_ERR, message); } - @Override public String getPrefix() diff --git a/java/src/Ice/src/main/java/com/zeroc/IceInternal/FactoryACMMonitor.java b/java/src/Ice/src/main/java/com/zeroc/IceInternal/FactoryACMMonitor.java index f6c1bfd1780..d952e567fea 100644 --- a/java/src/Ice/src/main/java/com/zeroc/IceInternal/FactoryACMMonitor.java +++ b/java/src/Ice/src/main/java/com/zeroc/IceInternal/FactoryACMMonitor.java @@ -189,7 +189,6 @@ class FactoryACMMonitor implements ACMMonitor } } - // // Monitor connections outside the thread synchronization, so // that connections can be added or removed during monitoring. diff --git a/java/src/Ice/src/main/java/com/zeroc/IceInternal/LoggerAdminI.java b/java/src/Ice/src/main/java/com/zeroc/IceInternal/LoggerAdminI.java index ce022cfa077..e9defaf1a1e 100644 --- a/java/src/Ice/src/main/java/com/zeroc/IceInternal/LoggerAdminI.java +++ b/java/src/Ice/src/main/java/com/zeroc/IceInternal/LoggerAdminI.java @@ -428,7 +428,6 @@ final class LoggerAdminI implements com.zeroc.Ice.LoggerAdmin return com.zeroc.Ice.Util.initialize(initData); } - private final java.util.List<LogMessage> _queue = new java.util.LinkedList<>(); private int _logCount = 0; // non-trace messages private final int _maxLogCount; diff --git a/java/src/Ice/src/main/java/com/zeroc/IceInternal/ObjectAdapterFactory.java b/java/src/Ice/src/main/java/com/zeroc/IceInternal/ObjectAdapterFactory.java index a9dd79f9dbb..a012ddee995 100644 --- a/java/src/Ice/src/main/java/com/zeroc/IceInternal/ObjectAdapterFactory.java +++ b/java/src/Ice/src/main/java/com/zeroc/IceInternal/ObjectAdapterFactory.java @@ -49,7 +49,6 @@ public final class ObjectAdapterFactory } } - public void waitForShutdown() { diff --git a/java/src/Ice/src/main/java/com/zeroc/IceInternal/PropertyNames.java b/java/src/Ice/src/main/java/com/zeroc/IceInternal/PropertyNames.java index 0747c9632ab..ee67ab7c1f0 100644 --- a/java/src/Ice/src/main/java/com/zeroc/IceInternal/PropertyNames.java +++ b/java/src/Ice/src/main/java/com/zeroc/IceInternal/PropertyNames.java @@ -1296,7 +1296,6 @@ public final class PropertyNames null }; - public static final Property[] validProps[] = { IceProps, diff --git a/java/src/Ice/src/main/java/com/zeroc/IceUtilInternal/Options.java b/java/src/Ice/src/main/java/com/zeroc/IceUtilInternal/Options.java index a8858b6e453..f3887f4aa68 100644 --- a/java/src/Ice/src/main/java/com/zeroc/IceUtilInternal/Options.java +++ b/java/src/Ice/src/main/java/com/zeroc/IceUtilInternal/Options.java @@ -401,5 +401,4 @@ public final class Options return vec.toArray(new String[0]); } - } diff --git a/java/src/IceBox/src/main/java/com/zeroc/IceBox/ServiceManagerI.java b/java/src/IceBox/src/main/java/com/zeroc/IceBox/ServiceManagerI.java index 703a0de30ac..e42e5778970 100644 --- a/java/src/IceBox/src/main/java/com/zeroc/IceBox/ServiceManagerI.java +++ b/java/src/IceBox/src/main/java/com/zeroc/IceBox/ServiceManagerI.java @@ -1151,7 +1151,6 @@ public class ServiceManagerI implements ServiceManager } } - private com.zeroc.Ice.Communicator _communicator; private boolean _adminEnabled = false; private java.util.Set<String> _adminFacetFilter; diff --git a/java/src/IceDiscovery/src/main/java/com/zeroc/IceDiscovery/LookupI.java b/java/src/IceDiscovery/src/main/java/com/zeroc/IceDiscovery/LookupI.java index 0de78d3215b..f223bfd87b4 100644 --- a/java/src/IceDiscovery/src/main/java/com/zeroc/IceDiscovery/LookupI.java +++ b/java/src/IceDiscovery/src/main/java/com/zeroc/IceDiscovery/LookupI.java @@ -423,7 +423,6 @@ class LookupI implements Lookup _objectRequests.remove(request.getId()); } - synchronized void objectRequestException(ObjectRequest request, Throwable ex) { ObjectRequest r = _objectRequests.get(request.getId()); diff --git a/java/src/IceGridGUI/javafx.gradle b/java/src/IceGridGUI/javafx.gradle index 02ff58f7685..51d0e29f4dc 100644 --- a/java/src/IceGridGUI/javafx.gradle +++ b/java/src/IceGridGUI/javafx.gradle @@ -45,7 +45,6 @@ jar { ant, 'javafx:com.sun.javafx.tools.ant') - ant.taskdef( resource: 'com/sun/javafx/tools/ant/antlib.xml', uri: 'javafx:com.sun.javafx.tools.ant', diff --git a/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/PropertySet.java b/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/PropertySet.java index 83a17458385..cf21ba56c8a 100644 --- a/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/PropertySet.java +++ b/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/PropertySet.java @@ -203,7 +203,6 @@ class PropertySet extends TreeNode rebuild(descriptor); } - PropertySet(TreeNode parent, String id, PropertySetDescriptor descriptor) { super(parent, id); diff --git a/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/Root.java b/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/Root.java index 94567611517..c8dcd0f72d8 100644 --- a/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/Root.java +++ b/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/Root.java @@ -42,7 +42,6 @@ public class Root extends ListTreeNode _file = file; _live = live; - init(); } diff --git a/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/ServerSubEditor.java b/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/ServerSubEditor.java index 557380f5514..ef3d91d253d 100644 --- a/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/ServerSubEditor.java +++ b/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Application/ServerSubEditor.java @@ -96,7 +96,6 @@ class ServerSubEditor extends CommunicatorSubEditor + "of this server can only be allocated by one session at a time.</html>"); _allocatable = new JCheckBox(allocatable); - Action appDistrib = new AbstractAction("Depends on the application distribution") { @Override diff --git a/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/ApplicationActions.java b/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/ApplicationActions.java index eed4a719183..0e31b5a25d3 100644 --- a/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/ApplicationActions.java +++ b/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/ApplicationActions.java @@ -145,7 +145,6 @@ public class ApplicationActions } }; - _array[TreeNode.NEW_SERVICE] = new AbstractAction(popup ? "New Service" : "Service") { @Override @@ -196,7 +195,6 @@ public class ApplicationActions } }; - _array[TreeNode.NEW_TEMPLATE_SERVICE] = new AbstractAction(popup ? "New Service Template" : "Service Template") { @Override diff --git a/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Coordinator.java b/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Coordinator.java index e5b95df54e0..a2af720198b 100644 --- a/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Coordinator.java +++ b/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/Coordinator.java @@ -2842,7 +2842,6 @@ public class Coordinator _saveToRegistry.setEnabled(false); _saveToRegistry.putValue(Action.SHORT_DESCRIPTION, "Save to registry (servers may restart)"); - _saveToRegistryWithoutRestart = new AbstractAction("Save to Registry (No server restart)") { @Override diff --git a/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveActions.java b/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveActions.java index 4c11c6fd4b8..9485198a63c 100644 --- a/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveActions.java +++ b/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveActions.java @@ -85,7 +85,6 @@ public class LiveActions }; _array[TreeNode.STOP].putValue(Action.SHORT_DESCRIPTION, "Stop this server or service"); - _array[TreeNode.ENABLE] = new AbstractAction("Enable", Utils.getIcon("/icons/16x16/enable.png")) { @Override @@ -124,7 +123,6 @@ public class LiveActions }; _array[TreeNode.WRITE_MESSAGE].putValue(Action.SHORT_DESCRIPTION, "Write message to stdout or stderr"); - _array[TreeNode.RETRIEVE_ICE_LOG] = new AbstractAction("Retrieve Ice log") { @Override @@ -135,7 +133,6 @@ public class LiveActions }; _array[TreeNode.RETRIEVE_ICE_LOG].putValue(Action.SHORT_DESCRIPTION, "Attach RemoteLogger to Ice logger"); - _array[TreeNode.RETRIEVE_STDOUT] = new AbstractAction("Retrieve stdout") { @Override diff --git a/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/Communicator.java b/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/Communicator.java index 1230d77dcb6..cfd2c686c69 100644 --- a/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/Communicator.java +++ b/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/Communicator.java @@ -145,7 +145,6 @@ abstract public class Communicator extends TreeNode return true; } - // // TreeNode overrides // @@ -296,7 +295,6 @@ abstract public class Communicator extends TreeNode } protected abstract String getDefaultFileName(); - private boolean provideAdmin(final String prefix, final java.util.function.Consumer<com.zeroc.Ice.ObjectPrx> consumer) { getRoot().getCoordinator().getStatusBar().setText(prefix); diff --git a/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/CommunicatorEditor.java b/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/CommunicatorEditor.java index 87d28223f31..c45d2a1f287 100644 --- a/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/CommunicatorEditor.java +++ b/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/CommunicatorEditor.java @@ -80,7 +80,6 @@ class CommunicatorEditor extends Editor _refreshButton.setEnabled(true); } - void setRuntimeProperties(java.util.SortedMap<String, String> map, Communicator communicator) { if(communicator == _target) diff --git a/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/GraphView.java b/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/GraphView.java index a9fdb990489..0b695187ef3 100644 --- a/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/GraphView.java +++ b/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/GraphView.java @@ -1695,7 +1695,6 @@ public class GraphView extends JFrame implements MetricsFieldContext, Coordinato "Metrics Name", "Metrics Id", "Metrics Field", "Scale", "Last", "Average", "Minimum", "Maximum", "Color"}; - // // The metrics view being graph // diff --git a/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/Node.java b/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/Node.java index 417c4ed554e..78330548850 100755 --- a/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/Node.java +++ b/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/Node.java @@ -209,7 +209,6 @@ class Node extends Communicator return _cellRenderer.getTreeCellRendererComponent(tree, value, sel, expanded, leaf, row, hasFocus); } - // // Implement Communicator abstract methods // diff --git a/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/RegistryEditor.java b/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/RegistryEditor.java index e0195f53cb7..2d2370ac26e 100644 --- a/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/RegistryEditor.java +++ b/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/RegistryEditor.java @@ -159,7 +159,6 @@ class RegistryEditor extends CommunicatorEditor } }); - Action deleteObject = new AbstractAction("Remove selected object") { @Override diff --git a/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/Server.java b/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/Server.java index 7b6891daf07..dcfadc2b53c 100755 --- a/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/Server.java +++ b/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/Server.java @@ -1001,7 +1001,6 @@ public class Server extends Communicator serverInstancePSDescriptor)); } - // // Implement Communicator abstract methods // diff --git a/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/Service.java b/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/Service.java index c6a4b29e0a3..8ae6388eb2c 100755 --- a/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/Service.java +++ b/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/Service.java @@ -239,7 +239,6 @@ public class Service extends Communicator return _popup; } - // // Implement Communicator abstract methods // diff --git a/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/ShowIceLogDialog.java b/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/ShowIceLogDialog.java index adad4109f50..3f4b6ace903 100755 --- a/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/ShowIceLogDialog.java +++ b/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/LiveDeployment/ShowIceLogDialog.java @@ -650,7 +650,6 @@ class ShowIceLogDialog extends JDialog _remoteLoggerPrx = RemoteLoggerPrx.uncheckedCast( _parent.getRoot().getCoordinator().addCallback(_remoteLogger, id, "")); - final String prefix = "Attaching remote logger to " + _loggerAdmin.ice_getIdentity().name + "..."; final String errorTitle = "Failed to attach remote logger to " + _loggerAdmin.ice_getIdentity().name; _parent.getRoot().getCoordinator().getStatusBar().setText(prefix); diff --git a/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/SessionKeeper.java b/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/SessionKeeper.java index f077179d86c..2e8387868d0 100644 --- a/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/SessionKeeper.java +++ b/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/SessionKeeper.java @@ -1028,7 +1028,6 @@ public class SessionKeeper private boolean _isDefault; } - // // FocusListener implementation that unselect the text // of a text component after focus gained. @@ -1234,7 +1233,6 @@ public class SessionKeeper } }); - _directDiscoveryLocatorList.addListSelectionListener(new ListSelectionListener() { @Override @@ -4742,7 +4740,6 @@ public class SessionKeeper Container contentPane = getContentPane(); contentPane.setLayout(new BoxLayout(contentPane, BoxLayout.Y_AXIS)); - FormLayout layout = new FormLayout("pref:grow", ""); DefaultFormBuilder builder = new DefaultFormBuilder(layout); builder.border(Borders.DIALOG); diff --git a/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/SimpleInternalFrame.java b/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/SimpleInternalFrame.java index 860e203da78..e2bf584edef 100644 --- a/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/SimpleInternalFrame.java +++ b/java/src/IceGridGUI/src/main/java/com/zeroc/IceGridGUI/SimpleInternalFrame.java @@ -70,7 +70,6 @@ public class SimpleInternalFrame extends JPanel { private JPanel headerPanel; private boolean selected; - // Instance Creation **************************************************** /** @@ -84,7 +83,6 @@ public class SimpleInternalFrame extends JPanel { this(null, title, null, null); } - /** * Constructs a SimpleInternalFrame with the specified * icon, and title. @@ -96,7 +94,6 @@ public class SimpleInternalFrame extends JPanel { this(icon, title, null, null); } - /** * Constructs a SimpleInternalFrame with the specified * title, tool bar, and content panel. @@ -109,7 +106,6 @@ public class SimpleInternalFrame extends JPanel { this(null, title, bar, content); } - /** * Constructs a SimpleInternalFrame with the specified * icon, title, tool bar, and content panel. @@ -138,7 +134,6 @@ public class SimpleInternalFrame extends JPanel { updateHeader(); } - // Public API *********************************************************** /** @@ -150,7 +145,6 @@ public class SimpleInternalFrame extends JPanel { return titleLabel.getIcon(); } - /** * Sets a new frame icon. * @@ -162,7 +156,6 @@ public class SimpleInternalFrame extends JPanel { firePropertyChange("frameIcon", oldIcon, newIcon); } - /** * Returns the frame's title text. * * @return String the current title text */ @@ -174,8 +167,6 @@ public class SimpleInternalFrame extends JPanel { return titleLabel; } - - /** * Sets a new title text. * * @param newText the title text tp be set */ @@ -185,7 +176,6 @@ public class SimpleInternalFrame extends JPanel { firePropertyChange("title", oldText, newText); } - /** * Returns the current toolbar, null if none has been set before. * @@ -197,7 +187,6 @@ public class SimpleInternalFrame extends JPanel { : null; } - /** * Sets a new tool bar in the header. * @@ -219,7 +208,6 @@ public class SimpleInternalFrame extends JPanel { firePropertyChange("toolBar", oldToolBar, newToolBar); } - /** * Returns the content - null, if none has been set. * * @return the current content */ @@ -227,7 +215,6 @@ public class SimpleInternalFrame extends JPanel { return hasContent() ? getComponent(1) : null; } - /** * Sets a new panel content; replaces any existing content, if existing. * * @param newContent the panel's new content */ @@ -240,7 +227,6 @@ public class SimpleInternalFrame extends JPanel { firePropertyChange("content", oldContent, newContent); } - /** * Answers if the panel is currently selected (or in other words active) * or not. In the selected state, the header background will be @@ -253,7 +239,6 @@ public class SimpleInternalFrame extends JPanel { return selected; } - /** * This panel draws its title bar differently if it is selected, * which may be used to indicate to the user that this panel @@ -270,7 +255,6 @@ public class SimpleInternalFrame extends JPanel { firePropertyChange("selected", oldValue, newValue); } - // Building ************************************************************* /** @@ -314,7 +298,6 @@ public class SimpleInternalFrame extends JPanel { headerPanel.repaint(); } - /** * Updates the UI. In addition to the superclass behavior, we need * to update the header component. @@ -327,7 +310,6 @@ public class SimpleInternalFrame extends JPanel { } } - // Helper Code ********************************************************** /** @@ -381,7 +363,6 @@ public class SimpleInternalFrame extends JPanel { : UIManager.getColor("InternalFrame.activeTitleBackground"); } - // Helper Classes ******************************************************* // A custom border for the raised header pseudo 3D effect. diff --git a/java/src/IceSSL/src/main/java/com/zeroc/IceSSL/SSLEngine.java b/java/src/IceSSL/src/main/java/com/zeroc/IceSSL/SSLEngine.java index da0ba6d11d0..1482811dc62 100644 --- a/java/src/IceSSL/src/main/java/com/zeroc/IceSSL/SSLEngine.java +++ b/java/src/IceSSL/src/main/java/com/zeroc/IceSSL/SSLEngine.java @@ -842,7 +842,6 @@ class SSLEngine } } - if(incoming) { if(_verifyPeer == 0) |