JBoss Tools SVN: r13502 - in trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common: editpart and 4 other directories.
by jbosstools-commits＠lists.jboss.org
Author: koen.aers(a)jboss.com
Date: 2009-02-05 22:23:31 -0500 (Thu, 05 Feb 2009)
New Revision: 13502
Added:
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/properties/DefaultLabelWrapperPropertySource.java
Modified:
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/command/RenameElementCommand.java
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/editpart/LabelEditPart.java
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/editpart/RootEditPart.java
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/policy/ElementDirectEditManager.java
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/policy/ElementDirectEditPolicy.java
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/registry/ElementRegistry.java
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/wrapper/DefaultLabelWrapper.java
Log:
direct editing of labels
Modified: trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/command/RenameElementCommand.java
===================================================================
--- trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/command/RenameElementCommand.java 2009-02-06 01:40:55 UTC (rev 13501)
+++ trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/command/RenameElementCommand.java 2009-02-06 03:23:31 UTC (rev 13502)
@@ -17,7 +17,9 @@
*/
import org.eclipse.gef.commands.Command;
-import org.jboss.tools.flow.common.wrapper.NodeWrapper;
+import org.eclipse.ui.views.properties.IPropertySource;
+import org.jboss.tools.flow.common.properties.IPropertyId;
+import org.jboss.tools.flow.common.wrapper.Wrapper;
/**
* A command for renaming an element.
@@ -26,12 +28,16 @@
*/
public class RenameElementCommand extends Command {
- private NodeWrapper source;
+ private Wrapper source;
private String name;
private String oldName;
+
public void execute() {
- source.setName(name);
+ IPropertySource propertySource = (IPropertySource)source.getAdapter(IPropertySource.class);
+ if (propertySource != null) {
+ propertySource.setPropertyValue(IPropertyId.NAME, name);
+ }
}
public void setName(String string) {
@@ -42,11 +48,14 @@
oldName = string;
}
- public void setSource(NodeWrapper action) {
+ public void setSource(Wrapper action) {
source = action;
}
public void undo() {
- source.setName(oldName);
+ IPropertySource propertySource = (IPropertySource)source.getAdapter(IPropertySource.class);
+ if (propertySource != null) {
+ propertySource.setPropertyValue(IPropertyId.NAME, oldName);
+ }
}
}
Modified: trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/editpart/LabelEditPart.java
===================================================================
--- trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/editpart/LabelEditPart.java 2009-02-06 01:40:55 UTC (rev 13501)
+++ trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/editpart/LabelEditPart.java 2009-02-06 03:23:31 UTC (rev 13502)
@@ -9,17 +9,25 @@
import org.eclipse.draw2d.geometry.Point;
import org.eclipse.gef.DragTracker;
import org.eclipse.gef.EditPart;
+import org.eclipse.gef.EditPolicy;
import org.eclipse.gef.GraphicalEditPart;
import org.eclipse.gef.Request;
+import org.eclipse.gef.RequestConstants;
import org.eclipse.gef.editparts.AbstractGraphicalEditPart;
+import org.eclipse.gef.tools.DirectEditManager;
import org.eclipse.gef.tools.DragEditPartsTracker;
+import org.jboss.tools.flow.common.policy.ElementDirectEditManager;
+import org.jboss.tools.flow.common.policy.ElementDirectEditPolicy;
import org.jboss.tools.flow.common.policy.LabelGraphicalNodeEditPolicy;
import org.jboss.tools.flow.common.wrapper.LabelWrapper;
import org.jboss.tools.flow.common.wrapper.ModelEvent;
import org.jboss.tools.flow.common.wrapper.ModelListener;
+import org.jboss.tools.flow.common.wrapper.Wrapper;
public class LabelEditPart extends AbstractGraphicalEditPart implements ModelListener {
+ private DirectEditManager manager;
+
@Override
protected IFigure createFigure() {
return new Label();
@@ -27,12 +35,12 @@
@Override
protected void createEditPolicies() {
- installEditPolicy("GraphicalNodeEditPoliy", new LabelGraphicalNodeEditPolicy());
+ installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new LabelGraphicalNodeEditPolicy());
+ installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new ElementDirectEditPolicy());
}
protected void refreshVisuals() {
String text = getLabelWrapper().getText();
-// if (text == null || "".equals(text)) text = "text";
Polyline polyline = (Polyline)((ConnectionEditPart)getParent()).getConnectionFigure();
Point location = ((LabelWrapper)getModel()).getLocation();
if (location == null) {
@@ -50,6 +58,25 @@
return new Point(- (textDimension.width +5) , -(textDimension.height + 5));
}
+ public void performRequest(Request request) {
+ if (request.getType() == RequestConstants.REQ_DIRECT_EDIT) {
+ performDirectEdit();
+ } else {
+ super.performRequest(request);
+ }
+ }
+
+ protected void performDirectEdit() {
+ Label label = (Label) getFigure();
+ if (label == null) {
+ return;
+ }
+ if (manager == null) {
+ manager = new ElementDirectEditManager(this, new CellEditorLocator(label));
+ }
+ manager.show();
+ }
+
public LabelWrapper getLabelWrapper() {
return (LabelWrapper)getModel();
}
@@ -65,9 +92,15 @@
public void activate() {
super.activate();
getLabelWrapper().addListener(this);
+ if (getParent().getModel() instanceof Wrapper) {
+ ((Wrapper)getParent().getModel()).addListener(this);
+ }
}
public void deactivate() {
+ if (getParent().getModel() instanceof Wrapper) {
+ ((Wrapper)getParent().getModel()).removeListener(this);
+ }
getLabelWrapper().removeListener(this);
super.deactivate();
}
Modified: trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/editpart/RootEditPart.java
===================================================================
--- trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/editpart/RootEditPart.java 2009-02-06 01:40:55 UTC (rev 13501)
+++ trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/editpart/RootEditPart.java 2009-02-06 03:23:31 UTC (rev 13502)
@@ -121,18 +121,4 @@
Animation.run(400);
}
-// @SuppressWarnings("unchecked")
-// public boolean setTableModelBounds() {
-// List<ElementEditPart> tableParts = getChildren();
-// for (ElementEditPart elementEditPart: tableParts) {
-// ElementFigure elementFigure = (ElementFigure) elementEditPart.getFigure();
-// if (elementFigure == null) {
-// continue;
-// }
-// Rectangle constraint = elementFigure.getBounds().getCopy();
-// NodeWrapper elementWrapper = elementEditPart.getElementWrapper();
-// elementWrapper.setConstraint(constraint);
-// }
-// return true;
-// }
}
Modified: trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/policy/ElementDirectEditManager.java
===================================================================
--- trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/policy/ElementDirectEditManager.java 2009-02-06 01:40:55 UTC (rev 13501)
+++ trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/policy/ElementDirectEditManager.java 2009-02-06 03:23:31 UTC (rev 13502)
@@ -16,12 +16,14 @@
* limitations under the License.
*/
+import org.eclipse.gef.GraphicalEditPart;
import org.eclipse.gef.tools.CellEditorLocator;
import org.eclipse.gef.tools.DirectEditManager;
import org.eclipse.jface.viewers.TextCellEditor;
import org.eclipse.swt.widgets.Text;
-import org.jboss.tools.flow.common.editpart.ElementEditPart;
-import org.jboss.tools.flow.common.wrapper.NodeWrapper;
+import org.eclipse.ui.views.properties.IPropertySource;
+import org.jboss.tools.flow.common.properties.IPropertyId;
+import org.jboss.tools.flow.common.wrapper.Wrapper;
/**
* Manager for directly editing elements.
@@ -30,15 +32,22 @@
*/
public class ElementDirectEditManager extends DirectEditManager {
- private NodeWrapper element;
+ private IPropertySource propertySource;
- public ElementDirectEditManager(ElementEditPart source, CellEditorLocator locator) {
+ public ElementDirectEditManager(GraphicalEditPart source, CellEditorLocator locator) {
super(source, TextCellEditor.class, locator);
- element = source.getElementWrapper();
+ Object object = source.getModel();
+ if (object instanceof Wrapper) {
+ propertySource = (IPropertySource)((Wrapper)object).getAdapter(IPropertySource.class);
+ }
}
protected void initCellEditor() {
- getCellEditor().setValue(element.getName());
+ String initialValue = null;
+ if (propertySource != null) {
+ initialValue = (String)propertySource.getPropertyValue(IPropertyId.NAME);
+ }
+ getCellEditor().setValue(initialValue == null ? "" : initialValue);
Text text = (Text) getCellEditor().getControl();
text.selectAll();
}
Modified: trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/policy/ElementDirectEditPolicy.java
===================================================================
--- trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/policy/ElementDirectEditPolicy.java 2009-02-06 01:40:55 UTC (rev 13501)
+++ trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/policy/ElementDirectEditPolicy.java 2009-02-06 03:23:31 UTC (rev 13502)
@@ -16,12 +16,16 @@
* limitations under the License.
*/
+import org.eclipse.draw2d.IFigure;
+import org.eclipse.draw2d.Label;
import org.eclipse.gef.commands.Command;
import org.eclipse.gef.editpolicies.DirectEditPolicy;
import org.eclipse.gef.requests.DirectEditRequest;
+import org.eclipse.ui.views.properties.IPropertySource;
import org.jboss.tools.flow.common.command.RenameElementCommand;
import org.jboss.tools.flow.common.figure.ElementFigure;
-import org.jboss.tools.flow.common.wrapper.NodeWrapper;
+import org.jboss.tools.flow.common.properties.IPropertyId;
+import org.jboss.tools.flow.common.wrapper.Wrapper;
/**
* Policy for directly editing elements.
@@ -32,15 +36,23 @@
protected Command getDirectEditCommand(DirectEditRequest request) {
RenameElementCommand cmd = new RenameElementCommand();
- cmd.setSource((NodeWrapper) getHost().getModel());
- cmd.setOldName(((NodeWrapper) getHost().getModel()).getName());
+ cmd.setSource((Wrapper) getHost().getModel());
+ IPropertySource propertySource = (IPropertySource)((Wrapper)getHost().getModel()).getAdapter(IPropertySource.class);
+ if (propertySource != null) {
+ cmd.setOldName((String)propertySource.getPropertyValue(IPropertyId.NAME));
+ }
cmd.setName((String) request.getCellEditor().getValue());
return cmd;
}
protected void showCurrentEditValue(DirectEditRequest request) {
String value = (String) request.getCellEditor().getValue();
- ((ElementFigure) getHostFigure()).setText(value);
+ IFigure figure = getHostFigure();
+ if (figure instanceof Label) {
+ ((Label)figure).setText(value);
+ } else if (figure instanceof ElementFigure){
+ ((ElementFigure)figure).setText(value);
+ }
}
}
Added: trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/properties/DefaultLabelWrapperPropertySource.java
===================================================================
--- trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/properties/DefaultLabelWrapperPropertySource.java (rev 0)
+++ trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/properties/DefaultLabelWrapperPropertySource.java 2009-02-06 03:23:31 UTC (rev 13502)
@@ -0,0 +1,22 @@
+package org.jboss.tools.flow.common.properties;
+
+import org.jboss.tools.flow.common.wrapper.DefaultLabelWrapper;
+
+public class DefaultLabelWrapperPropertySource extends WrapperPropertySource implements IPropertyId {
+
+ private DefaultLabelWrapper wrapper = null;
+
+ public DefaultLabelWrapperPropertySource(DefaultLabelWrapper wrapper) {
+ super(wrapper);
+ this.wrapper = wrapper;
+ }
+
+ public void setPropertyValue(Object id, Object value) {
+ if (NAME.equals(id)) {
+ if (value instanceof String) {
+ wrapper.setText((String)value);
+ }
+ }
+ super.setPropertyValue(id, value);
+ }
+}
Modified: trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/registry/ElementRegistry.java
===================================================================
--- trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/registry/ElementRegistry.java 2009-02-06 01:40:55 UTC (rev 13501)
+++ trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/registry/ElementRegistry.java 2009-02-06 03:23:31 UTC (rev 13502)
@@ -67,7 +67,7 @@
((Element)element).setMetaData("configurationElement", configurationElement);
ConnectionWrapper result = new DefaultConnectionWrapper();
result.setElement((Element)element);
- result.setLabel(new DefaultLabelWrapper((Element)element));
+ result.setLabel(new DefaultLabelWrapper(result));
return result;
}
Modified: trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/wrapper/DefaultLabelWrapper.java
===================================================================
--- trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/wrapper/DefaultLabelWrapper.java 2009-02-06 01:40:55 UTC (rev 13501)
+++ trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/wrapper/DefaultLabelWrapper.java 2009-02-06 03:23:31 UTC (rev 13502)
@@ -1,22 +1,23 @@
package org.jboss.tools.flow.common.wrapper;
import org.eclipse.ui.views.properties.IPropertySource;
-import org.jboss.tools.flow.common.model.Element;
import org.jboss.tools.flow.common.properties.IPropertyId;
public class DefaultLabelWrapper extends AbstractLabelWrapper {
private IPropertySource propertySource;
- public DefaultLabelWrapper(Element element) {
- if (element != null) {
- propertySource = (IPropertySource)element.getMetaData("propertySource");
+ public DefaultLabelWrapper(Wrapper owner) {
+ if (owner != null) {
+ propertySource = (IPropertySource)owner.getAdapter(IPropertySource.class);
+ setElement(owner.getElement());
}
}
public void setText(String text) {
if (propertySource != null) {
propertySource.setPropertyValue(IPropertyId.LABEL, text);
+ notifyListeners(CHANGE_VISUAL, text);
}
}
@@ -28,4 +29,13 @@
return result;
}
+ @SuppressWarnings("unchecked")
+ public Object getAdapter(Class adapter) {
+ if (adapter == IPropertySource.class && propertySource != null) {
+ return propertySource;
+ }
+ return super.getAdapter(adapter);
+ }
+
+
}
15 years, 3 months
- 1
- 0
JBoss Tools SVN: r13501 - trunk/jsf/features/org.jboss.tools.richfaces.feature.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2009-02-05 20:40:55 -0500 (Thu, 05 Feb 2009)
New Revision: 13501
Modified:
trunk/jsf/features/org.jboss.tools.richfaces.feature/feature.xml
Log:
https://jira.jboss.org/jira/browse/JBIDE-2767 - fixed in trunk
xulrunner feature build now included in a build process and has its own builder with the same name
richfaces includes xulrunner feature during assembling
Modified: trunk/jsf/features/org.jboss.tools.richfaces.feature/feature.xml
===================================================================
--- trunk/jsf/features/org.jboss.tools.richfaces.feature/feature.xml 2009-02-06 01:23:00 UTC (rev 13500)
+++ trunk/jsf/features/org.jboss.tools.richfaces.feature/feature.xml 2009-02-06 01:40:55 UTC (rev 13501)
@@ -486,14 +486,6 @@
unpack="false"/>
<plugin
- id="org.jboss.tools.xulrunner.initializer"
- download-size="0"
- install-size="0"
- version="0.0.0"
- fragment="true"
- unpack="false"/>
-
- <plugin
id="org.jboss.tools.vpe.docbook"
download-size="0"
install-size="0"
15 years, 3 months
- 1
- 0
JBoss Tools SVN: r13500 - trunk/vpe/features/org.jboss.tools.xulrunner.feature.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2009-02-05 20:23:00 -0500 (Thu, 05 Feb 2009)
New Revision: 13500
Modified:
trunk/vpe/features/org.jboss.tools.xulrunner.feature/feature.xml
Log:
Modified: trunk/vpe/features/org.jboss.tools.xulrunner.feature/feature.xml
===================================================================
--- trunk/vpe/features/org.jboss.tools.xulrunner.feature/feature.xml 2009-02-06 01:18:24 UTC (rev 13499)
+++ trunk/vpe/features/org.jboss.tools.xulrunner.feature/feature.xml 2009-02-06 01:23:00 UTC (rev 13500)
@@ -1,81 +1,81 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
- id="org.jboss.tools.xulrunner.feature"
- label="%featureName"
- version="1.8.1.3-20070904"
- provider-name="%providerName"
- plugin="org.jboss.tools.xulrunner.initializer">
-
- <description>
- %description
- </description>
-
- <copyright>
- %copyright
- </copyright>
-
- <license url="%licenseURL">
- %license
- </license>
-
- <url>
- <update label="%updateSiteName" url="http://download.jboss.org/jbosstools/updates/stable"/>
- <discovery label="%discoverySiteName" url="http://download.jboss.org/jbosstools/updates/development"/>
- </url>
-
- <plugin
- id="org.mozilla.xpcom"
- download-size="0"
- install-size="0"
- version="1.8.1.3-20070904"/>
-
- <plugin
- id="org.mozilla.xulrunner.carbon.macosx"
- os="macosx"
- ws="carbon"
- download-size="0"
- install-size="0"
- version="1.8.1.3-20070904"/>
-
- <plugin
- id="org.mozilla.xulrunner.gtk.linux.x86"
- os="linux"
- ws="gtk"
- arch="x86"
- download-size="0"
- install-size="0"
- version="1.8.1.3-20070904"/>
-
- <plugin
- id="org.mozilla.xulrunner.gtk.linux.x86_64"
- os="linux"
- ws="gtk"
- arch="x86_64"
- download-size="0"
- install-size="0"
- version="1.8.1.4-20080112"/>
-
- <plugin
- id="org.mozilla.xulrunner.win32.win32.x86"
- os="win32"
- ws="win32"
- arch="x86"
- download-size="0"
- install-size="0"
- version="1.8.1.3-20070904"/>
-
- <plugin
- id="org.jboss.tools.xulrunner.initializer"
- download-size="0"
- install-size="0"
- version="0.0.0"
- fragment="true"
- unpack="false"/>
-
- <plugin
- id="org.jboss.tools.xulrunner"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
-</feature>
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+ id="org.jboss.tools.xulrunner.feature"
+ label="%featureName"
+ version="1.8.1.3-20070904"
+ provider-name="%providerName"
+ plugin="org.jboss.tools.xulrunner">
+
+ <description>
+ %description
+ </description>
+
+ <copyright>
+ %copyright
+ </copyright>
+
+ <license url="%licenseURL">
+ %license
+ </license>
+
+ <url>
+ <update label="%updateSiteName" url="http://download.jboss.org/jbosstools/updates/stable"/>
+ <discovery label="%discoverySiteName" url="http://download.jboss.org/jbosstools/updates/development"/>
+ </url>
+
+ <plugin
+ id="org.mozilla.xpcom"
+ download-size="0"
+ install-size="0"
+ version="1.8.1.3-20070904"/>
+
+ <plugin
+ id="org.mozilla.xulrunner.carbon.macosx"
+ os="macosx"
+ ws="carbon"
+ download-size="0"
+ install-size="0"
+ version="1.8.1.3-20070904"/>
+
+ <plugin
+ id="org.mozilla.xulrunner.gtk.linux.x86"
+ os="linux"
+ ws="gtk"
+ arch="x86"
+ download-size="0"
+ install-size="0"
+ version="1.8.1.3-20070904"/>
+
+ <plugin
+ id="org.mozilla.xulrunner.gtk.linux.x86_64"
+ os="linux"
+ ws="gtk"
+ arch="x86_64"
+ download-size="0"
+ install-size="0"
+ version="1.8.1.4-20080112"/>
+
+ <plugin
+ id="org.mozilla.xulrunner.win32.win32.x86"
+ os="win32"
+ ws="win32"
+ arch="x86"
+ download-size="0"
+ install-size="0"
+ version="1.8.1.3-20070904"/>
+
+ <plugin
+ id="org.jboss.tools.xulrunner.initializer"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ fragment="true"
+ unpack="false"/>
+
+ <plugin
+ id="org.jboss.tools.xulrunner"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"/>
+
+</feature>
15 years, 3 months
- 1
- 0
JBoss Tools SVN: r13499 - vpe/plugins and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2009-02-05 20:18:24 -0500 (Thu, 05 Feb 2009)
New Revision: 13499
Added:
trunk/vpe/plugins/org.jboss.tools.xulrunner/
Removed:
vpe/plugins/org.jboss.tools.xulrunner/
Log:
https://jira.jboss.org/jira/browse/JBIDE-2767 - branding plugin for xulrunner feature was added
Copied: trunk/vpe/plugins/org.jboss.tools.xulrunner (from rev 13498, vpe/plugins/org.jboss.tools.xulrunner)
15 years, 3 months
- 1
- 0
JBoss Tools SVN: r13498 - trunk/vpe/features/org.jboss.tools.xulrunner.feature.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2009-02-05 19:53:10 -0500 (Thu, 05 Feb 2009)
New Revision: 13498
Modified:
trunk/vpe/features/org.jboss.tools.xulrunner.feature/feature.properties
trunk/vpe/features/org.jboss.tools.xulrunner.feature/feature.xml
Log:
https://jira.jboss.org/jira/browse/JBIDE-2767 - branding plugin for xulrunner feature was added
Modified: trunk/vpe/features/org.jboss.tools.xulrunner.feature/feature.properties
===================================================================
--- trunk/vpe/features/org.jboss.tools.xulrunner.feature/feature.properties 2009-02-05 23:16:30 UTC (rev 13497)
+++ trunk/vpe/features/org.jboss.tools.xulrunner.feature/feature.properties 2009-02-06 00:53:10 UTC (rev 13498)
@@ -1,13 +1,39 @@
-###############################################################################
-# Copyright (c) 2008 JBoss, a division of Red Hat and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# Contributors:
-# JBoss, a division of Red Hat - Initial implementation.
-##############################################################################
+# ***** BEGIN LICENSE BLOCK *****
+# Version: MPL 1.1/GPL 2.0/LGPL 2.1
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (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.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Original Code is mozilla.org code.
+#
+# The Initial Developer of the Original Code is
+# Netscape Communications Corporation.
+# Portions created by the Initial Developer are Copyright (C) 1999
+# the Initial Developer. All Rights Reserved.
+#
+# Contributor(s):
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 2 or later (the "GPL"), or
+# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+# in which case the provisions of the GPL or the LGPL are applicable instead
+# of those above. If you wish to allow use of your version of this file only
+# under the terms of either the GPL or the LGPL, and not to allow others to
+# use your version of this file under the terms of the MPL, indicate your
+# decision by deleting the provisions above and replace them with the notice
+# and other provisions required by the GPL or the LGPL. If you do not delete
+# the provisions above, a recipient may use your version of this file under
+# the terms of any one of the MPL, the GPL or the LGPL.
+#
+# ***** END LICENSE BLOCK *****
+
# feature.properties
# contains externalized strings for feature.xml
# "%foo" in feature.xml corresponds to the key "foo" in this file
Modified: trunk/vpe/features/org.jboss.tools.xulrunner.feature/feature.xml
===================================================================
--- trunk/vpe/features/org.jboss.tools.xulrunner.feature/feature.xml 2009-02-05 23:16:30 UTC (rev 13497)
+++ trunk/vpe/features/org.jboss.tools.xulrunner.feature/feature.xml 2009-02-06 00:53:10 UTC (rev 13498)
@@ -71,5 +71,11 @@
version="0.0.0"
fragment="true"
unpack="false"/>
+
+ <plugin
+ id="org.jboss.tools.xulrunner"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"/>
</feature>
15 years, 3 months
- 1
- 0
JBoss Tools SVN: r13497 - in trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4: policy and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: koen.aers(a)jboss.com
Date: 2009-02-05 18:16:30 -0500 (Thu, 05 Feb 2009)
New Revision: 13497
Added:
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/policy/ProcessNodeGraphicalNodeEditPolicy.java
Modified:
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/ProcessNodeEditPart.java
Log:
initial default name for connections
Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/ProcessNodeEditPart.java
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/ProcessNodeEditPart.java 2009-02-05 21:58:53 UTC (rev 13496)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/ProcessNodeEditPart.java 2009-02-05 23:16:30 UTC (rev 13497)
@@ -1,9 +1,17 @@
package org.jboss.tools.flow.jpdl4.editpart;
+import org.eclipse.gef.EditPolicy;
import org.jboss.tools.flow.common.editpart.NodeEditPart;
+import org.jboss.tools.flow.jpdl4.policy.ProcessNodeGraphicalNodeEditPolicy;
public class ProcessNodeEditPart extends NodeEditPart {
+ protected void createEditPolicies() {
+ super.createEditPolicies();
+ installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new ProcessNodeGraphicalNodeEditPolicy());
+ }
+
+ // make performDirectEdit public
public void performDirectEdit() {
super.performDirectEdit();
}
Added: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/policy/ProcessNodeGraphicalNodeEditPolicy.java
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/policy/ProcessNodeGraphicalNodeEditPolicy.java (rev 0)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/policy/ProcessNodeGraphicalNodeEditPolicy.java 2009-02-05 23:16:30 UTC (rev 13497)
@@ -0,0 +1,26 @@
+package org.jboss.tools.flow.jpdl4.policy;
+
+import org.eclipse.gef.commands.Command;
+import org.eclipse.gef.requests.CreateConnectionRequest;
+import org.jboss.tools.flow.common.model.Element;
+import org.jboss.tools.flow.common.policy.ElementNodeEditPolicy;
+import org.jboss.tools.flow.common.wrapper.ConnectionWrapper;
+import org.jboss.tools.flow.jpdl4.model.SequenceFlow;
+
+public class ProcessNodeGraphicalNodeEditPolicy extends ElementNodeEditPolicy {
+
+ protected Command getConnectionCompleteCommand(CreateConnectionRequest request) {
+ if (request.getNewObject() instanceof ConnectionWrapper) {
+ initializeConnectionName((ConnectionWrapper)request.getNewObject());
+ }
+ return super.getConnectionCompleteCommand(request);
+ }
+
+ private void initializeConnectionName(ConnectionWrapper connectionWrapper) {
+ Element element = connectionWrapper.getElement();
+ if (!(element instanceof SequenceFlow)) return;
+ SequenceFlow sequenceFlow = (SequenceFlow)element;
+ sequenceFlow.setName("to " + getElement().getName());
+ }
+
+}
15 years, 3 months
- 1
- 0
JBoss Tools SVN: r13496 - in trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4: command and 4 other directories.
by jbosstools-commits＠lists.jboss.org
Author: koen.aers(a)jboss.com
Date: 2009-02-05 16:58:53 -0500 (Thu, 05 Feb 2009)
New Revision: 13496
Added:
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/command/
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/command/AddProcessNodeCommand.java
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/JpdlEditPartFactory.java
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/ProcessEditPart.java
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/ProcessNodeEditPart.java
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/policy/
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/policy/ProcessLayoutEditPolicy.java
Modified:
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editor/JpdlEditor.java
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/Process.java
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/SequenceFlow.java
Log:
support for labels on connections
Added: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/command/AddProcessNodeCommand.java
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/command/AddProcessNodeCommand.java (rev 0)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/command/AddProcessNodeCommand.java 2009-02-05 21:58:53 UTC (rev 13496)
@@ -0,0 +1,28 @@
+package org.jboss.tools.flow.jpdl4.command;
+
+import org.jboss.tools.flow.common.command.AddElementCommand;
+import org.jboss.tools.flow.common.model.Flow;
+import org.jboss.tools.flow.common.model.Node;
+import org.jboss.tools.flow.jpdl4.util.Jpdl4Helper;
+
+public class AddProcessNodeCommand extends AddElementCommand {
+
+ public void execute() {
+ if (getChild().getName() == null) {
+ initializeChildName();
+ }
+ getParent().addElement(getChild());
+ getChild().setParent(getParent());
+ }
+
+ private void initializeChildName() {
+ if (getChild().getElement() instanceof Node && getParent().getElement() instanceof Flow) {
+ getChild().setName(Jpdl4Helper.getLabel((Node)getChild().getElement(), (Flow)getParent().getElement()));
+ } else {
+ String name = getChild().getElement().getClass().getName();
+ name = name.substring(name.lastIndexOf('.') + 1);
+ getChild().setName(name);
+ }
+ }
+
+ }
Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editor/JpdlEditor.java
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editor/JpdlEditor.java 2009-02-05 21:58:29 UTC (rev 13495)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editor/JpdlEditor.java 2009-02-05 21:58:53 UTC (rev 13496)
@@ -11,6 +11,7 @@
import org.jboss.tools.flow.common.editor.GenericModelEditor;
import org.jboss.tools.flow.common.registry.ElementRegistry;
import org.jboss.tools.flow.common.wrapper.Wrapper;
+import org.jboss.tools.flow.jpdl4.editpart.JpdlEditPartFactory;
import org.jboss.tools.flow.jpdl4.properties.JpdlPropertySheetPage;
public class JpdlEditor extends GenericModelEditor implements ITabbedPropertySheetPageContributor {
@@ -21,7 +22,9 @@
return new JpdlPaletteFactory().createPalette();
}
-
+ protected org.eclipse.gef.EditPartFactory createEditPartFactory() {
+ return new JpdlEditPartFactory();
+ }
protected Object createModel() {
return ElementRegistry.createWrapper("org.jboss.tools.flow.jpdl4.process");
Added: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/JpdlEditPartFactory.java
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/JpdlEditPartFactory.java (rev 0)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/JpdlEditPartFactory.java 2009-02-05 21:58:53 UTC (rev 13496)
@@ -0,0 +1,27 @@
+package org.jboss.tools.flow.jpdl4.editpart;
+
+import org.eclipse.core.runtime.IConfigurationElement;
+import org.eclipse.gef.EditPart;
+import org.jboss.tools.flow.common.editpart.EditPartFactory;
+import org.jboss.tools.flow.common.figure.IFigureFactory;
+import org.jboss.tools.flow.common.figure.NodeFigureFactory;
+import org.jboss.tools.flow.common.model.Element;
+
+public class JpdlEditPartFactory extends EditPartFactory {
+
+ protected EditPart createNodeEditPart(Element element) {
+ IConfigurationElement configurationElement =
+ (IConfigurationElement)element.getMetaData("configurationElement");
+ if (configurationElement == null) return null;
+ ProcessNodeEditPart result = new ProcessNodeEditPart();
+ IFigureFactory figureFactory = new NodeFigureFactory(configurationElement);
+ result.setFigureFactory(figureFactory);
+ return result;
+ }
+
+ protected EditPart createFlowEditPart(Element element) {
+ return new ProcessEditPart();
+ }
+
+
+}
Added: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/ProcessEditPart.java
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/ProcessEditPart.java (rev 0)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/ProcessEditPart.java 2009-02-05 21:58:53 UTC (rev 13496)
@@ -0,0 +1,34 @@
+package org.jboss.tools.flow.jpdl4.editpart;
+
+import org.eclipse.gef.EditPart;
+import org.eclipse.gef.EditPolicy;
+import org.eclipse.gef.editpolicies.RootComponentEditPolicy;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.jboss.tools.flow.common.editpart.RootEditPart;
+import org.jboss.tools.flow.common.wrapper.ContainerWrapper;
+import org.jboss.tools.flow.common.wrapper.ModelEvent;
+import org.jboss.tools.flow.jpdl4.policy.ProcessLayoutEditPolicy;
+
+public class ProcessEditPart extends RootEditPart {
+
+ protected void createEditPolicies() {
+ installEditPolicy(EditPolicy.LAYOUT_ROLE, new ProcessLayoutEditPolicy());
+ installEditPolicy(EditPolicy.COMPONENT_ROLE, new RootComponentEditPolicy());
+ }
+
+ public void modelChanged(ModelEvent event) {
+ super.modelChanged(event);
+ if (event.getChange() == ContainerWrapper.ADD_ELEMENT) {
+ Object changedObject = event.getChangedObject();
+ if (changedObject != null) {
+ EditPart editPart = (EditPart)getViewer().getEditPartRegistry().get(changedObject);
+ if (editPart instanceof ProcessNodeEditPart) {
+ ((ProcessNodeEditPart)editPart).performDirectEdit();
+ // force selection to update the properties view
+ getViewer().setSelection(new StructuredSelection(editPart));
+ }
+ }
+ }
+ }
+
+}
Added: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/ProcessNodeEditPart.java
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/ProcessNodeEditPart.java (rev 0)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/ProcessNodeEditPart.java 2009-02-05 21:58:53 UTC (rev 13496)
@@ -0,0 +1,11 @@
+package org.jboss.tools.flow.jpdl4.editpart;
+
+import org.jboss.tools.flow.common.editpart.NodeEditPart;
+
+public class ProcessNodeEditPart extends NodeEditPart {
+
+ public void performDirectEdit() {
+ super.performDirectEdit();
+ }
+
+}
Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/Process.java
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/Process.java 2009-02-05 21:58:29 UTC (rev 13495)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/Process.java 2009-02-05 21:58:53 UTC (rev 13496)
@@ -28,20 +28,9 @@
initial = node;
}
- public void addNode(Node node) {
- if (node.getName() == null || "".equals(node.getName())) {
- node.setName(getInitialName(node));
- }
- super.addNode(node);
- }
-
public void removeNode(Node node) {
Jpdl4Helper.mergeLeadingNodes(node);
super.removeNode(node);
}
- private String getInitialName(Node node) {
- return Jpdl4Helper.getLabel(node, this);
- }
-
}
Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/SequenceFlow.java
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/SequenceFlow.java 2009-02-05 21:58:29 UTC (rev 13495)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/SequenceFlow.java 2009-02-05 21:58:53 UTC (rev 13496)
@@ -43,14 +43,14 @@
}
public Object getPropertyValue(Object id) {
- if (NAME.equals(id)) {
+ if (NAME.equals(id) || LABEL.equals(id)) {
return getName() != null ? getName() : "";
- }
+ }
return null;
}
public boolean isPropertySet(Object id) {
- if (NAME.equals(id)) {
+ if (NAME.equals(id) || LABEL.equals(id)) {
return getName() != null;
}
return false;
@@ -60,7 +60,7 @@
}
public void setPropertyValue(Object id, Object value) {
- if (NAME.equals(id)) {
+ if (NAME.equals(id) || LABEL.equals(id)) {
if (value instanceof String) {
setName((String)value);
}
Added: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/policy/ProcessLayoutEditPolicy.java
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/policy/ProcessLayoutEditPolicy.java (rev 0)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/policy/ProcessLayoutEditPolicy.java 2009-02-05 21:58:53 UTC (rev 13496)
@@ -0,0 +1,22 @@
+package org.jboss.tools.flow.jpdl4.policy;
+
+import org.eclipse.draw2d.geometry.Rectangle;
+import org.eclipse.gef.commands.Command;
+import org.eclipse.gef.requests.CreateRequest;
+import org.jboss.tools.flow.common.policy.ElementContainerLayoutEditPolicy;
+import org.jboss.tools.flow.common.wrapper.ContainerWrapper;
+import org.jboss.tools.flow.common.wrapper.NodeWrapper;
+import org.jboss.tools.flow.jpdl4.command.AddProcessNodeCommand;
+
+public class ProcessLayoutEditPolicy extends ElementContainerLayoutEditPolicy {
+
+ protected Command getCreateCommand(CreateRequest request) {
+ AddProcessNodeCommand command = new AddProcessNodeCommand();
+ command.setParent((ContainerWrapper) getHost().getModel());
+ NodeWrapper element = (NodeWrapper) request.getNewObject();
+ element.setConstraint((Rectangle) getConstraintFor(request));
+ command.setChild(element);
+ return command;
+ }
+
+}
15 years, 3 months
- 1
- 0
JBoss Tools SVN: r13495 - in trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common: editpart and 5 other directories.
by jbosstools-commits＠lists.jboss.org
Author: koen.aers(a)jboss.com
Date: 2009-02-05 16:58:29 -0500 (Thu, 05 Feb 2009)
New Revision: 13495
Added:
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/command/LabelMoveCommand.java
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/editpart/LabelEditPart.java
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/policy/LabelGraphicalNodeEditPolicy.java
Removed:
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/model/DefaultLabel.java
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/model/Label.java
Modified:
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/editpart/EditPartFactory.java
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/editpart/ElementEditPart.java
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/editpart/RootEditPart.java
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/properties/IPropertyId.java
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/registry/ElementRegistry.java
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/wrapper/AbstractLabelWrapper.java
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/wrapper/AbstractNodeWrapper.java
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/wrapper/AbstractWrapper.java
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/wrapper/ContainerWrapper.java
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/wrapper/DefaultLabelWrapper.java
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/wrapper/NodeWrapper.java
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/wrapper/Wrapper.java
Log:
support for labels on connections
Added: trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/command/LabelMoveCommand.java
===================================================================
--- trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/command/LabelMoveCommand.java (rev 0)
+++ trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/command/LabelMoveCommand.java 2009-02-05 21:58:29 UTC (rev 13495)
@@ -0,0 +1,40 @@
+package org.jboss.tools.flow.common.command;
+
+import org.eclipse.draw2d.IFigure;
+import org.eclipse.draw2d.geometry.Point;
+import org.eclipse.gef.commands.Command;
+import org.jboss.tools.flow.common.wrapper.LabelWrapper;
+
+
+public class LabelMoveCommand extends Command {
+
+ LabelWrapper labelWrapper = null;
+ Point location = null;
+ IFigure parent = null;
+ Point oldOffset = null;
+ Point newOffset = null;
+
+ public LabelMoveCommand(LabelWrapper labelWrapper, IFigure parent, Point location) {
+ this.labelWrapper = labelWrapper;
+ this.parent = parent;
+ this.location = location;
+ }
+
+ public void execute() {
+ if (oldOffset == null) {
+ oldOffset = labelWrapper.getLocation();
+ }
+ if (newOffset == null) {
+ newOffset = labelWrapper.getLocation().getCopy();
+ parent.translateToAbsolute(newOffset);
+ newOffset.translate(location);
+ parent.translateToRelative(newOffset);
+ }
+ labelWrapper.setLocation(newOffset);
+ }
+
+ public void undo() {
+ labelWrapper.setLocation(oldOffset);
+ }
+
+}
Modified: trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/editpart/EditPartFactory.java
===================================================================
--- trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/editpart/EditPartFactory.java 2009-02-05 18:57:19 UTC (rev 13494)
+++ trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/editpart/EditPartFactory.java 2009-02-05 21:58:29 UTC (rev 13495)
@@ -6,6 +6,10 @@
import org.jboss.tools.flow.common.figure.NodeFigureFactory;
import org.jboss.tools.flow.common.model.Element;
import org.jboss.tools.flow.common.wrapper.ConnectionWrapper;
+import org.jboss.tools.flow.common.wrapper.ContainerWrapper;
+import org.jboss.tools.flow.common.wrapper.FlowWrapper;
+import org.jboss.tools.flow.common.wrapper.LabelWrapper;
+import org.jboss.tools.flow.common.wrapper.NodeWrapper;
import org.jboss.tools.flow.common.wrapper.Wrapper;
public class EditPartFactory implements org.eclipse.gef.EditPartFactory {
@@ -13,18 +17,86 @@
public EditPart createEditPart(EditPart context, Object model) {
EditPart result = null;
if (!(model instanceof Wrapper)) return result;
- Object element = ((Wrapper)model).getElement();
- if (element != null && element instanceof Element) {
- result = createEditPart((Element)element);
- } else if (model instanceof ConnectionWrapper) {
- result = new ConnectionEditPart();
- }
+ result = createEditPart((Wrapper)model);
if (result != null) {
result.setModel(model);
}
return result;
}
+ protected EditPart createEditPart(Wrapper wrapper) {
+ EditPart result = null;
+ if (wrapper instanceof FlowWrapper) {
+ result = createFlowEditPart((FlowWrapper)wrapper);
+ } else if (wrapper instanceof ContainerWrapper) {
+ result = createContainerEditPart((ContainerWrapper)wrapper);
+ } else if (wrapper instanceof NodeWrapper) {
+ result = createNodeEditPart((NodeWrapper)wrapper);
+ } else if (wrapper instanceof ConnectionWrapper) {
+ result = createConnectionEditPart((ConnectionWrapper)wrapper);
+ } else if (wrapper instanceof LabelWrapper) {
+ result = createLabelEditPart((LabelWrapper)wrapper);
+ }
+ return result;
+ }
+
+ protected EditPart createFlowEditPart(FlowWrapper wrapper) {
+ return createFlowEditPart(wrapper.getElement());
+ }
+
+ protected EditPart createFlowEditPart(Element element) {
+ return new RootEditPart();
+ }
+
+ protected EditPart createContainerEditPart(ContainerWrapper wrapper) {
+ Element element = wrapper.getElement();
+ if (element == null) {
+ return null;
+ } else {
+ return createContainerEditPart(element);
+ }
+ }
+
+ protected EditPart createContainerEditPart(Element element) {
+ return new ContainerEditPart();
+ }
+
+ protected EditPart createNodeEditPart(NodeWrapper wrapper) {
+ Element element = wrapper.getElement();
+ if (element == null) {
+ return null;
+ } else {
+ return createNodeEditPart(element);
+ }
+ }
+
+ protected EditPart createNodeEditPart(Element element) {
+ IConfigurationElement configurationElement =
+ (IConfigurationElement)element.getMetaData("configurationElement");
+ if (configurationElement == null) return null;
+ NodeEditPart result = new NodeEditPart();
+ IFigureFactory figureFactory = new NodeFigureFactory(configurationElement);
+ result.setFigureFactory(figureFactory);
+ return result;
+ }
+
+ protected EditPart createConnectionEditPart(ConnectionWrapper wrapper) {
+ Element element = wrapper.getElement();
+ if (element == null) {
+ return null;
+ } else {
+ return createConnectionEditPart(element);
+ }
+ }
+
+ protected EditPart createConnectionEditPart(Element element) {
+ return new ConnectionEditPart();
+ }
+
+ protected EditPart createLabelEditPart(LabelWrapper wrapper) {
+ return new LabelEditPart();
+ }
+
protected EditPart createEditPart(Element element) {
IConfigurationElement configurationElement =
(IConfigurationElement)element.getMetaData("configurationElement");
@@ -45,26 +117,4 @@
}
}
- public EditPart createFlowEditPart(Element element) {
- return new RootEditPart();
- }
-
- public EditPart createContainerEditPart(Element element) {
- return new ContainerEditPart();
- }
-
- public EditPart createNodeEditPart(Element element) {
- IConfigurationElement configurationElement =
- (IConfigurationElement)element.getMetaData("configurationElement");
- if (configurationElement == null) return null;
- NodeEditPart result = new NodeEditPart();
- IFigureFactory figureFactory = new NodeFigureFactory(configurationElement);
- result.setFigureFactory(figureFactory);
- return result;
- }
-
- public EditPart createConnectionEditPart(Element element) {
- return new ConnectionEditPart();
- }
-
}
Modified: trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/editpart/ElementEditPart.java
===================================================================
--- trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/editpart/ElementEditPart.java 2009-02-05 18:57:19 UTC (rev 13494)
+++ trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/editpart/ElementEditPart.java 2009-02-05 21:58:29 UTC (rev 13495)
@@ -100,12 +100,10 @@
public void modelChanged(ModelEvent event) {
if (event.getChange() == NodeWrapper.ADD_INCOMING_CONNECTION) {
- System.out.println("first");
refreshTargetConnections();
} else if (event.getChange() == NodeWrapper.REMOVE_INCOMING_CONNECTION) {
refreshTargetConnections();
} else if (event.getChange() == NodeWrapper.ADD_OUTGOING_CONNECTION) {
- System.out.println("second");
refreshSourceConnections();
} else if (event.getChange() == NodeWrapper.REMOVE_OUTGOING_CONNECTION) {
refreshSourceConnections();
Added: trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/editpart/LabelEditPart.java
===================================================================
--- trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/editpart/LabelEditPart.java (rev 0)
+++ trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/editpart/LabelEditPart.java 2009-02-05 21:58:29 UTC (rev 13495)
@@ -0,0 +1,99 @@
+package org.jboss.tools.flow.common.editpart;
+
+import org.eclipse.draw2d.FigureUtilities;
+import org.eclipse.draw2d.IFigure;
+import org.eclipse.draw2d.Label;
+import org.eclipse.draw2d.Locator;
+import org.eclipse.draw2d.Polyline;
+import org.eclipse.draw2d.geometry.Dimension;
+import org.eclipse.draw2d.geometry.Point;
+import org.eclipse.gef.DragTracker;
+import org.eclipse.gef.EditPart;
+import org.eclipse.gef.GraphicalEditPart;
+import org.eclipse.gef.Request;
+import org.eclipse.gef.editparts.AbstractGraphicalEditPart;
+import org.eclipse.gef.tools.DragEditPartsTracker;
+import org.jboss.tools.flow.common.policy.LabelGraphicalNodeEditPolicy;
+import org.jboss.tools.flow.common.wrapper.LabelWrapper;
+import org.jboss.tools.flow.common.wrapper.ModelEvent;
+import org.jboss.tools.flow.common.wrapper.ModelListener;
+
+public class LabelEditPart extends AbstractGraphicalEditPart implements ModelListener {
+
+ @Override
+ protected IFigure createFigure() {
+ return new Label();
+ }
+
+ @Override
+ protected void createEditPolicies() {
+ installEditPolicy("GraphicalNodeEditPoliy", new LabelGraphicalNodeEditPolicy());
+ }
+
+ protected void refreshVisuals() {
+ String text = getLabelWrapper().getText();
+// if (text == null || "".equals(text)) text = "text";
+ Polyline polyline = (Polyline)((ConnectionEditPart)getParent()).getConnectionFigure();
+ Point location = ((LabelWrapper)getModel()).getLocation();
+ if (location == null) {
+ location = calculateInitialLocation(polyline, text);
+ ((LabelWrapper)getModel()).setLocation(location);
+ }
+ Label label = (Label)getFigure();
+ label.setText(text);
+ LabelConstraint constraint = new LabelConstraint(text, location, polyline);
+ ((GraphicalEditPart)getParent()).setLayoutConstraint(this, getFigure(), constraint);
+ }
+
+ private Point calculateInitialLocation(Polyline polyline, String text) {
+ Dimension textDimension = FigureUtilities.getTextExtents(text, figure.getFont());
+ return new Point(- (textDimension.width +5) , -(textDimension.height + 5));
+ }
+
+ public LabelWrapper getLabelWrapper() {
+ return (LabelWrapper)getModel();
+ }
+
+ public DragTracker getDragTracker(Request request) {
+ return new DragEditPartsTracker(this) {
+ protected EditPart getTargetEditPart() {
+ return getParent();
+ }
+ };
+ }
+
+ public void activate() {
+ super.activate();
+ getLabelWrapper().addListener(this);
+ }
+
+ public void deactivate() {
+ getLabelWrapper().removeListener(this);
+ super.deactivate();
+ }
+
+ public void modelChanged(ModelEvent event) {
+ refreshVisuals();
+ }
+
+ private class LabelConstraint implements Locator {
+ String text;
+ Point relativeLocation;
+ Polyline polyline;
+ public LabelConstraint(String text, Point location, Polyline polyline) {
+ this.text = text;
+ this.relativeLocation = location;
+ this.polyline = polyline;
+ }
+ public void relocate(IFigure figure) {
+ Dimension minimum = FigureUtilities.getTextExtents(text, figure.getFont());
+ figure.setSize(minimum);
+ Point midPoint = polyline.getPoints().getMidpoint();
+ Point newLocation = relativeLocation.getCopy();
+ newLocation.translate(midPoint);
+ figure.setLocation(newLocation);
+ }
+ }
+
+
+}
Modified: trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/editpart/RootEditPart.java
===================================================================
--- trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/editpart/RootEditPart.java 2009-02-05 18:57:19 UTC (rev 13494)
+++ trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/editpart/RootEditPart.java 2009-02-05 21:58:29 UTC (rev 13495)
@@ -28,14 +28,12 @@
import org.eclipse.draw2d.ManhattanConnectionRouter;
import org.eclipse.draw2d.ShortestPathConnectionRouter;
import org.eclipse.draw2d.XYLayout;
-import org.eclipse.gef.EditPart;
import org.eclipse.gef.EditPolicy;
import org.eclipse.gef.LayerConstants;
import org.eclipse.gef.SnapToGrid;
import org.eclipse.gef.SnapToHelper;
import org.eclipse.gef.editparts.AbstractGraphicalEditPart;
import org.eclipse.gef.editpolicies.RootComponentEditPolicy;
-import org.eclipse.jface.viewers.StructuredSelection;
import org.eclipse.swt.SWT;
import org.jboss.tools.flow.common.policy.ElementContainerLayoutEditPolicy;
import org.jboss.tools.flow.common.wrapper.ContainerWrapper;
@@ -86,15 +84,6 @@
public void modelChanged(ModelEvent event) {
if (event.getChange() == ContainerWrapper.ADD_ELEMENT) {
refreshChildren();
- Object changedObject = event.getChangedObject();
- if (changedObject != null) {
- EditPart editPart = (EditPart)getViewer().getEditPartRegistry().get(changedObject);
- if (editPart instanceof ElementEditPart) {
- ((ElementEditPart)editPart).performDirectEdit();
- // force selection to update the properties view
- getViewer().setSelection(new StructuredSelection(editPart));
- }
- }
} else if (event.getChange() == ContainerWrapper.REMOVE_ELEMENT) {
refreshChildren();
} else if (event.getChange() == FlowWrapper.CHANGE_VISUAL) {
Deleted: trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/model/DefaultLabel.java
===================================================================
--- trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/model/DefaultLabel.java 2009-02-05 18:57:19 UTC (rev 13494)
+++ trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/model/DefaultLabel.java 2009-02-05 21:58:29 UTC (rev 13495)
@@ -1,27 +0,0 @@
-package org.jboss.tools.flow.common.model;
-
-import java.util.HashMap;
-
-public class DefaultLabel implements Label {
-
- private String text;
-
- private HashMap<String, Object> metaData = new HashMap<String, Object>();
-
- public String getText() {
- return text;
- }
-
- public void setText(String text) {
- this.text = text;
- }
-
- public void setMetaData(String key, Object value) {
- metaData.put(key, value);
- }
-
- public Object getMetaData(String key) {
- return metaData.get(key);
- }
-
-}
Deleted: trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/model/Label.java
===================================================================
--- trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/model/Label.java 2009-02-05 18:57:19 UTC (rev 13494)
+++ trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/model/Label.java 2009-02-05 21:58:29 UTC (rev 13495)
@@ -1,8 +0,0 @@
-package org.jboss.tools.flow.common.model;
-
-public interface Label extends Element {
-
- String getText();
- void setText(String text);
-
-}
Added: trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/policy/LabelGraphicalNodeEditPolicy.java
===================================================================
--- trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/policy/LabelGraphicalNodeEditPolicy.java (rev 0)
+++ trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/policy/LabelGraphicalNodeEditPolicy.java 2009-02-05 21:58:29 UTC (rev 13495)
@@ -0,0 +1,25 @@
+package org.jboss.tools.flow.common.policy;
+
+import org.eclipse.draw2d.IFigure;
+import org.eclipse.draw2d.geometry.Point;
+import org.eclipse.gef.GraphicalEditPart;
+import org.eclipse.gef.commands.Command;
+import org.eclipse.gef.editpolicies.NonResizableEditPolicy;
+import org.eclipse.gef.requests.ChangeBoundsRequest;
+import org.jboss.tools.flow.common.command.LabelMoveCommand;
+import org.jboss.tools.flow.common.wrapper.LabelWrapper;
+
+public class LabelGraphicalNodeEditPolicy extends NonResizableEditPolicy {
+
+ public Command getMoveCommand(ChangeBoundsRequest request) {
+ if (!(getHost().getModel() instanceof LabelWrapper)) return null;
+ LabelWrapper model = (LabelWrapper)getHost().getModel();
+ Point delta = request.getMoveDelta();
+ return new LabelMoveCommand(model, getParentFigure(), delta);
+ }
+
+ private IFigure getParentFigure() {
+ return ((GraphicalEditPart)getHost().getParent()).getFigure();
+ }
+
+}
Modified: trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/properties/IPropertyId.java
===================================================================
--- trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/properties/IPropertyId.java 2009-02-05 18:57:19 UTC (rev 13494)
+++ trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/properties/IPropertyId.java 2009-02-05 21:58:29 UTC (rev 13495)
@@ -3,5 +3,6 @@
public interface IPropertyId {
String NAME = "org.jboss.tools.flow.common.model.name";
+ String LABEL = "org.jboss.tools.flow.common.model.label";
}
Modified: trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/registry/ElementRegistry.java
===================================================================
--- trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/registry/ElementRegistry.java 2009-02-05 18:57:19 UTC (rev 13494)
+++ trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/registry/ElementRegistry.java 2009-02-05 21:58:29 UTC (rev 13495)
@@ -15,9 +15,11 @@
import org.jboss.tools.flow.common.strategy.AcceptsElementStrategy;
import org.jboss.tools.flow.common.strategy.AcceptsIncomingConnectionStrategy;
import org.jboss.tools.flow.common.strategy.AcceptsOutgoingConnectionStrategy;
+import org.jboss.tools.flow.common.wrapper.ConnectionWrapper;
import org.jboss.tools.flow.common.wrapper.DefaultConnectionWrapper;
import org.jboss.tools.flow.common.wrapper.DefaultContainerWrapper;
import org.jboss.tools.flow.common.wrapper.DefaultFlowWrapper;
+import org.jboss.tools.flow.common.wrapper.DefaultLabelWrapper;
import org.jboss.tools.flow.common.wrapper.DefaultNodeWrapper;
import org.jboss.tools.flow.common.wrapper.Wrapper;
@@ -63,8 +65,9 @@
return null;
}
((Element)element).setMetaData("configurationElement", configurationElement);
- Wrapper result = new DefaultConnectionWrapper();
+ ConnectionWrapper result = new DefaultConnectionWrapper();
result.setElement((Element)element);
+ result.setLabel(new DefaultLabelWrapper((Element)element));
return result;
}
Modified: trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/wrapper/AbstractLabelWrapper.java
===================================================================
--- trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/wrapper/AbstractLabelWrapper.java 2009-02-05 18:57:19 UTC (rev 13494)
+++ trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/wrapper/AbstractLabelWrapper.java 2009-02-05 21:58:29 UTC (rev 13495)
@@ -1,20 +1,14 @@
package org.jboss.tools.flow.common.wrapper;
-import java.util.ArrayList;
-import java.util.List;
-
import org.eclipse.draw2d.geometry.Point;
public abstract class AbstractLabelWrapper extends AbstractWrapper implements
LabelWrapper {
- private transient List<ModelListener> listeners = new ArrayList<ModelListener>();
private Point location = null;
- private Wrapper owner = null;
-
- public Point getLocation() {
- // TODO Auto-generated method stub
- return null;
+
+ public Point getLocation() {
+ return location;
}
public String getText() {
@@ -23,8 +17,8 @@
}
public void setLocation(Point location) {
- // TODO Auto-generated method stub
-
+ this.location = location;
+ notifyListeners(CHANGE_VISUAL, this);
}
public void setText(String text) {
@@ -32,12 +26,4 @@
}
- public void addListener(ModelListener listener) {
- listeners.add(listener);
- }
-
- public void removeListener(ModelListener listener) {
- listeners.remove(listener);
- }
-
}
Modified: trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/wrapper/AbstractNodeWrapper.java
===================================================================
--- trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/wrapper/AbstractNodeWrapper.java 2009-02-05 18:57:19 UTC (rev 13494)
+++ trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/wrapper/AbstractNodeWrapper.java 2009-02-05 21:58:29 UTC (rev 13495)
@@ -45,8 +45,7 @@
private transient Rectangle constraint;
private List<ConnectionWrapper> incomingConnections = new ArrayList<ConnectionWrapper>();
private List<ConnectionWrapper> outgoingConnections = new ArrayList<ConnectionWrapper>();
- private transient List<ModelListener> listeners = new ArrayList<ModelListener>();
-
+
public void setConstraint(Rectangle constraint) {
this.constraint = constraint;
internalSetConstraint(constraint);
@@ -140,19 +139,4 @@
protected void internalSetName(String name) {
}
- public void addListener(ModelListener listener) {
- listeners.add(listener);
- }
-
- public void removeListener(ModelListener listener) {
- listeners.remove(listener);
- }
-
- protected void notifyListeners(int change, Object object) {
- ModelEvent event = new ModelEvent(change, object);
- for (ModelListener listener: listeners) {
- listener.modelChanged(event);
- }
- }
-
}
Modified: trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/wrapper/AbstractWrapper.java
===================================================================
--- trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/wrapper/AbstractWrapper.java 2009-02-05 18:57:19 UTC (rev 13494)
+++ trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/wrapper/AbstractWrapper.java 2009-02-05 21:58:29 UTC (rev 13495)
@@ -1,11 +1,15 @@
package org.jboss.tools.flow.common.wrapper;
+import java.util.ArrayList;
+import java.util.List;
+
import org.jboss.tools.flow.common.model.Element;
public abstract class AbstractWrapper implements Wrapper {
private Element element;
-
+ private transient List<ModelListener> listeners = new ArrayList<ModelListener>();
+
public void setElement(Element element) {
this.element = element;
}
@@ -14,7 +18,22 @@
return element;
}
- @SuppressWarnings("unchecked")
+ public void addListener(ModelListener listener) {
+ listeners.add(listener);
+ }
+
+ public void removeListener(ModelListener listener) {
+ listeners.remove(listener);
+ }
+
+ protected void notifyListeners(int change, Object object) {
+ ModelEvent event = new ModelEvent(change, object);
+ for (ModelListener listener: listeners) {
+ listener.modelChanged(event);
+ }
+ }
+
+ @SuppressWarnings("unchecked")
public Object getAdapter(Class adapter) {
if (adapter == Element.class) {
return element;
Modified: trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/wrapper/ContainerWrapper.java
===================================================================
--- trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/wrapper/ContainerWrapper.java 2009-02-05 18:57:19 UTC (rev 13494)
+++ trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/wrapper/ContainerWrapper.java 2009-02-05 21:58:29 UTC (rev 13495)
@@ -20,10 +20,6 @@
public interface ContainerWrapper extends Wrapper {
- int ADD_ELEMENT = 1;
- int REMOVE_ELEMENT = 2;
- int CHANGE_VISUAL = 3;
-
void addElement(NodeWrapper element);
void localAddElement(NodeWrapper element);
Modified: trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/wrapper/DefaultLabelWrapper.java
===================================================================
--- trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/wrapper/DefaultLabelWrapper.java 2009-02-05 18:57:19 UTC (rev 13494)
+++ trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/wrapper/DefaultLabelWrapper.java 2009-02-05 21:58:29 UTC (rev 13495)
@@ -1,5 +1,31 @@
package org.jboss.tools.flow.common.wrapper;
+import org.eclipse.ui.views.properties.IPropertySource;
+import org.jboss.tools.flow.common.model.Element;
+import org.jboss.tools.flow.common.properties.IPropertyId;
+
public class DefaultLabelWrapper extends AbstractLabelWrapper {
-
+
+ private IPropertySource propertySource;
+
+ public DefaultLabelWrapper(Element element) {
+ if (element != null) {
+ propertySource = (IPropertySource)element.getMetaData("propertySource");
+ }
+ }
+
+ public void setText(String text) {
+ if (propertySource != null) {
+ propertySource.setPropertyValue(IPropertyId.LABEL, text);
+ }
+ }
+
+ public String getText() {
+ String result = null;
+ if (propertySource != null) {
+ result = (String)propertySource.getPropertyValue(IPropertyId.LABEL);
+ }
+ return result;
+ }
+
}
Modified: trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/wrapper/NodeWrapper.java
===================================================================
--- trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/wrapper/NodeWrapper.java 2009-02-05 18:57:19 UTC (rev 13494)
+++ trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/wrapper/NodeWrapper.java 2009-02-05 21:58:29 UTC (rev 13495)
@@ -27,12 +27,6 @@
*/
public interface NodeWrapper extends Wrapper {
- static final int ADD_INCOMING_CONNECTION = 1;
- static final int REMOVE_INCOMING_CONNECTION = 2;
- static final int ADD_OUTGOING_CONNECTION = 3;
- static final int REMOVE_OUTGOING_CONNECTION = 4;
- static final int CHANGE_VISUAL = 5;
-
String getId();
String getName();
void setName(String name);
Modified: trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/wrapper/Wrapper.java
===================================================================
--- trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/wrapper/Wrapper.java 2009-02-05 18:57:19 UTC (rev 13494)
+++ trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/wrapper/Wrapper.java 2009-02-05 21:58:29 UTC (rev 13495)
@@ -6,6 +6,16 @@
public interface Wrapper extends IAdaptable {
+ int ADD_INCOMING_CONNECTION = 1;
+ int REMOVE_INCOMING_CONNECTION = 2;
+ int ADD_OUTGOING_CONNECTION = 3;
+ int REMOVE_OUTGOING_CONNECTION = 4;
+ int CHANGE_VISUAL = 5;
+ int ADD_ELEMENT = 6;
+ int REMOVE_ELEMENT = 7;
+
+
+
void setElement(Element element);
Element getElement();
15 years, 3 months
- 1
- 0
JBoss Tools SVN: r13494 - trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2009-02-05 13:57:19 -0500 (Thu, 05 Feb 2009)
New Revision: 13494
Modified:
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/SeamUtil.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-3752 Cannot create Seam Artifacts on fresh created Seam EAR Project - Fixed
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/SeamUtil.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/SeamUtil.java 2009-02-05 18:50:56 UTC (rev 13493)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/SeamUtil.java 2009-02-05 18:57:19 UTC (rev 13494)
@@ -152,13 +152,15 @@
}
IVirtualComponent comp = ComponentCore.createComponent(project);
IVirtualReference[] refComponents = null;
- refComponents = comp.getReferences();
- for (IVirtualReference virtualReference : refComponents) {
- IVirtualComponent component = virtualReference.getReferencedComponent();
- if(component!=null && !component.isBinary() && JavaEEProjectUtilities.isDynamicWebComponent(component)) {
- ISeamProject seamProject = SeamCorePlugin.getSeamProject(component.getProject(), false);
- if(seamProject!=null) {
- return seamProject;
+ if(comp!=null) {
+ refComponents = comp.getReferences();
+ for (IVirtualReference virtualReference : refComponents) {
+ IVirtualComponent component = virtualReference.getReferencedComponent();
+ if(component!=null && !component.isBinary() && JavaEEProjectUtilities.isDynamicWebComponent(component)) {
+ ISeamProject seamProject = SeamCorePlugin.getSeamProject(component.getProject(), false);
+ if(seamProject!=null) {
+ return seamProject;
+ }
}
}
}
15 years, 3 months
- 1
- 0
JBoss Tools SVN: r13493 - in trunk/seam: plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: akazakov
Date: 2009-02-05 13:50:56 -0500 (Thu, 05 Feb 2009)
New Revision: 13493
Modified:
trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/SeamUtil.java
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamBaseWizardPage.java
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamWizardUtils.java
trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/SeamUiAllTests.java
trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/SeamActionNewWizardTest.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-3752 Cannot create Seam Artifacts on fresh created Seam EAR Project - Fixed
Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/SeamUtil.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/SeamUtil.java 2009-02-05 18:37:37 UTC (rev 13492)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/core/SeamUtil.java 2009-02-05 18:50:56 UTC (rev 13493)
@@ -17,7 +17,10 @@
import org.eclipse.core.resources.IProject;
import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.jst.j2ee.project.EarUtilities;
+import org.eclipse.jst.j2ee.project.JavaEEProjectUtilities;
+import org.eclipse.wst.common.componentcore.ComponentCore;
+import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
+import org.eclipse.wst.common.componentcore.resources.IVirtualReference;
import org.jboss.tools.seam.core.project.facet.SeamRuntime;
/**
@@ -147,6 +150,18 @@
return seamProject;
}
}
+ IVirtualComponent comp = ComponentCore.createComponent(project);
+ IVirtualReference[] refComponents = null;
+ refComponents = comp.getReferences();
+ for (IVirtualReference virtualReference : refComponents) {
+ IVirtualComponent component = virtualReference.getReferencedComponent();
+ if(component!=null && !component.isBinary() && JavaEEProjectUtilities.isDynamicWebComponent(component)) {
+ ISeamProject seamProject = SeamCorePlugin.getSeamProject(component.getProject(), false);
+ if(seamProject!=null) {
+ return seamProject;
+ }
+ }
+ }
}
return null;
}
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamBaseWizardPage.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamBaseWizardPage.java 2009-02-05 18:37:37 UTC (rev 13492)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamBaseWizardPage.java 2009-02-05 18:50:56 UTC (rev 13493)
@@ -207,6 +207,9 @@
* @see java.beans.PropertyChangeListener#propertyChange(java.beans.PropertyChangeEvent)
*/
public void propertyChange(PropertyChangeEvent event) {
+ if(IParameter.SEAM_PROJECT_NAME.equals(event.getPropertyName())) {
+ rootSeamProject = SeamWizardUtils.getRootSeamProject(getSelectedProject());
+ }
doFillDefaults(event);
doValidate(event);
}
@@ -450,5 +453,9 @@
return "war".equals(SeamCorePlugin.getSeamPreferences(getSelectedProject().getProject()).get(ISeamFacetDataModelProperties.JBOSS_AS_DEPLOY_AS,"war")); //$NON-NLS-1$ //$NON-NLS-2$
}
+ public String getRootSeamProject() {
+ return rootSeamProject!=null?rootSeamProject.getName():null;
+ }
+
public abstract String getDefaultMessageText();
}
\ No newline at end of file
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamWizardUtils.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamWizardUtils.java 2009-02-05 18:37:37 UTC (rev 13492)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamWizardUtils.java 2009-02-05 18:50:56 UTC (rev 13493)
@@ -26,6 +26,7 @@
import org.eclipse.ui.PlatformUI;
import org.jboss.tools.seam.core.ISeamProject;
import org.jboss.tools.seam.core.SeamCorePlugin;
+import org.jboss.tools.seam.core.SeamUtil;
import org.jboss.tools.seam.internal.core.project.facet.ISeamFacetDataModelProperties;
/**
@@ -65,7 +66,9 @@
if (project != null) {
ISeamProject seamProject = SeamCorePlugin.getSeamProject(project, false);
if (seamProject == null) {
- return null;
+ // Maybe it is EAR? Then it doesn't have Seam nature and we should try to find child Seam WAR project.
+ ISeamProject warProject = SeamUtil.findReferencingSeamWarProjectForProject(project);
+ return warProject!=null?warProject.getProject():null;
}
String parentProjectName = seamProject.getParentProjectName();
Modified: trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/SeamUiAllTests.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/SeamUiAllTests.java 2009-02-05 18:37:37 UTC (rev 13492)
+++ trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/SeamUiAllTests.java 2009-02-05 18:50:56 UTC (rev 13493)
@@ -27,6 +27,7 @@
import org.jboss.tools.seam.ui.test.wizard.Seam12WARNewOperationTest;
import org.jboss.tools.seam.ui.test.wizard.Seam20EARNewOperationTest;
import org.jboss.tools.seam.ui.test.wizard.Seam20WARNewOperationTest;
+import org.jboss.tools.seam.ui.test.wizard.SeamActionNewWizardTest;
import org.jboss.tools.seam.ui.test.wizard.SeamFormNewWizardTest;
import org.jboss.tools.seam.ui.test.wizard.SeamProjectNewWizardTest;
import org.jboss.tools.test.util.ProjectImportTestSetup;
@@ -43,6 +44,9 @@
suite.addTestSuite(OpenSeamComponentDialogTest.class);
suite.addTest(SeamComponentsViewAllTests.suite());
suite.addTest(SeamProjectNewWizardTest.suite());
+
+ suite.addTest(new ProjectImportTestSetup(new TestSuite(SeamActionNewWizardTest.class), "org.jboss.tools.seam.core.test", new String[]{"projects/Test1-ear", "projects/Test1-ejb", "projects/Test1"}, new String[]{"Test1-ear", "Test1-ejb", "Test1"}));
+
suite.addTestSuite(SeamFormNewWizardTest.class);
suite.addTestSuite(SeamPreferencesPageTest.class);
suite.addTestSuite(SeamViewHyperlinkPartitionerTest.class);
Modified: trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/SeamActionNewWizardTest.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/SeamActionNewWizardTest.java 2009-02-05 18:37:37 UTC (rev 13492)
+++ trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/wizard/SeamActionNewWizardTest.java 2009-02-05 18:50:56 UTC (rev 13493)
@@ -10,14 +10,18 @@
******************************************************************************/
package org.jboss.tools.seam.ui.test.wizard;
+import java.util.Map;
+
import junit.framework.TestCase;
import org.eclipse.jface.wizard.IWizard;
-import org.eclipse.jface.wizard.IWizardPage;
import org.eclipse.jface.wizard.WizardDialog;
import org.eclipse.ui.PlatformUI;
import org.jboss.tools.common.util.WorkbenchUtils;
import org.jboss.tools.seam.ui.ISeamUiConstants;
+import org.jboss.tools.seam.ui.widget.editor.IFieldEditor;
+import org.jboss.tools.seam.ui.wizard.IParameter;
+import org.jboss.tools.seam.ui.wizard.SeamBaseWizardPage;
/**
* @author eskimo
@@ -26,17 +30,25 @@
public class SeamActionNewWizardTest extends TestCase {
/**
- *
+ * https://jira.jboss.org/jira/browse/JBIDE-3752
*/
- public void testSeamActionNewWizardInstanceIsCreated() {
+ public void testSeamActionNewWizardInstanceIsInitialized() {
IWizard
aWizard = WorkbenchUtils.findWizardByDefId(
ISeamUiConstants.NEW_SEAM_ACTION_WIZARD_ID);
-
+
WizardDialog dialog = new WizardDialog(
PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(),
aWizard);
- IWizardPage startPage = aWizard.getStartingPage();
+ dialog.setBlockOnOpen(false);
+ dialog.open();
+ try {
+ SeamBaseWizardPage page = (SeamBaseWizardPage)dialog.getSelectedPage();
+
+ page.getEditor(IParameter.SEAM_PROJECT_NAME).setValue("Test1-ear");
+ assertEquals("Seam web parent project was not initialized for Seam EAR project.", "Test1", page.getRootSeamProject());
+ } finally {
+ dialog.close();
+ }
}
-
-}
+}
\ No newline at end of file
15 years, 3 months
- 1
- 0