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

Timestamp:

02/15/06 18:31:48 (19 years ago)

Author:

boris

Message:

• changed code to compute actual region of a component/class instead of first line as it was before
• implemented a mechanism to look up the class definition at a certain location in a modelica source file

Location:

trunk/org.modelica.mdt.omc/src/org/modelica/mdt/omc

Files:

• OMCProxy.java (modified) (3 diffs)
• internal/ElementLocation.java (deleted)

trunk/org.modelica.mdt.omc/src/org/modelica/mdt/omc/OMCProxy.java

@@ -61 +61 @@
 import org.modelica.mdt.core.compiler.ModelicaParser;
 import org.modelica.mdt.core.compiler.UnexpectedReplyException;
+import org.modelica.mdt.internal.core.ElementLocation;
 import org.modelica.mdt.internal.core.ErrorManager;
-import org.modelica.mdt.omc.internal.ElementLocation;
 import org.modelica.mdt.omc.internal.ParseResults;
 import org.modelica.mdt.omc.internal.OMCParser;
@@ -652 +652 @@
          * The getCrefInfo reply have the following format:
          * 
-         * <file path>,<line number>,<column number>
+         * <file path>,<something>,<start line>,<start column>,<end line>,<end column>
          * 
+         * for example:
+         * /foo/Modelica/package.mo,writable,1,1,1029,13
          */
 
@@ -661 +663 @@
 
         List tokens = ModelicaParser.parseList(retval);
-        int line;
+        
+        String filePath = tokens.elementAt(0).toString();
+        int startLine;
+        int startColumn;
+        int endLine;
+        int endColumn;
 
         try
         {
-            line = Integer.parseInt(tokens.elementAt(2).toString());
+            startLine = Integer.parseInt(tokens.elementAt(2).toString());
+            startColumn = Integer.parseInt(tokens.elementAt(3).toString());
+            endLine = Integer.parseInt(tokens.elementAt(4).toString());
+            endColumn = Integer.parseInt(tokens.elementAt(5).toString());
         }
         catch (NumberFormatException e)
         {
             throw new 
-            UnexpectedReplyException("can't parse getCrefInfo() reply, "+
-                    "unexpected format");
-        }
-        
-        return new ElementLocation(tokens.elementAt(0).toString(), line);
+                UnexpectedReplyException("can't parse getCrefInfo() reply, "+
+                        "unexpected format");
+        }
+        
+        return new ElementLocation(filePath, 
+                    startLine, startColumn, endLine, endColumn);
     }