diff options
41 files changed, 143 insertions, 195 deletions
diff --git a/java/src/Freeze/BackgroundSaveEvictorI.java b/java/src/Freeze/BackgroundSaveEvictorI.java index e5accc6bc79..c83a5de951f 100644 --- a/java/src/Freeze/BackgroundSaveEvictorI.java +++ b/java/src/Freeze/BackgroundSaveEvictorI.java @@ -301,7 +301,7 @@ class BackgroundSaveEvictorI extends EvictorI implements BackgroundSaveEvictor, ex.id = _communicator.identityToString(ident); if(facet.length() > 0) { - ex.id += " -f " + IceUtil.StringUtil.escapeString(facet, ""); + ex.id += " -f " + IceUtilInternal.StringUtil.escapeString(facet, ""); } throw ex; } @@ -443,7 +443,7 @@ class BackgroundSaveEvictorI extends EvictorI implements BackgroundSaveEvictor, ex.id = _communicator.identityToString(ident); if(facet.length() > 0) { - ex.id += " -f " + IceUtil.StringUtil.escapeString(facet, ""); + ex.id += " -f " + IceUtilInternal.StringUtil.escapeString(facet, ""); } throw ex; } @@ -561,7 +561,7 @@ class BackgroundSaveEvictorI extends EvictorI implements BackgroundSaveEvictor, ex.id = _communicator.identityToString(ident); if(facet.length() > 0) { - ex.id += " -f " + IceUtil.StringUtil.escapeString(facet, ""); + ex.id += " -f " + IceUtilInternal.StringUtil.escapeString(facet, ""); } throw ex; } @@ -634,7 +634,7 @@ class BackgroundSaveEvictorI extends EvictorI implements BackgroundSaveEvictor, ex.id = _communicator.identityToString(ident); if(facet.length() > 0) { - ex.id += " -f " + IceUtil.StringUtil.escapeString(facet, ""); + ex.id += " -f " + IceUtilInternal.StringUtil.escapeString(facet, ""); } throw ex; diff --git a/java/src/Freeze/TransactionalEvictorI.java b/java/src/Freeze/TransactionalEvictorI.java index fb17e6e3d7f..c81ada3d59c 100644 --- a/java/src/Freeze/TransactionalEvictorI.java +++ b/java/src/Freeze/TransactionalEvictorI.java @@ -85,7 +85,7 @@ class TransactionalEvictorI extends EvictorI implements TransactionalEvictor ex.id = _communicator.identityToString(ident); if(facet.length() > 0) { - ex.id += " -f " + IceUtil.StringUtil.escapeString(facet, ""); + ex.id += " -f " + IceUtilInternal.StringUtil.escapeString(facet, ""); } throw ex; } @@ -172,7 +172,7 @@ class TransactionalEvictorI extends EvictorI implements TransactionalEvictor ex.id = _communicator.identityToString(ident); if(facet.length() > 0) { - ex.id += " -f " + IceUtil.StringUtil.escapeString(facet, ""); + ex.id += " -f " + IceUtilInternal.StringUtil.escapeString(facet, ""); } throw ex; } diff --git a/java/src/Ice/ConnectionI.java b/java/src/Ice/ConnectionI.java index 958f999f0b9..fbacaf96d79 100644 --- a/java/src/Ice/ConnectionI.java +++ b/java/src/Ice/ConnectionI.java @@ -1485,14 +1485,14 @@ public final class ConnectionI extends IceInternal.EventHandler finalize() throws Throwable { - IceUtil.Assert.FinalizerAssert(_startCallback == null); - IceUtil.Assert.FinalizerAssert(_state == StateClosed); - IceUtil.Assert.FinalizerAssert(_transceiver == null); - IceUtil.Assert.FinalizerAssert(_dispatchCount == 0); - IceUtil.Assert.FinalizerAssert(_thread == null); - IceUtil.Assert.FinalizerAssert(_queuedStreams.isEmpty()); - IceUtil.Assert.FinalizerAssert(_requests.isEmpty()); - IceUtil.Assert.FinalizerAssert(_asyncRequests.isEmpty()); + IceUtilInternal.Assert.FinalizerAssert(_startCallback == null); + IceUtilInternal.Assert.FinalizerAssert(_state == StateClosed); + IceUtilInternal.Assert.FinalizerAssert(_transceiver == null); + IceUtilInternal.Assert.FinalizerAssert(_dispatchCount == 0); + IceUtilInternal.Assert.FinalizerAssert(_thread == null); + IceUtilInternal.Assert.FinalizerAssert(_queuedStreams.isEmpty()); + IceUtilInternal.Assert.FinalizerAssert(_requests.isEmpty()); + IceUtilInternal.Assert.FinalizerAssert(_asyncRequests.isEmpty()); super.finalize(); } diff --git a/java/src/Ice/LocalException.java b/java/src/Ice/LocalException.java index c139af66b7a..25bcd255d53 100644 --- a/java/src/Ice/LocalException.java +++ b/java/src/Ice/LocalException.java @@ -33,7 +33,7 @@ public abstract class LocalException extends RuntimeException implements Cloneab { java.io.StringWriter sw = new java.io.StringWriter(); java.io.PrintWriter pw = new java.io.PrintWriter(sw); - IceUtil.OutputBase out = new IceUtil.OutputBase(pw); + IceUtilInternal.OutputBase out = new IceUtilInternal.OutputBase(pw); out.setUseTab(false); out.print(getClass().getName()); out.inc(); diff --git a/java/src/Ice/ObjectAdapterI.java b/java/src/Ice/ObjectAdapterI.java index 38bcab3e208..886880f54ca 100644 --- a/java/src/Ice/ObjectAdapterI.java +++ b/java/src/Ice/ObjectAdapterI.java @@ -997,12 +997,12 @@ public final class ObjectAdapterI implements ObjectAdapter } else { - IceUtil.Assert.FinalizerAssert(_threadPool == null); - //IceUtil.Assert.FinalizerAssert(_servantManager == null); // Not cleared, it needs to be immutable. - IceUtil.Assert.FinalizerAssert(_communicator == null); - IceUtil.Assert.FinalizerAssert(_incomingConnectionFactories == null); - IceUtil.Assert.FinalizerAssert(_directCount == 0); - IceUtil.Assert.FinalizerAssert(!_waitForActivate); + IceUtilInternal.Assert.FinalizerAssert(_threadPool == null); + //IceUtilInternal.Assert.FinalizerAssert(_servantManager == null); // Not cleared, it needs to be immutable. + IceUtilInternal.Assert.FinalizerAssert(_communicator == null); + IceUtilInternal.Assert.FinalizerAssert(_incomingConnectionFactories == null); + IceUtilInternal.Assert.FinalizerAssert(_directCount == 0); + IceUtilInternal.Assert.FinalizerAssert(!_waitForActivate); } super.finalize(); @@ -1117,7 +1117,7 @@ public final class ObjectAdapterI implements ObjectAdapter java.util.ArrayList endpoints = new java.util.ArrayList(); while(end < endpts.length()) { - beg = IceUtil.StringUtil.findFirstNotOf(endpts, delim, end); + beg = IceUtilInternal.StringUtil.findFirstNotOf(endpts, delim, end); if(beg == -1) { break; diff --git a/java/src/Ice/SystemException.java b/java/src/Ice/SystemException.java index 40bddded409..aef0871085c 100644 --- a/java/src/Ice/SystemException.java +++ b/java/src/Ice/SystemException.java @@ -33,7 +33,7 @@ public abstract class SystemException extends RuntimeException implements Clonea { java.io.StringWriter sw = new java.io.StringWriter(); java.io.PrintWriter pw = new java.io.PrintWriter(sw); - IceUtil.OutputBase out = new IceUtil.OutputBase(pw); + IceUtilInternal.OutputBase out = new IceUtilInternal.OutputBase(pw); out.setUseTab(false); out.print(getClass().getName()); out.inc(); diff --git a/java/src/Ice/UserException.java b/java/src/Ice/UserException.java index f98af0e2a81..f20dd648561 100755 --- a/java/src/Ice/UserException.java +++ b/java/src/Ice/UserException.java @@ -33,7 +33,7 @@ public abstract class UserException extends Exception implements Cloneable { java.io.StringWriter sw = new java.io.StringWriter(); java.io.PrintWriter pw = new java.io.PrintWriter(sw); - IceUtil.OutputBase out = new IceUtil.OutputBase(pw); + IceUtilInternal.OutputBase out = new IceUtilInternal.OutputBase(pw); out.setUseTab(false); out.print(getClass().getName()); out.inc(); diff --git a/java/src/Ice/Util.java b/java/src/Ice/Util.java index ce557ccd558..18d0321cefb 100644 --- a/java/src/Ice/Util.java +++ b/java/src/Ice/Util.java @@ -218,7 +218,7 @@ public final class Util if(slash == -1) { StringHolder token = new StringHolder(); - if(!IceUtil.StringUtil.unescapeString(s, 0, s.length(), token)) + if(!IceUtilInternal.StringUtil.unescapeString(s, 0, s.length(), token)) { IdentityParseException ex = new IdentityParseException(); ex.str = s; @@ -230,7 +230,7 @@ public final class Util else { StringHolder token = new StringHolder(); - if(!IceUtil.StringUtil.unescapeString(s, 0, slash, token)) + if(!IceUtilInternal.StringUtil.unescapeString(s, 0, slash, token)) { IdentityParseException ex = new IdentityParseException(); ex.str = s; @@ -239,7 +239,7 @@ public final class Util ident.category = token.value; if(slash + 1 < s.length()) { - if(!IceUtil.StringUtil.unescapeString(s, slash + 1, s.length(), token)) + if(!IceUtilInternal.StringUtil.unescapeString(s, slash + 1, s.length(), token)) { IdentityParseException ex = new IdentityParseException(); ex.str = s; @@ -261,12 +261,12 @@ public final class Util { if(ident.category.length() == 0) { - return IceUtil.StringUtil.escapeString(ident.name, "/"); + return IceUtilInternal.StringUtil.escapeString(ident.name, "/"); } else { - return IceUtil.StringUtil.escapeString(ident.category, "/") + '/' + - IceUtil.StringUtil.escapeString(ident.name, "/"); + return IceUtilInternal.StringUtil.escapeString(ident.category, "/") + '/' + + IceUtilInternal.StringUtil.escapeString(ident.name, "/"); } } diff --git a/java/src/IceBox/ServiceManagerI.java b/java/src/IceBox/ServiceManagerI.java index eb538955815..7e9269f633b 100644 --- a/java/src/IceBox/ServiceManagerI.java +++ b/java/src/IceBox/ServiceManagerI.java @@ -405,7 +405,7 @@ public class ServiceManagerI extends _ServiceManagerDisp // String className; String[] args; - int pos = IceUtil.StringUtil.findFirstOf(value, " \t\n"); + int pos = IceUtilInternal.StringUtil.findFirstOf(value, " \t\n"); if(pos == -1) { className = value; @@ -416,9 +416,9 @@ public class ServiceManagerI extends _ServiceManagerDisp className = value.substring(0, pos); try { - args = IceUtil.Options.split(value.substring(pos)); + args = IceUtilInternal.Options.split(value.substring(pos)); } - catch(IceUtil.Options.BadQuote ex) + catch(IceUtilInternal.Options.BadQuote ex) { FailureException e = new FailureException(); e.reason = "ServiceManager: invalid arguments for service `" + name + "':\n" + ex.toString(); diff --git a/java/src/IceInternal/BasicStream.java b/java/src/IceInternal/BasicStream.java index f55c45b7669..b45b130f342 100644 --- a/java/src/IceInternal/BasicStream.java +++ b/java/src/IceInternal/BasicStream.java @@ -1651,7 +1651,7 @@ public class BasicStream { java.io.StringWriter sw = new java.io.StringWriter(); java.io.PrintWriter pw = new java.io.PrintWriter(sw); - IceUtil.OutputBase out = new IceUtil.OutputBase(pw); + IceUtilInternal.OutputBase out = new IceUtilInternal.OutputBase(pw); out.setUseTab(false); out.print("exception raised by ice_postUnmarshal:\n"); ex.printStackTrace(pw); @@ -1680,7 +1680,7 @@ public class BasicStream { java.io.StringWriter sw = new java.io.StringWriter(); java.io.PrintWriter pw = new java.io.PrintWriter(sw); - IceUtil.OutputBase out = new IceUtil.OutputBase(pw); + IceUtilInternal.OutputBase out = new IceUtilInternal.OutputBase(pw); out.setUseTab(false); out.print("exception raised by ice_preMarshal:\n"); ex.printStackTrace(pw); diff --git a/java/src/IceInternal/ConnectionMonitor.java b/java/src/IceInternal/ConnectionMonitor.java index 3806b077b13..187781bf722 100644 --- a/java/src/IceInternal/ConnectionMonitor.java +++ b/java/src/IceInternal/ConnectionMonitor.java @@ -52,8 +52,8 @@ public final class ConnectionMonitor implements IceInternal.TimerTask finalize() throws Throwable { - IceUtil.Assert.FinalizerAssert(_instance == null); - IceUtil.Assert.FinalizerAssert(_connections == null); + IceUtilInternal.Assert.FinalizerAssert(_instance == null); + IceUtilInternal.Assert.FinalizerAssert(_connections == null); super.finalize(); } diff --git a/java/src/IceInternal/IncomingBase.java b/java/src/IceInternal/IncomingBase.java index fb47903ca26..ed73861f67e 100644 --- a/java/src/IceInternal/IncomingBase.java +++ b/java/src/IceInternal/IncomingBase.java @@ -140,11 +140,11 @@ public class IncomingBase java.io.StringWriter sw = new java.io.StringWriter(); java.io.PrintWriter pw = new java.io.PrintWriter(sw); - IceUtil.OutputBase out = new IceUtil.OutputBase(pw); + IceUtilInternal.OutputBase out = new IceUtilInternal.OutputBase(pw); out.setUseTab(false); out.print("dispatch exception:"); out.print("\nidentity: " + _os.instance().identityToString(_current.id)); - out.print("\nfacet: " + IceUtil.StringUtil.escapeString(_current.facet, "")); + out.print("\nfacet: " + IceUtilInternal.StringUtil.escapeString(_current.facet, "")); out.print("\noperation: " + _current.operation); out.print("\n"); ex.printStackTrace(pw); diff --git a/java/src/IceInternal/IncomingConnectionFactory.java b/java/src/IceInternal/IncomingConnectionFactory.java index 2d01a11be95..5096ef05278 100644 --- a/java/src/IceInternal/IncomingConnectionFactory.java +++ b/java/src/IceInternal/IncomingConnectionFactory.java @@ -527,10 +527,10 @@ public final class IncomingConnectionFactory extends EventHandler implements Ice finalize() throws Throwable { - IceUtil.Assert.FinalizerAssert(_state == StateClosed); - IceUtil.Assert.FinalizerAssert(_acceptor == null); - IceUtil.Assert.FinalizerAssert(_connections == null); - IceUtil.Assert.FinalizerAssert(_threadPerIncomingConnectionFactory == null); + IceUtilInternal.Assert.FinalizerAssert(_state == StateClosed); + IceUtilInternal.Assert.FinalizerAssert(_acceptor == null); + IceUtilInternal.Assert.FinalizerAssert(_connections == null); + IceUtilInternal.Assert.FinalizerAssert(_threadPerIncomingConnectionFactory == null); super.finalize(); } diff --git a/java/src/IceInternal/IndirectReference.java b/java/src/IceInternal/IndirectReference.java index 55eb6f60c13..2879e4325bf 100644 --- a/java/src/IceInternal/IndirectReference.java +++ b/java/src/IceInternal/IndirectReference.java @@ -146,8 +146,8 @@ public class IndirectReference extends RoutableReference // the reference parser uses as separators, then we enclose // the adapter id string in quotes. // - String a = IceUtil.StringUtil.escapeString(_adapterId, null); - if(IceUtil.StringUtil.findFirstOf(a, " \t\n\r") != -1) + String a = IceUtilInternal.StringUtil.escapeString(_adapterId, null); + if(IceUtilInternal.StringUtil.findFirstOf(a, " \t\n\r") != -1) { s.append('"'); s.append(a); diff --git a/java/src/IceInternal/Instance.java b/java/src/IceInternal/Instance.java index 6bcd431b836..44b7d93bceb 100644 --- a/java/src/IceInternal/Instance.java +++ b/java/src/IceInternal/Instance.java @@ -740,22 +740,22 @@ public final class Instance finalize() throws Throwable { - IceUtil.Assert.FinalizerAssert(_state == StateDestroyed); - IceUtil.Assert.FinalizerAssert(_referenceFactory == null); - IceUtil.Assert.FinalizerAssert(_proxyFactory == null); - IceUtil.Assert.FinalizerAssert(_outgoingConnectionFactory == null); - IceUtil.Assert.FinalizerAssert(_connectionMonitor == null); - IceUtil.Assert.FinalizerAssert(_servantFactoryManager == null); - IceUtil.Assert.FinalizerAssert(_objectAdapterFactory == null); - IceUtil.Assert.FinalizerAssert(_clientThreadPool == null); - IceUtil.Assert.FinalizerAssert(_serverThreadPool == null); - IceUtil.Assert.FinalizerAssert(_selectorThread == null); - IceUtil.Assert.FinalizerAssert(_endpointHostResolver == null); - IceUtil.Assert.FinalizerAssert(_timer == null); - IceUtil.Assert.FinalizerAssert(_routerManager == null); - IceUtil.Assert.FinalizerAssert(_locatorManager == null); - IceUtil.Assert.FinalizerAssert(_endpointFactoryManager == null); - IceUtil.Assert.FinalizerAssert(_pluginManager == null); + IceUtilInternal.Assert.FinalizerAssert(_state == StateDestroyed); + IceUtilInternal.Assert.FinalizerAssert(_referenceFactory == null); + IceUtilInternal.Assert.FinalizerAssert(_proxyFactory == null); + IceUtilInternal.Assert.FinalizerAssert(_outgoingConnectionFactory == null); + IceUtilInternal.Assert.FinalizerAssert(_connectionMonitor == null); + IceUtilInternal.Assert.FinalizerAssert(_servantFactoryManager == null); + IceUtilInternal.Assert.FinalizerAssert(_objectAdapterFactory == null); + IceUtilInternal.Assert.FinalizerAssert(_clientThreadPool == null); + IceUtilInternal.Assert.FinalizerAssert(_serverThreadPool == null); + IceUtilInternal.Assert.FinalizerAssert(_selectorThread == null); + IceUtilInternal.Assert.FinalizerAssert(_endpointHostResolver == null); + IceUtilInternal.Assert.FinalizerAssert(_timer == null); + IceUtilInternal.Assert.FinalizerAssert(_routerManager == null); + IceUtilInternal.Assert.FinalizerAssert(_locatorManager == null); + IceUtilInternal.Assert.FinalizerAssert(_endpointFactoryManager == null); + IceUtilInternal.Assert.FinalizerAssert(_pluginManager == null); super.finalize(); } diff --git a/java/src/IceInternal/ObjectAdapterFactory.java b/java/src/IceInternal/ObjectAdapterFactory.java index 13d48ef3395..a5b5bd1f011 100644 --- a/java/src/IceInternal/ObjectAdapterFactory.java +++ b/java/src/IceInternal/ObjectAdapterFactory.java @@ -266,10 +266,10 @@ public final class ObjectAdapterFactory finalize() throws Throwable { - IceUtil.Assert.FinalizerAssert(_instance == null); - IceUtil.Assert.FinalizerAssert(_communicator == null); - IceUtil.Assert.FinalizerAssert(_adapters == null); - IceUtil.Assert.FinalizerAssert(!_waitForShutdown); + IceUtilInternal.Assert.FinalizerAssert(_instance == null); + IceUtilInternal.Assert.FinalizerAssert(_communicator == null); + IceUtilInternal.Assert.FinalizerAssert(_adapters == null); + IceUtilInternal.Assert.FinalizerAssert(!_waitForShutdown); super.finalize(); } diff --git a/java/src/IceInternal/OutgoingAsyncMessageCallback.java b/java/src/IceInternal/OutgoingAsyncMessageCallback.java index 677075f59e9..5efde254306 100644 --- a/java/src/IceInternal/OutgoingAsyncMessageCallback.java +++ b/java/src/IceInternal/OutgoingAsyncMessageCallback.java @@ -132,7 +132,7 @@ abstract public class OutgoingAsyncMessageCallback { java.io.StringWriter sw = new java.io.StringWriter(); java.io.PrintWriter pw = new java.io.PrintWriter(sw); - IceUtil.OutputBase out = new IceUtil.OutputBase(pw); + IceUtilInternal.OutputBase out = new IceUtilInternal.OutputBase(pw); out.setUseTab(false); out.print("exception raised by AMI callback:\n"); ex.printStackTrace(pw); diff --git a/java/src/IceInternal/OutgoingConnectionFactory.java b/java/src/IceInternal/OutgoingConnectionFactory.java index c94b50c5b86..4d25cbe5067 100644 --- a/java/src/IceInternal/OutgoingConnectionFactory.java +++ b/java/src/IceInternal/OutgoingConnectionFactory.java @@ -435,11 +435,11 @@ public final class OutgoingConnectionFactory finalize() throws Throwable { - IceUtil.Assert.FinalizerAssert(_destroyed); - IceUtil.Assert.FinalizerAssert(_connections == null); - IceUtil.Assert.FinalizerAssert(_connectionsByEndpoint == null); - IceUtil.Assert.FinalizerAssert(_pendingConnectCount == 0); - IceUtil.Assert.FinalizerAssert(_pending.isEmpty()); + IceUtilInternal.Assert.FinalizerAssert(_destroyed); + IceUtilInternal.Assert.FinalizerAssert(_connections == null); + IceUtilInternal.Assert.FinalizerAssert(_connectionsByEndpoint == null); + IceUtilInternal.Assert.FinalizerAssert(_pendingConnectCount == 0); + IceUtilInternal.Assert.FinalizerAssert(_pending.isEmpty()); super.finalize(); } diff --git a/java/src/IceInternal/Reference.java b/java/src/IceInternal/Reference.java index 5d486b41af3..eed4cd7693a 100644 --- a/java/src/IceInternal/Reference.java +++ b/java/src/IceInternal/Reference.java @@ -255,7 +255,7 @@ public abstract class Reference implements Cloneable // the identity string in quotes. // String id = _instance.identityToString(_identity); - if(IceUtil.StringUtil.findFirstOf(id, " \t\n\r:@") != -1) + if(IceUtilInternal.StringUtil.findFirstOf(id, " \t\n\r:@") != -1) { s.append('"'); s.append(id); @@ -274,8 +274,8 @@ public abstract class Reference implements Cloneable // the facet string in quotes. // s.append(" -f "); - String fs = IceUtil.StringUtil.escapeString(_facet, ""); - if(IceUtil.StringUtil.findFirstOf(fs, " \t\n\r:@") != -1) + String fs = IceUtilInternal.StringUtil.escapeString(_facet, ""); + if(IceUtilInternal.StringUtil.findFirstOf(fs, " \t\n\r:@") != -1) { s.append('"'); s.append(fs); diff --git a/java/src/IceInternal/ReferenceFactory.java b/java/src/IceInternal/ReferenceFactory.java index d8a7bd2e5ec..b05b9198942 100644 --- a/java/src/IceInternal/ReferenceFactory.java +++ b/java/src/IceInternal/ReferenceFactory.java @@ -134,7 +134,7 @@ public final class ReferenceFactory int beg; int end = 0; - beg = IceUtil.StringUtil.findFirstNotOf(s, delim, end); + beg = IceUtilInternal.StringUtil.findFirstNotOf(s, delim, end); if(beg == -1) { Ice.ProxyParseException e = new Ice.ProxyParseException(); @@ -147,7 +147,7 @@ public final class ReferenceFactory // or double quotation marks. // String idstr = null; - end = IceUtil.StringUtil.checkQuote(s, beg); + end = IceUtilInternal.StringUtil.checkQuote(s, beg); if(end == -1) { Ice.ProxyParseException e = new Ice.ProxyParseException(); @@ -156,7 +156,7 @@ public final class ReferenceFactory } else if(end == 0) { - end = IceUtil.StringUtil.findFirstOf(s, delim + ":@", beg); + end = IceUtilInternal.StringUtil.findFirstOf(s, delim + ":@", beg); if(end == -1) { end = s.length(); @@ -200,7 +200,7 @@ public final class ReferenceFactory // a null proxy, but only if nothing follows the // quotes. // - else if(IceUtil.StringUtil.findFirstNotOf(s, delim, end) != -1) + else if(IceUtilInternal.StringUtil.findFirstNotOf(s, delim, end) != -1) { Ice.ProxyParseException e = new Ice.ProxyParseException(); e.str = s; @@ -219,7 +219,7 @@ public final class ReferenceFactory while(true) { - beg = IceUtil.StringUtil.findFirstNotOf(s, delim, end); + beg = IceUtilInternal.StringUtil.findFirstNotOf(s, delim, end); if(beg == -1) { break; @@ -230,7 +230,7 @@ public final class ReferenceFactory break; } - end = IceUtil.StringUtil.findFirstOf(s, delim + ":@", beg); + end = IceUtilInternal.StringUtil.findFirstOf(s, delim + ":@", beg); if(end == -1) { end = s.length(); @@ -255,14 +255,14 @@ public final class ReferenceFactory // quotation marks. // String argument = null; - int argumentBeg = IceUtil.StringUtil.findFirstNotOf(s, delim, end); + int argumentBeg = IceUtilInternal.StringUtil.findFirstNotOf(s, delim, end); if(argumentBeg != -1) { final char ch = s.charAt(argumentBeg); if(ch != '@' && ch != ':' && ch != '-') { beg = argumentBeg; - end = IceUtil.StringUtil.checkQuote(s, beg); + end = IceUtilInternal.StringUtil.checkQuote(s, beg); if(end == -1) { Ice.ProxyParseException e = new Ice.ProxyParseException(); @@ -271,7 +271,7 @@ public final class ReferenceFactory } else if(end == 0) { - end = IceUtil.StringUtil.findFirstOf(s, delim + ":@", beg); + end = IceUtilInternal.StringUtil.findFirstOf(s, delim + ":@", beg); if(end == -1) { end = s.length(); @@ -303,7 +303,7 @@ public final class ReferenceFactory } Ice.StringHolder facetH = new Ice.StringHolder(); - if(!IceUtil.StringUtil.unescapeString(argument, 0, argument.length(), facetH)) + if(!IceUtilInternal.StringUtil.unescapeString(argument, 0, argument.length(), facetH)) { Ice.ProxyParseException e = new Ice.ProxyParseException(); e.str = s; @@ -499,7 +499,7 @@ public final class ReferenceFactory } else if(s.charAt(beg) == '@') { - beg = IceUtil.StringUtil.findFirstNotOf(s, delim, beg + 1); + beg = IceUtilInternal.StringUtil.findFirstNotOf(s, delim, beg + 1); if(beg == -1) { Ice.ProxyParseException e = new Ice.ProxyParseException(); @@ -508,7 +508,7 @@ public final class ReferenceFactory } String adapterstr = null; - end = IceUtil.StringUtil.checkQuote(s, beg); + end = IceUtilInternal.StringUtil.checkQuote(s, beg); if(end == -1) { Ice.ProxyParseException e = new Ice.ProxyParseException(); @@ -517,7 +517,7 @@ public final class ReferenceFactory } else if(end == 0) { - end = IceUtil.StringUtil.findFirstOf(s, delim, beg); + end = IceUtilInternal.StringUtil.findFirstOf(s, delim, beg); if(end == -1) { end = s.length(); @@ -531,7 +531,7 @@ public final class ReferenceFactory end++; // Skip trailing quote } - if(end != s.length() && IceUtil.StringUtil.findFirstNotOf(s, delim, end) != -1) + if(end != s.length() && IceUtilInternal.StringUtil.findFirstNotOf(s, delim, end) != -1) { Ice.ProxyParseException e = new Ice.ProxyParseException(); e.str = s; @@ -539,7 +539,7 @@ public final class ReferenceFactory } Ice.StringHolder token = new Ice.StringHolder(); - if(!IceUtil.StringUtil.unescapeString(adapterstr, 0, adapterstr.length(), token) || + if(!IceUtilInternal.StringUtil.unescapeString(adapterstr, 0, adapterstr.length(), token) || token.value.length() == 0) { Ice.ProxyParseException e = new Ice.ProxyParseException(); diff --git a/java/src/IceInternal/SelectorThread.java b/java/src/IceInternal/SelectorThread.java index 6a291e36926..ef3343293f9 100644 --- a/java/src/IceInternal/SelectorThread.java +++ b/java/src/IceInternal/SelectorThread.java @@ -64,7 +64,7 @@ public class SelectorThread finalize() throws Throwable { - IceUtil.Assert.FinalizerAssert(_destroyed); + IceUtilInternal.Assert.FinalizerAssert(_destroyed); } public synchronized void diff --git a/java/src/IceInternal/ServantManager.java b/java/src/IceInternal/ServantManager.java index caf5f6ba933..96d06df4425 100644 --- a/java/src/IceInternal/ServantManager.java +++ b/java/src/IceInternal/ServantManager.java @@ -36,7 +36,7 @@ public final class ServantManager ex.kindOfObject = "servant"; if(facet.length() > 0) { - ex.id += " -f " + IceUtil.StringUtil.escapeString(facet, ""); + ex.id += " -f " + IceUtilInternal.StringUtil.escapeString(facet, ""); } throw ex; } @@ -64,7 +64,7 @@ public final class ServantManager ex.kindOfObject = "servant"; if(facet.length() > 0) { - ex.id += " -f " + IceUtil.StringUtil.escapeString(facet, ""); + ex.id += " -f " + IceUtilInternal.StringUtil.escapeString(facet, ""); } throw ex; } @@ -167,7 +167,7 @@ public final class ServantManager if(l != null) { Ice.AlreadyRegisteredException ex = new Ice.AlreadyRegisteredException(); - ex.id = IceUtil.StringUtil.escapeString(category, ""); + ex.id = IceUtilInternal.StringUtil.escapeString(category, ""); ex.kindOfObject = "servant locator"; throw ex; } @@ -208,7 +208,7 @@ public final class ServantManager // not been called if the associated object adapter was not // properly deactivated. // - //IceUtil.Assert.FinalizerAssert(_instance == null); + //IceUtilInternal.Assert.FinalizerAssert(_instance == null); super.finalize(); } diff --git a/java/src/IceInternal/TcpAcceptor.java b/java/src/IceInternal/TcpAcceptor.java index 95d16d6bd90..f412d3d5243 100644 --- a/java/src/IceInternal/TcpAcceptor.java +++ b/java/src/IceInternal/TcpAcceptor.java @@ -237,7 +237,7 @@ class TcpAcceptor implements Acceptor finalize() throws Throwable { - IceUtil.Assert.FinalizerAssert(_fd == null); + IceUtilInternal.Assert.FinalizerAssert(_fd == null); super.finalize(); } diff --git a/java/src/IceInternal/TcpTransceiver.java b/java/src/IceInternal/TcpTransceiver.java index 82e46ec2552..d1f0ea8d625 100644 --- a/java/src/IceInternal/TcpTransceiver.java +++ b/java/src/IceInternal/TcpTransceiver.java @@ -393,7 +393,7 @@ final class TcpTransceiver implements Transceiver finalize() throws Throwable { - IceUtil.Assert.FinalizerAssert(_fd == null); + IceUtilInternal.Assert.FinalizerAssert(_fd == null); super.finalize(); } diff --git a/java/src/IceInternal/ThreadPool.java b/java/src/IceInternal/ThreadPool.java index cfdfc734bff..65f4776fb69 100644 --- a/java/src/IceInternal/ThreadPool.java +++ b/java/src/IceInternal/ThreadPool.java @@ -132,7 +132,7 @@ public final class ThreadPool finalize() throws Throwable { - IceUtil.Assert.FinalizerAssert(_destroyed); + IceUtilInternal.Assert.FinalizerAssert(_destroyed); } public synchronized void diff --git a/java/src/IceInternal/Timer.java b/java/src/IceInternal/Timer.java index 7646409a16c..2b862c55018 100644 --- a/java/src/IceInternal/Timer.java +++ b/java/src/IceInternal/Timer.java @@ -129,7 +129,7 @@ public final class Timer extends Thread finalize() throws Throwable { - IceUtil.Assert.FinalizerAssert(_instance == null); + IceUtilInternal.Assert.FinalizerAssert(_instance == null); super.finalize(); } diff --git a/java/src/IceInternal/TraceUtil.java b/java/src/IceInternal/TraceUtil.java index 6a85917a7c4..b8467ec689e 100644 --- a/java/src/IceInternal/TraceUtil.java +++ b/java/src/IceInternal/TraceUtil.java @@ -157,7 +157,7 @@ public final class TraceUtil out.write("\nfacet = "); if(facet.length > 0) { - out.write(IceUtil.StringUtil.escapeString(facet[0], "")); + out.write(IceUtilInternal.StringUtil.escapeString(facet[0], "")); } String operation = stream.readString(); diff --git a/java/src/IceInternal/UdpTransceiver.java b/java/src/IceInternal/UdpTransceiver.java index 91c85cb4408..737d4f7d179 100644 --- a/java/src/IceInternal/UdpTransceiver.java +++ b/java/src/IceInternal/UdpTransceiver.java @@ -656,7 +656,7 @@ final class UdpTransceiver implements Transceiver finalize() throws Throwable { - IceUtil.Assert.FinalizerAssert(_fd == null); + IceUtilInternal.Assert.FinalizerAssert(_fd == null); super.finalize(); } diff --git a/java/src/IceInternal/UnknownEndpointI.java b/java/src/IceInternal/UnknownEndpointI.java index 9b91786e0c1..fde622894a8 100644 --- a/java/src/IceInternal/UnknownEndpointI.java +++ b/java/src/IceInternal/UnknownEndpointI.java @@ -76,12 +76,12 @@ final class UnknownEndpointI extends EndpointI } for(int j = 0; j < argument.length(); ++j) { - if(!IceUtil.Base64.isBase64(argument.charAt(j))) + if(!IceUtilInternal.Base64.isBase64(argument.charAt(j))) { throw new Ice.EndpointParseException("opaque " + str); } } - _rawBytes = IceUtil.Base64.decode(argument); + _rawBytes = IceUtilInternal.Base64.decode(argument); ++vopt; break; } @@ -129,7 +129,7 @@ final class UnknownEndpointI extends EndpointI public String _toString() { - String val = IceUtil.Base64.encode(_rawBytes); + String val = IceUtilInternal.Base64.encode(_rawBytes); return "opaque -t " + _type + " -v " + val; } diff --git a/java/src/IceInternal/ValueWriter.java b/java/src/IceInternal/ValueWriter.java index 25fbd47a74d..bdf36dff9b2 100644 --- a/java/src/IceInternal/ValueWriter.java +++ b/java/src/IceInternal/ValueWriter.java @@ -12,13 +12,13 @@ package IceInternal; public final class ValueWriter { public static void - write(java.lang.Object obj, IceUtil.OutputBase out) + write(java.lang.Object obj, IceUtilInternal.OutputBase out) { writeValue(null, obj, null, out); } private static void - writeValue(String name, java.lang.Object value, java.util.Map objectTable, IceUtil.OutputBase out) + writeValue(String name, java.lang.Object value, java.util.Map objectTable, IceUtilInternal.OutputBase out) { if(value == null) { @@ -178,7 +178,7 @@ public final class ValueWriter } private static void - writeFields(String name, java.lang.Object obj, Class c, java.util.Map objectTable, IceUtil.OutputBase out) + writeFields(String name, java.lang.Object obj, Class c, java.util.Map objectTable, IceUtilInternal.OutputBase out) { if(!c.equals(java.lang.Object.class)) { @@ -216,7 +216,7 @@ public final class ValueWriter } private static void - writeName(String name, IceUtil.OutputBase out) + writeName(String name, IceUtilInternal.OutputBase out) { if(name != null) { diff --git a/java/src/IceSSL/AcceptorI.java b/java/src/IceSSL/AcceptorI.java index 05e1e7d50cb..c4dfc24d1b0 100644 --- a/java/src/IceSSL/AcceptorI.java +++ b/java/src/IceSSL/AcceptorI.java @@ -252,7 +252,7 @@ final class AcceptorI implements IceInternal.Acceptor finalize() throws Throwable { - IceUtil.Assert.FinalizerAssert(_fd == null); + IceUtilInternal.Assert.FinalizerAssert(_fd == null); super.finalize(); } diff --git a/java/src/IceSSL/TransceiverI.java b/java/src/IceSSL/TransceiverI.java index 0d56e6f5a83..fb156113cad 100644 --- a/java/src/IceSSL/TransceiverI.java +++ b/java/src/IceSSL/TransceiverI.java @@ -461,7 +461,7 @@ final class TransceiverI implements IceInternal.Transceiver finalize() throws Throwable { - IceUtil.Assert.FinalizerAssert(_fd == null); + IceUtilInternal.Assert.FinalizerAssert(_fd == null); super.finalize(); } diff --git a/java/src/IceUtil/Cache.java b/java/src/IceUtil/Cache.java index 0ba59b91b35..9b07cbab726 100644 --- a/java/src/IceUtil/Cache.java +++ b/java/src/IceUtil/Cache.java @@ -118,7 +118,7 @@ public class Cache } Object obj = null; - CountDownLatch latch = null; + java.util.concurrent.CountDownLatch latch = null; } private Object @@ -127,7 +127,7 @@ public class Cache for(;;) { CacheValue val = null; - CountDownLatch latch = null; + java.util.concurrent.CountDownLatch latch = null; synchronized(_map) { @@ -148,7 +148,7 @@ public class Cache // // The first queued thread creates the latch // - val.latch = new CountDownLatch(1); + val.latch = new java.util.concurrent.CountDownLatch(1); } latch = val.latch; } diff --git a/java/src/IceUtil/CountDownLatch.java b/java/src/IceUtil/CountDownLatch.java deleted file mode 100644 index 3550913d89a..00000000000 --- a/java/src/IceUtil/CountDownLatch.java +++ /dev/null @@ -1,52 +0,0 @@ -// ********************************************************************** -// -// Copyright (c) 2003-2007 ZeroC, Inc. All rights reserved. -// -// This copy of Ice is licensed to you under the terms described in the -// ICE_LICENSE file included in this distribution. -// -// ********************************************************************** - -package IceUtil; - -// -// See java.util.CountDownLatch in Java 1.5 -// - -public class CountDownLatch -{ - public CountDownLatch(int count) - { - if(_count < 0) - { - throw new IllegalArgumentException("count < 0"); - } - _count = count; - } - - public synchronized void - await() throws InterruptedException - { - while(_count > 0) - { - wait(); - } - } - - public synchronized void - countDown() - { - if(_count > 0 && --_count == 0) - { - notifyAll(); - } - } - - public synchronized long - getCount() - { - return _count; - } - - private int _count; -} diff --git a/java/src/IceUtil/Assert.java b/java/src/IceUtilInternal/Assert.java index d5745cc378e..f53410a63de 100644 --- a/java/src/IceUtil/Assert.java +++ b/java/src/IceUtilInternal/Assert.java @@ -7,7 +7,7 @@ // // ********************************************************************** -package IceUtil; +package IceUtilInternal; public final class Assert { diff --git a/java/src/IceUtil/Base64.java b/java/src/IceUtilInternal/Base64.java index da56f58cf4a..3b9fffd4a4c 100644 --- a/java/src/IceUtil/Base64.java +++ b/java/src/IceUtilInternal/Base64.java @@ -7,7 +7,7 @@ // // ********************************************************************** -package IceUtil; +package IceUtilInternal; public class Base64 { diff --git a/java/src/IceUtil/Options.java b/java/src/IceUtilInternal/Options.java index 5de815b1d36..6e78929862c 100644 --- a/java/src/IceUtil/Options.java +++ b/java/src/IceUtilInternal/Options.java @@ -7,7 +7,7 @@ // // ********************************************************************** -package IceUtil; +package IceUtilInternal; public final class Options { diff --git a/java/src/IceUtil/OutputBase.java b/java/src/IceUtilInternal/OutputBase.java index 20780627573..c85ff8fa870 100644 --- a/java/src/IceUtil/OutputBase.java +++ b/java/src/IceUtilInternal/OutputBase.java @@ -7,7 +7,7 @@ // // ********************************************************************** -package IceUtil; +package IceUtilInternal; public class OutputBase { diff --git a/java/src/IceUtil/StringUtil.java b/java/src/IceUtilInternal/StringUtil.java index d0cd0695dcc..71f6a61067a 100644 --- a/java/src/IceUtil/StringUtil.java +++ b/java/src/IceUtilInternal/StringUtil.java @@ -7,7 +7,7 @@ // // ********************************************************************** -package IceUtil; +package IceUtilInternal; public final class StringUtil { diff --git a/java/src/IceUtil/XMLOutput.java b/java/src/IceUtilInternal/XMLOutput.java index 1a2a137a6ee..4fc1bda71c3 100644 --- a/java/src/IceUtil/XMLOutput.java +++ b/java/src/IceUtilInternal/XMLOutput.java @@ -7,7 +7,7 @@ // // ********************************************************************** -package IceUtil; +package IceUtilInternal; public class XMLOutput extends OutputBase { diff --git a/java/test/IceUtil/inputUtil/Client.java b/java/test/IceUtil/inputUtil/Client.java index bf8db9dc3b1..358920a2bac 100644 --- a/java/test/IceUtil/inputUtil/Client.java +++ b/java/test/IceUtil/inputUtil/Client.java @@ -27,59 +27,59 @@ public class Client try { - test(IceUtil.Options.split("").length == 0); + test(IceUtilInternal.Options.split("").length == 0); - args = IceUtil.Options.split("\"\""); + args = IceUtilInternal.Options.split("\"\""); test(args.length == 1 && args[0].equals("")); - args = IceUtil.Options.split("''"); + args = IceUtilInternal.Options.split("''"); test(args.length == 1 && args[0].equals("")); - args = IceUtil.Options.split("$''"); + args = IceUtilInternal.Options.split("$''"); test(args.length == 1 && args[0].equals("")); - args = IceUtil.Options.split("-a -b -c"); + args = IceUtilInternal.Options.split("-a -b -c"); test(args.length == 3 && args[0].equals("-a") && args[1].equals("-b") && args[2].equals("-c")); - args = IceUtil.Options.split("\"-a\" '-b' $'-c'"); + args = IceUtilInternal.Options.split("\"-a\" '-b' $'-c'"); test(args.length == 3 && args[0].equals("-a") && args[1].equals("-b") && args[2].equals("-c")); - args = IceUtil.Options.split(" '-b' \"-a\" $'-c' "); + args = IceUtilInternal.Options.split(" '-b' \"-a\" $'-c' "); test(args.length == 3 && args[0].equals("-b") && args[1].equals("-a") && args[2].equals("-c")); - args = IceUtil.Options.split(" $'-c' '-b' \"-a\" "); + args = IceUtilInternal.Options.split(" $'-c' '-b' \"-a\" "); test(args.length == 3 && args[0].equals("-c") && args[1].equals("-b") && args[2].equals("-a")); // Testing single quote - args = IceUtil.Options.split("-Dir='C:\\\\test\\\\file'"); // -Dir='C:\\test\\file' + args = IceUtilInternal.Options.split("-Dir='C:\\\\test\\\\file'"); // -Dir='C:\\test\\file' test(args.length == 1 && args[0].equals("-Dir=C:\\\\test\\\\file")); // -Dir=C:\\test\\file - args = IceUtil.Options.split("-Dir='C:\\test\\file'"); // -Dir='C:\test\file' + args = IceUtilInternal.Options.split("-Dir='C:\\test\\file'"); // -Dir='C:\test\file' test(args.length == 1 && args[0].equals("-Dir=C:\\test\\file")); // -Dir=C:\test\file - args = IceUtil.Options.split("-Dir='C:\\test\\filewith\"quote'"); // -Dir='C:\test\filewith"quote' + args = IceUtilInternal.Options.split("-Dir='C:\\test\\filewith\"quote'"); // -Dir='C:\test\filewith"quote' test(args.length == 1 && args[0].equals("-Dir=C:\\test\\filewith\"quote")); // -Dir=C:\test\filewith"quote // Testing double quote - args = IceUtil.Options.split("-Dir=\"C:\\\\test\\\\file\""); // -Dir="C:\\test\\file" + args = IceUtilInternal.Options.split("-Dir=\"C:\\\\test\\\\file\""); // -Dir="C:\\test\\file" test(args.length == 1 && args[0].equals("-Dir=C:\\test\\file")); // -Dir=C:\test\file - args = IceUtil.Options.split("-Dir=\"C:\\test\\file\""); // -Dir="C:\test\file" + args = IceUtilInternal.Options.split("-Dir=\"C:\\test\\file\""); // -Dir="C:\test\file" test(args.length == 1 && args[0].equals("-Dir=C:\\test\\file")); // -Dir=C:\test\file - args = IceUtil.Options.split("-Dir=\"C:\\test\\filewith\\\"quote\""); // -Dir="C:\test\filewith\"quote" + args = IceUtilInternal.Options.split("-Dir=\"C:\\test\\filewith\\\"quote\""); // -Dir="C:\test\filewith\"quote" test(args.length == 1 && args[0].equals("-Dir=C:\\test\\filewith\"quote")); // -Dir=C:\test\filewith"quote // Testing ANSI quote - args = IceUtil.Options.split("-Dir=$'C:\\\\test\\\\file'"); // -Dir=$'C:\\test\\file' + args = IceUtilInternal.Options.split("-Dir=$'C:\\\\test\\\\file'"); // -Dir=$'C:\\test\\file' test(args.length == 1 && args[0].equals("-Dir=C:\\test\\file")); // -Dir=C:\test\file - args = IceUtil.Options.split("-Dir=$'C:\\oest\\oile'"); // -Dir='C:\oest\oile' + args = IceUtilInternal.Options.split("-Dir=$'C:\\oest\\oile'"); // -Dir='C:\oest\oile' test(args.length == 1 && args[0].equals("-Dir=C:\\oest\\oile")); // -Dir=C:\oest\oile - args = IceUtil.Options.split("-Dir=$'C:\\oest\\oilewith\"quote'"); // -Dir=$'C:\oest\oilewith"quote' + args = IceUtilInternal.Options.split("-Dir=$'C:\\oest\\oilewith\"quote'"); // -Dir=$'C:\oest\oilewith"quote' test(args.length == 1 && args[0].equals("-Dir=C:\\oest\\oilewith\"quote")); // -Dir=C:\oest\oilewith"quote - args = IceUtil.Options.split("-Dir=$'\\103\\072\\134\\164\\145\\163\\164\\134\\146\\151\\154\\145'"); + args = IceUtilInternal.Options.split("-Dir=$'\\103\\072\\134\\164\\145\\163\\164\\134\\146\\151\\154\\145'"); test(args.length == 1 && args[0].equals("-Dir=C:\\test\\file")); // -Dir=C:\test\file - args = IceUtil.Options.split("-Dir=$'\\x43\\x3A\\x5C\\x74\\x65\\x73\\x74\\x5C\\x66\\x69\\x6C\\x65'"); + args = IceUtilInternal.Options.split("-Dir=$'\\x43\\x3A\\x5C\\x74\\x65\\x73\\x74\\x5C\\x66\\x69\\x6C\\x65'"); test(args.length == 1 && args[0].equals("-Dir=C:\\test\\file")); // -Dir=C:\test\file - args = IceUtil.Options.split("-Dir=$'\\cM\\c_'"); // Control characters + args = IceUtilInternal.Options.split("-Dir=$'\\cM\\c_'"); // Control characters test(args.length == 1 && args[0].equals("-Dir=\015\037")); - args = IceUtil.Options.split("-Dir=$'C:\\\\\\146\\x66\\cMi'"); // -Dir=$'C:\\\146\x66i\cMi' + args = IceUtilInternal.Options.split("-Dir=$'C:\\\\\\146\\x66\\cMi'"); // -Dir=$'C:\\\146\x66i\cMi' test(args.length == 1 && args[0].equals("-Dir=C:\\ff\015i")); - args = IceUtil.Options.split("-Dir=$'C:\\\\\\cM\\x66\\146i'"); // -Dir=$'C:\\\cM\x66\146i' + args = IceUtilInternal.Options.split("-Dir=$'C:\\\\\\cM\\x66\\146i'"); // -Dir=$'C:\\\cM\x66\146i' test(args.length == 1 && args[0].equals("-Dir=C:\\\015ffi")); } - catch(IceUtil.Options.BadQuote ex) + catch(IceUtilInternal.Options.BadQuote ex) { test(false); } @@ -95,10 +95,10 @@ public class Client { try { - IceUtil.Options.split(badQuoteCommands[i]); + IceUtilInternal.Options.split(badQuoteCommands[i]); test(false); } - catch(IceUtil.Options.BadQuote ex) + catch(IceUtilInternal.Options.BadQuote ex) { } } |