JBoss Tools SVN: r10429 - 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: 2008-09-23 15:59:51 -0400 (Tue, 23 Sep 2008)
New Revision: 10429
Added:
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/strategy/SaveElementStrategy.java
Modified:
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/command/CreateBendpointCommand.java
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/command/DeleteBendpointCommand.java
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/command/DeleteConnectionCommand.java
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/command/ElementConnectionCreateCommand.java
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/command/MoveBendpointCommand.java
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/command/ReconnectElementConnectionSourceCommand.java
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/command/ReconnectElementConnectionTargetCommand.java
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/command/SplitConnectionCommand.java
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/editpart/ConnectionEditPart.java
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/model/Connection.java
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/model/DefaultConnection.java
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/policy/ConnectionEditPolicy.java
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/policy/ElementNodeEditPolicy.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/AbstractConnectionWrapper.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/ConnectionWrapper.java
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/wrapper/DefaultConnectionWrapper.java
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/wrapper/NodeWrapper.java
Log:
use ConnectionWrapper interface instead of AbstractConnectionWrapper class
Modified: trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/command/CreateBendpointCommand.java
===================================================================
--- trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/command/CreateBendpointCommand.java 2008-09-23 18:16:52 UTC (rev 10428)
+++ trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/command/CreateBendpointCommand.java 2008-09-23 19:59:51 UTC (rev 10429)
@@ -18,7 +18,7 @@
import org.eclipse.draw2d.geometry.Point;
import org.eclipse.gef.commands.Command;
-import org.jboss.tools.flow.common.wrapper.AbstractConnectionWrapper;
+import org.jboss.tools.flow.common.wrapper.ConnectionWrapper;
/**
* A command for creating a bendpoint.
@@ -27,7 +27,7 @@
*/
public class CreateBendpointCommand extends Command {
- private AbstractConnectionWrapper connection;
+ private ConnectionWrapper connection;
private Point location;
private int index;
@@ -36,7 +36,7 @@
}
public void setConnection(Object model) {
- connection = (AbstractConnectionWrapper) model;
+ connection = (ConnectionWrapper) model;
}
public void setIndex(int i) {
Modified: trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/command/DeleteBendpointCommand.java
===================================================================
--- trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/command/DeleteBendpointCommand.java 2008-09-23 18:16:52 UTC (rev 10428)
+++ trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/command/DeleteBendpointCommand.java 2008-09-23 19:59:51 UTC (rev 10429)
@@ -18,7 +18,7 @@
import org.eclipse.draw2d.geometry.Point;
import org.eclipse.gef.commands.Command;
-import org.jboss.tools.flow.common.wrapper.AbstractConnectionWrapper;
+import org.jboss.tools.flow.common.wrapper.ConnectionWrapper;
/**
@@ -28,7 +28,7 @@
*/
public class DeleteBendpointCommand extends Command {
- private AbstractConnectionWrapper connection;
+ private ConnectionWrapper connection;
private Point oldLocation;
private int index;
@@ -38,7 +38,7 @@
}
public void setConnectionModel(Object model) {
- connection = (AbstractConnectionWrapper) model;
+ connection = (ConnectionWrapper) model;
}
public void setIndex(int i) {
Modified: trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/command/DeleteConnectionCommand.java
===================================================================
--- trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/command/DeleteConnectionCommand.java 2008-09-23 18:16:52 UTC (rev 10428)
+++ trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/command/DeleteConnectionCommand.java 2008-09-23 19:59:51 UTC (rev 10429)
@@ -17,7 +17,7 @@
*/
import org.eclipse.gef.commands.Command;
-import org.jboss.tools.flow.common.wrapper.AbstractConnectionWrapper;
+import org.jboss.tools.flow.common.wrapper.ConnectionWrapper;
import org.jboss.tools.flow.common.wrapper.NodeWrapper;
/**
@@ -29,7 +29,7 @@
private NodeWrapper source;
private NodeWrapper target;
- private AbstractConnectionWrapper connection;
+ private ConnectionWrapper connection;
public void execute() {
connection.disconnect();
@@ -43,7 +43,7 @@
target = action;
}
- public void setAntecedentTaskConnection(AbstractConnectionWrapper connection) {
+ public void setAntecedentTaskConnection(ConnectionWrapper connection) {
this.connection = connection;
}
Modified: trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/command/ElementConnectionCreateCommand.java
===================================================================
--- trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/command/ElementConnectionCreateCommand.java 2008-09-23 18:16:52 UTC (rev 10428)
+++ trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/command/ElementConnectionCreateCommand.java 2008-09-23 19:59:51 UTC (rev 10429)
@@ -17,7 +17,6 @@
*/
import org.eclipse.gef.commands.Command;
-import org.jboss.tools.flow.common.wrapper.AbstractConnectionWrapper;
import org.jboss.tools.flow.common.wrapper.ConnectionWrapper;
import org.jboss.tools.flow.common.wrapper.NodeWrapper;
@@ -28,7 +27,7 @@
*/
public class ElementConnectionCreateCommand extends Command {
- private AbstractConnectionWrapper connection;
+ private ConnectionWrapper connection;
private NodeWrapper source;
private NodeWrapper target;
@@ -66,7 +65,7 @@
this.source = source;
}
- public void setConnection(AbstractConnectionWrapper connection) {
+ public void setConnection(ConnectionWrapper connection) {
this.connection = connection;
}
Modified: trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/command/MoveBendpointCommand.java
===================================================================
--- trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/command/MoveBendpointCommand.java 2008-09-23 18:16:52 UTC (rev 10428)
+++ trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/command/MoveBendpointCommand.java 2008-09-23 19:59:51 UTC (rev 10429)
@@ -18,7 +18,7 @@
import org.eclipse.draw2d.geometry.Point;
import org.eclipse.gef.commands.Command;
-import org.jboss.tools.flow.common.wrapper.AbstractConnectionWrapper;
+import org.jboss.tools.flow.common.wrapper.ConnectionWrapper;
/**
* A command for moving a bendpoint.
@@ -27,7 +27,7 @@
*/
public class MoveBendpointCommand extends Command {
- private AbstractConnectionWrapper connection;
+ private ConnectionWrapper connection;
private Point oldLocation, newLocation;
private int index;
@@ -37,7 +37,7 @@
}
public void setConnectionModel(Object model) {
- connection = (AbstractConnectionWrapper) model;
+ connection = (ConnectionWrapper) model;
}
public void setIndex(int i) {
Modified: trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/command/ReconnectElementConnectionSourceCommand.java
===================================================================
--- trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/command/ReconnectElementConnectionSourceCommand.java 2008-09-23 18:16:52 UTC (rev 10428)
+++ trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/command/ReconnectElementConnectionSourceCommand.java 2008-09-23 19:59:51 UTC (rev 10429)
@@ -17,7 +17,6 @@
*/
import org.eclipse.gef.commands.Command;
-import org.jboss.tools.flow.common.wrapper.AbstractConnectionWrapper;
import org.jboss.tools.flow.common.wrapper.ConnectionWrapper;
import org.jboss.tools.flow.common.wrapper.NodeWrapper;
@@ -28,7 +27,7 @@
*/
public class ReconnectElementConnectionSourceCommand extends Command {
- private AbstractConnectionWrapper connection;
+ private ConnectionWrapper connection;
private NodeWrapper target;
private NodeWrapper oldSource;
private NodeWrapper newSource;
@@ -56,7 +55,7 @@
this.newSource = source;
}
- public void setConnection(AbstractConnectionWrapper connection) {
+ public void setConnection(ConnectionWrapper connection) {
this.connection = connection;
this.target = connection.getTarget();
this.oldSource = connection.getSource();
Modified: trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/command/ReconnectElementConnectionTargetCommand.java
===================================================================
--- trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/command/ReconnectElementConnectionTargetCommand.java 2008-09-23 18:16:52 UTC (rev 10428)
+++ trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/command/ReconnectElementConnectionTargetCommand.java 2008-09-23 19:59:51 UTC (rev 10429)
@@ -17,7 +17,6 @@
*/
import org.eclipse.gef.commands.Command;
-import org.jboss.tools.flow.common.wrapper.AbstractConnectionWrapper;
import org.jboss.tools.flow.common.wrapper.ConnectionWrapper;
import org.jboss.tools.flow.common.wrapper.NodeWrapper;
@@ -28,7 +27,7 @@
*/
public class ReconnectElementConnectionTargetCommand extends Command {
- private AbstractConnectionWrapper connection;
+ private ConnectionWrapper connection;
private NodeWrapper oldTarget;
private NodeWrapper newTarget;
private NodeWrapper source;
@@ -57,7 +56,7 @@
this.newTarget = target;
}
- public void setConnection(AbstractConnectionWrapper connection) {
+ public void setConnection(ConnectionWrapper connection) {
this.connection = connection;
this.source = connection.getSource();
this.oldTarget = connection.getTarget();
Modified: trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/command/SplitConnectionCommand.java
===================================================================
--- trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/command/SplitConnectionCommand.java 2008-09-23 18:16:52 UTC (rev 10428)
+++ trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/command/SplitConnectionCommand.java 2008-09-23 19:59:51 UTC (rev 10429)
@@ -17,8 +17,8 @@
*/
import org.eclipse.gef.commands.Command;
-import org.jboss.tools.flow.common.wrapper.AbstractConnectionWrapper;
import org.jboss.tools.flow.common.wrapper.AbstractFlowWrapper;
+import org.jboss.tools.flow.common.wrapper.ConnectionWrapper;
import org.jboss.tools.flow.common.wrapper.NodeWrapper;
/**
@@ -31,11 +31,11 @@
private AbstractFlowWrapper parent;
private NodeWrapper oldSource;
private NodeWrapper oldTarget;
- private AbstractConnectionWrapper oldConnection;
- private AbstractConnectionWrapper secondConnection;
+ private ConnectionWrapper oldConnection;
+ private ConnectionWrapper secondConnection;
private NodeWrapper newElement;
- public void setNewSecondConnection(AbstractConnectionWrapper connection) {
+ public void setNewSecondConnection(ConnectionWrapper connection) {
if (connection == null) {
throw new IllegalArgumentException("new second connection cannot be null");
}
@@ -60,7 +60,7 @@
parent = process;
}
- public void setElementConnection(AbstractConnectionWrapper connection) {
+ public void setElementConnection(ConnectionWrapper connection) {
if (connection == null) {
throw new IllegalArgumentException("Element connection is null");
}
Modified: trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/editpart/ConnectionEditPart.java
===================================================================
--- trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/editpart/ConnectionEditPart.java 2008-09-23 18:16:52 UTC (rev 10428)
+++ trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/editpart/ConnectionEditPart.java 2008-09-23 19:59:51 UTC (rev 10429)
@@ -33,7 +33,7 @@
import org.eclipse.gef.requests.SimpleFactory;
import org.jboss.tools.flow.common.policy.ConnectionBendpointEditPolicy;
import org.jboss.tools.flow.common.policy.ConnectionEditPolicy;
-import org.jboss.tools.flow.common.wrapper.AbstractConnectionWrapper;
+import org.jboss.tools.flow.common.wrapper.ConnectionWrapper;
import org.jboss.tools.flow.common.wrapper.DefaultConnectionWrapper;
import org.jboss.tools.flow.common.wrapper.ModelEvent;
import org.jboss.tools.flow.common.wrapper.ModelListener;
@@ -45,8 +45,8 @@
*/
public class ConnectionEditPart extends AbstractConnectionEditPart implements ModelListener {
- public AbstractConnectionWrapper getElementConnection() {
- return (AbstractConnectionWrapper) getModel();
+ public ConnectionWrapper getElementConnection() {
+ return (ConnectionWrapper) getModel();
}
protected void createEditPolicies() {
@@ -83,7 +83,7 @@
}
public void modelChanged(ModelEvent event) {
- if (event.getChange() == AbstractConnectionWrapper.CHANGE_BENDPOINTS) {
+ if (event.getChange() == ConnectionWrapper.CHANGE_BENDPOINTS) {
refreshBendpoints();
}
}
Modified: trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/model/Connection.java
===================================================================
--- trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/model/Connection.java 2008-09-23 18:16:52 UTC (rev 10428)
+++ trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/model/Connection.java 2008-09-23 19:59:51 UTC (rev 10429)
@@ -30,12 +30,22 @@
Node getFrom();
/**
+ * Set the from node of the connection.
+ */
+ void setFrom(Node node);
+
+ /**
* Returns the to node of the connection
* @return the to node of the connection
*/
Node getTo();
/**
+ * Set the to node of the connection.
+ */
+ void setTo(Node node);
+
+ /**
* Returns the type of the connection at the from node
*
* @return the type of the connection at the from node
Modified: trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/model/DefaultConnection.java
===================================================================
--- trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/model/DefaultConnection.java 2008-09-23 18:16:52 UTC (rev 10428)
+++ trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/model/DefaultConnection.java 2008-09-23 19:59:51 UTC (rev 10429)
@@ -6,6 +6,10 @@
private HashMap<String, Object> metaData = new HashMap<String, Object>();
private Node from, to;
+
+ public DefaultConnection() {
+ this(null, null);
+ }
public DefaultConnection(Node from, Node to) {
this.from = from;
@@ -24,9 +28,17 @@
return from;
}
+ public void setFrom(Node node) {
+ this.from = node;
+ }
+
public Node getTo() {
return to;
}
+
+ public void setTo(Node node) {
+ this.to = node;
+ }
public String getFromType() {
return null;
Modified: trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/policy/ConnectionEditPolicy.java
===================================================================
--- trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/policy/ConnectionEditPolicy.java 2008-09-23 18:16:52 UTC (rev 10428)
+++ trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/policy/ConnectionEditPolicy.java 2008-09-23 19:59:51 UTC (rev 10429)
@@ -27,8 +27,8 @@
import org.jboss.tools.flow.common.command.SplitConnectionCommand;
import org.jboss.tools.flow.common.editpart.ConnectionEditPart;
import org.jboss.tools.flow.common.model.Element;
-import org.jboss.tools.flow.common.wrapper.AbstractConnectionWrapper;
import org.jboss.tools.flow.common.wrapper.AbstractFlowWrapper;
+import org.jboss.tools.flow.common.wrapper.ConnectionWrapper;
import org.jboss.tools.flow.common.wrapper.NodeWrapper;
/**
@@ -59,7 +59,7 @@
protected Command getDeleteCommand(GroupRequest request) {
DeleteConnectionCommand cmd = new DeleteConnectionCommand();
- AbstractConnectionWrapper connection = (AbstractConnectionWrapper) getHost().getModel();
+ ConnectionWrapper connection = (ConnectionWrapper) getHost().getModel();
cmd.setAntecedentTaskConnection(connection);
cmd.setSource(connection.getSource());
cmd.setTarget(connection.getTarget());
@@ -71,8 +71,8 @@
throw new IllegalStateException("DefaultElementConnectionFactory is null");
}
SplitConnectionCommand cmd = new SplitConnectionCommand();
- AbstractConnectionWrapper elementConnection = (AbstractConnectionWrapper)getHost().getModel();
- AbstractConnectionWrapper newSecondConnection = (AbstractConnectionWrapper)elementConnectionFactory.getNewObject();
+ ConnectionWrapper elementConnection = (ConnectionWrapper)getHost().getModel();
+ ConnectionWrapper newSecondConnection = (ConnectionWrapper)elementConnectionFactory.getNewObject();
// Copy the configurationElement from the first connection as it is empty
((Element)newSecondConnection.getElement()).setMetaData(
"configurationElement",
Modified: trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/policy/ElementNodeEditPolicy.java
===================================================================
--- trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/policy/ElementNodeEditPolicy.java 2008-09-23 18:16:52 UTC (rev 10428)
+++ trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/policy/ElementNodeEditPolicy.java 2008-09-23 19:59:51 UTC (rev 10429)
@@ -24,7 +24,7 @@
import org.jboss.tools.flow.common.command.ReconnectElementConnectionSourceCommand;
import org.jboss.tools.flow.common.command.ReconnectElementConnectionTargetCommand;
import org.jboss.tools.flow.common.editpart.ElementEditPart;
-import org.jboss.tools.flow.common.wrapper.AbstractConnectionWrapper;
+import org.jboss.tools.flow.common.wrapper.ConnectionWrapper;
import org.jboss.tools.flow.common.wrapper.NodeWrapper;
/**
@@ -37,7 +37,7 @@
protected Command getConnectionCompleteCommand(CreateConnectionRequest request) {
ElementConnectionCreateCommand cmd =
(ElementConnectionCreateCommand) request.getStartCommand();
- cmd.setConnection((AbstractConnectionWrapper) request.getNewObject());
+ cmd.setConnection((ConnectionWrapper) request.getNewObject());
cmd.setTarget(getElement());
return cmd;
}
@@ -45,7 +45,7 @@
protected Command getConnectionCreateCommand(CreateConnectionRequest request) {
ElementConnectionCreateCommand cmd =
new ElementConnectionCreateCommand();
- cmd.setConnection((AbstractConnectionWrapper) request.getNewObject());
+ cmd.setConnection((ConnectionWrapper) request.getNewObject());
cmd.setSource(getElement());
request.setStartCommand(cmd);
return cmd;
@@ -62,7 +62,7 @@
protected Command getReconnectSourceCommand(ReconnectRequest request) {
ReconnectElementConnectionSourceCommand cmd
= new ReconnectElementConnectionSourceCommand();
- cmd.setConnection((AbstractConnectionWrapper) request.getConnectionEditPart().getModel());
+ cmd.setConnection((ConnectionWrapper) request.getConnectionEditPart().getModel());
cmd.setSource(getElement());
return cmd;
}
@@ -70,7 +70,7 @@
protected Command getReconnectTargetCommand(ReconnectRequest request) {
ReconnectElementConnectionTargetCommand cmd
= new ReconnectElementConnectionTargetCommand();
- cmd.setConnection((AbstractConnectionWrapper) request.getConnectionEditPart().getModel());
+ cmd.setConnection((ConnectionWrapper) request.getConnectionEditPart().getModel());
cmd.setTarget(getElement());
return cmd;
}
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 2008-09-23 18:16:52 UTC (rev 10428)
+++ trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/registry/ElementRegistry.java 2008-09-23 19:59:51 UTC (rev 10429)
@@ -24,6 +24,7 @@
import org.jboss.tools.flow.common.figure.EllipseElementFigure;
import org.jboss.tools.flow.common.figure.RectangleElementFigure;
import org.jboss.tools.flow.common.figure.RoundedRectangleElementFigure;
+import org.jboss.tools.flow.common.model.Connection;
import org.jboss.tools.flow.common.model.Container;
import org.jboss.tools.flow.common.model.Element;
import org.jboss.tools.flow.common.model.Flow;
@@ -74,8 +75,15 @@
private static Wrapper createConnection(IConfigurationElement configurationElement)
throws CoreException {
+ Object element = configurationElement.createExecutableExtension("class");
+ if (!(element instanceof Connection)) {
+ String message = "Expecting to instantiate a org.jboss.tools.flow.common.model.Connection instance.";
+ Logger.logError(message, new RuntimeException(message));
+ return null;
+ }
+ ((Element)element).setMetaData("configurationElement", configurationElement);
Wrapper result = new DefaultConnectionWrapper();
- ((Element)result.getElement()).setMetaData("configurationElement", configurationElement);
+ result.setElement(element);
return result;
}
Added: trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/strategy/SaveElementStrategy.java
===================================================================
--- trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/strategy/SaveElementStrategy.java (rev 0)
+++ trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/strategy/SaveElementStrategy.java 2008-09-23 19:59:51 UTC (rev 10429)
@@ -0,0 +1,11 @@
+package org.jboss.tools.flow.common.strategy;
+
+import org.jboss.tools.flow.common.model.Container;
+
+public interface SaveElementStrategy {
+
+ void setContainer(Container container);
+
+ boolean acceptsElement(Object element);
+
+}
Modified: trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/wrapper/AbstractConnectionWrapper.java
===================================================================
--- trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/wrapper/AbstractConnectionWrapper.java 2008-09-23 18:16:52 UTC (rev 10428)
+++ trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/wrapper/AbstractConnectionWrapper.java 2008-09-23 19:59:51 UTC (rev 10429)
@@ -30,8 +30,6 @@
private static final long serialVersionUID = 1L;
- public static final int CHANGE_BENDPOINTS = 1;
-
private Object element;
private NodeWrapper source;
private NodeWrapper target;
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 2008-09-23 18:16:52 UTC (rev 10428)
+++ trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/wrapper/AbstractNodeWrapper.java 2008-09-23 19:59:51 UTC (rev 10429)
@@ -79,48 +79,48 @@
return Collections.unmodifiableList(incomingConnections);
}
- public void addIncomingConnection(AbstractConnectionWrapper connection) {
+ public void addIncomingConnection(ConnectionWrapper connection) {
localAddIncomingConnection(connection);
internalAddIncomingConnection(connection);
notifyListeners(CHANGE_INCOMING_CONNECTIONS);
}
- public void localAddIncomingConnection(AbstractConnectionWrapper connection) {
+ public void localAddIncomingConnection(ConnectionWrapper connection) {
incomingConnections.add(connection);
}
- protected void internalAddIncomingConnection(AbstractConnectionWrapper connection) {
+ protected void internalAddIncomingConnection(ConnectionWrapper connection) {
}
- public void removeIncomingConnection(AbstractConnectionWrapper connection) {
+ public void removeIncomingConnection(ConnectionWrapper connection) {
incomingConnections.remove(connection);
internalRemoveIncomingConnection(connection);
notifyListeners(CHANGE_INCOMING_CONNECTIONS);
}
- protected void internalRemoveIncomingConnection(AbstractConnectionWrapper connection) {
+ protected void internalRemoveIncomingConnection(ConnectionWrapper connection) {
}
- public void addOutgoingConnection(AbstractConnectionWrapper connection) {
+ public void addOutgoingConnection(ConnectionWrapper connection) {
localAddOutgoingConnection(connection);
internalAddOutgoingConnection(connection);
notifyListeners(CHANGE_OUTGOING_CONNECTIONS);
}
- public void localAddOutgoingConnection(AbstractConnectionWrapper connection) {
+ public void localAddOutgoingConnection(ConnectionWrapper connection) {
outgoingConnections.add(connection);
}
- protected void internalAddOutgoingConnection(AbstractConnectionWrapper connection) {
+ protected void internalAddOutgoingConnection(ConnectionWrapper connection) {
}
- public void removeOutgoingConnection(AbstractConnectionWrapper connection) {
+ public void removeOutgoingConnection(ConnectionWrapper connection) {
outgoingConnections.remove(connection);
internalRemoveOutgoingConnection(connection);
notifyListeners(CHANGE_OUTGOING_CONNECTIONS);
}
- protected void internalRemoveOutgoingConnection(AbstractConnectionWrapper connection) {
+ protected void internalRemoveOutgoingConnection(ConnectionWrapper connection) {
}
public void setName(String name) {
Modified: trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/wrapper/ConnectionWrapper.java
===================================================================
--- trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/wrapper/ConnectionWrapper.java 2008-09-23 18:16:52 UTC (rev 10428)
+++ trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/wrapper/ConnectionWrapper.java 2008-09-23 19:59:51 UTC (rev 10429)
@@ -1,10 +1,25 @@
package org.jboss.tools.flow.common.wrapper;
+import java.util.List;
+
+import org.eclipse.draw2d.geometry.Point;
+
public interface ConnectionWrapper extends Wrapper {
+ static final int CHANGE_BENDPOINTS = 1;
+
NodeWrapper getSource();
NodeWrapper getTarget();
+
void disconnect();
void connect(NodeWrapper source, NodeWrapper target);
+
+ void addBendpoint(int index, Point location);
+ void replaceBendpoint(int index, Point newLocation);
+ void removeBendpoint(int index);
+ List<Point> getBendpoints();
+
+ void addListener(ModelListener modelListener);
+ void removeListener(ModelListener modelListener);
}
Modified: trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/wrapper/DefaultConnectionWrapper.java
===================================================================
--- trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/wrapper/DefaultConnectionWrapper.java 2008-09-23 18:16:52 UTC (rev 10428)
+++ trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/wrapper/DefaultConnectionWrapper.java 2008-09-23 19:59:51 UTC (rev 10429)
@@ -12,11 +12,6 @@
public class DefaultConnectionWrapper extends AbstractConnectionWrapper {
- public DefaultConnectionWrapper() {
- // create a dummy connection in order to be able to add the metadata
- setElement(createConnection(null, null));
- }
-
public Connection getConnection() {
return (Connection)getElement();
}
@@ -61,7 +56,13 @@
super.connect(source, target);
Node from = (Node)getSource().getElement();
Node to = (Node)getTarget().getElement();
- setElement(createConnection(from, to));
+ Connection connection = getConnection();
+ if (connection != null) {
+ connection.setTo(to);
+ connection.setFrom(from);
+ } else {
+ setElement(createConnection(from, to));
+ }
}
protected Connection createConnection(Node from, Node to) {
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 2008-09-23 18:16:52 UTC (rev 10428)
+++ trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/wrapper/NodeWrapper.java 2008-09-23 19:59:51 UTC (rev 10429)
@@ -43,12 +43,12 @@
List<ConnectionWrapper> getOutgoingConnections();
List<ConnectionWrapper> getIncomingConnections();
- void addIncomingConnection(AbstractConnectionWrapper connection);
- void localAddIncomingConnection(AbstractConnectionWrapper connection);
- void removeIncomingConnection(AbstractConnectionWrapper connection);
- void addOutgoingConnection(AbstractConnectionWrapper connection);
- void localAddOutgoingConnection(AbstractConnectionWrapper connection);
- void removeOutgoingConnection(AbstractConnectionWrapper connection);
+ void addIncomingConnection(ConnectionWrapper connection);
+ void localAddIncomingConnection(ConnectionWrapper connection);
+ void removeIncomingConnection(ConnectionWrapper connection);
+ void addOutgoingConnection(ConnectionWrapper connection);
+ void localAddOutgoingConnection(ConnectionWrapper connection);
+ void removeOutgoingConnection(ConnectionWrapper connection);
boolean acceptsIncomingConnection(ConnectionWrapper connection, NodeWrapper source);
boolean acceptsOutgoingConnection(ConnectionWrapper connection, NodeWrapper target);
16 years
JBoss Tools SVN: r10428 - trunk/seam/plugins/org.jboss.tools.seam.text.ext/src/org/jboss/tools/seam/text/ext/hyperlink.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2008-09-23 14:16:52 -0400 (Tue, 23 Sep 2008)
New Revision: 10428
Modified:
trunk/seam/plugins/org.jboss.tools.seam.text.ext/src/org/jboss/tools/seam/text/ext/hyperlink/SeamViewHyperlink.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-2785 NPE exception fix
Modified: trunk/seam/plugins/org.jboss.tools.seam.text.ext/src/org/jboss/tools/seam/text/ext/hyperlink/SeamViewHyperlink.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.text.ext/src/org/jboss/tools/seam/text/ext/hyperlink/SeamViewHyperlink.java 2008-09-23 17:07:59 UTC (rev 10427)
+++ trunk/seam/plugins/org.jboss.tools.seam.text.ext/src/org/jboss/tools/seam/text/ext/hyperlink/SeamViewHyperlink.java 2008-09-23 18:16:52 UTC (rev 10428)
@@ -50,7 +50,12 @@
protected IFile getFileFromProject(String fileName) {
IFile documentFile = getFile();
IProject project = documentFile.getProject();
- return super.getFileFromProject(updateFilenameForModel(fileName, project));
+ String updatedFileName = updateFilenameForModel(fileName, project);
+ if(updatedFileName!=null) {
+ return super.getFileFromProject(updatedFileName);
+ } else {
+ return null;
+ }
}
}
\ No newline at end of file
16 years
JBoss Tools SVN: r10427 - documentation/trunk/movies/HQL_JPA-QL_queries.
by jbosstools-commits＠lists.jboss.org
Author: smukhina
Date: 2008-09-23 13:07:59 -0400 (Tue, 23 Sep 2008)
New Revision: 10427
Added:
documentation/trunk/movies/HQL_JPA-QL_queries/readme.txt
Log:
https://jira.jboss.org/jira/browse/JBDS-348
this new file explains how to add common movie styles to generated one
Added: documentation/trunk/movies/HQL_JPA-QL_queries/readme.txt
===================================================================
--- documentation/trunk/movies/HQL_JPA-QL_queries/readme.txt (rev 0)
+++ documentation/trunk/movies/HQL_JPA-QL_queries/readme.txt 2008-09-23 17:07:59 UTC (rev 10427)
@@ -0,0 +1,25 @@
+To apply Jboss org styles to the generated HTML file, you should do next:
+
+
+- first, add the HEAD of the HTML document to attach a style sheet, a tab icon and a title of the page:
+
+ <head>
+ <title>Using HQL editor</title>
+ <link rel="stylesheet" href="../resources/tools.css"
+ type="text/css"/>
+ <link xmlns="" rel="shortcut icon" type="image/vnd.microsoft.icon" href="../resources/images/favicon.ico"/>
+ </head>
+
+
+- place the generated by Wink OBJECT inside this block element:
+
+ <div class="book">
+ <p id="title"><a href="http://www.jboss.org" class="site_href">
+ <strong>JBoss.org</strong></a><a href="http://docs.jboss.org/" class="doc_href">
+ <strong>Community Demos</strong></a></p>
+
+ <--! Place the OBJECT generated by Wink here. -->
+
+ </div>
+
+
\ No newline at end of file
16 years
JBoss Tools SVN: r10426 - trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2008-09-23 13:03:01 -0400 (Tue, 23 Sep 2008)
New Revision: 10426
Modified:
trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/plugin.xml
Log:
JBIDE-2804, JBIDE-2803, JBIDE-2799
Modified: trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/plugin.xml
===================================================================
--- trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/plugin.xml 2008-09-23 17:02:56 UTC (rev 10425)
+++ trunk/archives/plugins/org.jboss.ide.eclipse.archives.ui/plugin.xml 2008-09-23 17:03:01 UTC (rev 10426)
@@ -8,7 +8,7 @@
point="org.eclipse.ui.views">
<view
allowMultiple="false"
- category="org.jboss.ide.eclipse.ui.views"
+ category="org.jboss.tools.common.model.ui.views"
class="org.jboss.ide.eclipse.archives.ui.views.ProjectArchivesCommonView"
icon="icons/jar_obj.gif"
id="org.jboss.ide.eclipse.archives.ui.ProjectArchivesView"
16 years
JBoss Tools SVN: r10425 - in trunk/common/plugins/org.jboss.tools.common.model.ui: src/org/jboss/tools/common/model/ui/preferences and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2008-09-23 13:02:56 -0400 (Tue, 23 Sep 2008)
New Revision: 10425
Added:
trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/preferences/MainPreferencePage.java
Modified:
trunk/common/plugins/org.jboss.tools.common.model.ui/plugin.properties
trunk/common/plugins/org.jboss.tools.common.model.ui/plugin.xml
Log:
JBIDE-2804, JBIDE-2803, JBIDE-2799
Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/plugin.properties
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model.ui/plugin.properties 2008-09-23 17:02:48 UTC (rev 10424)
+++ trunk/common/plugins/org.jboss.tools.common.model.ui/plugin.properties 2008-09-23 17:02:56 UTC (rev 10425)
@@ -28,3 +28,6 @@
action.reportproblem.label=Report Problem
action.visitsite.label=Red Hat Web Site
+
+MainPreferencePage=JBoss Tools
+org.jboss.tools.common.model.ui.views=JBoss Tools
Modified: trunk/common/plugins/org.jboss.tools.common.model.ui/plugin.xml
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model.ui/plugin.xml 2008-09-23 17:02:48 UTC (rev 10424)
+++ trunk/common/plugins/org.jboss.tools.common.model.ui/plugin.xml 2008-09-23 17:02:56 UTC (rev 10425)
@@ -222,8 +222,13 @@
</actionSet>
</extension>
<extension point="org.eclipse.ui.preferencePages">
+ <page
+ name="%MainPreferencePage"
+ class="org.jboss.tools.common.model.ui.preferences.MainPreferencePage"
+ id="org.jboss.tools.common.model.ui.MainPreferencePage">
+ </page>
<page
- category="org.jboss.ide.eclipse.ui.MainPreferencePage"
+ category="org.jboss.tools.common.model.ui.MainPreferencePage"
class="org.jboss.tools.common.model.ui.preferences.CompanyPreferencesPage"
id="org.jboss.tools.common.model.ui"
name="Web">
@@ -243,7 +248,15 @@
name="Templates">
</page>
</extension>
-
+
+ <extension
+ point="org.eclipse.ui.views">
+ <category
+ name="%org.jboss.tools.common.model.ui.views"
+ id="org.jboss.tools.common.model.ui.views">
+ </category>
+ </extension>
+
<extension point="org.eclipse.ui.propertyPages">
<page
adaptable="true"
Added: trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/preferences/MainPreferencePage.java
===================================================================
--- trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/preferences/MainPreferencePage.java (rev 0)
+++ trunk/common/plugins/org.jboss.tools.common.model.ui/src/org/jboss/tools/common/model/ui/preferences/MainPreferencePage.java 2008-09-23 17:02:56 UTC (rev 10425)
@@ -0,0 +1,78 @@
+/*
+ * JBoss, a division of Red Hat
+ * Copyright 2006, Red Hat Middleware, LLC, and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.tools.common.model.ui.preferences;
+
+import org.eclipse.jface.preference.PreferencePage;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.ui.IWorkbench;
+import org.eclipse.ui.IWorkbenchPreferencePage;
+
+/**
+ * Empty preference page for JBoss-IDE.
+ *
+ * @author Laurent Etiemble
+ * @version $Revision: 8012 $
+ */
+
+public class MainPreferencePage extends PreferencePage implements
+ IWorkbenchPreferencePage {
+ private Image image;
+
+ /** Default constructor */
+ public MainPreferencePage() {
+ this.setDescription("JBossTools preferences");
+ }
+
+ /** Description of the Method */
+ public void dispose() {
+ if (this.image != null) {
+ this.image.dispose();
+ }
+ super.dispose();
+ }
+
+ /**
+ * Initialization
+ *
+ * @param workbench
+ * Workbench
+ */
+ public void init(IWorkbench workbench) {
+ }
+
+ /**
+ * Create the content of the preference page
+ *
+ * @param parent
+ * Parent
+ * @return The content of the preference page
+ */
+ protected Control createContents(Composite parent) {
+ Composite composite = new Composite(parent, SWT.NONE);
+
+ noDefaultAndApplyButton();
+ return composite;
+ }
+}
16 years
JBoss Tools SVN: r10424 - trunk/esb/plugins/org.jboss.tools.esb.project.ui.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2008-09-23 13:02:48 -0400 (Tue, 23 Sep 2008)
New Revision: 10424
Modified:
trunk/esb/plugins/org.jboss.tools.esb.project.ui/plugin.xml
Log:
JBIDE-2804, JBIDE-2803, JBIDE-2799
Modified: trunk/esb/plugins/org.jboss.tools.esb.project.ui/plugin.xml
===================================================================
--- trunk/esb/plugins/org.jboss.tools.esb.project.ui/plugin.xml 2008-09-23 17:02:26 UTC (rev 10423)
+++ trunk/esb/plugins/org.jboss.tools.esb.project.ui/plugin.xml 2008-09-23 17:02:48 UTC (rev 10424)
@@ -30,7 +30,7 @@
<extension
point="org.eclipse.ui.preferencePages">
<page
- category="org.jboss.ide.eclipse.ui.MainPreferencePage"
+ category="org.jboss.tools.common.model.ui.MainPreferencePage"
class="org.jboss.tools.esb.project.ui.preference.controls.JBossESBRuntimePreferencePage"
id="org.jboss.tools.esb.project.runtime.preference"
name="JBoss ESB Runtimes">
16 years
JBoss Tools SVN: r10423 - documentation/trunk/movies/HQL_JPA-QL_queries.
by jbosstools-commits＠lists.jboss.org
Author: smukhina
Date: 2008-09-23 13:02:26 -0400 (Tue, 23 Sep 2008)
New Revision: 10423
Removed:
documentation/trunk/movies/HQL_JPA-QL_queries/HQL_JPA-QL_queries.htm
documentation/trunk/movies/HQL_JPA-QL_queries/HQL_JPA-QL_queries.js
documentation/trunk/movies/HQL_JPA-QL_queries/HQL_JPA-QL_queries.swf
Log:
https://jira.jboss.org/jira/browse/JBDS-348
generated files are not required in SVN
Deleted: documentation/trunk/movies/HQL_JPA-QL_queries/HQL_JPA-QL_queries.htm
===================================================================
--- documentation/trunk/movies/HQL_JPA-QL_queries/HQL_JPA-QL_queries.htm 2008-09-23 16:49:32 UTC (rev 10422)
+++ documentation/trunk/movies/HQL_JPA-QL_queries/HQL_JPA-QL_queries.htm 2008-09-23 17:02:26 UTC (rev 10423)
@@ -1,23 +0,0 @@
-<HTML>
-<head>
-<link rel="stylesheet" href="../resources/tools.css" type="text/css"/>
-<link xmlns="" rel="shortcut icon" type="image/vnd.microsoft.icon" href="../resources/images/favicon.ico"/>
-<title>A video tutorial that shows how to use the HQL editor with code completion and dynamic sql preview and how to inspect the results</title>
-</head>
-
-<BODY>
-<div class="book">
-<p id="title"><a href="http://www.jboss.org" class="site_href">
-<strong>JBoss.org</strong></a><a href="http://docs.jboss.org/" class="doc_href">
-<strong >Community Demos</strong></a></p><center><OBJECT CLASSID="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000" WIDTH="752" HEIGHT="628" CODEBASE="http://active.macromedia.com/flash5/cabs/swflash.cab#version=7,0,0,0">
-<PARAM NAME=movie VALUE="HQL_JPA-QL_queries.swf">
-<PARAM NAME=play VALUE=true>
-<PARAM NAME=loop VALUE=false>
-<PARAM NAME=wmode VALUE=transparent>
-<PARAM NAME=quality VALUE=low>
-<EMBED SRC="HQL_JPA-QL_queries.swf" WIDTH=752 HEIGHT=628 quality=low loop=false wmode=transparent TYPE="application/x-shockwave-flash" PLUGINSPAGE="http://www.macromedia.com/shockwave/download/index.cgi?P1_Prod_Version=Sh...">
-</EMBED>
-</OBJECT></center>
-<SCRIPT src='HQL_JPA-QL_queries.js'></script>
-</BODY>
-</HTML>
Deleted: documentation/trunk/movies/HQL_JPA-QL_queries/HQL_JPA-QL_queries.js
===================================================================
--- documentation/trunk/movies/HQL_JPA-QL_queries/HQL_JPA-QL_queries.js 2008-09-23 16:49:32 UTC (rev 10422)
+++ documentation/trunk/movies/HQL_JPA-QL_queries/HQL_JPA-QL_queries.js 2008-09-23 17:02:26 UTC (rev 10423)
@@ -1,3 +0,0 @@
-obj=document.getElementsByTagName('object');
-for (var i=0; i<obj.length; ++i)
- obj[i].outerHTML=obj[i].outerHTML;
Deleted: documentation/trunk/movies/HQL_JPA-QL_queries/HQL_JPA-QL_queries.swf
===================================================================
(Binary files differ)
16 years
JBoss Tools SVN: r10422 - in trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test: src/org/jboss/tools/jsf/vpe/jsf/test and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: sdzmitrovich
Date: 2008-09-23 12:49:32 -0400 (Tue, 23 Sep 2008)
New Revision: 10422
Added:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/outputLink.jsp.xml
Removed:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/Copy of selectOneMenu.jsp.xml
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/outputLink.jsp
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfComponentContentTest.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-2797
Deleted: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/Copy of selectOneMenu.jsp.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/Copy of selectOneMenu.jsp.xml 2008-09-23 16:39:40 UTC (rev 10421)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/Copy of selectOneMenu.jsp.xml 2008-09-23 16:49:32 UTC (rev 10422)
@@ -1,9 +0,0 @@
-<tests>
- <test id="selectOneListbox">
- <SELECT SIZE="3">
- <OPTION> value1</OPTION>
- <OPTION> value2</OPTION>
- <OPTION> value3</OPTION>
- </SELECT>
- </test>
-</tests>
\ No newline at end of file
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/outputLink.jsp
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/outputLink.jsp 2008-09-23 16:39:40 UTC (rev 10421)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/outputLink.jsp 2008-09-23 16:49:32 UTC (rev 10422)
@@ -9,9 +9,15 @@
<f:view>
<h1><h:outputText value="outputLink" /></h1>
- <h:outputLink value="www.exadel.com" >
- <h:outputText value="outputLink"/>
+ <h:outputLink value="" id="outputLink1" dir="rtl">
+ outputLink1
</h:outputLink>
+ <h:outputLink disabled="true" value="" id="outputLink2">
+ outputLink1
+ </h:outputLink>
+ <h:outputLink disabled="false" value="" id="outputLink3">
+ outputLink1
+ </h:outputLink>
</f:view>
</body>
</html>
\ No newline at end of file
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/outputLink.jsp.xml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/outputLink.jsp.xml (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/components/outputLink.jsp.xml 2008-09-23 16:49:32 UTC (rev 10422)
@@ -0,0 +1,17 @@
+<tests>
+ <test id="outputLink1">
+ <A DIR="rtl">
+ <SPAN>outputLink1</SPAN>
+ </A>
+ </test>
+ <test id="outputLink2">
+ <SPAN>
+ <SPAN> outputLink1</SPAN>
+ </SPAN>
+ </test>
+ <test id="outputLink3">
+ <A>
+ <SPAN>outputLink1</SPAN>
+ </A>
+ </test>
+</tests>
\ No newline at end of file
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfComponentContentTest.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfComponentContentTest.java 2008-09-23 16:39:40 UTC (rev 10421)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfComponentContentTest.java 2008-09-23 16:49:32 UTC (rev 10422)
@@ -80,7 +80,7 @@
}
public void testOutputLink() throws Throwable {
- assertTrue("it is necessery to add body of the test", false); //$NON-NLS-1$
+ performContentTest("components/outputLink.jsp"); //$NON-NLS-1$
}
public void testOutputText() throws Throwable {
16 years
JBoss Tools SVN: r10421 - in documentation/trunk/movies: edit_and_run_criteria and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: msorokin
Date: 2008-09-23 12:39:40 -0400 (Tue, 23 Sep 2008)
New Revision: 10421
Added:
documentation/trunk/movies/edit_and_run_criteria/
documentation/trunk/movies/edit_and_run_criteria/edit_and_run_criteria.wnk
documentation/trunk/movies/edit_and_run_criteria/readme.txt
Log:
Added: documentation/trunk/movies/edit_and_run_criteria/edit_and_run_criteria.wnk
===================================================================
(Binary files differ)
Property changes on: documentation/trunk/movies/edit_and_run_criteria/edit_and_run_criteria.wnk
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: documentation/trunk/movies/edit_and_run_criteria/readme.txt
===================================================================
--- documentation/trunk/movies/edit_and_run_criteria/readme.txt (rev 0)
+++ documentation/trunk/movies/edit_and_run_criteria/readme.txt 2008-09-23 16:39:40 UTC (rev 10421)
@@ -0,0 +1,25 @@
+To apply Jboss org styles to the generated HTML file, you should do next:
+
+
+- first, add the HEAD of the HTML document to attach a style sheet, a tab icon and a title of the page:
+
+ <head>
+ <title>Importing Custom Tag Library to JBoss Tools Palette</title>
+ <link rel="stylesheet" href="../resources/tools.css"
+ type="text/css"/>
+ <link xmlns="" rel="shortcut icon" type="image/vnd.microsoft.icon" href="../resources/images/favicon.ico"/>
+ </head>
+
+
+- place the generated by Wink OBJECT inside this block element:
+
+ <div class="book">
+ <p id="title"><a href="http://www.jboss.org" class="site_href">
+ <strong>JBoss.org</strong></a><a href="http://docs.jboss.org/" class="doc_href">
+ <strong>Community Demos</strong></a></p>
+
+ <--! Place the OBJECT generated by Wink here. -->
+
+ </div>
+
+
\ No newline at end of file
16 years
JBoss Tools SVN: r10420 - trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util.
by jbosstools-commits＠lists.jboss.org
Author: sdzmitrovich
Date: 2008-09-23 12:25:21 -0400 (Tue, 23 Sep 2008)
New Revision: 10420
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/DocTypeUtil.java
Log:
corrected loading of init page
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/DocTypeUtil.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/DocTypeUtil.java 2008-09-23 16:14:03 UTC (rev 10419)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/DocTypeUtil.java 2008-09-23 16:25:21 UTC (rev 10420)
@@ -335,11 +335,14 @@
if (element.hasAttribute(attributeName)) {
Attr attr = element.getAttributeNode(attributeName);
+
+ File file = new File(attr.getValue());
+ if (!file.exists()) {
+ // corrected path
+ attr.setValue(initFile.getParent()
+ + File.separator + attr.getValue());
- // corrected path
- attr.setValue(initFile.getParent() + File.separator
- + attr.getValue());
-
+ }
}
}
16 years