diff options
author | Joe George <joe@zeroc.com> | 2017-06-07 16:39:31 -0400 |
---|---|---|
committer | Joe George <joe@zeroc.com> | 2017-06-07 16:39:31 -0400 |
commit | 2fb970cdea450b15b5f7d74099246b6abef16857 (patch) | |
tree | ac0fdf40cff12d1cba313e20da757671cbdeeebd /java-compat/src | |
parent | Remove trailing whitespace (diff) | |
download | ice-2fb970cdea450b15b5f7d74099246b6abef16857.tar.bz2 ice-2fb970cdea450b15b5f7d74099246b6abef16857.tar.xz ice-2fb970cdea450b15b5f7d74099246b6abef16857.zip |
Remove excessive empty lines
Diffstat (limited to 'java-compat/src')
13 files changed, 0 insertions, 15 deletions
diff --git a/java-compat/src/Ice/src/main/java/Ice/CommunicatorI.java b/java-compat/src/Ice/src/main/java/Ice/CommunicatorI.java index 102deb2e229..1bfa8fd1c3b 100644 --- a/java-compat/src/Ice/src/main/java/Ice/CommunicatorI.java +++ b/java-compat/src/Ice/src/main/java/Ice/CommunicatorI.java @@ -301,7 +301,6 @@ public final class CommunicatorI implements Communicator ri.waitForResponseOrUserEx(); } - @Override public ObjectPrx createAdmin(ObjectAdapter adminAdapter, Identity adminId) diff --git a/java-compat/src/Ice/src/main/java/Ice/LoggerI.java b/java-compat/src/Ice/src/main/java/Ice/LoggerI.java index bb650553fe7..999c8ce5405 100644 --- a/java-compat/src/Ice/src/main/java/Ice/LoggerI.java +++ b/java-compat/src/Ice/src/main/java/Ice/LoggerI.java @@ -108,7 +108,6 @@ public class LoggerI implements Logger write(s, true); } - @Override public String getPrefix() diff --git a/java-compat/src/Ice/src/main/java/Ice/ObjectAdapterI.java b/java-compat/src/Ice/src/main/java/Ice/ObjectAdapterI.java index 2e817cf9bff..98cd90ca3d6 100644 --- a/java-compat/src/Ice/src/main/java/Ice/ObjectAdapterI.java +++ b/java-compat/src/Ice/src/main/java/Ice/ObjectAdapterI.java @@ -160,7 +160,6 @@ public final class ObjectAdapterI implements ObjectAdapter } } - @Override public void deactivate() @@ -705,7 +704,6 @@ public final class ObjectAdapterI implements ObjectAdapter } } - public boolean isLocal(ObjectPrx proxy) { diff --git a/java-compat/src/Ice/src/main/java/Ice/SysLoggerI.java b/java-compat/src/Ice/src/main/java/Ice/SysLoggerI.java index 672ed9cae1c..eac20878110 100644 --- a/java-compat/src/Ice/src/main/java/Ice/SysLoggerI.java +++ b/java-compat/src/Ice/src/main/java/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-compat/src/Ice/src/main/java/IceInternal/FactoryACMMonitor.java b/java-compat/src/Ice/src/main/java/IceInternal/FactoryACMMonitor.java index 44da4fcf3dc..f9ebb993713 100644 --- a/java-compat/src/Ice/src/main/java/IceInternal/FactoryACMMonitor.java +++ b/java-compat/src/Ice/src/main/java/IceInternal/FactoryACMMonitor.java @@ -192,7 +192,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-compat/src/Ice/src/main/java/IceInternal/IPEndpointI.java b/java-compat/src/Ice/src/main/java/IceInternal/IPEndpointI.java index e67a02ff611..62275da0227 100644 --- a/java-compat/src/Ice/src/main/java/IceInternal/IPEndpointI.java +++ b/java-compat/src/Ice/src/main/java/IceInternal/IPEndpointI.java @@ -159,7 +159,6 @@ public abstract class IPEndpointI extends EndpointI _instance.preferIPv6(), true); - java.util.ArrayList<EndpointI> endpoints = new java.util.ArrayList<>(); if(addresses.size() == 1) { diff --git a/java-compat/src/Ice/src/main/java/IceInternal/LoggerAdminI.java b/java-compat/src/Ice/src/main/java/IceInternal/LoggerAdminI.java index fc9a6120dd6..685d5bb20df 100644 --- a/java-compat/src/Ice/src/main/java/IceInternal/LoggerAdminI.java +++ b/java-compat/src/Ice/src/main/java/IceInternal/LoggerAdminI.java @@ -166,7 +166,6 @@ final class LoggerAdminI extends Ice._LoggerAdminDisp return logMessages.toArray(new Ice.LogMessage[0]); } - LoggerAdminI(Ice.Properties props, LoggerAdminLoggerI logger) { _maxLogCount = props.getPropertyAsIntWithDefault("Ice.Admin.Logger.KeepLogs", 100); @@ -420,7 +419,6 @@ final class LoggerAdminI extends Ice._LoggerAdminDisp return Ice.Util.initialize(initData); } - private final java.util.List<Ice.LogMessage> _queue = new java.util.LinkedList<Ice.LogMessage>(); private int _logCount = 0; // non-trace messages private final int _maxLogCount; diff --git a/java-compat/src/Ice/src/main/java/IceInternal/ObjectAdapterFactory.java b/java-compat/src/Ice/src/main/java/IceInternal/ObjectAdapterFactory.java index c73ca6d4cdb..3ded667ea44 100644 --- a/java-compat/src/Ice/src/main/java/IceInternal/ObjectAdapterFactory.java +++ b/java-compat/src/Ice/src/main/java/IceInternal/ObjectAdapterFactory.java @@ -46,7 +46,6 @@ public final class ObjectAdapterFactory } } - public void waitForShutdown() { diff --git a/java-compat/src/Ice/src/main/java/IceInternal/PropertyNames.java b/java-compat/src/Ice/src/main/java/IceInternal/PropertyNames.java index b9145e5445f..316c60073be 100644 --- a/java-compat/src/Ice/src/main/java/IceInternal/PropertyNames.java +++ b/java-compat/src/Ice/src/main/java/IceInternal/PropertyNames.java @@ -1296,7 +1296,6 @@ public final class PropertyNames null }; - public static final Property[] validProps[] = { IceProps, diff --git a/java-compat/src/Ice/src/main/java/IceSSL/SSLEngine.java b/java-compat/src/Ice/src/main/java/IceSSL/SSLEngine.java index 70f7152dc9e..234f8fd83fe 100644 --- a/java-compat/src/Ice/src/main/java/IceSSL/SSLEngine.java +++ b/java-compat/src/Ice/src/main/java/IceSSL/SSLEngine.java @@ -836,7 +836,6 @@ class SSLEngine } } - if(incoming) { if(_verifyPeer == 0) diff --git a/java-compat/src/Ice/src/main/java/IceUtilInternal/Options.java b/java-compat/src/Ice/src/main/java/IceUtilInternal/Options.java index 68d3a7a95da..4c60ce1d92f 100644 --- a/java-compat/src/Ice/src/main/java/IceUtilInternal/Options.java +++ b/java-compat/src/Ice/src/main/java/IceUtilInternal/Options.java @@ -399,5 +399,4 @@ public final class Options return vec.toArray(new String[0]); } - } diff --git a/java-compat/src/Ice/src/main/java/IceUtilInternal/StringUtil.java b/java-compat/src/Ice/src/main/java/IceUtilInternal/StringUtil.java index b5f4322d2c5..b7607fa2b67 100644 --- a/java-compat/src/Ice/src/main/java/IceUtilInternal/StringUtil.java +++ b/java-compat/src/Ice/src/main/java/IceUtilInternal/StringUtil.java @@ -587,7 +587,6 @@ public final class StringUtil } } - // // Join a list of strings using the given delimiter. // diff --git a/java-compat/src/IceBox/src/main/java/IceBox/ServiceManagerI.java b/java-compat/src/IceBox/src/main/java/IceBox/ServiceManagerI.java index a5d621d8ca4..ecbf8360ecb 100644 --- a/java-compat/src/IceBox/src/main/java/IceBox/ServiceManagerI.java +++ b/java-compat/src/IceBox/src/main/java/IceBox/ServiceManagerI.java @@ -1162,7 +1162,6 @@ public class ServiceManagerI extends _ServiceManagerDisp } } - private Ice.Communicator _communicator; private boolean _adminEnabled = false; private java.util.Set<String> _adminFacetFilter; |