Changeset 67 for trunk/src/org/expeditee/io/KMSReader.java

Timestamp:

05/19/08 12:03:18 (16 years ago)

Author:

ra33

Message:

Fixed a bunch of problems with rectangles and resizing the window, as well as adding some more unit tests etc.

File:

• trunk/src/org/expeditee/io/KMSReader.java (modified) (9 diffs)

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

@@ -1 +1 @@
 package org.expeditee.io;
 
-import java.awt.Color;
-import java.awt.Font;
-import java.awt.Point;
 import java.io.BufferedReader;
 import java.io.FileReader;
@@ -13 +10 @@
 import java.util.Iterator;
 import java.util.LinkedHashMap;
-import java.util.List;
 
 import org.expeditee.gui.Frame;
@@ -30 +26 @@
  * 
  */
-public class KMSReader implements FrameReader {
+public class KMSReader extends FrameReader {
 
         private BufferedReader _reader = null;
@@ -48 +44 @@
                 _FrameTags = new LinkedHashMap<String, Method>();
 
-                Class[] pString = { String.class };
-                Class[] pInt = { int.class };
-                Class[] pFloat = { float.class };
-                Class[] pColor = { Color.class };
-                Class[] pBool = { boolean.class };
-                Class[] pFont = { Font.class };
-                Class[] pPoint = { Point.class };
-                Class[] pArrow = { int.class, double.class };
-                Class[] pList = { List.class };
-                Class[] pIntArray = { int[].class };
-                Class[] pItem = { Item.class };
-
                 try {
                         _FrameTags.put("A", Frame.class.getMethod("setFrameName", pString));
                         _FrameTags.put("V", Frame.class.getMethod("setVersion", pInt));
-                        _FrameTags
-                                        .put("v", Frame.class.getMethod("setFormatVersion", pInt));
                         _FrameTags
                                         .put("p", Frame.class.getMethod("setProtection", pString));
@@ -152 +134 @@
          * @return true if s begins with a KMS tag
          */
-        private boolean isValidLine(String s) {
+        private static boolean isValidLine(String s) {
                 return s.length() >= 3 && s.charAt(0) == '+' && s.charAt(2) == '+'
                                 && Character.isLetter(s.charAt(1));
@@ -332 +314 @@
         }
 
-        private String getTag(String line) {
+        private static String getTag(String line) {
                 assert (line.charAt(0) == '+');
                 assert (line.length() > 2);
@@ -338 +320 @@
         }
 
-        private String getValue(String line) {
+        private static String getValue(String line) {
                 assert (line.charAt(0) == '+');
                 if (line.length() > 4)
@@ -365 +347 @@
 
                 if (_FrameTags.get(tag) == null) {
-                        if (!tag.equals("t"))
+                        if (!tag.equals("t") && !tag.equals("v") )
                                 FrameGraphics.ErrorMessage("Tag '" + tag + "' in '" + line
                                                 + "' is not supported.");
@@ -530 +512 @@
                 return toMake;
         }
+        
+        public static int getVersion(String fullpath) {
+                try {
+                        BufferedReader reader = new BufferedReader(new FileReader(fullpath));
+                        String next = "";
+                        // First read the header lines until we get the version number
+                        while (reader.ready() && (next = reader.readLine())!= null) {
+                                if (isValidLine(next)) {
+                                        char tag = getTag(next).charAt(0);
+                                        String value = getValue(next);
+                                        if (tag == 'V')
+                                                return Integer.parseInt(value);
+                                        else if(tag == 'Z')
+                                                return 0;
+                                }
+                        }
+                } catch (Exception e) {
+                }
+                return 0;
+        }
 }