Changeset 7893

Timestamp:

06/17/08 12:43:42 (5 years ago)

Author:

Snyder.Jason

Message:

moved the editing support for the interface column to its own class to make things easier

Location:

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

Files:

• ComponentEditor.java (modified) (6 diffs)
• InterfaceEditingSupport.java (added)

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

@@ -1 +1 @@
 package edu.vt.ossie.editors;
 
+import java.util.ArrayList;
 import java.util.List;
-import java.util.Vector;
 import org.apache.log4j.Logger;
 import org.eclipse.core.resources.IFile;
@@ -464 +464 @@
 
 
-        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);
-            
-        });
+        portInterfaceColumn.setEditingSupport(new InterfaceEditingSupport(portsTableViewer));
+        
 
 
@@ -559 +519 @@
             };
 
-            private CellEditor editor =
-                new ComboBoxCellEditor(portsTable, portTypeChoices, SWT.READ_ONLY);
+            
 
 
@@ -1205 +1164 @@
            portsTableViewer.setInput(component);
 
-           PyList CFInterfaces = mainFrame().getCFInterfaces();
-           PyList StandardInterfaces = mainFrame().getStandardInterfaces();
-           PyList CustomInterfaces = mainFrame().getCustomInterfaces();
-           PyWrapper[] ints = wavedevFactory.toArrayOfWrappedElements(CFInterfaces);
-           for(PyWrapper i : ints)
-               interfaceChoicesVector.add(((Interface)i).getName());
-           interfaceChoicesVector.add(" ");
-           
-           ints = wavedevFactory.toArrayOfWrappedElements(StandardInterfaces);
-           for(PyWrapper i : ints)
-               interfaceChoicesVector.add(((Interface)i).getName());
-           interfaceChoicesVector.add(" ");
-           
-           ints = wavedevFactory.toArrayOfWrappedElements(CustomInterfaces);
-           for(PyWrapper i : ints)
-               interfaceChoicesVector.add(((Interface)i).getName());
-           
-           interfaceChoices = new String[interfaceChoicesVector.size()];
-           interfaceChoices = interfaceChoicesVector.toArray(interfaceChoices);
-           
-           for(String s: interfaceChoices)
-               log.debug(s);
+//           PyList CFInterfaces = mainFrame().getCFInterfaces();
+//           PyList StandardInterfaces = mainFrame().getStandardInterfaces();
+//           PyList CustomInterfaces = mainFrame().getCustomInterfaces();
+//           PyWrapper[] ints = wavedevFactory.toArrayOfWrappedElements(CFInterfaces);
+//           for(PyWrapper i : ints)
+//               interfaceChoicesList.add(((Interface)i).getName());
+//           interfaceChoicesList.add(" ");
+//           
+//           ints = wavedevFactory.toArrayOfWrappedElements(StandardInterfaces);
+//           for(PyWrapper i : ints)
+//               interfaceChoicesList.add(((Interface)i).getName());
+//           interfaceChoicesList.add(" ");
+//           
+//           ints = wavedevFactory.toArrayOfWrappedElements(CustomInterfaces);
+//           for(PyWrapper i : ints)
+//               interfaceChoicesList.add(((Interface)i).getName());
+//           
+//           interfaceChoices = new String[interfaceChoicesList.size()];
+//           interfaceChoices = interfaceChoicesList.toArray(interfaceChoices);
+//           
+//           for(String s: interfaceChoices)
+//               log.debug(s);
            
            // Now place them in the tree
@@ -1375 +1334 @@
     private String[] templateChoices;
     private TableViewer portsTableViewer;
-    private Vector<String> interfaceChoicesVector = new Vector<String>();
+    private ArrayList<String> interfaceChoicesList = new ArrayList<String>();
     private String[] interfaceChoices = {"realChar"};
 
@@ -1383 +1342 @@
     private List<ISelectionChangedListener> listeners =
         new java.util.ArrayList<ISelectionChangedListener>();
+    private CellEditor editor;
+        
 
     private static final String[] COLUMN_NAMES = new String[]