Changeset 7652

Timestamp:

05/29/08 09:06:52 (5 years ago)

Author:

stedwar2

Message:

Minor layout fixups.

Files:

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

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

@@ -65 +65 @@
     implements IReusableEditor
 {
-   
-
-
-        
-
-
     //~ Constructor ...........................................................
 
@@ -171 +165 @@
         descriptionGroup.setLayoutData(group2LData);
         {
-            componentNameLabel = new Label(descriptionGroup, SWT.NONE);
+            Label componentNameLabel = new Label(descriptionGroup, SWT.NONE);
             componentNameLabel.setText("Name");
         }
@@ -178 +172 @@
         }
         {
-            descriptionLabel = new Label(descriptionGroup, SWT.NONE);
+            Label descriptionLabel = new Label(descriptionGroup, SWT.NONE);
             descriptionLabel.setText("Description");
         }
         {
-            descriptionInputField = new Text(descriptionGroup, SWT.BORDER | SWT.WRAP | SWT.V_SCROLL);
+            descriptionInputField = new Text(
+                descriptionGroup, SWT.BORDER | SWT.WRAP | SWT.V_SCROLL);
             // descriptionInputField.setBounds(104, 62, 137, 60);
             GridData descriptionInputFieldLData = new GridData();
@@ -208 +203 @@
             configurationGroup.setText("Generation Options");
             //group1.setBounds(554, 15, 270, 150);
-            configurationGroup.setLayoutData(new GridData(SWT.LEFT, SWT.BOTTOM, true, false));
+            configurationGroup.setLayoutData(
+                new GridData(SWT.LEFT, SWT.BOTTOM, true, false));
             {
                 Label templateLabel = new Label(configurationGroup, SWT.NONE);
@@ -220 +216 @@
             }
             {
-                timingPortSupportCheckBox = new Button(configurationGroup, SWT.CHECK | SWT.LEFT);
+                timingPortSupportCheckBox = new Button(
+                    configurationGroup, SWT.CHECK | SWT.LEFT);
                 timingPortSupportCheckBox.setText("Timing Port Support");
                 timingPortSupportCheckBox.setBounds(7, 78, 168, 21);
@@ -226 +223 @@
             }
             {
-                ACESupportCheckBox = new Button(configurationGroup, SWT.CHECK | SWT.LEFT);
+                ACESupportCheckBox = new Button(
+                    configurationGroup, SWT.CHECK | SWT.LEFT);
                 ACESupportCheckBox.setText("ACE Support");
                 ACESupportCheckBox.setBounds(7, 104, 113, 21);
@@ -232 +230 @@
             }
         }
-        
+
         portsGroup = new Group(mainWindow, SWT.NONE);
-        
+
         portsGroup.setText("Ports");
         portsGroup.setLayout(null);
-        portsGroup.setLayoutData(new GridData(SWT.LEFT, SWT.BOTTOM, true, false));
+        portsGroup.setLayoutData(
+            new GridData(SWT.LEFT, SWT.BOTTOM, true, false));
 
         GridData portsGroupData = new GridData();
@@ -250 +249 @@
         portsTreeViewer.setContentProvider(new ContentProvider());
         portsTreeViewer.setLabelProvider(new LabelProvider());
-        
+
 
         addPortButton = new Button(portsGroup, SWT.PUSH | SWT.CENTER);
@@ -258 +257 @@
         addPortButton.addSelectionListener(new SelectionListener()
         {
-
             public void widgetDefaultSelected(SelectionEvent e)
             {
-                // TODO Auto-generated method stub
-                
+                // not used
             }
 
@@ -268 +265 @@
             {
                 AddPortDialog apd = new AddPortDialog(null);
-                apd.open();   
-            }
-            
+                apd.open();
+            }
         });
-        
+
         removePortButton = new Button(portsGroup, SWT.PUSH | SWT.CENTER);
         removePortButton.setText("Remove Port");
@@ -279 +275 @@
         propertiesGroup = new Group(mainWindow, SWT.NONE);
         propertiesGroup.setText("Properties");
-        propertiesGroup.setLayoutData(new GridData(SWT.CENTER, SWT.BOTTOM, true, false));
-        
+        propertiesGroup.setLayoutData(
+            new GridData(SWT.CENTER, SWT.BOTTOM, true, false));
+
         GridData propertiesGroupData = new GridData();
         propertiesGroupData.widthHint = 250;
@@ -286 +283 @@
         propertiesGroupData.grabExcessHorizontalSpace = true;
         propertiesGroup.setLayoutData(propertiesGroupData);
-        
-        propertiesTable = new Table(propertiesGroup, SWT.SINGLE | SWT.BORDER | SWT.H_SCROLL | SWT.V_SCROLL |
-                        SWT.FULL_SELECTION | SWT.HIDE_SELECTION);
+
+        propertiesTable = new Table(propertiesGroup,
+            SWT.SINGLE | SWT.BORDER | SWT.H_SCROLL | SWT.V_SCROLL
+            | SWT.FULL_SELECTION | SWT.HIDE_SELECTION);
         GridData gridData = new GridData(GridData.FILL_BOTH);
-                gridData.grabExcessVerticalSpace = true;
-                gridData.horizontalSpan = 3;
-                propertiesTable.setLayoutData(gridData);
-
-                propertiesTable.setLinesVisible(true);
-                propertiesTable.setHeaderVisible(true);
-                
-                tableViewer = new TableViewer(propertiesTable);
+        gridData.grabExcessVerticalSpace = true;
+        gridData.horizontalSpan = 3;
+        propertiesTable.setLayoutData(gridData);
+
+        propertiesTable.setLinesVisible(true);
+        propertiesTable.setHeaderVisible(true);
+
+        tableViewer = new TableViewer(propertiesTable);
         tableViewer.setColumnProperties(columnNames);
         tableViewer.setContentProvider(new TableContentProvider());
-        
-        TableViewerColumn propertiesColumn = new TableViewerColumn(tableViewer, SWT.LEFT);
-                propertiesColumn.getColumn().setText(columnNames[0]);
-                propertiesColumn.getColumn().setWidth(100);
-                propertiesColumn.setLabelProvider(new ColumnLabelProvider()
-                {
-                    public String getText(Object element)
-                    {
-                        return ((SimpleProperty)element).getName();
-                    }
-            });
-                
-                TableViewerColumn defaultValuesColumn = new TableViewerColumn(tableViewer, SWT.RIGHT);
-                defaultValuesColumn.getColumn().setText(columnNames[2]);
-                defaultValuesColumn.getColumn().setWidth(90);
+
+        TableViewerColumn propertiesColumn =
+            new TableViewerColumn(tableViewer, SWT.LEFT);
+        propertiesColumn.getColumn().setText(columnNames[0]);
+        propertiesColumn.getColumn().setWidth(100);
+        propertiesColumn.setLabelProvider(new ColumnLabelProvider()
+        {
+            public String getText(Object element)
+            {
+                return ((SimpleProperty)element).getName();
+            }
+        });
+
+        TableViewerColumn defaultValuesColumn =
+            new TableViewerColumn(tableViewer, SWT.RIGHT);
+        defaultValuesColumn.getColumn().setText(columnNames[2]);
+        defaultValuesColumn.getColumn().setWidth(90);
         defaultValuesColumn.setLabelProvider(new ColumnLabelProvider()
         {
@@ -322 +322 @@
             }
         });
-                
-                TableViewerColumn valuesColumn = new TableViewerColumn(tableViewer, SWT.RIGHT);
-                valuesColumn.getColumn().setText(columnNames[1]);
-                valuesColumn.getColumn().setWidth(50);
+
+        TableViewerColumn valuesColumn =
+            new TableViewerColumn(tableViewer, SWT.RIGHT);
+        valuesColumn.getColumn().setText(columnNames[1]);
+        valuesColumn.getColumn().setWidth(50);
         valuesColumn.setLabelProvider(new ColumnLabelProvider()
         {
@@ -333 +334 @@
             }
         });
-                 valuesColumn.setEditingSupport(new EditingSupport(tableViewer) {
-           @Override
-           protected boolean canEdit(Object element)
-           {
-               return element instanceof SimpleProperty;
-           }
-
-           @Override
-           protected CellEditor getCellEditor(Object element)
-           {
-               return editor;
-           }
-
-           @Override
-           protected Object getValue(Object element)
-           {
-               
-               return ((SimpleProperty)element).getValue();
-               
-           }
-
-           @Override
-           protected void setValue(Object element, Object value)
-           {
-               ((SimpleProperty)element).setValue(
-                   Integer.parseInt((String)value));
-               getViewer().update(element, null);
-           }
-
-           private CellEditor editor = new TextCellEditor(tableViewer.getTable());
-                 });
-                 
-                
-
-                 tableViewer.setInput(component);
-                 
+        valuesColumn.setEditingSupport(new EditingSupport(tableViewer)
+        {
+            @Override
+            protected boolean canEdit(Object element)
+            {
+                return element instanceof SimpleProperty;
+            }
+
+            @Override
+            protected CellEditor getCellEditor(Object element)
+            {
+                return editor;
+            }
+
+            @Override
+            protected Object getValue(Object element)
+            {
+                return ((SimpleProperty)element).getValue();
+            }
+
+            @Override
+            protected void setValue(Object element, Object value)
+            {
+                ((SimpleProperty)element).setValue(
+                    Integer.parseInt((String)value));
+                getViewer().update(element, null);
+            }
+
+            private CellEditor editor =
+                new TextCellEditor(tableViewer.getTable());
+        });
+
+
+
+        tableViewer.setInput(component);
+
         propertiesTable.setBounds(1, 16, 250, 175);
-        
+
         addPropertyButton = new Button(propertiesGroup, SWT.PUSH | SWT.CENTER);
         addPropertyButton.setText("Add Property");
@@ -376 +377 @@
         addPropertyButton.addSelectionListener(new SelectionListener()
         {
-
             public void widgetDefaultSelected(SelectionEvent e)
             {
-                // TODO Auto-generated method stub
-                
+                // not used
             }
 
@@ -389 +388 @@
                 log.debug(component.getProperties());
                 pDlg.open();
-                
-            }
-            
+            }
         });
-        
-        removePropertyButton = new Button(propertiesGroup, SWT.PUSH | SWT.CENTER);
+
+        removePropertyButton =
+            new Button(propertiesGroup, SWT.PUSH | SWT.CENTER);
         removePropertyButton.setText("Remove Property");
         removePropertyButton.setBounds(120, 190, 140, 30);
-        
+
 //        {
 ////            Label componentNameLabel = new Label(mainWindow, SWT.NONE);
 ////            componentNameLabel.setText("Name:");
 ////          //  componentNameLabel.setBounds(12, 12, 92, 19);
-//            componentNameLabel.setLayoutData(new GridData(SWT.CENTER, SWT.BOTTOM, true, false));
+//            componentNameLabel.setLayoutData(new GridData(
+//                SWT.CENTER, SWT.BOTTOM, true, false));
 //        }
-        
-       
+
+
 //        {
 //            componentNameInputField = new Text(mainWindow, SWT.BORDER);
@@ -423 +422 @@
 //            });
 //        }
-        
+
 
 //        {
@@ -449 +448 @@
 //            }
 //            {
-//                assemblyControllerCheckBox = new Button(group2, SWT.CHECK | SWT.LEFT);
+//                assemblyControllerCheckBox =
+//                    new Button(group2, SWT.CHECK | SWT.LEFT);
 //                assemblyControllerCheckBox.setText("Assembly Controller");
 //                assemblyControllerCheckBox.setBounds(7, 103, 168, 21);
@@ -696 +696 @@
         return str == null ? "" : str;
     }
+
+
     //~ Private Methods .......................................................
 
@@ -739 +741 @@
     //~ Instance/static variables .............................................
 
-    private Label descriptionLabel;
     private TableViewer tableViewer;
     private Text   descriptionInputField;
     private Text   componentNameInputField;
-    private Label  componentBaseName;
     private Button ACESupportCheckBox;
     private Button timingPortSupportCheckBox;
@@ -753 +753 @@
     private static final Logger log =
         OWDPlugin.getLogManager().getLogger(ComponentEditor.class);
-    private Label componentNameLabel;
     private Button addPortButton;
     private Button removePortButton;
@@ -761 +760 @@
     private Group descriptionGroup;
     private Group portsGroup;
-        private Group propertiesGroup;
-        private Table propertiesTable;
-        private TreeViewer portsTreeViewer;
-        private String[] columnNames = new String[] {"Properties", "Values", "DefaultValues"};
+    private Group propertiesGroup;
+    private Table propertiesTable;
+    private TreeViewer portsTreeViewer;
+    private String[] columnNames = new String[]
+    {
+        "Properties",
+        "Values",
+        "DefaultValues"
+    };
 }