JAL-629 labelled breaks are frowned upon by everyone

[jalview.git] / src / jalview / bin / Commands.java

diff --git a/src/jalview/bin/Commands.java b/src/jalview/bin/Commands.java
index c05194d..5b3e199 100644 (file)
--- a/src/jalview/bin/Commands.java
+++ b/src/jalview/bin/Commands.java
@@ -121,11 +121,12 @@ public class Commands
 
       boolean first = true;
       AlignFrame af;
-      OPEN: for (String openFile : ArgParser.getValues(m, Arg.OPEN))
+      for (String openFile : ArgParser.getValues(m, Arg.OPEN))
       {
         if (openFile == null)
-          continue OPEN;
+          continue;
 
+        argsWereParsed = true;
         if (first)
         {
           first = false;
@@ -150,7 +151,6 @@ public class Commands
             if (!(new File(openFile)).exists())
             {
               Console.warn("Can't find file '" + openFile + "'");
-              continue OPEN;
             }
           }
         }
@@ -391,7 +391,7 @@ public class Commands
       AlignFrame af = afMap.get(id);
       if (ArgParser.getArgValues(m, Arg.STRUCTURE) != null)
       {
-        STRUCTURE: for (String val : ArgParser.getValues(m, Arg.STRUCTURE))
+        for (String val : ArgParser.getValues(m, Arg.STRUCTURE))
         {
           SubVal subId = new SubVal(val);
           SequenceI seq = getSpecifiedSequence(af, subId);
@@ -421,14 +421,14 @@ public class Commands
           if (structureFile == null)
           {
             Console.warn("Not provided structure file with '" + val + "'");
-            continue STRUCTURE;
+            continue;
           }
 
           if (!structureFile.exists())
           {
             Console.warn("Structure file '"
                     + structureFile.getAbsoluteFile() + "' not found.");
-            continue STRUCTURE;
+            continue;
           }
 
           Console.debug("Using structure file "