Changeset 7878

Timestamp:

06/16/08 13:40:54 (5 years ago)

Author:

Snyder.Jason

Message:

working on making the interface column editable in the component editor. It's not working yet so most of it is commented out for now.

Location:

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

Files:

• editors/ComponentEditor.java (modified) (5 diffs)
• jyinterface/interfaces/MainFrame.java (modified) (1 diff)
• wavedev/Port.java (modified) (1 diff)

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

@@ -60 +60 @@
 import org.python.core.Py;
 import org.python.core.PyList;
+import org.python.core.PyObject;
 import org.python.core.PyString;
 import edu.vt.ossie.OWDPlugin;
@@ -191 +192 @@
 
 
-    private TableViewer portsTableViewer;
+    
 
 
@@ -401 +402 @@
         });
         
-
+        
+//        PyList CFInterfaces = mainFrame().getCFInterfaces();
+//        PyList StandardInterfaces = mainFrame().getStandardInterfaces();
+//        PyList CustomInterfaces = mainFrame().getCustomInterfaces();
+//        log.debug("cf: " + CFInterfaces.__len__());
+//        log.debug("standard: " + StandardInterfaces.__len__());
+//        log.debug("custom: " + CustomInterfaces.__len__());
+//        int count = 0;
+//        int[] counts = new int[3];
+//        int i = 0;
+//        int j = 0;
+//        
+//        String[] tmpInterfaceChoices = new String[100];
+//        String tmp;
+//        PyList interfaceList = mainFrame().importStandardIDL();
+//        log.debug(interfaceList.__len__());
+//        while(interfaceList.__len__() > 0)
+//        {
+//            PyObject customInts = interfaceList.pop();
+//            log.debug(customInts.__getattr__("name"));
+//            PyList ci = (PyList)customInts.__getattr__("contents");
+//            
+//            while(ci.__len__() > 0)
+//            {
+//                tmp = ci.pop().__getattr__("name").toString();
+//                log.debug("adding " + tmp + " to interfaceChoices");
+//                tmpInterfaceChoices[count] = tmp;
+//                count++;
+//                counts[i]++;
+//                j++;
+//            }
+//            log.debug("added " + counts[i]);
+//            
+//            if(interfaceList.__len__() > 0)
+//            {
+//                tmpInterfaceChoices[count] = "";
+//                count++;
+//            }
+//            i++;
+//        }
+//        interfaceChoices = new String[count];
+//        log.debug("printing contents of array");
+//        for(int k = 0; k < count; k++)
+//        {
+//            interfaceChoices[k] = tmpInterfaceChoices[k];
+//            log.debug(interfaceChoices[k]);
+//        }
         TableViewerColumn portInterfaceColumn =
             new TableViewerColumn(portsTableViewer, SWT.LEFT);
@@ -413 +460 @@
             }
         });
+        
+//        portInterfaceColumn.setEditingSupport(new EditingSupport(portsTableViewer)
+//        {
+//
+//            @Override
+//            protected boolean canEdit(Object element)
+//            {
+//                return true;
+//            }
+//
+//            @Override
+//            protected CellEditor getCellEditor(Object element)
+//            {
+//                // TODO Auto-generated method stub
+//                return editor;
+//            }
+//
+//            @Override
+//            protected Object getValue(Object element)
+//            {
+//                Integer result = -1;
+//                String iface = ((Port)element).getInterface().getName();
+//                for(int i = 0; i < interfaceChoices.length; i++)
+//                    if(interfaceChoices[i].equals(iface))
+//                    {    
+//                        result = i;
+//                        break;
+//                    }
+//                return result;
+//            }
+//
+//            @Override
+//            protected void setValue(Object element, Object value)
+//            {
+//                ((Port)element).setInterface(interfaceChoices[(Integer)value]);
+//                getViewer().update(element, null);
+//                setIsDirty(true);
+//                
+//            }
+//            private CellEditor editor =
+//                new ComboBoxCellEditor(portsTable, interfaceChoices, SWT.READ_ONLY);
+//            
+//        });
         
         
@@ -1258 +1348 @@
     private Button removePropertyButton;
     private String[] templateChoices;
+    private TableViewer portsTableViewer;
+    protected String[] interfaceChoices = {"realShort", "realLong"};
 
     private Component component;

ossiedev/branches/jsnyder/ComponentProject/src/edu/vt/ossie/jyinterface/interfaces/MainFrame.java

@@ -33 +33 @@
     PyList getTemplates();
     PyList formatSequenceValues(String values);
-    PyList getInterfaceList();
+    PyList getCFInterfaces();
+    PyList getStandardInterfaces();
+    PyList getCustomInterfaces();
     
 }

ossiedev/branches/jsnyder/ComponentProject/src/edu/vt/ossie/wavedev/Port.java

@@ -245 +245 @@
         put(INTERFACE, iface);
     }
+    
+    public void setInterface(String iface)
+    {
+        put(INTERFACE, iface);
+    }