svn commit: r16322 - trunk/src/argouml-app/src/org/argouml/uml/reveng/ImportCommon.java

Author: tfmorris
Date: 2008-12-10 14:18:37-0800
New Revision: 16322

Modified:
   trunk/src/argouml-app/src/org/argouml/uml/reveng/ImportCommon.java

Log:
Clean up warnings.  Small refactoring.

Modified: trunk/src/argouml-app/src/org/argouml/uml/reveng/ImportCommon.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/argouml-app/src/org/argouml/uml/reveng/ImportCommon.java?view=diff&pathrev=16322&r1=16321&r2=16322
==============================================================================
--- trunk/src/argouml-app/src/org/argouml/uml/reveng/ImportCommon.java	(original)
+++ trunk/src/argouml-app/src/org/argouml/uml/reveng/ImportCommon.java	2008-12-10 14:18:37-0800
@@ -27,7 +27,6 @@
 import java.io.File;
 import java.io.PrintWriter;
 import java.io.StringWriter;
-import java.net.URL;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
@@ -277,8 +276,9 @@
 
     protected File[] getSelectedFiles() {
 	File[] copy = new File[selectedFiles.length];
-	for (int i = 0; i < selectedFiles.length; i++)
+	for (int i = 0; i < selectedFiles.length; i++) {
 	    copy[i] = selectedFiles[i];
+	}
 	return copy;
         //return Arrays.copyOf(selectedFiles, selectedFiles.length);
     }
@@ -330,7 +330,7 @@
                 Configuration.getString(Argo.KEY_IMPORT_GENERAL_SETTINGS_FLAGS);
         if (flags != null && flags.length() > 0) {
             StringTokenizer st = new StringTokenizer(flags, ",");
-            if (st.hasMoreTokens()) st.nextToken();
+            skipTokens(st, 1);
             if (st.hasMoreTokens() && st.nextToken().equals("false")) {
                 return false;
             }
@@ -350,8 +350,7 @@
                         Argo.KEY_IMPORT_GENERAL_SETTINGS_FLAGS);
         if (flags != null && flags.length() > 0) {
             StringTokenizer st = new StringTokenizer(flags, ",");
-            if (st.hasMoreTokens()) st.nextToken();
-            if (st.hasMoreTokens()) st.nextToken();
+            skipTokens(st, 2);
             if (st.hasMoreTokens() && st.nextToken().equals("false")) {
                 return false;
             }
@@ -371,9 +370,7 @@
                         Argo.KEY_IMPORT_GENERAL_SETTINGS_FLAGS);
         if (flags != null && flags.length() > 0) {
             StringTokenizer st = new StringTokenizer(flags, ",");
-            if (st.hasMoreTokens()) st.nextToken();
-            if (st.hasMoreTokens()) st.nextToken();
-            if (st.hasMoreTokens()) st.nextToken();
+            skipTokens(st, 3);
             if (st.hasMoreTokens() && st.nextToken().equals("false")) {
                 return false;
             }
@@ -381,6 +378,14 @@
         return true;
     }
 
+    private void skipTokens(StringTokenizer st, int count) {
+        for (int i = 0; i < count; i++) {
+            if (st.hasMoreTokens()) {
+                st.nextToken();
+            }
+        }
+    }
+
     /**
      * The flag for: perform automatic diagram layout.
      * This should be asked by the GUI for initialization.
@@ -393,10 +398,7 @@
                         Argo.KEY_IMPORT_GENERAL_SETTINGS_FLAGS);
         if (flags != null && flags.length() > 0) {
             StringTokenizer st = new StringTokenizer(flags, ",");
-            if (st.hasMoreTokens()) st.nextToken();
-            if (st.hasMoreTokens()) st.nextToken();
-            if (st.hasMoreTokens()) st.nextToken();
-            if (st.hasMoreTokens()) st.nextToken();
+            skipTokens(st, 4);
             if (st.hasMoreTokens() && st.nextToken().equals("false")) {
                 return false;
             }
@@ -485,6 +487,7 @@
             if (criticThreadWasOn) {
                 Designer.theDesigner().setAutoCritique(true);
             }
+            // TODO: Send an event instead of calling Explorer directly
             ExplorerEventAdaptor.getInstance().structureChanged();
             Model.getPump().startPumpingEvents();
             // Should already be closed.  If not, something bad happened, so

------------------------------------------------------
http://argouml.tigris.org/ds/viewMessage.do?dsForumId=5905&dsMessageId=982575

To unsubscribe from this discussion, e-mail: [[email protected]].