1 files changed, 40 insertions, 55 deletions

diff --git a/cpp/src/slice2java/Main.cpp b/cpp/src/slice2java/Main.cpp
index bb4a66ce102..8148956dd91 100644
--- a/cpp/src/slice2java/Main.cpp
+++ b/cpp/src/slice2java/Main.cpp
@@ -48,21 +48,6 @@ usage(const char* n)
 int
 main(int argc, char* argv[])
 {
-    string cppArgs;
-    vector<string> includePaths;
-    bool preprocess;
-    string output;
-    bool tie;
-    bool impl;
-    bool implTie;
-    bool depend;
-    bool debug;
-    bool ice;
-    string checksumClass;
-    bool stream;
-    StringList globalMetadata;
-    bool caseSensitive;
-
     IceUtil::Options opts;
     opts.addOpt("h", "help");
     opts.addOpt("v", "version");
@@ -99,57 +84,57 @@ main(int argc, char* argv[])
 	usage(argv[0]);
 	return EXIT_SUCCESS;
     }
+
     if(opts.isSet("version"))
     {
 	cout << ICE_STRING_VERSION << endl;
 	return EXIT_SUCCESS;
     }
-    if(opts.isSet("D"))
-    {
-        vector<string> optargs = opts.argVec("D");
-	for(vector<string>::const_iterator i = optargs.begin(); i != optargs.end(); ++i)
-	{
-	    cppArgs += " -D\"" + *i + "\"";
-	}
-    }
-    if(opts.isSet("U"))
-    {
-        vector<string> optargs = opts.argVec("U");
-	for(vector<string>::const_iterator i = optargs.begin(); i != optargs.end(); ++i)
-	{
-	    cppArgs += " -U\"" + *i + "\"";
-	}
-    }
-    if(opts.isSet("I"))
-    {
-        includePaths = opts.argVec("I");
-	for(vector<string>::const_iterator i = includePaths.begin(); i != includePaths.end(); ++i)
-	{
-	    cppArgs += " -I\"" + *i + "\"";
-	}
-    }
-    preprocess = opts.isSet("E");
-    if(opts.isSet("output-dir"))
+
+    string cppArgs;
+    vector<string> optargs = opts.argVec("D");
+    for(vector<string>::const_iterator i = optargs.begin(); i != optargs.end(); ++i)
     {
-	output = opts.optArg("output-dir");
+	cppArgs += " -D\"" + *i + "\"";
     }
-    tie = opts.isSet("tie");
-    impl = opts.isSet("impl");
-    implTie = opts.isSet("impl-tie");
-    depend = opts.isSet("depend");
-    debug = opts.isSet("debug");
-    ice = opts.isSet("ice");
-    if(opts.isSet("checksum"))
+
+    optargs = opts.argVec("U");
+    for(vector<string>::const_iterator i = optargs.begin(); i != optargs.end(); ++i)
     {
-	checksumClass = opts.optArg("checksum");
+	cppArgs += " -U\"" + *i + "\"";
     }
-    stream = opts.isSet("stream");
-    if(opts.isSet("meta"))
+
+    vector<string> includePaths = opts.argVec("I");
+    for(vector<string>::const_iterator i = includePaths.begin(); i != includePaths.end(); ++i)
     {
-	vector<string> v = opts.argVec("meta");
-	copy(v.begin(), v.end(), back_inserter(globalMetadata));
+	cppArgs += " -I\"" + *i + "\"";
     }
-    caseSensitive = opts.isSet("case-sensitive");
+
+    bool preprocess = opts.isSet("E");
+
+    string output = opts.optArg("output-dir");
+
+    bool tie = opts.isSet("tie");
+
+    bool impl = opts.isSet("impl");
+
+    bool implTie = opts.isSet("impl-tie");
+
+    bool depend = opts.isSet("depend");
+
+    bool debug = opts.isSet("debug");
+
+    bool ice = opts.isSet("ice");
+
+    string checksumClass = opts.optArg("checksum");
+
+    bool stream = opts.isSet("stream");
+
+    StringList globalMetadata;
+    vector<string> v = opts.argVec("meta");
+    copy(v.begin(), v.end(), back_inserter(globalMetadata));
+
+    bool caseSensitive = opts.isSet("case-sensitive");
 
     if(args.empty())
     {