Changeset 7708

Timestamp:

05/31/08 16:31:34 (5 years ago)

Author:

stedwar2

Message:

Interface reading in the add port dialog works now.

Location:

ossiedev/branches/jsnyder/ComponentProject/src/edu/vt/ossie

Files:

• dialogs/AddPortDialog.java (modified) (6 diffs)
• editors/ComponentEditor.java (modified) (3 diffs)

ossiedev/branches/jsnyder/ComponentProject/src/edu/vt/ossie/dialogs/AddPortDialog.java

@@ -11 +11 @@
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.swt.widgets.Text;
 import org.eclipse.swt.widgets.Tree;
-import org.python.core.PyList;
 
 import edu.vt.ossie.OWDPlugin;
-import edu.vt.ossie.jyinterface.interfaces.MainFrame;
+import edu.vt.ossie.editors.ComponentEditor;
+import edu.vt.ossie.wavedev.MainFrameTreeNode;
 import edu.vt.ossie.wavedev.treemodel.ContentProvider;
 import edu.vt.ossie.wavedev.treemodel.LabelProvider;
@@ -33 +32 @@
     extends Dialog
 {
-
-    private MainFrame mainFrame;
-    private static final Logger log =
-        OWDPlugin.getLogManager().getLogger(AddPortDialog.class);
+    //~ Constructor ...........................................................
 
         // ----------------------------------------------------------
@@ -42 +38 @@
      * @param parentShell
      */
-    public AddPortDialog(Shell parentShell)
+    public AddPortDialog(Shell parentShell, ComponentEditor parent)
     {
         super(parentShell);
+        owner = parent;
+    }
 
-    }
+
+    //~ Methods ...............................................................
 
     // ----------------------------------------------------------
@@ -74 +73 @@
         try
         {
-        PyList interfaces = mainFrame().importStandardIDL();
-        log.debug(interfaces.toString());
-        interfacesTreeViewer.setInput(interfaces);
+            MainFrameTreeNode interfaces = (MainFrameTreeNode)owner
+                .wavedevFactory().wrap(owner.mainFrame().importStandardIDL());
+            log.debug(interfaces.toString());
+            interfacesTreeViewer.setInput(interfaces);
         }
         catch (Exception e)
@@ -82 +82 @@
             log.error("failure importing standard idl:", e);
         }
-        
-       // interfacesTreeViewer.setInput(mainFrame().importStandardIDL());
 
         Button importButton = new Button(interfaceComposite, SWT.PUSH);
@@ -107 +105 @@
         portTypeCombo.setText("Uses");
 
-
-
-
-
-
         return comp;
     }
 
-    private MainFrame mainFrame()
-    {
-        if (mainFrame == null)
-        {
-            mainFrame = OWDPlugin.createMainFrame();
-        }
-        return mainFrame;
-    }
 
     // ----------------------------------------------------------
-    @Override
-    protected void configureShell(Shell newShell)
-    {
-        // TODO Auto-generated method stub
-        super.configureShell(newShell);
-        newShell.setText("Add Port");
-    }
+//    @Override
+//    protected void configureShell(Shell newShell)
+//    {
+//        // TODO Auto-generated method stub
+//        super.configureShell(newShell);
+//        newShell.setText("Add Port");
+//    }
+//
+//    public static void main(String[] args)
+//    {
+//        Display display = new Display();
+//        Shell shell = new Shell(display);
+//        AddPortDialog apd = new AddPortDialog(shell);
+//        apd.open();
+//
+//        while (!shell.isDisposed()) {
+//            if (!display.readAndDispatch()) {
+//              // If no more entries in event queue
+//              display.sleep();
+//            }
+//          }
+//    }
 
-    public static void main(String[] args)
-    {
-        Display display = new Display();
-        Shell shell = new Shell(display);
-        AddPortDialog apd = new AddPortDialog(shell);
-        apd.open();
 
-        while (!shell.isDisposed()) {
-            if (!display.readAndDispatch()) {
-              // If no more entries in event queue
-              display.sleep();
-            }
-          }
-    }
+    //~ Instance/static variables .............................................
 
+    ComponentEditor owner;
+
+    private static final Logger log =
+        OWDPlugin.getLogManager().getLogger(AddPortDialog.class);
 }

ossiedev/branches/jsnyder/ComponentProject/src/edu/vt/ossie/editors/ComponentEditor.java

@@ -302 +302 @@
             public void widgetSelected(SelectionEvent e)
             {
-                AddPortDialog apd = new AddPortDialog(null);
+                AddPortDialog apd = new AddPortDialog(
+                    getSite().getShell(), ComponentEditor.this);
                 apd.open();
             }
@@ -855 +856 @@
 
     // ----------------------------------------------------------
-    private MainFrame mainFrame()
+    // Public so that dialogs can use it
+    public MainFrame mainFrame()
     {
         if (mainFrame == null)
@@ -866 +868 @@
 
     // ----------------------------------------------------------
-    private Factory wavedevFactory()
+    // Public so that dialogs can use it
+    public Factory wavedevFactory()
     {
         if (wavedevFactory == null)