[jbosstools-commits] JBoss Tools SVN: r9433 - trunk/flow/plugins/org.jboss.tools.flow.common.graph/src/org/jboss/tools/flow/editor/action.

[jbosstools-commits at lists.jboss.org]

Author: koen.aers at jboss.com
Date: 2008-07-30 10:12:13 -0400 (Wed, 30 Jul 2008)
New Revision: 9433

Removed:
   trunk/flow/plugins/org.jboss.tools.flow.common.graph/src/org/jboss/tools/flow/editor/action/HorizontalAutoLayoutActionDelegate.java
   trunk/flow/plugins/org.jboss.tools.flow.common.graph/src/org/jboss/tools/flow/editor/action/VerticalAutoLayoutActionDelegate.java
Log:
generalized the auto layout actions

Deleted: trunk/flow/plugins/org.jboss.tools.flow.common.graph/src/org/jboss/tools/flow/editor/action/HorizontalAutoLayoutActionDelegate.java
===================================================================
--- trunk/flow/plugins/org.jboss.tools.flow.common.graph/src/org/jboss/tools/flow/editor/action/HorizontalAutoLayoutActionDelegate.java	2008-07-30 14:11:21 UTC (rev 9432)
+++ trunk/flow/plugins/org.jboss.tools.flow.common.graph/src/org/jboss/tools/flow/editor/action/HorizontalAutoLayoutActionDelegate.java	2008-07-30 14:12:13 UTC (rev 9433)
@@ -1,38 +0,0 @@
-package org.jboss.tools.flow.editor.action;
-
-/*
- * Copyright 2005 JBoss Inc
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import java.util.Map;
-
-import org.eclipse.draw2d.PositionConstants;
-import org.eclipse.draw2d.graph.DirectedGraph;
-import org.eclipse.draw2d.graph.Node;
-
-/**
- * Action for auto layouting a process.
- * 
- * @author <a href="mailto:kris_verlaenen at hotmail.com">Kris Verlaenen</a>
- */
-public class HorizontalAutoLayoutActionDelegate extends VerticalAutoLayoutActionDelegate {
-
-    protected DirectedGraph createDirectedGraph(Map<String, Node> mapping) {
-        DirectedGraph graph = super.createDirectedGraph(mapping);
-        graph.setDirection(PositionConstants.HORIZONTAL);
-        return graph;
-    }
-
-}

Deleted: trunk/flow/plugins/org.jboss.tools.flow.common.graph/src/org/jboss/tools/flow/editor/action/VerticalAutoLayoutActionDelegate.java
===================================================================
--- trunk/flow/plugins/org.jboss.tools.flow.common.graph/src/org/jboss/tools/flow/editor/action/VerticalAutoLayoutActionDelegate.java	2008-07-30 14:11:21 UTC (rev 9432)
+++ trunk/flow/plugins/org.jboss.tools.flow.common.graph/src/org/jboss/tools/flow/editor/action/VerticalAutoLayoutActionDelegate.java	2008-07-30 14:12:13 UTC (rev 9433)
@@ -1,98 +0,0 @@
-package org.jboss.tools.flow.editor.action;
-
-/*
- * Copyright 2005 JBoss Inc
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.draw2d.geometry.Dimension;
-import org.eclipse.draw2d.geometry.Rectangle;
-import org.eclipse.draw2d.graph.DirectedGraph;
-import org.eclipse.draw2d.graph.DirectedGraphLayout;
-import org.eclipse.draw2d.graph.Edge;
-import org.eclipse.draw2d.graph.Node;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.ui.IEditorActionDelegate;
-import org.eclipse.ui.IEditorPart;
-import org.eclipse.ui.actions.ActionDelegate;
-import org.jboss.tools.flow.editor.GenericModelEditor;
-import org.jboss.tools.flow.editor.core.AbstractConnectionWrapper;
-import org.jboss.tools.flow.editor.core.AbstractFlowWrapper;
-import org.jboss.tools.flow.editor.core.NodeWrapper;
-
-/**
- * Action for auto layouting a process.
- * 
- * @author <a href="mailto:kris_verlaenen at hotmail.com">Kris Verlaenen</a>
- */
-public class VerticalAutoLayoutActionDelegate extends ActionDelegate implements IEditorActionDelegate {
-
-    private IEditorPart editor;
-    
-    public void run(IAction action) {
-        execute();
-    }
-
-    public void setActiveEditor(IAction action, IEditorPart targetEditor) {
-        editor = targetEditor;
-    }
-
-    private void execute() {
-        editor.doSave(null);
-        Map<String, Node> mapping = new HashMap<String, Node>();
-        DirectedGraph graph = createDirectedGraph(mapping);
-        DirectedGraphLayout layout = new DirectedGraphLayout();
-        layout.visit(graph);
-        for (Map.Entry<String, Node> entry: mapping.entrySet()) {
-            Node node = entry.getValue();
-            NodeWrapper nodeWrapper =
-                ((AbstractFlowWrapper) ((GenericModelEditor) editor).getModel()).getElement(entry.getKey());
-            nodeWrapper.setConstraint(new Rectangle(node.x, node.y, node.width, node.height));
-        }
-        // TODO: implement changes as a command, so we can support undo
-        editor.doSave(null);
-    }
-    
-    @SuppressWarnings("unchecked")
-    protected DirectedGraph createDirectedGraph(Map<String, Node> mapping) {
-        DirectedGraph graph = new DirectedGraph();
-        AbstractFlowWrapper processWrapper = (AbstractFlowWrapper) ((GenericModelEditor) editor).getModel();
-        for (NodeWrapper elementWrapper: processWrapper.getElements()) {
-            Node node = new Node();
-            Integer width = (Integer) elementWrapper.getConstraint().width;
-            Integer height = (Integer) elementWrapper.getConstraint().height;
-            if (width == null || width <= 0) {
-                width = 80;
-            }
-            if (height == null || height <= 0) {
-                height = 40;
-            }
-            node.setSize(new Dimension(width, height));
-            graph.nodes.add(node);
-            mapping.put(elementWrapper.getId(), node);
-        }
-        for (NodeWrapper elementWrapper: processWrapper.getElements()) {
-            for (AbstractConnectionWrapper connection: elementWrapper.getIncomingConnections()) {
-                Node source = mapping.get(connection.getSource().getId());
-                Node target = mapping.get(connection.getTarget().getId());
-                graph.edges.add(new Edge(source, target));
-            }
-        }
-        return graph;
-    }
-
-}