Changeset 1189 for trunk/src/org/expeditee/io

Timestamp:

10/31/18 10:22:56 (6 years ago)

Author:

bln4

Message:

 

File:

• trunk/src/org/expeditee/io/ExpReader.java (modified) (7 diffs)

trunk/src/org/expeditee/io/ExpReader.java

@@ -81 +81 @@
          *             Any exceptions occured by the BufferedReader.
          */
+        @Override
         public Frame readFrame(BufferedReader reader) throws IOException {
                 _reader = reader;
@@ -133 +134 @@
                                         Point idtype = separateValues(next.substring(2));
                                         // The next line must be the endpoints
-                                        if (!_reader.ready())
+                                        if (!_reader.ready()) {
                                                 throw new Exception("Unexpected end of file");
+                                        }
                                         next = _reader.readLine();
                                         Point startend = separateValues(next.substring(2));
@@ -156 +158 @@
                                         Point idtype = separateValues(next.substring(2));
                                         // The next line must be the endpoints
-                                        if (!_reader.ready())
+                                        if (!_reader.ready()) {
                                                 throw new Exception("Unexpected end of file");
+                                        }
                                         next = _reader.readLine();
                                         Point startend = separateValues(next.substring(2));
@@ -168 +171 @@
                         }
                         
-                        for(DelayedAction action: delayedActions) 
+                        for(DelayedAction action: delayedActions) {
                                 action.exec();
+                        }
 
                         // Read the stats
@@ -234 +238 @@
 
                 Method toRun = _ItemTags.get(tag);
-                if (toRun == null) System.out.println("Error accessing tag method: " + tag);
+                if (toRun == null) {
+                        System.out.println("Error accessing tag method: " + tag);
+                }
                 Object[] vals = Conversion.Convert(toRun, value);
 
                 try {
-                        if (vals != null) toRun.invoke(item, vals);
+                        if (vals != null) {
+                                toRun.invoke(item, vals);
+                        }
                 } catch (Exception e) {
                         System.out.println("Error running tag method: " + tag);
@@ -251 +259 @@
 
         protected static String getValue(String line) {
-                if (line.length() > 2)
+                if (line.length() > 2) {
                         return line.substring(2);
-                else
+                } else {
                         return "";
+                }
         }
         
@@ -312 +321 @@
                                         Character tag = getTag(next);
                                         String value = getValue(next);
-                                        if (tag.equals('V'))
+                                        if (tag.equals('V')) {
                                                 return Integer.parseInt(value);
+                                        }
                                 }
                         }