Changeset 36 for trunk/org.modelica.mdt/src/org/modelica/mdt

Timestamp:

09/27/05 16:00:50 (19 years ago)

Author:

boris

Message:

• added some more modifiers checkboxes to new class dialog
• reworked somewhat the structure of the code that generates the class file

File:

• trunk/org.modelica.mdt/src/org/modelica/mdt/NewClassWizard.java (modified) (11 diffs)

trunk/org.modelica.mdt/src/org/modelica/mdt/NewClassWizard.java

@@ -49 +49 @@
 public class NewClassWizard extends Wizard implements INewWizard
 {
+    
     public class NewClassPage extends WizardPage
     {
@@ -55 +56 @@
         private Combo classType;
         private Button initialEquation;
+        private Button partialClass;
+        private Button externalBody;
     
         private IPath selection = null;
@@ -188 +191 @@
                 public void widgetSelected(SelectionEvent e)
                 {
+                    /*
+                     * update state of the modifiers checkboxes
+                     */
                     initialEquation.setEnabled
-                    (NewClassWizard.classTypeHaveEquations(classType.getText()));                   
+                    (NewClassWizard.classTypeHaveEquations(classType.getText()));
+                    
+                    partialClass.setEnabled
+                    (NewClassWizard.canBePartial(classType.getText()));
+                    
+                    externalBody.setEnabled(classType.getText().equals("function"));
+
                 }
 
@@ -197 +209 @@
             });
             
-            
             /* fill upp 'empty' space */
             new Label(composite, SWT.NONE);
-            new Label(composite, SWT.NONE);
+
+            
+            /* create separator */
+            l = new Label(composite, SWT.HORIZONTAL | SWT.SEPARATOR);
+            gd = new GridData(GridData.HORIZONTAL_ALIGN_FILL | GridData.GRAB_HORIZONTAL);
+            gd.horizontalSpan = 3;
+            l.setLayoutData(gd);
+            
+            
+            /* modifiers section */
+            l = new Label(composite, SWT.NONE);
+            l.setText("Modifiers:");
             
             /* initial equation block */
@@ -208 +230 @@
             gd = new GridData();
             gd.horizontalAlignment = GridData.BEGINNING;
+            gd.horizontalSpan = 2;
             initialEquation.setLayoutData(gd);
+            
+            /* partial class */
+            new Label(composite, SWT.NONE); /* empty label for padding */
+            partialClass = new Button(composite, SWT.CHECK);
+            partialClass.setText("is partial class");
+            
+            gd = new GridData();
+            gd.horizontalAlignment = GridData.BEGINNING;
+            gd.horizontalSpan = 2;
+            partialClass.setLayoutData(gd);
+
+            /* external body */
+            new Label(composite, SWT.NONE); /* empty label for padding */
+            externalBody = new Button(composite, SWT.CHECK);
+            externalBody.setText("have external body");
+            externalBody.setEnabled(false);
+            
+            gd = new GridData();
+            gd.horizontalAlignment = GridData.BEGINNING;
+            gd.horizontalSpan = 2;
+            externalBody.setLayoutData(gd);
+            
 
         }
@@ -311 +356 @@
 
     /**
-     * @param classType
+     * @param classType name of the class type, e.g. 'record'
      * @return false if class type can't have equations, e.g.
-     * false is returned for record and connector
+     * false is returned for record
      */
     public static boolean classTypeHaveEquations(String classType)
     {
         return  
-        !(classType.equals("record") || classType.equals("connector"));
-    }
+        !(classType.equals("record") 
+                || classType.equals("type")
+                || classType.equals("connector") 
+                || classType.equals("function"));
+    }
+    
+    /**
+     * @param classType name of the class type, e.g. 'record'
+     * @return false if class type can't have equations, e.g.
+     * false is returned for type
+     */
+    public static boolean canBePartial(String classType)
+    {
+        return  
+        (!(classType.equals("type") 
+                || classType.equals("function"))); 
+    }
+
     
     @Override
@@ -329 +390 @@
         final boolean initialEquationBlock = 
             classPage.initialEquation.getSelection();
+        final boolean partialClass = 
+            classPage.partialClass.getSelection();
+        final boolean externalBody = 
+            classPage.externalBody.getSelection();
+
         
         IRunnableWithProgress op = new IRunnableWithProgress() {
@@ -337 +403 @@
                 {
                     doFinish(sourceFolder, className, classType, 
-                            initialEquationBlock, monitor);
+                            initialEquationBlock, partialClass, externalBody, monitor);
                 } 
                 catch (CoreException e)
@@ -367 +433 @@
 
     protected void doFinish(String sourceFolder, String className, 
-            String classType, boolean initialEquationBlock, IProgressMonitor monitor)
+            String classType, boolean initialEquationBlock, boolean partialClass, 
+            boolean haveExternalBody, IProgressMonitor monitor)
     throws CoreException
     {
@@ -380 +447 @@
         final IFile file = container.getFile(new Path(className+".mo"));
         
-        boolean haveEquationBlock = 
-            classTypeHaveEquations(classType);
-        
-        String contents = 
-            classType + " " + className + "\n\n" +
-            ( haveEquationBlock ? "equation\n\n" : ""  ) + 
-            ( (haveEquationBlock && initialEquationBlock) 
-                    ? "initial equation\n\n" : "" ) +
-            "end " + className + ";";
-        
-    
         try
         {
-            InputStream stream = new ByteArrayInputStream(contents.getBytes());
+            String contents = generateClassContentes(className, classType, 
+                    initialEquationBlock, partialClass, haveExternalBody);
+            InputStream stream = 
+                new ByteArrayInputStream(contents.getBytes());
             if (file.exists())
             {
@@ -433 +492 @@
     }
 
+    private String generateClassContentes(String className, String classType, 
+            boolean initialEquationBlock, boolean partialClass, boolean haveExternalBody) 
+    {
+        /*
+         * the gory logic of generating a skeleton for a modelica class
+         */
+        String contents = "";
+
+        if (canBePartial(classType) && partialClass)
+        {
+            contents += "partial ";
+        }
+        
+        contents += classType + " " + className;
+        
+        if (classTypeHaveEquations(classType))
+        {
+            contents += "\n\nequation\n";
+            if (initialEquationBlock)
+            {
+                contents += "\ninitial equation\n";
+            }
+        }
+        
+        if (classType.equals("function"))
+        {
+            if (haveExternalBody)
+            {
+                contents += "\nexternal";
+            }
+            else
+            {   
+                contents += "\nalgorithm\n";
+            }
+        }
+
+        if (!classType.equals("type"))
+        {
+            contents += "\nend " + className;
+        }
+
+        contents += ";";
+        return contents ;
+    }
+
     public void init(IWorkbench workbench, IStructuredSelection selection)
     {