override

7 files changed, 37 insertions, 37 deletions

diff --git a/java/src/IceInternal/DefaultsAndOverwrites.java b/java/src/IceInternal/DefaultsAndOverrides.java
index 2bcfe5a50c6..070c40b9300 100644
--- a/java/src/IceInternal/DefaultsAndOverwrites.java
+++ b/java/src/IceInternal/DefaultsAndOverrides.java
@@ -10,9 +10,9 @@
 
 package IceInternal;
 
-public final class DefaultsAndOverwrites
+public final class DefaultsAndOverrides
 {
-    DefaultsAndOverwrites(Ice.Properties properties)
+    DefaultsAndOverrides(Ice.Properties properties)
     {
 	String value;
 	
@@ -30,28 +30,28 @@ public final class DefaultsAndOverwrites
 	
 	defaultRouter = properties.getProperty("Ice.Default.Router");
 	
-	value = properties.getProperty("Ice.Overwrite.Timeout");
+	value = properties.getProperty("Ice.Override.Timeout");
 	if (value.length() > 0)
 	{
-	    overwriteTimeout = true;
-	    overwriteTimeoutValue = properties.getPropertyAsInt("Ice.Overwrite.Timeout");
+	    overrideTimeout = true;
+	    overrideTimeoutValue = properties.getPropertyAsInt("Ice.Override.Timeout");
 	}
 	else
 	{
-	    overwriteTimeout = false;
-	    overwriteTimeoutValue = -1;
+	    overrideTimeout = false;
+	    overrideTimeoutValue = -1;
 	}
 
-	value = properties.getProperty("Ice.Overwrite.Compress");
+	value = properties.getProperty("Ice.Override.Compress");
 	if (value.length() > 0)
 	{
-	    overwriteCompress = true;
-	    overwriteCompressValue = properties.getPropertyAsInt("Ice.Overwrite.Compress") != 0;
+	    overrideComppress = true;
+	    overrideComppressValue = properties.getPropertyAsInt("Ice.Override.Compress") != 0;
 	}
 	else
 	{
-	    overwriteCompress = false;
-	    overwriteCompressValue = false;
+	    overrideComppress = false;
+	    overrideComppressValue = false;
 	}
     }
 
@@ -59,8 +59,8 @@ public final class DefaultsAndOverwrites
     final public String defaultProtocol;
     final public String defaultRouter;
 
-    final public boolean overwriteTimeout;
-    final public int overwriteTimeoutValue;
-    final public boolean overwriteCompress;
-    final public boolean overwriteCompressValue;
+    final public boolean overrideTimeout;
+    final public int overrideTimeoutValue;
+    final public boolean overrideComppress;
+    final public boolean overrideComppressValue;
 }
diff --git a/java/src/IceInternal/EndpointFactoryManager.java b/java/src/IceInternal/EndpointFactoryManager.java
index 6eaf1bfb8b4..8156a8c0afb 100644
--- a/java/src/IceInternal/EndpointFactoryManager.java
+++ b/java/src/IceInternal/EndpointFactoryManager.java
@@ -63,7 +63,7 @@ public final class EndpointFactoryManager
 
         if (protocol.equals("default"))
         {
-            protocol = _instance.defaultsAndOverwrites().defaultProtocol;
+            protocol = _instance.defaultsAndOverrides().defaultProtocol;
         }
 
         for (int i = 0; i < _factories.size(); i++)
diff --git a/java/src/IceInternal/IncomingConnectionFactory.java b/java/src/IceInternal/IncomingConnectionFactory.java
index f5a44a5c7db..a4cacda340e 100644
--- a/java/src/IceInternal/IncomingConnectionFactory.java
+++ b/java/src/IceInternal/IncomingConnectionFactory.java
@@ -201,10 +201,10 @@ public class IncomingConnectionFactory extends EventHandler
     {
         super(instance);
         _endpoint = endpoint;
-	DefaultsAndOverwrites defaultsAndOverwrites = _instance.defaultsAndOverwrites();
-	if (defaultsAndOverwrites.overwriteTimeout)
+	DefaultsAndOverrides defaultsAndOverrides = _instance.defaultsAndOverrides();
+	if (defaultsAndOverrides.overrideTimeout)
 	{
-	    _endpoint = _endpoint.timeout(defaultsAndOverwrites.overwriteTimeoutValue);
+	    _endpoint = _endpoint.timeout(defaultsAndOverrides.overrideTimeoutValue);
 	}
         _adapter = adapter;
         _state = StateHolding;
diff --git a/java/src/IceInternal/Instance.java b/java/src/IceInternal/Instance.java
index 7420af631d9..d42681f0cd1 100644
--- a/java/src/IceInternal/Instance.java
+++ b/java/src/IceInternal/Instance.java
@@ -44,11 +44,11 @@ public class Instance
         return _traceLevels;
     }
 
-    public DefaultsAndOverwrites
-    defaultsAndOverwrites()
+    public DefaultsAndOverrides
+    defaultsAndOverrides()
     {
 	// No mutex lock, immutable.
-        return _defaultsAndOverwrites;
+        return _defaultsAndOverrides;
     }
 
     public synchronized RouterManager
@@ -160,7 +160,7 @@ public class Instance
 
             _traceLevels = new TraceLevels(_properties);
 
-            _defaultsAndOverwrites = new DefaultsAndOverwrites(_properties);
+            _defaultsAndOverrides = new DefaultsAndOverrides(_properties);
 
             _routerManager = new RouterManager();
 
@@ -176,10 +176,10 @@ public class Instance
 
             _pluginManager = new Ice.PluginManagerI(this);
 
-            if (_defaultsAndOverwrites.defaultRouter.length() > 0)
+            if (_defaultsAndOverrides.defaultRouter.length() > 0)
             {
                 _referenceFactory.setDefaultRouter(Ice.RouterPrxHelper.uncheckedCast(
-		    _proxyFactory.stringToProxy(_defaultsAndOverwrites.defaultRouter)));
+		    _proxyFactory.stringToProxy(_defaultsAndOverrides.defaultRouter)));
             }
 
             _outgoingConnectionFactory = new OutgoingConnectionFactory(this);
@@ -348,7 +348,7 @@ public class Instance
     private Ice.Properties _properties; // Immutable, not reset by destroy().
     private Ice.Logger _logger; // Not reset by destroy().
     private TraceLevels _traceLevels; // Immutable, not reset by destroy().
-    private DefaultsAndOverwrites _defaultsAndOverwrites; // Immutable, not reset by destroy().
+    private DefaultsAndOverrides _defaultsAndOverrides; // Immutable, not reset by destroy().
     private RouterManager _routerManager;
     private ReferenceFactory _referenceFactory;
     private ProxyFactory _proxyFactory;
diff --git a/java/src/IceInternal/OutgoingConnectionFactory.java b/java/src/IceInternal/OutgoingConnectionFactory.java
index 5a36de0e9da..aff6d4ab87a 100644
--- a/java/src/IceInternal/OutgoingConnectionFactory.java
+++ b/java/src/IceInternal/OutgoingConnectionFactory.java
@@ -38,13 +38,13 @@ public class OutgoingConnectionFactory
         //
         // Search for existing connections.
         //
-	DefaultsAndOverwrites defaultsAndOverwrites = _instance.defaultsAndOverwrites();
+	DefaultsAndOverrides defaultsAndOverrides = _instance.defaultsAndOverrides();
         for (int i = 0; i < endpoints.length; i++)
         {
 	    Endpoint endpoint = endpoints[i];
-	    if (defaultsAndOverwrites.overwriteTimeout)
+	    if (defaultsAndOverrides.overrideTimeout)
 	    {
-		endpoint = endpoint.timeout(defaultsAndOverwrites.overwriteTimeoutValue);
+		endpoint = endpoint.timeout(defaultsAndOverrides.overrideTimeoutValue);
 	    }
 
             Connection connection = (Connection)_connections.get(endpoints);
@@ -65,9 +65,9 @@ public class OutgoingConnectionFactory
         for (int i = 0; i < endpoints.length; i++)
         {
   	    Endpoint endpoint = endpoints[i];
-	    if (defaultsAndOverwrites.overwriteTimeout)
+	    if (defaultsAndOverrides.overrideTimeout)
 	    {
-		endpoint = endpoint.timeout(defaultsAndOverwrites.overwriteTimeoutValue);
+		endpoint = endpoint.timeout(defaultsAndOverrides.overrideTimeoutValue);
 	    }
 	    
 	    try
@@ -149,14 +149,14 @@ public class OutgoingConnectionFactory
             //
             Ice.ObjectPrx proxy = routerInfo.getClientProxy();
             Ice.ObjectAdapter adapter = routerInfo.getAdapter();
-	    DefaultsAndOverwrites defaultsAndOverwrites = _instance.defaultsAndOverwrites();
+	    DefaultsAndOverrides defaultsAndOverrides = _instance.defaultsAndOverrides();
             Endpoint[] endpoints = ((Ice.ObjectPrxHelper)proxy).__reference().endpoints;
             for (int i = 0; i < endpoints.length; i++)
             {
 		Endpoint endpoint = endpoints[i];
-		if (defaultsAndOverwrites.overwriteTimeout)
+		if (defaultsAndOverrides.overrideTimeout)
 		{
-		    endpoint = endpoint.timeout(defaultsAndOverwrites.overwriteTimeoutValue);
+		    endpoint = endpoint.timeout(defaultsAndOverrides.overrideTimeoutValue);
 		}
 
                 Connection connection = (Connection)_connections.get(endpoint);
diff --git a/java/src/IceInternal/TcpEndpoint.java b/java/src/IceInternal/TcpEndpoint.java
index 6d1655c499b..a40adcd5ffb 100644
--- a/java/src/IceInternal/TcpEndpoint.java
+++ b/java/src/IceInternal/TcpEndpoint.java
@@ -115,7 +115,7 @@ final class TcpEndpoint implements Endpoint
 
         if (_host == null)
         {
-            _host = _instance.defaultsAndOverwrites().defaultHost;
+            _host = _instance.defaultsAndOverrides().defaultHost;
         }
 
         calcHashValue();
diff --git a/java/src/IceInternal/UdpEndpoint.java b/java/src/IceInternal/UdpEndpoint.java
index a391c265c23..e1b06e7f656 100644
--- a/java/src/IceInternal/UdpEndpoint.java
+++ b/java/src/IceInternal/UdpEndpoint.java
@@ -107,7 +107,7 @@ final class UdpEndpoint implements Endpoint
 
         if (_host == null)
         {
-            _host = instance.defaultsAndOverwrites().defaultHost;
+            _host = instance.defaultsAndOverrides().defaultHost;
         }
 
         calcHashValue();