Changeset 10735

Timestamp:

05/30/11 13:15:50 (2 years ago)

Author:

Snyder.Jason

Message:

updated the waveform editor to use sash forms so the four main panels can be resized

Files:

• ossiedev/trunk/tools/OEF/src/edu/vt/ossie/editors/OWDEditor.java (modified) (6 diffs)

ossiedev/trunk/tools/OEF/src/edu/vt/ossie/editors/OWDEditor.java

@@ -39 +39 @@
 import org.eclipse.jface.viewers.TreeViewer;
 import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.SashForm;
 import org.eclipse.swt.custom.ScrolledComposite;
 import org.eclipse.swt.dnd.DropTargetEvent;
@@ -137 +138 @@
         scroller.setExpandHorizontal(true);
         scroller.setExpandVertical(true);
-        mainWindow = new Composite(scroller, SWT.NONE);
-        mainWindow.setLayout(new GridLayout(2, false));
-
-        Label resourcesLabel = new Label(mainWindow, SWT.NONE);
+        mainWindow = new SashForm(scroller, SWT.HORIZONTAL);
+
+        mainWindowLeft = new Composite(mainWindow, SWT.BORDER);
+        mainWindowLeft.setLayout(new GridLayout(1, true));
+        Label resourcesLabel = new Label(mainWindowLeft, SWT.CENTER);
         resourcesLabel.setText("Available Resources");
+        
         //resourcesLabel.setBounds(15, 48, 140, 17);
         resourcesLabel.setLayoutData(
             new GridData(SWT.CENTER, SWT.BOTTOM, true, false));
-
-        Label waveformLabel = new Label(mainWindow, SWT.NONE);
+        createResourcesTree(mainWindowLeft);
+        
+        mainWindowRight = new SashForm(mainWindow, SWT.VERTICAL);
+        
+        mainWindowRightTop = new Composite(mainWindowRight, SWT.BORDER);
+        mainWindowRightTop.setLayout(new GridLayout(1, true));
+        Label waveformLabel = new Label(mainWindowRightTop, SWT.CENTER);
         waveformLabel.setText("Waveform");
         //waveformLabel.setBounds(445, 7, 77, 23);
@@ -152 +160 @@
             new GridData(SWT.CENTER, SWT.BOTTOM, true, false));
 
-        createResourcesTree(mainWindow);
-        createWaveformTree(mainWindow);
-
-        Label platformLabel = new Label(mainWindow, SWT.NONE);
+        
+        createWaveformTree(mainWindowRightTop);
+        
+        mainWindowRightBottom = new Composite(mainWindowRight, SWT.BORDER);
+        mainWindowRightBottom.setLayout(new GridLayout(1, true));
+
+        Label platformLabel = new Label(mainWindowRightBottom, SWT.CENTER);
         platformLabel.setText("Platform");
         platformLabel.setLayoutData(
             new GridData(SWT.CENTER, SWT.BOTTOM, true, false));
 
-        createPlatformTree(mainWindow);
-
-        mainWindow.setSize(mainWindow.computeSize(SWT.DEFAULT, SWT.DEFAULT));
+        createPlatformTree(mainWindowRightBottom);
+
+        //mainWindow.setSize(mainWindow.computeSize(SWT.DEFAULT, SWT.DEFAULT));
         parent.setSize(parent.computeSize(SWT.DEFAULT, SWT.DEFAULT));
 
-        scroller.setMinSize(mainWindow.computeSize(SWT.DEFAULT, SWT.DEFAULT));
+        //scroller.setMinSize(mainWindow.computeSize(SWT.DEFAULT, SWT.DEFAULT));
         scroller.setContent(mainWindow);
 
@@ -754 +765 @@
     {
         Tree resourcesTree = new Tree(parent, SWT.MULTI | SWT.BORDER);
-        GridData data = new GridData(SWT.FILL, SWT.FILL, true, true, 1, 3);
+        GridData data = new GridData(SWT.FILL, SWT.FILL, true, true);
         data.minimumHeight = 200;
         data.minimumWidth = 200;
@@ -1618 +1629 @@
         }
     }
+    
+    public boolean isConnectedToFile()
+    {
+        return getEditorInput() instanceof IFileEditorInput;
+    }
+ 
+    // ----------------------------------------------------------
+    public IFileEditorInput getFileInput()
+    {
+        return isConnectedToFile()
+            ? (IFileEditorInput)getEditorInput()
+            : null;
+    }
 
 
@@ -2105 +2129 @@
     protected ResourceTreeViewer waveformTreeViewer;
     protected ResourceTreeViewer platformTreeViewer;
-    private Composite mainWindow;
+    private SashForm mainWindow;
+    private Composite mainWindowLeft;
+    private SashForm mainWindowRight;
+    private Composite mainWindowRightTop;
+    private Composite mainWindowRightBottom;
 
     private MainFrame  mainFrame;