Index: /ossiedev/branches/jsnyder/ComponentProject/src/edu/vt/ossie/editors/OWDEditor.java
===================================================================
--- /ossiedev/branches/jsnyder/ComponentProject/src/edu/vt/ossie/editors/OWDEditor.java	(revision 7329)
+++ /ossiedev/branches/jsnyder/ComponentProject/src/edu/vt/ossie/editors/OWDEditor.java	(revision 7331)
@@ -105,7 +105,7 @@
         {
             {
-                availableResourcesLabel = new Label(mainWindow, SWT.NONE);
-                availableResourcesLabel.setText("Available Resources");
-                availableResourcesLabel.setBounds(15, 48, 140, 17);
+                Label resourcesLabel = new Label(mainWindow, SWT.NONE);
+                resourcesLabel.setText("Available Resources");
+                resourcesLabel.setBounds(15, 48, 140, 17);
             }
             {
@@ -124,13 +124,13 @@
             }
             {
-                availableResourcesTree = new Tree(mainWindow, SWT.BORDER);
+                Tree availableResourcesTree = new Tree(mainWindow, SWT.BORDER);
                 availableResourcesTree.setBounds(16, 83, 227, 282);
-                availableResourcesTreeViewer =
+                resourcesTreeViewer =
                     new TreeViewer(availableResourcesTree);
-                availableResourcesTreeViewer.setContentProvider(
+                resourcesTreeViewer.setContentProvider(
                     new ResourceTreeContentProvider());
-                availableResourcesTreeViewer.setLabelProvider(
+                resourcesTreeViewer.setLabelProvider(
                     new ResourceTreeLabelProvider());
-                availableResourcesTreeViewer.setAutoExpandLevel(2);
+                resourcesTreeViewer.setAutoExpandLevel(2);
 
                 final Action cannotAddToNode = new Action("Add to Node")
@@ -150,5 +150,5 @@
                             IStructuredSelection selection =
                                 (IStructuredSelection)
-                                availableResourcesTreeViewer
+                                resourcesTreeViewer
                                 .getSelection();
                             if (!selection.isEmpty())
@@ -196,6 +196,6 @@
                     }
                 });
-                availableResourcesTreeViewer.getControl().setMenu(
-                    mgr.createContextMenu(availableResourcesTreeViewer
+                resourcesTreeViewer.getControl().setMenu(
+                    mgr.createContextMenu(resourcesTreeViewer
                         .getControl()));
 
@@ -203,27 +203,27 @@
             }
             {
-                waveformLabel = new Label(mainWindow, SWT.NONE);
+                Label waveformLabel = new Label(mainWindow, SWT.NONE);
                 waveformLabel.setText("Waveform");
                 waveformLabel.setBounds(445, 7, 77, 23);
             }
             {
-            	activeWaveformTree = new Tree(mainWindow, SWT.BORDER);
+                Tree activeWaveformTree = new Tree(mainWindow, SWT.BORDER);
 				activeWaveformTree.setBounds(257, 30, 490, 149);
-				activeWaveformTreeViewer = new TreeViewer(activeWaveformTree);
-				activeWaveformTreeViewer.setContentProvider(
+				waveformTreeViewer = new TreeViewer(activeWaveformTree);
+				waveformTreeViewer.setContentProvider(
 				    new ResourceTreeContentProvider());
-				activeWaveformTreeViewer.setLabelProvider(
+				waveformTreeViewer.setLabelProvider(
 				    new ResourceTreeLabelProvider());
 
             }
             {
-                activePlatformTree = new Tree(mainWindow, SWT.BORDER);
+                Tree activePlatformTree = new Tree(mainWindow, SWT.BORDER);
                 activePlatformTree.setBounds(257, 191, 490, 173);
-                activePlatformTreeViewer = new TreeViewer(activePlatformTree);
-                activePlatformTreeViewer.setContentProvider(
+                platformTreeViewer = new TreeViewer(activePlatformTree);
+                platformTreeViewer.setContentProvider(
                     new ResourceTreeContentProvider());
-                activePlatformTreeViewer.setLabelProvider(
+                platformTreeViewer.setLabelProvider(
                     new ResourceTreeLabelProvider());
-                activePlatformTreeViewer.setAutoExpandLevel(2);
+                platformTreeViewer.setAutoExpandLevel(2);
             }
             mainWindow.setSize(
@@ -382,5 +382,5 @@
     {
         final Display display =
-            availableResourcesTreeViewer.getControl().getDisplay();
+            resourcesTreeViewer.getControl().getDisplay();
 
         // Post this action to run asynchronously outside the UI thread.
@@ -405,5 +405,6 @@
                         // make sure window still exists by checking
                         // the resources tree control
-                        if (!availableResourcesTree.isDisposed())
+                        if (!resourcesTreeViewer.getControl()
+                            .isDisposed())
                         {
                             System.out.println("Refreshing resources tree");
@@ -423,10 +424,10 @@
                                     {
                                         //make sure the tree still exists
-                                        if (availableResourcesTreeViewer
+                                        if (resourcesTreeViewer
                                             .getControl().isDisposed())
                                         {
                                             return;
                                         }
-                                        availableResourcesTreeViewer
+                                        resourcesTreeViewer
                                             .setInput(result);
                                     }
@@ -468,8 +469,8 @@
     public void refreshWaveform()
     {
-        if (activeWaveformTreeViewer != null)
+        if (waveformTreeViewer != null)
         {
             System.out.println("Refreshing waveform tree");
-            activeWaveformTreeViewer.setInput(getActiveWaveform());
+            waveformTreeViewer.setInput(getActiveWaveform());
         }
     }
@@ -491,8 +492,8 @@
     public void refreshPlatform()
     {
-        if (activePlatformTreeViewer != null)
+        if (platformTreeViewer != null)
         {
             System.out.println("Refreshing platform tree");
-            activePlatformTreeViewer.setInput(getActivePlatform());
+            platformTreeViewer.setInput(getActivePlatform());
         }
     }
@@ -503,5 +504,5 @@
     {
         IStructuredSelection selection = (IStructuredSelection)
-            activePlatformTreeViewer.getSelection();
+            platformTreeViewer.getSelection();
         if (!selection.isEmpty())
         {
@@ -532,5 +533,6 @@
         {
             final IPath newLocation = delta.getMovedToPath();
-            Display display = availableResourcesTree.getDisplay();
+            Display display =
+                resourcesTreeViewer.getControl().getDisplay();
             if (!display.isDisposed())
             {
@@ -541,5 +543,6 @@
                         // make sure window still exists by checking
                         // the resources tree control
-                        if (availableResourcesTree.isDisposed())
+                        if (resourcesTreeViewer.getControl()
+                            .isDisposed())
                         {
                             return;
@@ -823,13 +826,7 @@
 
     private Button     refreshResourcesButton;
-    private Tree       availableResourcesTree;
-    private TreeViewer availableResourcesTreeViewer;
-    private Tree       activePlatformTree;
-    private TreeViewer activePlatformTreeViewer;
-    private Tree       activeWaveformTree;
-    private TreeViewer activeWaveformTreeViewer;
-    private Label      waveformLabel;
-    private Label      availableResourcesLabel;
-
+    private TreeViewer resourcesTreeViewer;
+    private TreeViewer waveformTreeViewer;
+    private TreeViewer platformTreeViewer;
 
     private MainFrame  mainFrame;