From abada90e3f84dc703b8ddc9efcbed8a946fadead Mon Sep 17 00:00:00 2001 From: Bernard Normier Date: Thu, 1 Feb 2007 17:09:49 +0000 Subject: Expanded tabs into spaces --- java/test/Freeze/complex/Client.java | 350 +++++++++++++++++------------------ 1 file changed, 175 insertions(+), 175 deletions(-) (limited to 'java/test/Freeze/complex/Client.java') diff --git a/java/test/Freeze/complex/Client.java b/java/test/Freeze/complex/Client.java index 5ab5e5ff25a..e4257f9bee9 100644 --- a/java/test/Freeze/complex/Client.java +++ b/java/test/Freeze/complex/Client.java @@ -24,215 +24,215 @@ public class Client private int validate(String dbName) - throws DatabaseException + throws DatabaseException { - Complex.ComplexDict m = new Complex.ComplexDict(_connection, dbName, true); - - try - { - Parser parser = new Parser(); - - System.out.print("testing database expressions... "); - java.util.Iterator p = m.entrySet().iterator(); - while(p.hasNext()) - { - java.util.Map.Entry e = (java.util.Map.Entry)p.next(); - - Complex.Key key = (Complex.Key)e.getKey(); - - // - // Verify the stored record is correct. - // - test(key.result == ((Complex.Node)e.getValue()).calc()); - - // - // Verify that the expression & result again. - // - Complex.Node root = parser.parse(key.expression); - test(root.calc(null) == key.result); - } - System.out.println("ok"); - } - catch(ParseError e) - { - e.printStackTrace(); - test(false); - } - - m.close(); - - return 0; + Complex.ComplexDict m = new Complex.ComplexDict(_connection, dbName, true); + + try + { + Parser parser = new Parser(); + + System.out.print("testing database expressions... "); + java.util.Iterator p = m.entrySet().iterator(); + while(p.hasNext()) + { + java.util.Map.Entry e = (java.util.Map.Entry)p.next(); + + Complex.Key key = (Complex.Key)e.getKey(); + + // + // Verify the stored record is correct. + // + test(key.result == ((Complex.Node)e.getValue()).calc()); + + // + // Verify that the expression & result again. + // + Complex.Node root = parser.parse(key.expression); + test(root.calc(null) == key.result); + } + System.out.println("ok"); + } + catch(ParseError e) + { + e.printStackTrace(); + test(false); + } + + m.close(); + + return 0; } private int populate(String dbName) - throws DatabaseException + throws DatabaseException { - String[] expressions = - { - "2", - "10", - "2+(5*3)", - "5*(2+3)", - "10+(10+(20+(8*(2*(3*2+4+5+6)))))" - }; - - Complex.ComplexDict m = new Complex.ComplexDict(_connection, dbName, true); - - try - { - Parser parser = new Parser(); - - System.out.print("populating the database... "); - for(int i = 0 ; i < expressions.length; ++i) - { - Complex.Node root = parser.parse(expressions[i]); - assert(root != null); - Complex.Key k = new Complex.Key(); - k.expression = expressions[i]; - k.result = root.calc(null); - m.put(k, root); - } - System.out.println("ok"); - } - catch(ParseError e) - { - e.printStackTrace(); - test(false); - } - - m.close(); - return 0; + String[] expressions = + { + "2", + "10", + "2+(5*3)", + "5*(2+3)", + "10+(10+(20+(8*(2*(3*2+4+5+6)))))" + }; + + Complex.ComplexDict m = new Complex.ComplexDict(_connection, dbName, true); + + try + { + Parser parser = new Parser(); + + System.out.print("populating the database... "); + for(int i = 0 ; i < expressions.length; ++i) + { + Complex.Node root = parser.parse(expressions[i]); + assert(root != null); + Complex.Key k = new Complex.Key(); + k.expression = expressions[i]; + k.result = root.calc(null); + m.put(k, root); + } + System.out.println("ok"); + } + catch(ParseError e) + { + e.printStackTrace(); + test(false); + } + + m.close(); + return 0; } static void usage(String name) { - System.out.println("Usage: " + name + " [options] validate|populate"); - System.out.println("Options:"); - System.out.println("--dbdir Location of the database directory."); + System.out.println("Usage: " + name + " [options] validate|populate"); + System.out.println("Options:"); + System.out.println("--dbdir Location of the database directory."); } private int run(String[] args, String dbName) - throws DatabaseException + throws DatabaseException { - // - // Register a factory for the node types. - // - Ice.ObjectFactory factory = new Complex.ObjectFactoryI(); - _communicator.addObjectFactory(factory, "::Complex::NumberNode"); - _communicator.addObjectFactory(factory, "::Complex::AddNode"); - _communicator.addObjectFactory(factory, "::Complex::MultiplyNode"); - - if(args.length != 0 && args[0].equals("populate")) - { - return populate(dbName); - } - if(args.length != 0 && args[0].equals("validate")) - { - return validate(dbName); - } - usage(progName); - + // + // Register a factory for the node types. + // + Ice.ObjectFactory factory = new Complex.ObjectFactoryI(); + _communicator.addObjectFactory(factory, "::Complex::NumberNode"); + _communicator.addObjectFactory(factory, "::Complex::AddNode"); + _communicator.addObjectFactory(factory, "::Complex::MultiplyNode"); + + if(args.length != 0 && args[0].equals("populate")) + { + return populate(dbName); + } + if(args.length != 0 && args[0].equals("validate")) + { + return validate(dbName); + } + usage(progName); + return 0; } private void close() { - _connection.close(); + _connection.close(); } private Client(Ice.Communicator communicator, String envName) { - _communicator = communicator; - _connection = Freeze.Util.createConnection(communicator, envName); + _communicator = communicator; + _connection = Freeze.Util.createConnection(communicator, envName); } static public void main(String[] args) { - int status; - Ice.Communicator communicator = null; - String envName = "db"; - - try - { - // - // Scan for --dbdir command line argument. - // - int i = 0; - while(i < args.length) - { - if(args[i].equals("--dbdir")) - { - if(i +1 >= args.length) - { - usage(progName); - System.exit(1); - } - - envName = args[i+1]; - envName += "/"; - envName += "db"; - - // - // Consume arguments - // - String[] arr = new String[args.length - 2]; - System.arraycopy(args, 0, arr, 0, i); - if(i < args.length - 2) - { - System.arraycopy(args, i + 2, arr, i, args.length - i - 2); - } - args = arr; - } - else - { - ++i; - } - } - - Ice.StringSeqHolder holder = new Ice.StringSeqHolder(); - holder.value = args; - communicator = Ice.Util.initialize(holder); - args = holder.value; - Client client = new Client(communicator, envName); - try - { - status = client.run(args, "test"); - } - finally - { - client.close(); - } - } - catch(Exception ex) - { - ex.printStackTrace(); - System.err.println(ex); - status = 1; - } - - if(communicator != null) - { - try - { - communicator.destroy(); - } - catch(Exception ex) - { - System.err.println(ex); - status = 1; - } - } - - System.gc(); - System.exit(status); + int status; + Ice.Communicator communicator = null; + String envName = "db"; + + try + { + // + // Scan for --dbdir command line argument. + // + int i = 0; + while(i < args.length) + { + if(args[i].equals("--dbdir")) + { + if(i +1 >= args.length) + { + usage(progName); + System.exit(1); + } + + envName = args[i+1]; + envName += "/"; + envName += "db"; + + // + // Consume arguments + // + String[] arr = new String[args.length - 2]; + System.arraycopy(args, 0, arr, 0, i); + if(i < args.length - 2) + { + System.arraycopy(args, i + 2, arr, i, args.length - i - 2); + } + args = arr; + } + else + { + ++i; + } + } + + Ice.StringSeqHolder holder = new Ice.StringSeqHolder(); + holder.value = args; + communicator = Ice.Util.initialize(holder); + args = holder.value; + Client client = new Client(communicator, envName); + try + { + status = client.run(args, "test"); + } + finally + { + client.close(); + } + } + catch(Exception ex) + { + ex.printStackTrace(); + System.err.println(ex); + status = 1; + } + + if(communicator != null) + { + try + { + communicator.destroy(); + } + catch(Exception ex) + { + System.err.println(ex); + status = 1; + } + } + + System.gc(); + System.exit(status); } private Ice.Communicator _communicator; -- cgit v1.2.3