Changeset 7712

Timestamp:

06/01/08 16:29:46 (5 years ago)

Author:

Snyder.Jason

Message:

made properties table work with SimpleSequenceProperties?

Files:

• ossiedev/branches/jsnyder/ComponentProject/src/edu/vt/ossie/editors/ComponentEditor.java (modified) (10 diffs)

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

@@ -319 +319 @@
             new GridData(GridData.FILL, GridData.FILL, true, true));
 
-        Table propertiesTable = new Table(propertiesGroup,
+        final Table propertiesTable = new Table(propertiesGroup,
             SWT.SINGLE | SWT.BORDER | SWT.H_SCROLL | SWT.V_SCROLL
             | SWT.FULL_SELECTION | SWT.HIDE_SELECTION);
         propertiesTable.setLayoutData(
             new GridData(GridData.FILL, GridData.FILL, true, true));
-        ((GridData)propertiesTable.getLayoutData()).horizontalSpan = 2;
+        ((GridData)propertiesTable.getLayoutData()).horizontalSpan = 3;
         propertiesTable.setLinesVisible(true);
         propertiesTable.setHeaderVisible(true);
@@ -335 +335 @@
             new TableViewerColumn(tableViewer, SWT.LEFT);
         propertiesColumn.getColumn().setText(COLUMN_NAMES[0]);
-        propertiesColumn.getColumn().setWidth(100);
+        propertiesColumn.getColumn().setWidth(200);
         propertiesColumn.setLabelProvider(new ColumnLabelProvider()
         {
             public String getText(Object element)
             {
-                return ((SimpleProperty)element).getName();
+                return ((Property)element).getName();
             }
         });
@@ -350 +350 @@
         defaultValuesColumn.setLabelProvider(new ColumnLabelProvider()
         {
-            public String getText(Object element)
-            {
-                return ((SimpleProperty)element).getDefaultValue();
+                public String getText(Object element)
+            {
+                String result = "";
+
+                if (element instanceof SimpleSequenceProperty)
+                {
+                     result = ((SimpleSequenceProperty)element)
+                         .getDefaultValues().toString();
+                }
+                else if (element instanceof SimpleProperty)
+                {
+                    result = ((SimpleProperty)element).getDefaultValue();
+                }
+                return result;
             }
         });
@@ -362 +373 @@
         valuesColumn.setLabelProvider(new ColumnLabelProvider()
         {
-            public String getText(Object element)
-            {
-                return ((SimpleProperty)element).getValue();
+                public String getText(Object element)
+            {
+                String result = "";
+                if (element instanceof SimpleProperty)
+                {
+                    result = ((SimpleProperty)element).getValue();
+                }
+                else if (element instanceof SimpleSequenceProperty)
+                {
+                    result = ((SimpleSequenceProperty)element)
+                        .getValues().toString();
+                }
+                return result;
             }
         });
@@ -372 +393 @@
             protected boolean canEdit(Object element)
             {
-                return element instanceof SimpleProperty;
+                return element instanceof SimpleProperty
+                        || element instanceof SimpleSequenceProperty;
             }
 
@@ -384 +406 @@
             protected Object getValue(Object element)
             {
-                return ((SimpleProperty)element).getValue();
+                Object result = null;
+
+                if (element instanceof SimpleProperty)
+                {
+                    result = ((SimpleProperty)element).getValue();
+                }
+                else if (element instanceof SimpleSequenceProperty)
+                {
+                    result = ((SimpleSequenceProperty)element).getValues();
+                }
+                return result;
             }
 
@@ -390 +422 @@
             protected void setValue(Object element, Object value)
             {
-                ((SimpleProperty)element).setValue(
-                    Integer.parseInt((String)value));
+                if (element instanceof SimpleProperty)
+                {
+                    ((SimpleProperty)element).setValue(
+                        Integer.parseInt((String)value));
+                }
+                else if (element instanceof SimpleSequenceProperty)
+                {
+                    ((SimpleSequenceProperty)element).setValues();
+                }
                 getViewer().update(element, null);
+                
             }
 
             private CellEditor editor =
-                new TextCellEditor(tableViewer.getTable());
+                new TextCellEditor(propertiesTable);
         });
 
@@ -402 +442 @@
 
         tableViewer.setInput(component);
+        tableViewer.refresh();
 
         addPropertyButton = new Button(propertiesGroup, SWT.PUSH | SWT.CENTER);
@@ -420 +461 @@
                 log.debug(component.getProperties());
                 pDlg.open();
+                log.debug(component.getProperties());
+                tableViewer.refresh();
             }
         });
@@ -921 +964 @@
     private static final String[] COLUMN_NAMES = new String[]
     {
-        "Properties",
-        "Values",
-        "DefaultValues"
+        "Property",
+        "Value",
+        "Default Value"
     };