Author: DartPeng Date: 2010-10-08 06:08:12 -0400 (Fri, 08 Oct 2010) New Revision: 25640 Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/actions/AbstractProcessGraphAction.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/SmooksProcessGraphicalEditor.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/process/TaskNodeFigure.java Log: JBIDE-7236 Done Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/actions/AbstractProcessGraphAction.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/actions/AbstractProcessGraphAction.java 2010-10-08 09:03:47 UTC (rev 25639) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/actions/AbstractProcessGraphAction.java 2010-10-08 10:08:12 UTC (rev 25640) @@ -71,15 +71,6 @@ } protected List<TaskType> getCurrentSelectedTask(){ - if(editorPart instanceof SmooksProcessGraphicalEditor) { - TaskType currentlySelectedTask = ((SmooksProcessGraphicalEditor)editorPart).getCurrentlySelectedTask(); - if(currentlySelectedTask != null) { - List<TaskType> selectedTasks = new ArrayList<TaskType>(); - selectedTasks.add(currentlySelectedTask); - return selectedTasks; - } - } - if(currentSelection != null){ List<TaskType> selectedTasks = new ArrayList<TaskType>(); List<?> selections = ((IStructuredSelection) currentSelection).toList(); @@ -90,6 +81,14 @@ } return selectedTasks; } + if(editorPart instanceof SmooksProcessGraphicalEditor) { + TaskType currentlySelectedTask = ((SmooksProcessGraphicalEditor)editorPart).getCurrentlySelectedTask(); + if(currentlySelectedTask != null) { + List<TaskType> selectedTasks = new ArrayList<TaskType>(); + selectedTasks.add(currentlySelectedTask); + return selectedTasks; + } + } return null; } Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/SmooksProcessGraphicalEditor.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/SmooksProcessGraphicalEditor.java 2010-10-08 09:03:47 UTC (rev 25639) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/SmooksProcessGraphicalEditor.java 2010-10-08 10:08:12 UTC (rev 25640) @@ -1349,6 +1349,10 @@ } } } + + public List<IAction> getProcessPanelActionList(){ + return processPanelActions; + } public IAction getAction(String actionId) { if (processMapActived) { Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/process/TaskNodeFigure.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/process/TaskNodeFigure.java 2010-10-08 09:03:47 UTC (rev 25639) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/process/TaskNodeFigure.java 2010-10-08 10:08:12 UTC (rev 25640) @@ -28,6 +28,7 @@ import org.eclipse.draw2d.geometry.Dimension; import org.eclipse.draw2d.geometry.Point; import org.eclipse.draw2d.geometry.Rectangle; +import org.eclipse.jface.action.IAction; import org.eclipse.jface.viewers.StructuredSelection; import org.eclipse.swt.graphics.Color; import org.eclipse.swt.graphics.Image; @@ -37,6 +38,7 @@ import org.eclipse.zest.core.widgets.GraphItem; import org.jboss.tools.smooks.configuration.SmooksConfigurationActivator; import org.jboss.tools.smooks.configuration.editors.GraphicsConstants; +import org.jboss.tools.smooks.graphical.actions.DeleteTaskNodeAction; import org.jboss.tools.smooks.graphical.editors.SmooksProcessGraphicalEditor; import org.jboss.tools.smooks.graphical.editors.TaskTypeManager; @@ -101,29 +103,6 @@ } private void hookTaskNodeFigure() { - // this.addMouseMotionListener(new MouseMotionListener() { - // - // public void mouseDragged(MouseEvent me) { - // } - // - // public void mouseEntered(MouseEvent me) { - // showAddFigure = true; - // imageSourceRectangle = null; - // addTaskFigure.repaint(); - // } - // - // public void mouseExited(MouseEvent me) { - // showAddFigure = false; - // addTaskFigure.repaint(); - // } - // - // public void mouseHover(MouseEvent me) { - // } - // - // public void mouseMoved(MouseEvent me) { - // } - // - // }); addTaskFigure.addMouseMotionListener(new MouseMotionListener() { public void mouseDragged(MouseEvent me) { @@ -187,6 +166,36 @@ // imageSourceRectangle = new Rectangle(rect.x + feet, // rect.y + feet, rect.width - feet * 2, // rect.height - feet * 2); + }else{ + Graph g = processGraphicalViewerEditor.getProcessGraphViewer() + .getGraphControl(); + processGraphicalViewerEditor.setNeedupdatewhenshow(false); + List<?> nodes = g.getNodes(); + for (Iterator<?> iterator = nodes.iterator(); iterator + .hasNext();) { + GraphItem item = (GraphItem) iterator.next(); + if (item instanceof CGraphNode) { + if (TaskNodeFigure.this == ((CGraphNode) item) + .getFigure()) { + processGraphicalViewerEditor + .updateProcessActions(new StructuredSelection( + item.getData())); + break; + } + } + } + List<IAction> actionsList = processGraphicalViewerEditor.getProcessPanelActionList(); + boolean hideAddIcon = true; + for (IAction iAction : actionsList) { + if(iAction.isEnabled() && !(iAction instanceof DeleteTaskNodeAction)){ + hideAddIcon = false; + break; + } + } + if(hideAddIcon){ + graphics.fillRectangle(rect); + return; + } } Image image = SmooksConfigurationActivator.getDefault() .getImageRegistry()