Changeset 402 for trunk/org.modelica.mdt.omc/src

Timestamp:

03/09/06 09:28:43 (19 years ago)

Author:

remar

Message:

• parseErrorString doesn't die on strange error strings anymore! (I hope)

File:

• trunk/org.modelica.mdt.omc/src/org/modelica/mdt/omc/internal/OMCParser.java (modified) (4 diffs)

trunk/org.modelica.mdt.omc/src/org/modelica/mdt/omc/internal/OMCParser.java

@@ -69 +69 @@
         throws UnexpectedReplyException
     {
+        if(errorString.equals(""))
+        {
+            throw new UnexpectedReplyException("Empty error message");
+        }
+        
         StringTokenizer strTok = new StringTokenizer(errorString, "\r\n");
+        
+        if(strTok.countTokens() == 0)
+        {
+            throw new UnexpectedReplyException("Empty error message");
+        }
+        
         CompileError[] compileErrs = new CompileError[strTok.countTokens()];
         
@@ -94 +105 @@
             String[] errorParts = errorLine.split("]");
             
-            if(errorParts.length < 2)
+            if(errorParts.length != 2)
             {
                 throw new UnexpectedReplyException("Weird error message from "+
@@ -134 +145 @@
              *   that the line and column numbers can be found.
              */
+            if(errorLocationParts[1].length() == 0)
+            {
+                throw new UnexpectedReplyException("Weird error message from " +
+                        "the compiler: [" + errorLine + "]");
+            }
+            
             char startCharacter = errorLocationParts[1].charAt(0);
             int infoOffset;
@@ -166 +183 @@
             {
                 ErrorManager.logError(e);
+                throw new UnexpectedReplyException("Weird error message from"+
+                        " the compiler: [" + errorLine + "]");
             }