Changeset 7486

Timestamp:

05/06/08 09:04:14 (5 years ago)

Author:

stedwar2

Message:

Added custom tree viewer class and custom drag-and-drop transfer
type.

Location:

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

Files:

• OWDEditor.java (modified) (13 diffs)
• ResourceTransfer.java (added)
• ResourceTreeViewer.java (modified) (15 diffs)

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

@@ -25 +25 @@
 import org.eclipse.ui.part.FileEditorInput;
 import org.eclipse.jface.action.Action;
-import org.eclipse.jface.action.IMenuListener;
 import org.eclipse.jface.action.IMenuManager;
 import org.eclipse.jface.action.IStatusLineManager;
@@ -35 +34 @@
 import org.eclipse.jface.operation.IRunnableWithProgress;
 import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.viewers.CellEditor;
-import org.eclipse.jface.viewers.ColumnViewerEditor;
-import org.eclipse.jface.viewers.ColumnViewerEditorActivationEvent;
-import org.eclipse.jface.viewers.ColumnViewerEditorActivationStrategy;
 import org.eclipse.jface.viewers.DoubleClickEvent;
-import org.eclipse.jface.viewers.ICellModifier;
 import org.eclipse.jface.viewers.IDoubleClickListener;
 import org.eclipse.jface.viewers.ISelectionChangedListener;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.TreeViewer;
-import org.eclipse.jface.viewers.TreeViewerEditor;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.ScrolledComposite;
-import org.eclipse.swt.dnd.DND;
-import org.eclipse.swt.dnd.DragSourceEvent;
-import org.eclipse.swt.dnd.DragSourceListener;
 import org.eclipse.swt.dnd.DropTargetEvent;
-import org.eclipse.swt.dnd.DropTargetListener;
-import org.eclipse.swt.dnd.TextTransfer;
-import org.eclipse.swt.dnd.Transfer;
 import org.eclipse.swt.events.FocusEvent;
 import org.eclipse.swt.events.FocusListener;
@@ -67 +54 @@
 import org.eclipse.swt.widgets.TreeItem;
 import org.python.core.Py;
-import org.python.core.PyList;
 import edu.vt.ossie.OWDPlugin;
 import edu.vt.ossie.dialogs.ConnectDialog;
 import edu.vt.ossie.jyinterface.interfaces.MainFrame;
 import edu.vt.ossie.wavedev.*;
+import edu.vt.ossie.wavedev.treemodel.ITreeNode;
 import edu.vt.ossie.wavedev.treemodel.ContentProvider;
-import edu.vt.ossie.wavedev.treemodel.ITreeNode;
 import edu.vt.ossie.wavedev.treemodel.LabelProvider;
 
@@ -707 +693 @@
         data.minimumWidth = 200;
         resourcesTree.setLayoutData(data);
-        resourcesTreeViewer = new ResourceTreeViewer(resourcesTree);
+        resourcesTreeViewer = new ResourceTreeViewer(
+            resourcesTree, ResourceTransfer.ResourceData.RESOURCE_TREE);
         resourcesTreeViewer.setAutoExpandLevel(2);
         resourcesTree.addFocusListener(this);
@@ -831 +818 @@
         data.minimumWidth = 200;
         waveformTree.setLayoutData(data);
-        waveformTreeViewer = new ResourceTreeViewer(waveformTree);
+        waveformTreeViewer = new ResourceTreeViewer(
+            waveformTree, ResourceTransfer.ResourceData.WAVEFORM_TREE);
         waveformTree.addFocusListener(this);
 
         // Turn on name decorations in the tree
-        ((LabelProvider)resourcesTreeViewer.getLabelProvider())
+        ((LabelProvider)waveformTreeViewer.getLabelProvider())
             .setShowDecoratedNames(true);
 
@@ -914 +902 @@
 
 
+        // Add drag-and-drop support for inserting into waveform/platform
+
+        waveformTreeViewer.addDragSupport(null);
+
+
         // Add drag-and-drop support for adding components from resources
 
@@ -947 +940 @@
                         {
                             getActiveWaveform().addNewComponent(toAdd, after);
-                            refreshWaveform();
                             return true;
                         }
@@ -965 +957 @@
         data.minimumWidth = 200;
         platformTree.setLayoutData(data);
-        platformTreeViewer = new ResourceTreeViewer(platformTree);
+        platformTreeViewer = new ResourceTreeViewer(
+            platformTree, ResourceTransfer.ResourceData.PLATFORM_TREE);
         platformTreeViewer.setAutoExpandLevel(2);
         platformTree.addFocusListener(this);
@@ -996 +989 @@
         // Add edit support for node and device names
 
-        platformTreeViewer.addNameEditSupport(null, dirtySetter);
+        platformTreeViewer.addNameEditSupport(null,
+            new ResourceTreeViewer.SetDirty()
+        {
+            // ----------------------------------------------------------
+            public void setIsDirty(boolean isDirty)
+            {
+                waveformTreeViewer.refresh();
+                OWDEditor.this.setIsDirty(isDirty);
+            }
+        });
+
+
+        // Add drag-and-drop support for moving components between devices
+
+        platformTreeViewer.addDragSupport(new ResourceTreeViewer.AllowAction()
+        {
+            // ----------------------------------------------------------
+            @Override
+            public boolean allowAction(PyWrapper object)
+            {
+                return object instanceof Component
+                    && !((Component)object).isDevice();
+            }
+        });
 
 
@@ -1014 +1030 @@
                     }
                 },
-                new ResourceTreeViewer.SetDirty()
-                {
-                    public void setIsDirty(boolean isDirty)
-                    {
-                        refreshPlatform();
-                        OWDEditor.this.setIsDirty(isDirty);
-                    }
-                }
-                )
+                dirtySetter)
             {
                 // ----------------------------------------------------------
                 public boolean drop(DropTargetEvent event, ITreeNode onNode)
+                {
+                    ResourceTransfer.ResourceData data =
+                        (ResourceTransfer.ResourceData)event.data;
+                    if (data.tree == resourcesTreeViewer.treeId())
+                    {
+                        return dropNewResource(event, onNode);
+                    }
+                    else // if (data.tree == waveformTreeViewer.treeId())
+                    {
+                        return dropComponentAssignment(event, onNode);
+                    }
+                }
+
+                // ----------------------------------------------------------
+                public boolean dropComponentAssignment(
+                    DropTargetEvent event, ITreeNode onNode)
+                {
+                    ResourceTreeViewer sourceViewer = viewerSource(event);
+                    ITreeNode droppedNode =
+                        getDroppedNode(event, sourceViewer);
+                    droppedNode =
+                        nearestEnclosingNode(Component.class, droppedNode);
+                    if (droppedNode == null) return false;
+
+                    onNode =
+                        nearestEnclosingNode(Component.class, onNode);
+                    while (onNode != null
+                        && !((Component)onNode.data()).isDevice())
+                    {
+                        onNode =
+                            nearestEnclosingNode(Component.class, onNode);
+                    }
+                    if (onNode == null) return false;
+
+                    Component c = (Component)droppedNode.data();
+                    Component oldDevice = c.getDevice();
+                    Component newDevice = (Component)onNode.data();
+                    c.assignToDevice(newDevice);
+                    sourceViewer.update(droppedNode, null);
+                    if (sourceViewer != waveformTreeViewer)
+                    {
+                        waveformTreeViewer.update(((ContentProvider)
+                            waveformTreeViewer.getContentProvider())
+                            .findNodeByData(c), null);
+                    }
+                    viewer().refresh(onNode);
+                    viewer().expandToLevel(onNode, 1);
+                    if (oldDevice != null)
+                    {
+                        ITreeNode oldNode = ((ContentProvider)viewer()
+                            .getContentProvider()).findNodeByData(oldDevice);
+                        if (oldNode != null)
+                        {
+                            viewer().refresh(oldNode);
+                        }
+                    }
+                    return true;
+                }
+
+                // ----------------------------------------------------------
+                public boolean dropNewResource(
+                    DropTargetEvent event, ITreeNode onNode)
                 {
                     ITreeNode droppedNode =
@@ -1035 +1105 @@
                         getActivePlatform().addNewNode(
                             (Node)droppedNode.data(), after);
+                        refreshPlatform();
                         return true;
                     }
@@ -1046 +1117 @@
                             ? null
                             : (Component)afterNode.data();
-                        Node nodeForDevice = nearestEnclosingObject(Node.class,
+                        ITreeNode nodeForDevice = nearestEnclosingNode(
+                            Node.class,
                             afterNode == null ? onNode : afterNode);
                         if (nodeForDevice == null) return false;
 
-                        nodeForDevice.addNewDevice(device, after);
+                        Node theNode = (Node)nodeForDevice.data();
+                        log.debug("before add: " + theNode.getDevices());
+                        theNode.addNewDevice(device, after);
+                        log.debug("after add: " + theNode.getDevices());
+                        viewer().refresh(nodeForDevice);
                         return true;
                     }
@@ -1140 +1216 @@
         {
             log.error("openComponentInEditor()", e);
+        }
+    }
+
+
+    // ----------------------------------------------------------
+    private ResourceTreeViewer viewerSource(DropTargetEvent e)
+    {
+        return viewerFromId(((ResourceTransfer.ResourceData)e.data).tree);
+    }
+
+
+    // ----------------------------------------------------------
+    private ResourceTreeViewer viewerFromId(int treeId)
+    {
+        if (treeId == waveformTreeViewer.treeId())
+        {
+            return waveformTreeViewer;
+        }
+        else if (treeId == platformTreeViewer.treeId())
+        {
+            return platformTreeViewer;
+        }
+        else
+        {
+            return resourcesTreeViewer;
         }
     }

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

@@ -10 +10 @@
 import org.eclipse.jface.viewers.ColumnViewerEditorActivationStrategy;
 import org.eclipse.jface.viewers.DoubleClickEvent;
-import org.eclipse.jface.viewers.IBaseLabelProvider;
 import org.eclipse.jface.viewers.ICellModifier;
-import org.eclipse.jface.viewers.IContentProvider;
 import org.eclipse.jface.viewers.IDoubleClickListener;
 import org.eclipse.jface.viewers.IStructuredSelection;
@@ -19 +17 @@
 import org.eclipse.swt.dnd.DND;
 import org.eclipse.swt.dnd.DragSourceEvent;
-import org.eclipse.swt.dnd.DragSourceListener;
 import org.eclipse.swt.dnd.DropTargetEvent;
-import org.eclipse.swt.dnd.DropTargetListener;
 import org.eclipse.swt.dnd.TextTransfer;
 import org.eclipse.swt.dnd.Transfer;
-import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Tree;
 import org.eclipse.swt.widgets.TreeItem;
-import org.python.core.PyList;
 import edu.vt.ossie.OWDPlugin;
-import edu.vt.ossie.wavedev.Component;
-import edu.vt.ossie.wavedev.MainFrameTreeNode;
 import edu.vt.ossie.wavedev.NamedObject;
-import edu.vt.ossie.wavedev.Node;
-import edu.vt.ossie.wavedev.Port;
 import edu.vt.ossie.wavedev.PyWrapper;
 import edu.vt.ossie.wavedev.treemodel.ContentProvider;
@@ -54 +44 @@
 
     // ----------------------------------------------------------
-    public ResourceTreeViewer(Tree tree)
+    public ResourceTreeViewer(Tree tree, int treeId)
     {
         super(tree);
+        this.treeId = treeId;
         setContentProvider(new ContentProvider());
         setLabelProvider(new LabelProvider());
@@ -63 +54 @@
 
     //~ Public Methods ........................................................
+
+    // ----------------------------------------------------------
+    public int treeId()
+    {
+        return treeId;
+    }
+
 
     // ----------------------------------------------------------
@@ -75 +73 @@
         addDragSupport(
             DND.DROP_COPY | DND.DROP_DEFAULT,
-            new Transfer[] {TextTransfer.getInstance()},
-            new DragSourceListener(filter, null));
+            new Transfer[] {ResourceTransfer.getInstance()},
+            new DragSourceListener(filter, null, treeId));
     }
 
@@ -91 +89 @@
         addDropSupport(
             DND.DROP_COPY | DND.DROP_DEFAULT,
-            new Transfer[] {TextTransfer.getInstance()},
+            new Transfer[] {ResourceTransfer.getInstance()},
             listener);
     }
@@ -232 +230 @@
 
         // ----------------------------------------------------------
-        public DragSourceListener()
-        {
-            this(null, null);
-        }
-
-
-        // ----------------------------------------------------------
-        public DragSourceListener(AllowAction allower, SetDirty setter)
+        public DragSourceListener(int treeId)
+        {
+            this(null, null, treeId);
+        }
+
+
+        // ----------------------------------------------------------
+        public DragSourceListener(
+            AllowAction allower, SetDirty setter, int treeId)
         {
             allowAction = allower;
             dirtySetter = setter;
+            this.treeId = treeId;
         }
 
@@ -290 +290 @@
         public void dragSetData(DragSourceEvent event)
         {
-            if (TextTransfer.getInstance().isSupportedType(
+            if (ResourceTransfer.getInstance().isSupportedType(
                 event.dataType))
             {
@@ -299 +299 @@
                     ITreeNode node =
                         (ITreeNode)selection.getFirstElement();
-                    event.data = node.getName();
+                    ResourceTransfer.ResourceData data =
+                        new ResourceTransfer.ResourceData();
+                    data.name = node.getName();
+                    data.tree = treeId;
+                    event.data = data;
                 }
             }
@@ -318 +322 @@
         protected AllowAction allowAction;
         protected SetDirty dirtySetter;
+        protected int treeId;
     }
 
@@ -491 +496 @@
                 }
             }
-            for (int i = 0; i < event.dataTypes.length; i++)
-            {
-                if (TextTransfer.getInstance().isSupportedType(
-                    event.dataTypes[i]))
-                {
-                    event.currentDataType = event.dataTypes[i];
-                    break;
-                }
-            }
             if (event.detail != DND.DROP_COPY)
             {
@@ -549 +545 @@
             DropTargetEvent event, ResourceTreeViewer source)
         {
-            String name = (String)event.data;
+            ResourceTransfer.ResourceData data =
+                (ResourceTransfer.ResourceData)event.data;
             return ((ContentProvider)
                 source.getContentProvider())
-                .findNodeByName(name);
+                .findNodeByName(data.name);
         }
 
@@ -594 +591 @@
         public void drop(DropTargetEvent event)
         {
-            if (TextTransfer.getInstance().isSupportedType(
+            if (ResourceTransfer.getInstance().isSupportedType(
                 event.currentDataType))
             {
@@ -619 +616 @@
         public void dropAccept(DropTargetEvent event)
         {
-            if (allowAction != null)
+            if (allowAction != null && event.item != null)
             {
                 TreeItem item = (TreeItem)event.item;
@@ -640 +637 @@
     //~ Instance/static variables .............................................
 
+    private int treeId;
+
     private static final Logger log =
         OWDPlugin.getLogManager().getLogger(ResourceTreeViewer.class);