Changeset 1040 for trunk

Timestamp:

10/18/11 21:37:33 (13 years ago)

Author:

masberg

Message:

Fix typos, warnings, and formatting

File:

• trunk/org.modelica.mdt.omc/src/org/modelica/mdt/omc/OMCProxy.java (modified) (48 diffs)

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

@@ -103 +103 @@
 public class OMCProxy implements IModelicaCompiler
 {
-    
+
     /* the CORBA object */
     private  OmcCommunication omcc;
 
     enum osType { WINDOWS, UNIX };
-    
+
     private String corbaSession = "mdt";
 
@@ -123 +123 @@
     /* number of compiler errors to show */
     private int numberOfErrors = 0; 
-    
+
 
     /* indicates if the Modelica System Library has been loaded */
@@ -129 +129 @@
 
     private ArrayList<String> standardLibraryPackages = null;
-    
+
     /* should we trace the calls to sendExpression? */
     private  boolean traceOMCCalls  = false;
     private  boolean traceOMCStatus = true;
-    
+
     private  boolean traceStatusPreferences = false;
     private  boolean traceCommandsPreferences = false;
     private  boolean traceErrorPreferences = false; 
     private  boolean traceReplyPrefereces = false;  
-    
+
     {
         /* load debug options and set debug flag variables accordingly */
@@ -154 +154 @@
         }
     }
-    
+
     private  OutputStream consoleOutput = null;
-    
+
     private OMCThread fOMCThread = null;
     private boolean fOMCThreadHasBeenScheduled = false;
-    
+
     //private ILock fOMCLock = null;
 
@@ -245 +245 @@
      * With the help of voodoo magic determines the path to the
      * omc binary that user (probably) wants to use and the working
-     * direcoty of where that binary (most likely) should be started in
+     * directory of where that binary (most likely) should be started in
      * 
      * This will returns for example 'c:\openmodelica132\omc.exe'
@@ -272 +272 @@
              * user specified that standard path to omc should be used,
              * try to determine the omc path via the OPENMODELICAHOME and
-             * by checking in it's varius subdirectory for the omc binary file
+             * by checking in it's various subdirectory for the omc binary file
              */
             logOMCStatus("Using OPENMODELICAHOME environment variable to find omc-binary", true);
@@ -285 +285 @@
                 final String m = "Environment variable OPENMODELICAHOME not set";
                 logOMCStatus("Environment variable OPENMODELICAHOME not set,"+
-                " don't know how to start OMC from standard path.", true);
+                        " don't know how to start OMC from standard path.", true);
                 throw new ConnectException(m);
             }
@@ -330 +330 @@
                 logOMCStatus("file '" + omcBinary.getAbsolutePath() + "' does not exist", true);
                 throw new ConnectException("Specified omc-binary '" + omcBinary.getAbsolutePath() +
-                "' does not exist");
+                        "' does not exist");
             }
 
@@ -350 +350 @@
 
             if (parent.getName().equalsIgnoreCase("bin") || 
-                parent.getName().equalsIgnoreCase("compiler"))
+                    parent.getName().equalsIgnoreCase("compiler"))
             {
                 omcWorkingDirectory = parent.getParentFile();
@@ -406 +406 @@
         String args[] = {null};
 
-        /* set the CORBA read timeout to a larger value as we send huge ammounts of data
+        /* set the CORBA read timeout to a larger value as we send huge amounts of data
          * from OMC to MDT
          */
         System.setProperty("com.sun.CORBA.transport.ORBTCPReadTimeouts", "1:60000:300:1"); 
-        
+
         ORB orb;
         orb = ORB.init(args, null);     
@@ -531 +531 @@
     // communication with OMC
     // old synchronization aka 'private synchronized String sendExpression(String command)'
-    // doesnt work when there is possibility of multiple instances of OMCProxy objects
+    // doesn't work when there is possibility of multiple instances of OMCProxy objects
     public ICompilerResult sendExpression(String command, boolean showInConsole) throws ConnectException
     {   
@@ -541 +541 @@
             return CompilerResult.makeResult(retval, error);
         }
-        
+
         if (numberOfErrors > showMaxErrors) return CompilerResult.makeResult(retval, error);
-        
+
         // trim the start and end spaces
         command = command.trim();
@@ -553 +553 @@
             return CompilerResult.makeResult(retval, error);
         }
-        
+
         if(hasInitialized == false)
         {
             init();
         }
-        
+
         if (command.equalsIgnoreCase("quit()")) 
             hasInitialized = false;
@@ -591 +591 @@
                 else
                     System.out.println("");
-                */
+                 */
                 return CompilerResult.makeResult(retval, error);                
             }           
@@ -623 +623 @@
             }
         }
-            
+
         if (!traceOMCCalls)
         {
@@ -630 +630 @@
         System.out.println(">> " + expression);
     }
-    
+
     public void setConsoleOutputStream(OutputStream outputStream)
     {
         consoleOutput = outputStream;
     }
-    
+
 
     /**
@@ -653 +653 @@
             }
         }
-        
+
         if(!traceOMCCalls)
         {
@@ -662 +662 @@
 
     /**
-     * loggs the message conserning OMC status if the
+     * logs the message concerning OMC status if the
      * tracing flag traceOMCStatus is set
      * @param message the message to log
@@ -677 +677 @@
             }
         }
-        
+
         if (!traceOMCStatus)
         {
@@ -689 +689 @@
      * the tracing flag (traceOMCCalls) is set
      * 
-     * @param reply the reply recieved from the OMC
+     * @param reply the reply received from the OMC
      */
     private  void logOMCReply(String reply, boolean showInConsole)
@@ -702 +702 @@
             }
         }
-        
+
         if (!traceOMCCalls)
         {
@@ -756 +756 @@
      */
     public IModelicaClass.Restriction getRestriction(String className)
-    throws ConnectException, UnexpectedReplyException
-    {
+            throws ConnectException, UnexpectedReplyException
+            {
         ICompilerResult result = sendExpression("getClassRestriction(" + className + ")", true);
 
@@ -782 +782 @@
 
         return type;
-    }
+            }
 
     /**
@@ -796 +796 @@
          */     
         return 
-        (retval.toLowerCase().contains("error") /* && 
+                (retval.toLowerCase().contains("error") /* && 
                 !retval.startsWith("{")) || 
                 retval.equals("{}"*/);
@@ -805 +805 @@
         ParseResults results;
         long lastModification;
-        
+
         public LazyLoadResult(ParseResults results, long lastModification)
         {
@@ -813 +813 @@
     }
     private static Map<IPath, LazyLoadResult> lazyLoadList = new HashMap<IPath, LazyLoadResult>(); 
-    
+
     public static Map<IPath, LazyLoadResult> getLazyLoadList()
     {
         return lazyLoadList;
     }
-    
+
     /**
      * Tries to load file into OMC which causes it to be parsed and the syntax
@@ -900 +900 @@
                 long lastModification = file.getModificationStamp();
                 if (lastModification != IFile.NULL_STAMP)               
-                getLazyLoadList().put(file.getFullPath(), new LazyLoadResult(res, lastModification));
+                    getLazyLoadList().put(file.getFullPath(), new LazyLoadResult(res, lastModification));
             }
         }       
@@ -917 +917 @@
      */
     public DefinitionLocation getClassLocation(String className)
-    throws ConnectException, UnexpectedReplyException, InvocationError 
-    {
+            throws ConnectException, UnexpectedReplyException, InvocationError 
+            {
         ICompilerResult res = sendExpression("getCrefInfo(" + className + ")", true);
 
@@ -967 +967 @@
             throw new 
             UnexpectedReplyException("Can't parse getCrefInfo() reply, "+
-            "unexpected format");
+                    "unexpected format");
         }
 
         return new DefinitionLocation(filePath, startLine, startColumn, endLine, endColumn);
-    }
+            }
 
     /**
@@ -997 +997 @@
      */
     public Collection<ElementInfo> getElements(String className)
-    throws ConnectException, InvocationError, UnexpectedReplyException
-    {       
+            throws ConnectException, InvocationError, UnexpectedReplyException
+            {       
         ICompilerResult res = sendExpression("getElementsInfo("+ className +")", true);
         String retval = res.getFirstResult();
@@ -1010 +1010 @@
             {
                 /* 
-                 * we found the begining of the list, send it to parser and 
+                 * we found the beginning of the list, send it to parser and 
                  * hope for the best 
                  */
@@ -1052 +1052 @@
         /* we have no idea what OMC returned */
         throw new UnexpectedReplyException("getElementsInfo("+ className +")" + "replies:'" + retval + "'");
-    }
+            }
 
     public IClassInfo getClassInfo(String className)
-    throws ConnectException, UnexpectedReplyException
-    {
+            throws ConnectException, UnexpectedReplyException
+            {
         ICompilerResult res = sendExpression("getClassInformation("+ className +")", true);
         String retval = res.getFirstResult();
@@ -1076 +1076 @@
 
         return  ci;
-    }
+            }
 
 
@@ -1139 +1139 @@
             {
                 sendExpression("loadModel("+(String)lib+")", true);
-                
+
             }
 
@@ -1154 +1154 @@
      * the server
      */ 
-    public ICompilerResult getClassString(String className)
-    throws ConnectException, UnexpectedReplyException
-    {
+    public ICompilerResult getClassString(String className) throws ConnectException, UnexpectedReplyException {
         ICompilerResult res = sendExpression("list("+ className +")", true);
 
@@ -1163 +1161 @@
         return res;
     }
-    
+
     /**
      * 
@@ -1174 +1172 @@
         private String message = null;
         private String prefix = null;
-        
+
         public ConsoleWriter(OutputStream output, String prefix)
         {
@@ -1184 +1182 @@
             this.prefix = prefix;
         }
-        
+
         public synchronized void setMessage(String what)
         {
             message = what;
         }
-        
+
         public synchronized void run()
         {
@@ -1204 +1202 @@
         }
     }
-    
+
     /**
      * Evaluate command locally, don't sent it to OpenModelica Compiler
@@ -1217 +1215 @@
         {
             retval = 
-                "All the MDT Console local commands start with '!'.\n" +
-                "All commands not starting with '!' will be sent to the OpenModelica compiler.\n" +
-                "For a list of OpenModelica commands available type help().\n" +
-                "NOTE: The !trace* commands display traces of all OpenModelica<->MDT\n" +
-                "      communication except the commands send from the console!\n" +
-                "Available local commands are:\n" +
-                "!help         - toggle display help on local commands.\n" +
-                "!traceStatus  - toggle display the status of the OpenModelica compiler.\n" +
-                "!traceError   - toggle display errors talking with the OpenModelica compiler.\n" +
-                "!traceReply   - toggle display the reply of the OpenModelica compiler.\n" +
-                "!traceCommand - toggle display the commands send to the OpenModelica compiler.\n" +
-                "!traceAll     - toggle on the display of all the traces available.\n" +
-                "!traceNone    - toggle off the display of all the traces available.\n";
-        }
-        
+                    "All the MDT Console local commands start with '!'.\n" +
+                            "All commands not starting with '!' will be sent to the OpenModelica compiler.\n" +
+                            "For a list of OpenModelica commands available type help().\n" +
+                            "NOTE: The !trace* commands display traces of all OpenModelica<->MDT\n" +
+                            "      communication except the commands send from the console!\n" +
+                            "Available local commands are:\n" +
+                            "!help         - toggle display help on local commands.\n" +
+                            "!traceStatus  - toggle display the status of the OpenModelica compiler.\n" +
+                            "!traceError   - toggle display errors talking with the OpenModelica compiler.\n" +
+                            "!traceReply   - toggle display the reply of the OpenModelica compiler.\n" +
+                            "!traceCommand - toggle display the commands send to the OpenModelica compiler.\n" +
+                            "!traceAll     - toggle on the display of all the traces available.\n" +
+                            "!traceNone    - toggle off the display of all the traces available.\n";
+        }
+
         if (command.equals("traceStatus"))
         {
@@ -1237 +1235 @@
             retval = "Tracing of OpenModelica status is set to: " + traceStatusPreferences;
         }
-        
+
         if (command.equals("traceError"))
         {
             traceErrorPreferences = traceErrorPreferences ? false : true;
             retval = 
-                "Tracing of errors while talking with OpenModelica is set to: " + traceErrorPreferences;
+                    "Tracing of errors while talking with OpenModelica is set to: " + traceErrorPreferences;
         }       
-        
+
         if (command.equals("traceReply"))
         {
@@ -1256 +1254 @@
             retval = "Tracing of commands sent to OpenModelica is set to: " + traceCommandsPreferences;
         }
-        
+
         if (command.equals("traceAll"))
         {
@@ -1265 +1263 @@
             retval = "All tracing is now enabled!";         
         }
-        
+
         if (command.equals("traceNone"))
         {
@@ -1274 +1272 @@
             retval = "All tracing is now disabled!";            
         }       
-        
+
         return "\n" + retval;
     }
-    
+
     class OMCThread extends Thread
     {
-        
+
         public OMCThread()
         {
@@ -1310 +1308 @@
              */
             long lastModified = 0;
-            if(f.exists())
-            {
-                logOMCStatus("Remember the creation time for old OMC object reference file.", true);
-                lastModified = f.lastModified();
-            }
-            
+            if(f.exists())
+            {
+                logOMCStatus("Remember the creation time for old OMC object reference file.", true);
+                lastModified = f.lastModified();
+            }
+
             Process proc = null;
             StreamReaderThread outThread = null;
@@ -1322 +1320 @@
             String command[] = { omcBinary.getAbsolutePath(), "+c="+corbaSession, "+d=interactiveCorba"};
             String extraCmds[] = PreferenceManager.getOMCCommandLineParametersArray();
-            ArrayList both = new ArrayList(command.length + extraCmds.length);
-            Collections.addAll(both, command);
-            Collections.addAll(both, extraCmds);
-            String cmd[] = new String[both.size()];
-            int nonNull = 0;
-            for (int i=0; i < both.size(); i++)
-            {
-                String str = (String) both.get(i);
-                if (str != null)
-                {
-                    cmd[nonNull] = str;
-                    nonNull++;
-                }
-            }
-            String fullCMD = "";
-            for (int i=0; i < nonNull; i++) 
-                fullCMD += cmd[i] + " ";
+            ArrayList<String> both = new ArrayList<String>(command.length + extraCmds.length);
+            Collections.addAll(both, command);
+            Collections.addAll(both, extraCmds);
+            String cmd[] = new String[both.size()];
+            int nonNull = 0;
+            for (int i=0; i < both.size(); i++)
+            {
+                String str = (String) both.get(i);
+                if (str != null)
+                {
+                    cmd[nonNull] = str;
+                    nonNull++;
+                }
+            }
+            String fullCMD = "";
+            for (int i=0; i < nonNull; i++) 
+                fullCMD += cmd[i] + " ";
             logOMCStatus("Running command: " + fullCMD, true);
             logOMCStatus("Setting working directory to: " + workingDirectory.getAbsolutePath(), true);              
@@ -1374 +1372 @@
                     if (lastModified == 0 || (lastModified != 0 && f.lastModified() != lastModified)) 
                         break;
-                
+
                 try
                 {
@@ -1416 +1414 @@
         }
     }
-    
+
     public boolean isRunning()
     {