Changeset 8303

Timestamp:

09/12/08 09:08:00 (5 years ago)

Author:

stedwar2

Message:

Fixed several DND problems with ports in the platform tree.

Files:

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

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

@@ -961 +961 @@
                                 p.getConnectionsAsArray();
                             p.removeAllConnections();
-                            viewer().refresh(p);
+                            refresh(p);
                             for (Connection c : connections)
                             {
-                                viewer().refresh(c.getRemotePort());
+                                refresh(c.getRemotePort());
                             }
                             setIsDirty(true);
@@ -1040 +1040 @@
                         return dropPortConnection(event, onNode);
                     }
+                    else if (data.tree == platformTreeViewer.hashCode())
+                    {
+                        return dropPortConnection(event, onNode);
+                    }
                     else // could be from platform viewer
                     {
@@ -1051 +1055 @@
                     DropTargetEvent event, ITreeNode onNode)
                 {
+                    ITreeNode droppedNode = getDroppedNode(event, viewer());
+                    if (droppedNode == null)
+                    {
+                        droppedNode = getDroppedNode(event, platformTreeViewer);
+                    }
+                    if (droppedNode == null
+                        || !(droppedNode.data() instanceof Port))
+                    {
+                        return false;
+                    }
+
+                    Port fromPort = (Port)droppedNode.data();
+                    return dropPortConnection(fromPort, onNode);
+                }
+
+
+                // ----------------------------------------------------------
+                private boolean dropPortConnection(
+                    Port droppedPort, ITreeNode onNode)
+                {
                     Port toPort =
                         nearestEnclosingObject(Port.class, onNode);
                     if (toPort == null) return false;
 
-                    ITreeNode droppedNode =
-                        getDroppedNode(event, viewer());
-                    if (droppedNode == null
-                        || !(droppedNode.data() instanceof Port))
-                    {
-                        return false;
-                    }
-
-                    Port fromPort = (Port)droppedNode.data();
-
-                    log.debug("waveform: connecting port " + fromPort
+                    log.debug("waveform: connecting port " + droppedPort
                         + " to " + toPort);
-                    String result = fromPort.connectTo(toPort);
+                    String result = droppedPort.connectTo(toPort);
                     if (result == null)
                     {
                         refresh(toPort);
-                        refresh(fromPort);
+                        refresh(droppedPort);
                         return true;
                     }
@@ -1138 +1152 @@
             public void aboutToShow(IMenuManager manager, final ITreeNode node)
             {
+                if (!(node.data() instanceof Port))
                 manager.add(new Action("Rename")
                 {
@@ -1172 +1187 @@
                                 p.getConnectionsAsArray();
                             p.removeAllConnections();
-                            viewer().refresh(p);
+                            refresh(p);
                             for (Connection c : connections)
                             {
-                                viewer().refresh(c.getRemotePort());
+                                refresh(c.getRemotePort());
                             }
                             setIsDirty(true);
@@ -1214 +1229 @@
             public boolean allowAction(PyWrapper object)
             {
-                return object instanceof Component
-                    && !((Component)object).isDevice();
+                return (object instanceof Component
+                        && !((Component)object).isDevice())
+                    || (object instanceof Port);
             }
         });
@@ -1267 +1283 @@
                     else
                     {
-                        return dropComponentAssignment(event, onNode);
+                        ITreeNode droppedNode =
+                            getDroppedNode(event, platformTreeViewer);
+                        if (droppedNode != null
+                            && droppedNode.data() instanceof Port)
+                        {
+                            return dropPortConnection(
+                                (Port)droppedNode.data(), onNode);
+                        }
+                        else
+                        {
+                            return dropComponentAssignment(event, onNode);
+                        }
                     }
                 }