property fixes; minor cleanup

12 files changed, 76 insertions, 130 deletions

diff --git a/java/demo/Freeze/phonebook/Collocated.java b/java/demo/Freeze/phonebook/Collocated.java
index 337f2321ea2..9ee0626b4de 100644
--- a/java/demo/Freeze/phonebook/Collocated.java
+++ b/java/demo/Freeze/phonebook/Collocated.java
@@ -27,19 +27,15 @@ class PhoneBookCollocated extends Freeze.Application
 	// Create an Evictor for contacts.
 	//
 	Freeze.Evictor evictor;
-	String value = properties.getProperty("PhoneBook.SaveAfterMutatingOperation");
 	int v = 0;
-	if (value != null)
-	{
-	    try
-	    {
-		v = Integer.parseInt(value);
-	    }
-	    catch (NumberFormatException ex)
-	    {
-	    }
-	}
-	
+        try
+        {
+            v = Integer.parseInt(properties.getProperty("PhoneBook.SaveAfterMutatingOperation"));
+        }
+        catch (NumberFormatException ex)
+        {
+        }
+
 	if(v != 0)
 	{
 	    evictor = dbContacts.createEvictor(Freeze.EvictorPersistenceMode.SaveAfterMutatingOperation);
@@ -49,17 +45,13 @@ class PhoneBookCollocated extends Freeze.Application
 	    evictor = dbContacts.createEvictor(Freeze.EvictorPersistenceMode.SaveUponEviction);
 	}
 
-	value = properties.getProperty("PhoneBook.EvictorSize");
-	if (value != null)
-	{
-	    try
-	    {
-		v = Integer.parseInt(value);
-	    }
-	    catch (NumberFormatException ex)
-	    {
-	    }
-	}
+        try
+        {
+            v = Integer.parseInt(properties.getProperty("PhoneBook.EvictorSize"));
+        }
+        catch (NumberFormatException ex)
+        {
+        }
 
 	if(v != 0)
 	{
diff --git a/java/demo/Freeze/phonebook/Parser.java b/java/demo/Freeze/phonebook/Parser.java
index 7ad33e680a1..bdf3f24c905 100644
--- a/java/demo/Freeze/phonebook/Parser.java
+++ b/java/demo/Freeze/phonebook/Parser.java
@@ -10,7 +10,6 @@
 
 class Parser
 {
-
     public
     Parser(Ice.Communicator communicator, PhoneBookPrx phoneBook)
     {
@@ -42,7 +41,7 @@ class Parser
     {
 	if (args.isEmpty())
 	{
-	    error("`add' requires at least one rgument (type `help' for more info)");
+	    error("`add' requires at least one argument (type `help' for more info)");
 	    return;
 	}
 	
@@ -331,5 +330,4 @@ class Parser
     private PhoneBookPrx _phoneBook;
 
     private java.io.BufferedReader _in;
-
 }
diff --git a/java/demo/Freeze/phonebook/RunParser.java b/java/demo/Freeze/phonebook/RunParser.java
index d006eeb0789..80b4842fb81 100644
--- a/java/demo/Freeze/phonebook/RunParser.java
+++ b/java/demo/Freeze/phonebook/RunParser.java
@@ -56,7 +56,7 @@ class RunParser
 	Ice.Properties properties = communicator.getProperties();
 	String refProperty = "PhoneBook.PhoneBook";
 	String ref = properties.getProperty(refProperty);
-	if (ref == null)
+	if (ref.length() == 0)
 	{
 	    System.err.println(appName +  ": property `" + refProperty + "' not set");
 	    return 1;
diff --git a/java/demo/Freeze/phonebook/Scanner.java b/java/demo/Freeze/phonebook/Scanner.java
index fc3efd9643b..dff7d5bfd3b 100644
--- a/java/demo/Freeze/phonebook/Scanner.java
+++ b/java/demo/Freeze/phonebook/Scanner.java
@@ -286,4 +286,3 @@ class Scanner
     private String _buf = null;
     private int _pos;
 }
-
diff --git a/java/demo/Freeze/phonebook/Server.java b/java/demo/Freeze/phonebook/Server.java
index 98c6b891b9f..06bd41783df 100644
--- a/java/demo/Freeze/phonebook/Server.java
+++ b/java/demo/Freeze/phonebook/Server.java
@@ -27,19 +27,14 @@ class PhoneBookServer extends Freeze.Application
 	// Create an Evictor for contacts.
 	//
 	Freeze.Evictor evictor;
-	String value = properties.getProperty("PhoneBook.SaveAfterMutatingOperation");
 	int v = 0;
-	if (value != null)
-	{
-	    try
-	    {
-		v = Integer.parseInt(value);
-	    }
-	    catch (NumberFormatException ex)
-	    {
-	    }
+        try
+        {
+            v = Integer.parseInt(properties.getProperty("PhoneBook.SaveAfterMutatingOperation"));
+        }
+        catch (NumberFormatException ex)
+        {
 	}
-	
 
 	if(v != 0)
 	{
@@ -50,17 +45,13 @@ class PhoneBookServer extends Freeze.Application
 	    evictor = dbContacts.createEvictor(Freeze.EvictorPersistenceMode.SaveUponEviction);
 	}
 
-	value = properties.getProperty("PhoneBook.EvictorSize");
-	if (value != null)
-	{
-	    try
-	    {
-		v = Integer.parseInt(value);
-	    }
-	    catch (NumberFormatException ex)
-	    {
-	    }
-	}
+        try
+        {
+            v = Integer.parseInt(properties.getProperty("PhoneBook.EvictorSize"));
+        }
+        catch (NumberFormatException ex)
+        {
+        }
 
 	if(v != 0)
 	{
diff --git a/java/src/Freeze/Application.java b/java/src/Freeze/Application.java
index 9769ca720ff..47554482082 100644
--- a/java/src/Freeze/Application.java
+++ b/java/src/Freeze/Application.java
@@ -12,8 +12,8 @@ package Freeze;
 
 public abstract class Application extends Ice.Application
 {
-
-    public Application(String dbEnvName)
+    public
+    Application(String dbEnvName)
     {
 	_dbEnvName = dbEnvName;
     }
@@ -81,5 +81,4 @@ public abstract class Application extends Ice.Application
     runFreeze(String[] args, DBEnvironment dbEnv);
 
     private String _dbEnvName;
-
 }
diff --git a/java/src/Freeze/DBCursorI.java b/java/src/Freeze/DBCursorI.java
index 90d01378d2b..2994e85a62f 100644
--- a/java/src/Freeze/DBCursorI.java
+++ b/java/src/Freeze/DBCursorI.java
@@ -280,23 +280,15 @@ class DBCursorI implements DBCursor
 	_name = name;
 	_cursor = cursor;
 
-	Ice.Properties properties = _communicator.getProperties();
-	String value;
-
-	value = properties.getProperty("Freeze.Trace.DB");
-	if (value != null)
-	{
-	    try
-	    {
-		_trace = Integer.parseInt(value);
-	    }
-	    catch (NumberFormatException ex)
-	    {
-		// TODO: Do anything?
-	    }
-	}
-
 	_errorPrefix = "Freeze::DBCursor(\"" + _name + "\"): ";
+        try
+        {
+            _trace = Integer.parseInt(_communicator.getProperties().getProperty("Freeze.Trace.DB"));
+        }
+        catch (NumberFormatException ex)
+        {
+            // TODO: Do anything?
+        }
 
 	if (_trace >= 1)
 	{
diff --git a/java/src/Freeze/DBEnvironmentI.java b/java/src/Freeze/DBEnvironmentI.java
index 34d1fc316d6..e1632b5b2c0 100644
--- a/java/src/Freeze/DBEnvironmentI.java
+++ b/java/src/Freeze/DBEnvironmentI.java
@@ -202,19 +202,14 @@ class DBEnvironmentI implements DBEnvironment
 
 	_errorPrefix = "Freeze::DBEnvironment(\"" + _name + "\"): ";
 
-	Ice.Properties properties = _communicator.getProperties();
-	String value = properties.getProperty("Freeze.Trace.DB");
-	if (value != null)
-	{
-	    try
-	    {
-		_trace = Integer.parseInt(value);
-	    }
-	    catch (NumberFormatException ex)
-	    {
-		// TODO: Do anything?
-	    }
-	}
+        try
+        {
+            _trace = Integer.parseInt(_communicator.getProperties().getProperty("Freeze.Trace.DB"));
+        }
+        catch (NumberFormatException ex)
+        {
+            // TODO: Do anything?
+        }
 
 	_dbEnv = new com.sleepycat.db.DbEnv(0);
 	
diff --git a/java/src/Freeze/DBI.java b/java/src/Freeze/DBI.java
index 698839bd2af..a10e38e2ce5 100644
--- a/java/src/Freeze/DBI.java
+++ b/java/src/Freeze/DBI.java
@@ -504,22 +504,15 @@ class DBI implements DB
 
 	_errorPrefix = "Freeze::DB(\"" + _name + "\"): ";
 
-	Ice.Properties properties = _communicator.getProperties();
-	String value;
+        try
+        {
+            _trace = Integer.parseInt(_communicator.getProperties().getProperty("Freeze.Trace.DB"));
+        }
+        catch (NumberFormatException ex)
+        {
+            // TODO: Do anything?
+        }
 
-	value = properties.getProperty("Freeze.Trace.DB");
-	if (value != null)
-	{
-	    try
-	    {
-		_trace = Integer.parseInt(value);
-	    }
-	    catch (NumberFormatException ex)
-	    {
-		// TODO: Do anything?
-	    }
-	}
-	
 	if (_trace >= 1)
 	{
 	    _communicator.getLogger().trace("DB","opening database \"" + _name + "\" in environment \"" +
diff --git a/java/src/Freeze/DBTransactionI.java b/java/src/Freeze/DBTransactionI.java
index b7f4319a322..cfe2d7cbc1b 100644
--- a/java/src/Freeze/DBTransactionI.java
+++ b/java/src/Freeze/DBTransactionI.java
@@ -64,7 +64,7 @@ class DBTransactionI implements DBTransaction
 	if (_trace >= 2)
 	{
 	    _communicator.getLogger().trace("DB", "aborting transaction for environment \"" + _name +
-					     "\" due to deadlock");
+					    "\" due to deadlock");
 	}
 	
 	try
@@ -88,20 +88,15 @@ class DBTransactionI implements DBTransaction
 	_name = name;
 
 	_errorPrefix = "Freeze::DBTransaction(\"" + _name + "\"): ";
-	
-	String value = _communicator.getProperties().getProperty("Freeze.Trace.DB");
-	if (value != null)
-	{
-	    try
-	    {
-		_trace = Integer.parseInt(value);
-	    }
-	    catch (NumberFormatException ex)
-	    {
-		// TODO: Do anything?
-	    }
-	}
-	
+        try
+        {
+            _trace = Integer.parseInt(_communicator.getProperties().getProperty("Freeze.Trace.DB"));
+        }
+        catch (NumberFormatException ex)
+        {
+            // TODO: Do anything?
+        }
+
 	if (_trace >= 2)
 	{
 	    _communicator.getLogger().trace("DB", "starting transaction for environment \"" + _name + "\"");
diff --git a/java/src/Freeze/EvictorI.java b/java/src/Freeze/EvictorI.java
index 0012c983ee7..c1dee180fcb 100644
--- a/java/src/Freeze/EvictorI.java
+++ b/java/src/Freeze/EvictorI.java
@@ -272,21 +272,14 @@ class EvictorI implements Evictor
 	_dict = new IdentityObjectDict(db);
 	_persistenceMode = persistenceMode;
 
-	Ice.Properties properties = _db.getCommunicator().getProperties();
-	String value;
-
-	value = properties.getProperty("Freeze.Trace.Evictor");
-	if (value != null)
-	{
-	    try
-	    {
-		_trace = Integer.parseInt(value);
-	    }
-	    catch (NumberFormatException ex)
-	    {
-		// TODO: Do anything?
-	    }
-	}
+        try
+        {
+            _trace = Integer.parseInt(_db.getCommunicator().getProperties().getProperty("Freeze.Trace.Evictor"));
+        }
+        catch (NumberFormatException ex)
+        {
+            // TODO: Do anything?
+        }
     }
 
     private void
@@ -393,7 +386,6 @@ class EvictorI implements Evictor
 	public int usageCount;
     };
 
-
     //
     // Map of Ice.Identity to EvictorElement
     //
diff --git a/java/src/Freeze/Map.java b/java/src/Freeze/Map.java
index 96fcf7625c7..57865bb4ec5 100644
--- a/java/src/Freeze/Map.java
+++ b/java/src/Freeze/Map.java
@@ -199,7 +199,7 @@ public abstract class Map extends java.util.AbstractMap
 		{
 		    Map.this.clear();
 		}
-		};
+            };
         }
 
         return _entrySet;
@@ -246,7 +246,7 @@ public abstract class Map extends java.util.AbstractMap
     private static boolean
     valEquals(Object o1, Object o2)
     {
-        return (o1==null ? o2==null : o1.equals(o2));
+        return (o1 == null ? o2 == null : o1.equals(o2));
     }
 
     class EntryIterator implements java.util.Iterator