JBoss Tools SVN: r13673 - in trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4: editpart and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: koen.aers(a)jboss.com
Date: 2009-02-19 06:00:34 -0500 (Thu, 19 Feb 2009)
New Revision: 13673
Added:
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/JpdlTreeEditPart.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/editpart/JpdlTreeEditPartFactory.java
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/ProcessNodeGraphicalEditPart.java
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/ProcessNodeListTreeEditPart.java
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/ProcessTreeRootEditPart.java
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/SequenceFlowGraphicalEditPart.java
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/Event.java
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/ExclusiveGateway.java
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/ProcessNode.java
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/StartEvent.java
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/Task.java
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/view/DetailsView.java
Log:
default and conditional transitions, detailsview
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-19 10:58:11 UTC (rev 13672)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editor/JpdlEditor.java 2009-02-19 11:00:34 UTC (rev 13673)
@@ -89,6 +89,10 @@
getEditDomain().addViewer(treeViewer);
getSelectionSynchronizer().addViewer(treeViewer);
detailsPage = new DetailsPage(treeViewer) ;
+ if (((Wrapper)getModel()).getElement() == null) {
+ System.out.println("Ha!");
+ }
+ treeViewer.setContents(((Wrapper)getModel()).getElement());
getSite().getSelectionProvider().addSelectionChangedListener(detailsPage);
}
Added: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/JpdlTreeEditPart.java
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/JpdlTreeEditPart.java (rev 0)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/JpdlTreeEditPart.java 2009-02-19 11:00:34 UTC (rev 13673)
@@ -0,0 +1,26 @@
+package org.jboss.tools.flow.jpdl4.editpart;
+
+import org.eclipse.gef.editparts.AbstractTreeEditPart;
+import org.eclipse.ui.views.properties.IPropertySource;
+import org.jboss.tools.flow.common.model.Element;
+
+public class JpdlTreeEditPart extends AbstractTreeEditPart {
+
+ protected IPropertySource propertySource;
+
+ public JpdlTreeEditPart(Element element) {
+ super(element);
+ Object object = element.getMetaData("propertySource");
+ if (object != null && object instanceof IPropertySource) {
+ propertySource = (IPropertySource)object;
+ }
+ }
+
+ @SuppressWarnings("unchecked")
+ public Object getAdapter(Class adapter) {
+ if (adapter == IPropertySource.class)
+ return propertySource;
+ return super.getAdapter(adapter);
+ }
+
+}
Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/JpdlTreeEditPartFactory.java
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/JpdlTreeEditPartFactory.java 2009-02-19 10:58:11 UTC (rev 13672)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/JpdlTreeEditPartFactory.java 2009-02-19 11:00:34 UTC (rev 13673)
@@ -7,7 +7,7 @@
public class JpdlTreeEditPartFactory implements EditPartFactory {
public EditPart createEditPart(EditPart context, Object model) {
- if (model instanceof Process) return new ProcessTreeRootEditPart((Process)model);
+ if (model instanceof Process && context == null) return new ProcessTreeRootEditPart((Process)model);
if (model instanceof ProcessNodeListTreeEditPart) return (EditPart)model;
return null;
}
Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/ProcessNodeGraphicalEditPart.java
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/ProcessNodeGraphicalEditPart.java 2009-02-19 10:58:11 UTC (rev 13672)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/ProcessNodeGraphicalEditPart.java 2009-02-19 11:00:34 UTC (rev 13673)
@@ -2,6 +2,7 @@
import org.eclipse.gef.EditPart;
import org.eclipse.gef.EditPolicy;
+import org.eclipse.gef.editparts.AbstractConnectionEditPart;
import org.jboss.tools.flow.common.editpart.NodeEditPart;
import org.jboss.tools.flow.common.wrapper.ModelEvent;
import org.jboss.tools.flow.common.wrapper.Wrapper;
@@ -22,6 +23,14 @@
getViewer().select((EditPart)object);
((SequenceFlowGraphicalEditPart)object).performDirectEdit();
}
+ } else if (event.getChange() == Wrapper.ADD_OUTGOING_CONNECTION ||
+ event.getChange() == Wrapper.REMOVE_OUTGOING_CONNECTION) {
+ for (Object connection : getSourceConnections()) {
+ if (connection instanceof AbstractConnectionEditPart) {
+ ((AbstractConnectionEditPart)connection).refresh();
+ }
+ }
+
}
}
Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/ProcessNodeListTreeEditPart.java
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/ProcessNodeListTreeEditPart.java 2009-02-19 10:58:11 UTC (rev 13672)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/ProcessNodeListTreeEditPart.java 2009-02-19 11:00:34 UTC (rev 13673)
@@ -1,13 +1,12 @@
package org.jboss.tools.flow.jpdl4.editpart;
import org.eclipse.core.runtime.Platform;
-import org.eclipse.gef.editparts.AbstractTreeEditPart;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.swt.graphics.Image;
import org.jboss.tools.flow.jpdl4.model.Process;
import org.jboss.tools.flow.jpdl4.util.SharedImages;
-public class ProcessNodeListTreeEditPart extends AbstractTreeEditPart {
+public class ProcessNodeListTreeEditPart extends JpdlTreeEditPart {
public ProcessNodeListTreeEditPart(Process process) {
super(process);
Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/ProcessTreeRootEditPart.java
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/ProcessTreeRootEditPart.java 2009-02-19 10:58:11 UTC (rev 13672)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/ProcessTreeRootEditPart.java 2009-02-19 11:00:34 UTC (rev 13673)
@@ -3,11 +3,10 @@
import java.util.ArrayList;
import java.util.List;
-import org.eclipse.gef.editparts.AbstractTreeEditPart;
import org.jboss.tools.flow.jpdl4.model.Process;
-public class ProcessTreeRootEditPart extends AbstractTreeEditPart {
-
+public class ProcessTreeRootEditPart extends JpdlTreeEditPart {
+
public ProcessTreeRootEditPart(Process process) {
super(process);
}
@@ -20,5 +19,5 @@
result.add(new ProcessNodeListTreeEditPart((Process)getModel()));
return result;
}
-
+
}
Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/SequenceFlowGraphicalEditPart.java
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/SequenceFlowGraphicalEditPart.java 2009-02-19 10:58:11 UTC (rev 13672)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/SequenceFlowGraphicalEditPart.java 2009-02-19 11:00:34 UTC (rev 13673)
@@ -8,7 +8,6 @@
import org.eclipse.gef.RequestConstants;
import org.eclipse.gef.requests.DirectEditRequest;
import org.jboss.tools.flow.common.editpart.ConnectionEditPart;
-import org.jboss.tools.flow.common.figure.CrossHairDecoration;
import org.jboss.tools.flow.common.figure.DiamondDecoration;
import org.jboss.tools.flow.common.model.Element;
import org.jboss.tools.flow.common.policy.ElementDirectEditPolicy;
@@ -25,19 +24,30 @@
installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new ElementDirectEditPolicy());
}
+ public void refreshVisuals() {
+ decorateFigure((PolylineConnection)getFigure(), ((Wrapper)getModel()).getElement());
+ }
+
protected IFigure createFigure() {
- PolylineConnection result = (PolylineConnection)super.createFigure();
- Element element = ((Wrapper)getModel()).getElement();
- if (element instanceof SequenceFlow) {
+ return decorateFigure((PolylineConnection)super.createFigure(), ((Wrapper)getModel()).getElement());
+ }
+
+ private IFigure decorateFigure(PolylineConnection figure, Element element) {
+ if (element instanceof SequenceFlow) {
SequenceFlow sequenceFlow = (SequenceFlow)element;
- if (sequenceFlow.isDefault()) {
- result.setSourceDecoration(new CrossHairDecoration());
- } else if (sequenceFlow.isConditional()) {
- result.setSourceDecoration(new DiamondDecoration());
+// if (sequenceFlow.isDefault()) {
+// figure.setSourceDecoration(new CrossHairDecoration());
+// } else
+ if (sequenceFlow.isConditional()) {
+ if (getElementConnection().getSource().getOutgoingConnections().size() > 1) {
+ figure.setSourceDecoration(new DiamondDecoration());
+ }
+ } else {
+ figure.setSourceDecoration(null);
}
}
- return result;
- }
+ return figure;
+ }
public void performRequest(Request request) {
if (request.getType() == RequestConstants.REQ_DIRECT_EDIT) {
Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/Event.java
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/Event.java 2009-02-19 10:58:11 UTC (rev 13672)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/Event.java 2009-02-19 11:00:34 UTC (rev 13673)
@@ -1,6 +1,15 @@
package org.jboss.tools.flow.jpdl4.model;
+import org.jboss.tools.flow.common.model.Connection;
+
public class Event extends ProcessNode {
+ public void addOutgoingConnection(String type, Connection connection) {
+ super.addOutgoingConnection(type, connection);
+ if (isPropagationExclusive() && !((SequenceFlow)connection).isDefault()) {
+ ((SequenceFlow)connection).setConditional(true);
+ }
+ }
+
}
Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/ExclusiveGateway.java
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/ExclusiveGateway.java 2009-02-19 10:58:11 UTC (rev 13672)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/ExclusiveGateway.java 2009-02-19 11:00:34 UTC (rev 13673)
@@ -3,4 +3,8 @@
public class ExclusiveGateway extends Gateway {
+ protected boolean isPropagationExclusive() {
+ return true;
+ }
+
}
Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/ProcessNode.java
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/ProcessNode.java 2009-02-19 10:58:11 UTC (rev 13672)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/ProcessNode.java 2009-02-19 11:00:34 UTC (rev 13673)
@@ -6,6 +6,10 @@
public class ProcessNode extends DefaultNode {
+ protected boolean isPropagationExclusive() {
+ return false;
+ }
+
public void removeOutgoingConnection(String type, Connection connection) {
Jpdl4Helper.mergeLeadingNodes(connection);
super.removeOutgoingConnection(type, connection);
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-19 10:58:11 UTC (rev 13672)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/SequenceFlow.java 2009-02-19 11:00:34 UTC (rev 13673)
@@ -1,8 +1,11 @@
package org.jboss.tools.flow.jpdl4.model;
+import java.util.List;
+
import org.eclipse.ui.views.properties.IPropertyDescriptor;
import org.eclipse.ui.views.properties.IPropertySource;
import org.eclipse.ui.views.properties.TextPropertyDescriptor;
+import org.jboss.tools.flow.common.model.Connection;
import org.jboss.tools.flow.common.model.DefaultConnection;
import org.jboss.tools.flow.common.model.Node;
import org.jboss.tools.flow.common.properties.IPropertyId;
@@ -38,7 +41,14 @@
}
public boolean isDefault() {
- return true;
+ Node from = getFrom();
+ if (from != null) {
+ List<Connection> outgoingConnections = from.getOutgoingConnections("");
+ if (outgoingConnections != null) {
+ return outgoingConnections.size() > 1 && outgoingConnections.get(0) == this;
+ }
+ }
+ return false;
}
private class PropertySource implements IPropertySource, IPropertyId {
Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/StartEvent.java
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/StartEvent.java 2009-02-19 10:58:11 UTC (rev 13672)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/StartEvent.java 2009-02-19 11:00:34 UTC (rev 13673)
@@ -3,4 +3,8 @@
public class StartEvent extends Event {
+ protected boolean isPropagationExclusive() {
+ return true;
+ }
+
}
Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/Task.java
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/Task.java 2009-02-19 10:58:11 UTC (rev 13672)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/model/Task.java 2009-02-19 11:00:34 UTC (rev 13673)
@@ -1,15 +1,10 @@
package org.jboss.tools.flow.jpdl4.model;
import org.jboss.tools.flow.common.model.Connection;
-import org.jboss.tools.flow.jpdl4.util.Jpdl4Helper;
public class Task extends ProcessNode {
- protected boolean isPropagationExclusive() {
- return false;
- }
-
public void addOutgoingConnection(String type, Connection connection) {
super.addOutgoingConnection(type, connection);
if (isPropagationExclusive() && !((SequenceFlow)connection).isDefault()) {
@@ -17,9 +12,4 @@
}
}
- public void removeOutgoingConnection(String type, Connection connection) {
- Jpdl4Helper.mergeLeadingNodes(connection);
- super.removeOutgoingConnection(type, connection);
- }
-
}
Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/view/DetailsView.java
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/view/DetailsView.java 2009-02-19 10:58:11 UTC (rev 13672)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/view/DetailsView.java 2009-02-19 11:00:34 UTC (rev 13673)
@@ -13,6 +13,7 @@
import org.eclipse.ui.part.MessagePage;
import org.eclipse.ui.part.PageBook;
import org.eclipse.ui.part.PageBookView;
+import org.eclipse.ui.views.properties.IPropertySheetPage;
public class DetailsView extends PageBookView implements ISelectionProvider,
ISelectionChangedListener {
@@ -91,4 +92,13 @@
}
super.showPageRec(pageRec);
}
+
+ @SuppressWarnings("unchecked")
+ public Object getAdapter(Class adapter) {
+ if (adapter == IPropertySheetPage.class)
+ return getCurrentContributingPart().getAdapter(adapter);
+ return super.getAdapter(adapter);
+ }
+
+
}
17 years, 1 month
- 1
- 0
JBoss Tools SVN: r13672 - in trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common: wrapper and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: koen.aers(a)jboss.com
Date: 2009-02-19 05:58:11 -0500 (Thu, 19 Feb 2009)
New Revision: 13672
Removed:
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/registry/PropertySourceRegistry.java
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/DefaultNodeWrapper.java
Log:
Deleted: trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/registry/PropertySourceRegistry.java
===================================================================
--- trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/registry/PropertySourceRegistry.java 2009-02-19 08:03:16 UTC (rev 13671)
+++ trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/registry/PropertySourceRegistry.java 2009-02-19 10:58:11 UTC (rev 13672)
@@ -1,5 +0,0 @@
-package org.jboss.tools.flow.common.registry;
-
-public class PropertySourceRegistry {
-
-}
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 2009-02-19 08:03:16 UTC (rev 13671)
+++ trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/wrapper/DefaultConnectionWrapper.java 2009-02-19 10:58:11 UTC (rev 13672)
@@ -57,9 +57,8 @@
public void connect(NodeWrapper source, NodeWrapper target) {
- super.connect(source, target);
- Node from = (Node)getSource().getElement();
- Node to = (Node)getTarget().getElement();
+ Node from = (Node)source.getElement();
+ Node to = (Node)target.getElement();
Connection connection = getConnection();
if (connection != null) {
connection.setTo(to);
@@ -67,6 +66,7 @@
} else {
setElement(createConnection(from, to));
}
+ super.connect(source, target);
}
protected Connection createConnection(Node from, Node to) {
Modified: trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/wrapper/DefaultNodeWrapper.java
===================================================================
--- trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/wrapper/DefaultNodeWrapper.java 2009-02-19 08:03:16 UTC (rev 13671)
+++ trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/wrapper/DefaultNodeWrapper.java 2009-02-19 10:58:11 UTC (rev 13672)
@@ -88,22 +88,22 @@
}
protected void internalAddIncomingConnection(AbstractConnectionWrapper connection) {
- getNode().addIncomingConnection("DROOLS_DEFAULT",
+ getNode().addIncomingConnection("",
((DefaultConnectionWrapper) connection).getConnection());
}
protected void internalRemoveIncomingConnection(AbstractConnectionWrapper connection) {
- getNode().removeIncomingConnection("DROOLS_DEFAULT",
+ getNode().removeIncomingConnection("",
((DefaultConnectionWrapper) connection).getConnection());
}
protected void internalAddOutgoingConnection(AbstractConnectionWrapper connection) {
- getNode().addOutgoingConnection("DROOLS_DEFAULT",
+ getNode().addOutgoingConnection("",
((DefaultConnectionWrapper) connection).getConnection());
}
protected void internalRemoveOutgoingConnection(AbstractConnectionWrapper connection) {
- getNode().removeOutgoingConnection("DROOLS_DEFAULT",
+ getNode().removeOutgoingConnection("",
((DefaultConnectionWrapper) connection).getConnection());
}
17 years, 1 month
- 1
- 0
JBoss Tools SVN: r13671 - in trunk/jbpm/plugins/org.jboss.tools.jbpm.convert: icons and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: Grid.Qian
Date: 2009-02-19 03:03:16 -0500 (Thu, 19 Feb 2009)
New Revision: 13671
Added:
trunk/jbpm/plugins/org.jboss.tools.jbpm.convert/icons/process_definition_enabled.gif
Removed:
trunk/jbpm/plugins/org.jboss.tools.jbpm.convert/icons/sample.gif
Modified:
trunk/jbpm/plugins/org.jboss.tools.jbpm.convert/plugin.xml
Log:
JBIDE-3828: change icon for bpmn -> jpdl
Added: trunk/jbpm/plugins/org.jboss.tools.jbpm.convert/icons/process_definition_enabled.gif
===================================================================
(Binary files differ)
Property changes on: trunk/jbpm/plugins/org.jboss.tools.jbpm.convert/icons/process_definition_enabled.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: trunk/jbpm/plugins/org.jboss.tools.jbpm.convert/icons/sample.gif
===================================================================
(Binary files differ)
Modified: trunk/jbpm/plugins/org.jboss.tools.jbpm.convert/plugin.xml
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.jbpm.convert/plugin.xml 2009-02-19 04:55:32 UTC (rev 13670)
+++ trunk/jbpm/plugins/org.jboss.tools.jbpm.convert/plugin.xml 2009-02-19 08:03:16 UTC (rev 13671)
@@ -5,7 +5,7 @@
<category name="%category.name"
id="org.jboss.tools.jbpm.convert.export.category"/>
<wizard name="%wizard.name"
- icon="$nl$/icons/sample.gif"
+ icon="$nl$/icons/process_definition_enabled.gif"
category="org.jboss.tools.jbpm.convert.export.category"
class="org.jboss.tools.jbpm.convert.b2j.wizard.B2JExportWizard"
id="org.jboss.tools.jbpm.convert.export.b2jexportwizard">
17 years, 1 month
- 1
- 0
JBoss Tools SVN: r13670 - trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml/ui.
by jbosstools-commits＠lists.jboss.org
Author: DartPeng
Date: 2009-02-18 23:55:32 -0500 (Wed, 18 Feb 2009)
New Revision: 13670
Modified:
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml/ui/RemoveXMLNodeAction.java
Log:
JBIDE-3669
Fix the bug
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml/ui/RemoveXMLNodeAction.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml/ui/RemoveXMLNodeAction.java 2009-02-19 02:37:01 UTC (rev 13669)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml/ui/RemoveXMLNodeAction.java 2009-02-19 04:55:32 UTC (rev 13670)
@@ -43,7 +43,7 @@
}
if (v != null && v instanceof PropertyChangeListener) {
- ((TagObject)obj).removeNodePropetyChangeListener((PropertyChangeListener)v);
+ ((AbstractXMLObject)obj).removeNodePropetyChangeListener((PropertyChangeListener)v);
}
}
}
17 years, 1 month
- 1
- 0
JBoss Tools SVN: r13669 - in trunk/smooks/plugins/org.jboss.tools.smooks.ui: src/org/jboss/tools/smooks/javabean/model and 7 other directories.
by jbosstools-commits＠lists.jboss.org
Author: DartPeng
Date: 2009-02-18 21:37:01 -0500 (Wed, 18 Feb 2009)
New Revision: 13669
Added:
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml2xml/XML2XMLGraphicalModelListener.java
Modified:
trunk/smooks/plugins/org.jboss.tools.smooks.ui/plugin.xml
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/model/SelectorAttributes.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/ui/BeanPopulatorConnectionSection.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/ui/BeanPopulatorGraphicalModelListener.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/ui/BeanPopulatorMappingAnalyzer.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/AbstractSmooksPropertySection.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/utils/UIUtils.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml/model/AbstractXMLObject.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml/model/XMLConnectionCommandProcessor.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml/model/XMLObjectAnalyzer.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml/ui/AddXMLChildNodeAction.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml/ui/AddXMLRootNodeAction.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml/ui/XMLNodePropertySection.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml2java/analyzer/AbstractXMLModelAnalyzer.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml2xml/XML2XMLAnalyzer.java
Log:
JBIDE-2870
X2X issues
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/plugin.xml
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/plugin.xml 2009-02-19 00:10:53 UTC (rev 13668)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/plugin.xml 2009-02-19 02:37:01 UTC (rev 13669)
@@ -327,5 +327,10 @@
sourceId="org.jboss.tools.smooks.xml.viewerInitor.xml"
targetId="org.jboss.tools.smooks.ui.viewerInitor.javabean">
</graphicalModelListener>
+ <graphicalModelListener
+ class="org.jboss.tools.smooks.xml2xml.XML2XMLGraphicalModelListener"
+ sourceId="org.jboss.tools.smooks.xml.viewerInitor.xml"
+ targetId="org.jboss.tools.smooks.xml.viewerInitor.xml">
+ </graphicalModelListener>
</extension>
</plugin>
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/model/SelectorAttributes.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/model/SelectorAttributes.java 2009-02-19 00:10:53 UTC (rev 13668)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/model/SelectorAttributes.java 2009-02-19 02:37:01 UTC (rev 13669)
@@ -3,15 +3,21 @@
*/
package org.jboss.tools.smooks.javabean.model;
-import org.jboss.tools.smooks.javabean.ui.BeanPopulatorMappingAnalyzer;
/**
* @author Dart
*
*/
public class SelectorAttributes {
+ public static final String ONLY_NAME = "only_name";
+
+ public static final String FULL_PATH = "full_path";
+
+ public static final String IGNORE_ROOT = "ignore_root";
+
+ public static final String INCLUDE_PARENT = "include_parent";
private String selectorSperator = " ";
- private String selectorPolicy = BeanPopulatorMappingAnalyzer.FULL_PATH;
+ private String selectorPolicy = SelectorAttributes.FULL_PATH;
public String getSelectorSperator() {
return selectorSperator;
}
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/ui/BeanPopulatorConnectionSection.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/ui/BeanPopulatorConnectionSection.java 2009-02-19 00:10:53 UTC (rev 13668)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/ui/BeanPopulatorConnectionSection.java 2009-02-19 02:37:01 UTC (rev 13669)
@@ -109,15 +109,15 @@
protected void hookButtons() {
allPathButton.addSelectionListener(new PolicyButtonSelectionListener(
- BeanPopulatorMappingAnalyzer.FULL_PATH));
+ SelectorAttributes.FULL_PATH));
nameOnlyButton.addSelectionListener(new PolicyButtonSelectionListener(
- BeanPopulatorMappingAnalyzer.ONLY_NAME));
+ SelectorAttributes.ONLY_NAME));
includeParentButton
.addSelectionListener(new PolicyButtonSelectionListener(
- BeanPopulatorMappingAnalyzer.INCLUDE_PARENT));
+ SelectorAttributes.INCLUDE_PARENT));
ignoreRootButton
.addSelectionListener(new PolicyButtonSelectionListener(
- BeanPopulatorMappingAnalyzer.IGNORE_ROOT));
+ SelectorAttributes.IGNORE_ROOT));
}
protected void hookSperatorCombox() {
@@ -175,22 +175,22 @@
String policy = getSelectorPolicy();
if (policy == null) {
- policy = BeanPopulatorMappingAnalyzer.FULL_PATH;
+ policy = SelectorAttributes.FULL_PATH;
}
allPathButton.setSelection(false);
nameOnlyButton.setSelection(false);
ignoreRootButton.setSelection(false);
includeParentButton.setSelection(false);
- if (policy.equals(BeanPopulatorMappingAnalyzer.FULL_PATH)) {
+ if (policy.equals(SelectorAttributes.FULL_PATH)) {
this.allPathButton.setSelection(true);
}
- if (policy.equals(BeanPopulatorMappingAnalyzer.ONLY_NAME)) {
+ if (policy.equals(SelectorAttributes.ONLY_NAME)) {
this.nameOnlyButton.setSelection(true);
}
- if (policy.equals(BeanPopulatorMappingAnalyzer.IGNORE_ROOT)) {
+ if (policy.equals(SelectorAttributes.IGNORE_ROOT)) {
this.ignoreRootButton.setSelection(true);
}
- if (policy.equals(BeanPopulatorMappingAnalyzer.INCLUDE_PARENT)) {
+ if (policy.equals(SelectorAttributes.INCLUDE_PARENT)) {
this.includeParentButton.setSelection(true);
}
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/ui/BeanPopulatorGraphicalModelListener.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/ui/BeanPopulatorGraphicalModelListener.java 2009-02-19 00:10:53 UTC (rev 13668)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/ui/BeanPopulatorGraphicalModelListener.java 2009-02-19 02:37:01 UTC (rev 13669)
@@ -284,7 +284,7 @@
resourceConfig);
line.getProperties().add(bindingType);
SelectorAttributes sa = new SelectorAttributes();
- sa.setSelectorPolicy(BeanPopulatorMappingAnalyzer.FULL_PATH);
+ sa.setSelectorPolicy(SelectorAttributes.FULL_PATH);
sa.setSelectorSperator(" ");
PropertyModel selectorProperty = new PropertyModel(
BeanPopulatorMappingAnalyzer.PRO_SELECTOR_ATTRIBUTES, sa);
@@ -375,7 +375,7 @@
BeanPopulatorMappingAnalyzer.PRO_REFERENCE_RESOURCE_CONFIG,
resourceConfig);
SelectorAttributes sa = new SelectorAttributes();
- sa.setSelectorPolicy(BeanPopulatorMappingAnalyzer.FULL_PATH);
+ sa.setSelectorPolicy(SelectorAttributes.FULL_PATH);
sa.setSelectorSperator(" ");
PropertyModel selectorProperty = new PropertyModel(
BeanPopulatorMappingAnalyzer.PRO_SELECTOR_ATTRIBUTES, sa);
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/ui/BeanPopulatorMappingAnalyzer.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/ui/BeanPopulatorMappingAnalyzer.java 2009-02-19 00:10:53 UTC (rev 13668)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/javabean/ui/BeanPopulatorMappingAnalyzer.java 2009-02-19 02:37:01 UTC (rev 13669)
@@ -45,14 +45,8 @@
public static final String REFERENCE_BINDING = "referenceBinding";
public static final String[] SELECTOR_SPERATORS = new String[] { " ", "/"};
- public static final String ONLY_NAME = "only_name";
- public static final String FULL_PATH = "full_path";
- public static final String IGNORE_ROOT = "ignore_root";
-
- public static final String INCLUDE_PARENT = "include_parent";
-
/*
* (non-Javadoc)
*
@@ -337,7 +331,7 @@
for (Iterator iterator = children.iterator(); iterator.hasNext();) {
JavaBeanModel javaBean = (JavaBeanModel) iterator.next();
if (className.equals(javaBean.getBeanClassString())) {
- // If the node hasbean coonect
+ // If the node has bean connected
if (!ignoreMultipleConnection) {
if (isHasBeenConnected(mappingList, javaBean)) {
continue;
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/AbstractSmooksPropertySection.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/AbstractSmooksPropertySection.java 2009-02-19 00:10:53 UTC (rev 13668)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/ui/AbstractSmooksPropertySection.java 2009-02-19 02:37:01 UTC (rev 13669)
@@ -39,6 +39,7 @@
public SmooksGraphicalFormPage getGraphicalEditor() {
IStructuredSelection selection = (IStructuredSelection) this
.getSelection();
+ if(selection == null) return null;
Object obj = selection.getFirstElement();
if (obj == null)
return null;
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/utils/UIUtils.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/utils/UIUtils.java 2009-02-19 00:10:53 UTC (rev 13668)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/utils/UIUtils.java 2009-02-19 02:37:01 UTC (rev 13669)
@@ -95,7 +95,7 @@
}
if(!hasSperator){
- property.setSelectorPolicy(BeanPopulatorMappingAnalyzer.ONLY_NAME);
+ property.setSelectorPolicy(SelectorAttributes.ONLY_NAME);
return property;
}
String[] nodeNames = selector.split(property.getSelectorSperator());
@@ -105,13 +105,13 @@
}
IXMLStructuredObject rootNode = getRootParent(node);
if(parent == rootNode){
- property.setSelectorPolicy(BeanPopulatorMappingAnalyzer.FULL_PATH);
+ property.setSelectorPolicy(SelectorAttributes.FULL_PATH);
return property;
}
if(parent == node.getParent()){
- property.setSelectorPolicy(BeanPopulatorMappingAnalyzer.INCLUDE_PARENT);
+ property.setSelectorPolicy(SelectorAttributes.INCLUDE_PARENT);
}else{
- property.setSelectorPolicy(BeanPopulatorMappingAnalyzer.IGNORE_ROOT);
+ property.setSelectorPolicy(SelectorAttributes.IGNORE_ROOT);
}
return property;
}
@@ -676,17 +676,17 @@
String sperator = selectorAttributes.getSelectorSperator();
String policy = selectorAttributes.getSelectorPolicy();
if(sperator == null) sperator = " ";
- if(policy == null) policy = BeanPopulatorMappingAnalyzer.FULL_PATH;
- if(policy.equals(BeanPopulatorMappingAnalyzer.FULL_PATH)){
+ if(policy == null) policy = SelectorAttributes.FULL_PATH;
+ if(policy.equals(SelectorAttributes.FULL_PATH)){
return generateFullPath(node, sperator);
}
- if(policy.equals(BeanPopulatorMappingAnalyzer.INCLUDE_PARENT)){
+ if(policy.equals(SelectorAttributes.INCLUDE_PARENT)){
return generatePath(node, node.getParent(),sperator,true);
}
- if(policy.equals(BeanPopulatorMappingAnalyzer.IGNORE_ROOT)){
+ if(policy.equals(SelectorAttributes.IGNORE_ROOT)){
}
- if(policy.equals(BeanPopulatorMappingAnalyzer.ONLY_NAME)){
+ if(policy.equals(SelectorAttributes.ONLY_NAME)){
return node.getNodeName();
}
return generateFullPath(node,sperator);
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml/model/AbstractXMLObject.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml/model/AbstractXMLObject.java 2009-02-19 00:10:53 UTC (rev 13668)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml/model/AbstractXMLObject.java 2009-02-19 02:37:01 UTC (rev 13669)
@@ -15,6 +15,7 @@
import java.util.ArrayList;
import java.util.List;
+import org.dom4j.Element;
import org.jboss.tools.smooks.ui.IXMLStructuredObject;
import org.jboss.tools.smooks.ui.editors.TransformDataTreeViewer;
@@ -26,6 +27,8 @@
protected PropertyChangeSupport support = new PropertyChangeSupport(this);
+ protected Element referenceElement = null;
+
protected boolean canEdit = false;
public boolean isCanEdit() {
@@ -67,6 +70,10 @@
public void setName(String name) {
String oldName = this.name;
this.name = name;
+ Element element = this.getReferenceElement();
+ if(element != null){
+ element.setName(name);
+ }
support.firePropertyChange(TransformDataTreeViewer.NODE_PROPERTY_EVENT, oldName, this.name);
}
@@ -77,7 +84,15 @@
public void setChildren(List<AbstractXMLObject> children) {
this.children = children;
}
+
+ public Element getReferenceElement() {
+ return referenceElement;
+ }
+ public void setReferenceElement(Element referenceElement) {
+ this.referenceElement = referenceElement;
+ }
+
/**
* @return the parent
*/
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml/model/XMLConnectionCommandProcessor.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml/model/XMLConnectionCommandProcessor.java 2009-02-19 00:10:53 UTC (rev 13668)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml/model/XMLConnectionCommandProcessor.java 2009-02-19 02:37:01 UTC (rev 13669)
@@ -8,7 +8,6 @@
import org.jboss.tools.smooks.ui.gef.commands.CreateConnectionCommand;
import org.jboss.tools.smooks.ui.gef.model.AbstractStructuredDataModel;
import org.jboss.tools.smooks.ui.gef.model.IConnectableModel;
-import org.jboss.tools.smooks.ui.gef.model.LineConnectionModel;
import org.jboss.tools.smooks.ui.gef.model.PropertyModel;
import org.jboss.tools.smooks.ui.modelparser.SmooksConfigurationFileGenerateContext;
import org.jboss.tools.smooks.xml.ui.XMLPropertiesSection;
@@ -18,7 +17,6 @@
*
*/
public class XMLConnectionCommandProcessor implements ICommandProcessor {
-
/*
* (non-Javadoc)
*
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml/model/XMLObjectAnalyzer.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml/model/XMLObjectAnalyzer.java 2009-02-19 00:10:53 UTC (rev 13668)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml/model/XMLObjectAnalyzer.java 2009-02-19 02:37:01 UTC (rev 13669)
@@ -89,6 +89,7 @@
tag = new TagObject();
canAdd = true;
}
+ tag.setReferenceElement(element);
tag.setName(element.getName());
fillProperties(element, tag ,ignoreNodeNames);
tag.setNamespaceURL(element.getNamespaceURI());
@@ -96,8 +97,10 @@
for (Iterator iterator = list.iterator(); iterator.hasNext();) {
Element childElement = (Element) iterator.next();
TagObject t = parseElement(childElement, tag , ignoreNodeNames);
- if (t != null)
+ if (t != null){
+ t.setReferenceElement(childElement);
tag.addChildTag(t);
+ }
}
if (canAdd)
return tag;
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml/ui/AddXMLChildNodeAction.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml/ui/AddXMLChildNodeAction.java 2009-02-19 00:10:53 UTC (rev 13668)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml/ui/AddXMLChildNodeAction.java 2009-02-19 02:37:01 UTC (rev 13669)
@@ -5,6 +5,8 @@
import java.beans.PropertyChangeListener;
+import org.dom4j.Element;
+import org.dom4j.tree.DefaultElement;
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.jboss.tools.smooks.ui.popup.SmooksAction;
@@ -34,6 +36,12 @@
tag
.addNodePropetyChangeListener((PropertyChangeListener) v);
}
+ Element element = new DefaultElement("Node");
+ Element parentElement = ((TagObject) obj).getReferenceElement();
+ if(parentElement != null){
+ parentElement.add(element);
+ }
+ tag.setReferenceElement(element);
((TagObject) obj).addChildTag(tag);
}
}
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml/ui/AddXMLRootNodeAction.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml/ui/AddXMLRootNodeAction.java 2009-02-19 00:10:53 UTC (rev 13668)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml/ui/AddXMLRootNodeAction.java 2009-02-19 02:37:01 UTC (rev 13669)
@@ -5,6 +5,11 @@
import java.beans.PropertyChangeListener;
+import org.dom4j.Document;
+import org.dom4j.Element;
+import org.dom4j.dom.DOMDocumentFactory;
+import org.dom4j.tree.DefaultElement;
+import org.eclipse.emf.ecore.xmi.DOMHelper;
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.TreeViewer;
import org.jboss.tools.smooks.ui.popup.SmooksAction;
@@ -29,6 +34,10 @@
TagObject tag = new TagObject();
tag.setCanEdit(true);
tag.setName("Node");
+ Element element = new DefaultElement("Node");
+ Document doc = DOMDocumentFactory.getInstance().createDocument();
+ doc.setRootElement(element);
+ tag.setReferenceElement(element);
((TagList) obj).addRootTag(tag);
Object v = this.getViewer();
if (v != null && v instanceof TreeViewer) {
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml/ui/XMLNodePropertySection.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml/ui/XMLNodePropertySection.java 2009-02-19 00:10:53 UTC (rev 13668)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml/ui/XMLNodePropertySection.java 2009-02-19 02:37:01 UTC (rev 13669)
@@ -17,8 +17,14 @@
import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetPage;
import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory;
import org.jboss.tools.smooks.ui.AbstractSmooksPropertySection;
+import org.jboss.tools.smooks.ui.IXMLStructuredObject;
+import org.jboss.tools.smooks.ui.editors.SmooksFormEditor;
import org.jboss.tools.smooks.ui.editors.SmooksGraphicalFormPage;
+import org.jboss.tools.smooks.ui.gef.model.IConnectableModel;
+import org.jboss.tools.smooks.ui.modelparser.SmooksConfigurationFileGenerateContext;
+import org.jboss.tools.smooks.utils.UIUtils;
import org.jboss.tools.smooks.xml.model.AbstractXMLObject;
+import org.jboss.tools.smooks.xml2xml.XML2XMLGraphicalModelListener;
/**
* @author Dart
@@ -38,7 +44,6 @@
public void createControls(Composite parent,
TabbedPropertySheetPage tabbedPropertySheetPage) {
super.createControls(parent, tabbedPropertySheetPage);
-
TabbedPropertySheetWidgetFactory factory = tabbedPropertySheetPage
.getWidgetFactory();
Section section = createRootSection(factory, parent);
@@ -68,23 +73,30 @@
public void modifyText(ModifyEvent e) {
if (isLock())
return;
+ SmooksGraphicalFormPage page = null;
+ IWorkbenchPart part = getPart();
+ if(part instanceof SmooksFormEditor){
+ page = ((SmooksFormEditor)part).getGraphicalPage();
+ }
+
String text = nodeText.getText();
AbstractXMLObject model = getModel();
if (model != null && model.isCanEdit()) {
model.setName(text);
-
+ if(page != null){
+ SmooksConfigurationFileGenerateContext context = page.getSmooksConfigurationFileGenerateContext();
+ IConnectableModel connectModel = (IConnectableModel) UIUtils.findGraphModel(context.getGraphicalRootModel(), model);
+ XML2XMLGraphicalModelListener.setResourceCDATAViaTargetNode(model.getReferenceElement(), connectModel);
+ }
}
}
-
});
}
-
-
@Override
public SmooksGraphicalFormPage getGraphicalEditor() {
IWorkbenchPart part = getPart();
- return null;
+ return super.getGraphicalEditor();
}
@Override
@@ -99,12 +111,12 @@
unLockEventFire();
}
- private AbstractXMLObject getModel(){
- ISelection selection = this.getSelection();
- if(selection instanceof IStructuredSelection){
- Object model = ((IStructuredSelection)selection).getFirstElement();
- if(model instanceof AbstractXMLObject){
- return (AbstractXMLObject)model;
+ private AbstractXMLObject getModel() {
+ ISelection selection = this.getSelection();
+ if (selection instanceof IStructuredSelection) {
+ Object model = ((IStructuredSelection) selection).getFirstElement();
+ if (model instanceof AbstractXMLObject) {
+ return (AbstractXMLObject) model;
}
}
return null;
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml2java/analyzer/AbstractXMLModelAnalyzer.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml2java/analyzer/AbstractXMLModelAnalyzer.java 2009-02-19 00:10:53 UTC (rev 13668)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml2java/analyzer/AbstractXMLModelAnalyzer.java 2009-02-19 02:37:01 UTC (rev 13669)
@@ -51,6 +51,8 @@
public static final String RESOURCE = "Resource:/";
+ public static final String XSL_NAMESPACE = " xmlns:xsl=\"http://www.w3.org/1999/XSL/Transform\" ";
+
private String parmaKey = ""; //$NON-NLS-1$
public AbstractXMLModelAnalyzer(String paramKey) {
@@ -144,7 +146,7 @@
if ("xsl".equals(resource.getType())) {
String cdata = resource.getCDATAValue();
if (cdata != null) {
- cdata = cdata.replaceAll(":", "-");
+ cdata = processXSLFragmentString(cdata);
XMLObjectAnalyzer fragmentBuilder = new XMLObjectAnalyzer();
try {
TagObject tag = fragmentBuilder
@@ -152,7 +154,9 @@
new ByteArrayInputStream(
cdata
.getBytes()),
- new String[] { "xsl-value-of" });
+ new String[] {
+ "value-of",
+ "null_xsl" });
if (tag != null) {
if (viewer instanceof PropertyChangeListener) {
document
@@ -180,6 +184,22 @@
return document;
}
+ private String processXSLFragmentString(String cdata) {
+ // cdata = cdata.replaceAll(":", "-");
+ int start_index = cdata.indexOf("<");
+ int end_index = cdata.indexOf(">");
+ if(start_index == -1 || end_index == -1) return cdata;
+ String contents = cdata.substring(start_index,end_index);
+ if(contents.indexOf("\"http://www.w3.org/1999/XSL/Transform\"") != -1){
+ return cdata;
+ }
+
+ String second_frg = cdata.substring(end_index,cdata.length());
+
+ cdata = contents + XSL_NAMESPACE + second_frg;
+ return cdata;
+ }
+
public static void hookNodes(TagObject tag, PropertyChangeListener viewer) {
tag.setCanEdit(true);
tag.addNodePropetyChangeListener(viewer);
Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml2xml/XML2XMLAnalyzer.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml2xml/XML2XMLAnalyzer.java 2009-02-19 00:10:53 UTC (rev 13668)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml2xml/XML2XMLAnalyzer.java 2009-02-19 02:37:01 UTC (rev 13669)
@@ -20,6 +20,7 @@
import org.jboss.tools.smooks.analyzer.MappingModel;
import org.jboss.tools.smooks.analyzer.MappingResourceConfigList;
import org.jboss.tools.smooks.analyzer.SmooksAnalyzerException;
+import org.jboss.tools.smooks.javabean.model.SelectorAttributes;
import org.jboss.tools.smooks.model.AbstractResourceConfig;
import org.jboss.tools.smooks.model.ResourceConfigType;
import org.jboss.tools.smooks.model.ResourceType;
@@ -49,8 +50,14 @@
*/
public class XML2XMLAnalyzer extends AbstractAnalyzer {
- private static final String XSL = "xsl";
+ public static final String XSL_PRO_SELECT = "select";
+ public static final String XSL_ELEMENT_VALUE_OF = "value-of";
+
+ public static final String XSL = "xsl";
+
+ public static final String XSL_NAMESPACE = " xmlns:xsl=\"http://www.w3.org/1999/XSL/Transform\" ";
+
private List<AbstractXMLObject> xmlUsedList = new ArrayList<AbstractXMLObject>();
/*
@@ -65,6 +72,8 @@
public void analyzeMappingGraphModel(
SmooksConfigurationFileGenerateContext context)
throws SmooksAnalyzerException {
+ if (true)
+ return;
GraphRootModel root = context.getGraphicalRootModel();
List<SourceModel> sourceList = root.loadSourceModelList();
for (Iterator<SourceModel> iterator = sourceList.iterator(); iterator
@@ -187,7 +196,8 @@
.getReferenceEntityModel();
String selector = transformModel.getName();
AbstractXMLObject parent = transformModel.getParent();
- while (parent != null && !(parent instanceof TagList) && !(parent.getParent() instanceof TagList)) {
+ while (parent != null && !(parent instanceof TagList)
+ && !(parent.getParent() instanceof TagList)) {
selector = parent.getName() + " " + selector;
parent = parent.getParent();
}
@@ -203,7 +213,7 @@
String select = generateXSLValueOfSelectValue(context, mappingSource,
bindingSource);
if (select != null)
- element.addAttribute("select", select);
+ element.addAttribute(XSL_PRO_SELECT, select);
return element;
}
@@ -311,7 +321,7 @@
}
}
}
- removeXSLElements(targetList, new String[] { "xsl-value-of" });
+ removeXSLElements(targetList, new String[] { "value-of" });
if (listeners != null) {
List<TagObject> tagList = targetList.getRootTagList();
for (Iterator iterator = tagList.iterator(); iterator.hasNext();) {
@@ -419,6 +429,28 @@
new PropertyModel(
XMLPropertiesSection.MAPPING_TYPE,
XMLPropertiesSection.MAPPING));
+ // link resourceConfig to the connection model;
+ mapping
+ .getProperties()
+ .add(
+ new PropertyModel(
+ XML2XMLGraphicalModelListener.PRO_REFERENCE_RESOURCE_CONFIG,
+ resourceConfig));
+
+ SelectorAttributes sa = UIUtils.guessSelectorProperty(
+ resourceConfig.getSelector(), sourceNode);
+ if (sa == null) {
+ sa = new SelectorAttributes();
+ sa.setSelectorPolicy(SelectorAttributes.FULL_PATH);
+ sa.setSelectorSperator(" ");
+ }
+ mapping
+ .getProperties()
+ .add(
+ new PropertyModel(
+ XML2XMLGraphicalModelListener.PRO_SELECTOR_ATTRIBUTES,
+ sa));
+
mappingList.getMappingModelList().add(mapping);
setXMLObjectUsed(sourceNode);
setXMLObjectUsed(targetNode);
@@ -436,24 +468,27 @@
ResourceType resource = resourceConfig.getResource();
if (resource != null) {
processCDATA(resource.getCDATAValue(), mappingList, sourceList,
- targetNode, mappingSource);
+ targetNode, mappingSource, resourceConfig);
}
}
}
private void processCDATA(String cdata,
MappingResourceConfigList mappingList, TagList sourceList,
- AbstractXMLObject targetNode, AbstractXMLObject mappingSource) {
+ AbstractXMLObject targetNode, AbstractXMLObject mappingSource,
+ ResourceConfigType referenceRC) {
if (cdata == null)
return;
cdata = cdata.trim();
cdata = transformCDATA(cdata);
- handleXSLNode(targetNode, mappingSource, mappingList);
+ handleXSLNode(targetNode, mappingSource, mappingList, referenceRC);
}
private void handleXSLNode(AbstractXMLObject node,
- AbstractXMLObject mappingNode, MappingResourceConfigList mappingList) {
- if ("xsl-value-of".equals(node.getName())) {
+ AbstractXMLObject mappingNode,
+ MappingResourceConfigList mappingList,
+ ResourceConfigType referenceResourceConfig) {
+ if (XSL_ELEMENT_VALUE_OF.equals(node.getName())) {
if (node instanceof TagObject) {
List<TagPropertyObject> propertyList = ((TagObject) node)
.getProperties();
@@ -461,7 +496,7 @@
.hasNext();) {
TagPropertyObject tagPropertyObject = (TagPropertyObject) iterator
.next();
- if ("select".equals(tagPropertyObject.getName())) {
+ if (XSL_PRO_SELECT.equals(tagPropertyObject.getName())) {
String selectValue = tagPropertyObject.getValue();
AbstractXMLObject sourceNode = findSourceNodeFromXSLSelect(
selectValue, mappingNode);
@@ -480,6 +515,12 @@
new PropertyModel(
XMLPropertiesSection.MAPPING_TYPE,
XMLPropertiesSection.BINDING));
+ mapping
+ .getProperties()
+ .add(
+ new PropertyModel(
+ XML2XMLGraphicalModelListener.PRO_REFERENCE_RESOURCE_CONFIG,
+ referenceResourceConfig));
mappingList.getMappingModelList().add(mapping);
}
}
@@ -494,7 +535,8 @@
.hasNext();) {
AbstractXMLObject abstractXMLObject = (AbstractXMLObject) iterator
.next();
- handleXSLNode(abstractXMLObject, mappingNode, mappingList);
+ handleXSLNode(abstractXMLObject, mappingNode, mappingList,
+ referenceResourceConfig);
}
}
}
@@ -545,7 +587,18 @@
}
private String transformCDATA(String cdata) {
- cdata = cdata.replace(":", "-");
+ // cdata = cdata.replace(":", "-");
+ // return cdata;
+ int start_index = cdata.indexOf("<");
+ int end_index = cdata.indexOf(">");
+ if (start_index == -1 || end_index == -1)
+ return cdata;
+ String contents = cdata.substring(start_index, end_index);
+ if (contents.indexOf("\"http://www.w3.org/1999/XSL/Transform\"") != -1) {
+ return cdata;
+ }
+ String second_frg = cdata.substring(end_index, cdata.length());
+ cdata = contents + XSL_NAMESPACE + second_frg;
return cdata;
}
Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml2xml/XML2XMLGraphicalModelListener.java
===================================================================
--- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml2xml/XML2XMLGraphicalModelListener.java (rev 0)
+++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml2xml/XML2XMLGraphicalModelListener.java 2009-02-19 02:37:01 UTC (rev 13669)
@@ -0,0 +1,401 @@
+/**
+ *
+ */
+package org.jboss.tools.smooks.xml2xml;
+
+import java.beans.PropertyChangeEvent;
+import java.io.ByteArrayOutputStream;
+import java.util.Iterator;
+import java.util.List;
+
+import javax.xml.namespace.QName;
+
+import org.dom4j.Element;
+import org.dom4j.io.OutputFormat;
+import org.dom4j.io.XMLWriter;
+import org.dom4j.tree.DefaultElement;
+import org.jboss.tools.smooks.javabean.model.SelectorAttributes;
+import org.jboss.tools.smooks.model.ResourceConfigType;
+import org.jboss.tools.smooks.model.ResourceType;
+import org.jboss.tools.smooks.model.SmooksFactory;
+import org.jboss.tools.smooks.model.SmooksResourceListType;
+import org.jboss.tools.smooks.model.util.SmooksModelUtils;
+import org.jboss.tools.smooks.ui.IXMLStructuredObject;
+import org.jboss.tools.smooks.ui.gef.model.AbstractStructuredDataModel;
+import org.jboss.tools.smooks.ui.gef.model.IConnectableModel;
+import org.jboss.tools.smooks.ui.gef.model.IGraphicalModelListener;
+import org.jboss.tools.smooks.ui.gef.model.LineConnectionModel;
+import org.jboss.tools.smooks.ui.gef.model.PropertyModel;
+import org.jboss.tools.smooks.ui.modelparser.SmooksConfigurationFileGenerateContext;
+import org.jboss.tools.smooks.utils.UIUtils;
+import org.jboss.tools.smooks.xml.model.AbstractXMLObject;
+import org.jboss.tools.smooks.xml.model.TagPropertyObject;
+import org.jboss.tools.smooks.xml.ui.XMLPropertiesSection;
+
+/**
+ * @author Dart
+ *
+ */
+public class XML2XMLGraphicalModelListener implements IGraphicalModelListener {
+ public static final String PRO_REFERENCE_RESOURCE_CONFIG = "__reference_resource_config_x2x";
+
+ public static final String PRO_SELECTOR_ATTRIBUTES = "__pro_selector_attributes_x2x";
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see
+ * org.jboss.tools.smooks.ui.gef.model.IGraphicalModelListener#modelAdded
+ * (java.lang.Object,
+ * org.jboss.tools.smooks.ui.modelparser.SmooksConfigurationFileGenerateContext
+ * )
+ */
+ public void modelAdded(Object graphicalModel,
+ SmooksConfigurationFileGenerateContext context) {
+ if (graphicalModel instanceof LineConnectionModel) {
+ AbstractStructuredDataModel source = (AbstractStructuredDataModel) ((LineConnectionModel) graphicalModel)
+ .getSource();
+ AbstractStructuredDataModel target = (AbstractStructuredDataModel) ((LineConnectionModel) graphicalModel)
+ .getTarget();
+ Object mappingType = ((LineConnectionModel) graphicalModel)
+ .getProperty(XMLPropertiesSection.MAPPING_TYPE);
+ if (XMLPropertiesSection.BINDING.equals(mappingType)) {
+ bindingConnectionAdded(source, target,
+ (LineConnectionModel) graphicalModel, context);
+ }
+ if (XMLPropertiesSection.MAPPING.equals(mappingType)) {
+ mappingConnectionAdded(source, target,
+ (LineConnectionModel) graphicalModel, context);
+ }
+ }
+ }
+
+ private void mappingConnectionAdded(AbstractStructuredDataModel source,
+ AbstractStructuredDataModel target, LineConnectionModel connection,
+ SmooksConfigurationFileGenerateContext context) {
+ Object obj = source.getReferenceEntityModel();
+ IXMLStructuredObject sourceModel = null;
+ if (obj instanceof IXMLStructuredObject) {
+ sourceModel = (IXMLStructuredObject) obj;
+ }
+ if (sourceModel == null)
+ return;
+
+ SelectorAttributes selectorAttributes = (SelectorAttributes) connection
+ .getProperty(PRO_SELECTOR_ATTRIBUTES);
+ if (selectorAttributes == null) {
+ selectorAttributes = newDefaultSelectorAttribute();
+ connection.getProperties().add(
+ new PropertyModel(PRO_SELECTOR_ATTRIBUTES,
+ selectorAttributes));
+ }
+
+ String selector = UIUtils.generatePath(sourceModel, selectorAttributes);
+ if (selector == null)
+ return;
+
+ newMappingResourceConfig(selector, target, context);
+ }
+
+ private void newMappingResourceConfig(String selector,
+ AbstractStructuredDataModel target,
+ SmooksConfigurationFileGenerateContext context) {
+ SmooksResourceListType list = context.getSmooksResourceListModel();
+ ResourceConfigType resourceConfig = SmooksFactory.eINSTANCE
+ .createResourceConfigType();
+ resourceConfig.setSelector(selector);
+
+ ResourceType resource = SmooksFactory.eINSTANCE.createResourceType();
+ resource.setType(XML2XMLAnalyzer.XSL);
+ resourceConfig.setResource(resource);
+
+ AbstractXMLObject xmlNode = (AbstractXMLObject) target
+ .getReferenceEntityModel();
+ String cdata = getXMLString(xmlNode.getReferenceElement());
+
+ if (cdata != null) {
+ resource.setCDATAValue(cdata);
+ }
+
+ UIUtils
+ .addResourceConfigType(context.getDomain(), list,
+ resourceConfig);
+
+ }
+
+ private SelectorAttributes newDefaultSelectorAttribute() {
+ SelectorAttributes sa = new SelectorAttributes();
+ sa.setSelectorPolicy(SelectorAttributes.FULL_PATH);
+ sa.setSelectorSperator(" ");
+ return sa;
+ }
+
+ private void bindingConnectionAdded(AbstractStructuredDataModel source,
+ AbstractStructuredDataModel target, LineConnectionModel line,
+ SmooksConfigurationFileGenerateContext context) {
+ AbstractXMLObject targetModel = (AbstractXMLObject) target
+ .getReferenceEntityModel();
+ AbstractXMLObject mappingModel = findDefaultRelateMappingTargetModel(
+ targetModel, context);
+ IConnectableModel mappingGraph = (IConnectableModel) UIUtils
+ .findGraphModel(context.getGraphicalRootModel(), mappingModel);
+ if (mappingGraph != null) {
+ List list = mappingGraph.getModelTargetConnections();
+ ResourceConfigType resourceConfig = null;
+ if (list.size() > 1)
+ return;
+ for (Iterator iterator = list.iterator(); iterator.hasNext();) {
+ LineConnectionModel connection = (LineConnectionModel) iterator
+ .next();
+ resourceConfig = (ResourceConfigType) connection
+ .getProperty(PRO_REFERENCE_RESOURCE_CONFIG);
+ if (resourceConfig == null)
+ return;
+ break;
+ }
+ // link resourceConfig to the connection model;
+ line
+ .addPropertyModel(PRO_REFERENCE_RESOURCE_CONFIG,
+ resourceConfig);
+ Element valueOf = createValueOfElement(source, target, context);
+ ResourceType resource = resourceConfig.getResource();
+ if (resource != null
+ && XML2XMLAnalyzer.XSL.equals(resource.getType())) {
+ SmooksModelUtils.setCDATAToAnyType(resource,
+ getXMLString(valueOf));
+ }
+ }
+ }
+
+ public static void setResourceCDATAViaTargetNode(Element element,
+ IConnectableModel node) {
+ List list = node.getModelTargetConnections();
+ ResourceConfigType resourceConfig = null;
+ if (list.size() > 1 || list.isEmpty())
+ return;
+ for (Iterator iterator = list.iterator(); iterator.hasNext();) {
+ LineConnectionModel connection = (LineConnectionModel) iterator
+ .next();
+ resourceConfig = (ResourceConfigType) connection
+ .getProperty(PRO_REFERENCE_RESOURCE_CONFIG);
+ if (resourceConfig == null)
+ return;
+ break;
+ }
+ ResourceType resource = resourceConfig.getResource();
+ if (resource != null && XML2XMLAnalyzer.XSL.equals(resource.getType())) {
+ resource.setCDATAValue(getXMLString(element.getDocument()
+ .getRootElement()));
+ }
+ }
+
+ public static String getXMLString(Element node) {
+ String sss = node.asXML();
+ String string = null;
+ ByteArrayOutputStream stream = null;
+ XMLWriter writer = null;
+ try {
+ stream = new ByteArrayOutputStream();
+ OutputFormat format = OutputFormat.createPrettyPrint();
+ writer = new XMLWriter(stream, format);
+ writer.write(node);
+ string = new String(stream.toByteArray());
+ } catch (Exception e) {
+ // ignore
+ } finally {
+ try {
+ if (stream != null)
+ stream.close();
+ if (writer != null)
+ writer.close();
+ } catch (Throwable t) {
+ }
+ }
+ if (string == null) {
+ return node.asXML();
+ }
+ String s = XML2XMLAnalyzer.XSL_NAMESPACE;
+ s = s.trim();
+ if (string.indexOf(s) != -1) {
+ string = string.replaceAll(s, "");
+ }
+ return string;
+ }
+
+ private Element createValueOfElement(AbstractStructuredDataModel source,
+ AbstractStructuredDataModel target,
+ SmooksConfigurationFileGenerateContext context) {
+ AbstractXMLObject sourceModel = (AbstractXMLObject) source
+ .getReferenceEntityModel();
+ AbstractXMLObject targetModel = (AbstractXMLObject) target
+ .getReferenceEntityModel();
+
+ AbstractXMLObject mappingModel = findDefaultRelateMappingSourceModel(
+ sourceModel, context);
+
+ String select = generateSelectProValue(mappingModel, sourceModel);
+ Element valueOf = newValueOfElement(select);
+
+ Element referenceElement = targetModel.getReferenceElement();
+ if (referenceElement != null && valueOf != null) {
+ referenceElement.add(valueOf);
+ }
+ return referenceElement.getDocument().getRootElement();
+ }
+
+ private AbstractXMLObject findDefaultRelateMappingTargetModel(
+ AbstractXMLObject targetModel,
+ SmooksConfigurationFileGenerateContext context) {
+ AbstractXMLObject parent = targetModel.getParent();
+ AbstractStructuredDataModel parentGraph = UIUtils.findGraphModel(
+ context.getGraphicalRootModel(), parent);
+ if (parentGraph instanceof IConnectableModel) {
+ List connections = ((IConnectableModel) parentGraph)
+ .getModelTargetConnections();
+ if (connections.isEmpty()) {
+ AbstractXMLObject p1 = findDefaultRelateMappingTargetModel(
+ parent, context);
+ if (p1 != null)
+ return p1;
+ } else {
+ for (Iterator iterator = connections.iterator(); iterator
+ .hasNext();) {
+ LineConnectionModel connection = (LineConnectionModel) iterator
+ .next();
+ Object mt = connection
+ .getProperty(XMLPropertiesSection.MAPPING_TYPE);
+ if (XMLPropertiesSection.MAPPING.equals(mt)) {
+ return parent;
+ }
+ }
+ }
+ }
+ return null;
+ }
+
+ private AbstractXMLObject findDefaultRelateMappingSourceModel(
+ AbstractXMLObject sourceModel,
+ SmooksConfigurationFileGenerateContext context) {
+ AbstractXMLObject parent = sourceModel.getParent();
+ AbstractStructuredDataModel parentGraph = UIUtils.findGraphModel(
+ context.getGraphicalRootModel(), parent);
+ if (parentGraph instanceof IConnectableModel) {
+ List connections = ((IConnectableModel) parentGraph)
+ .getModelSourceConnections();
+ if (connections.isEmpty()) {
+ AbstractXMLObject p1 = findDefaultRelateMappingSourceModel(
+ parent, context);
+ if (p1 != null)
+ return p1;
+ } else {
+ for (Iterator iterator = connections.iterator(); iterator
+ .hasNext();) {
+ LineConnectionModel connection = (LineConnectionModel) iterator
+ .next();
+ Object mt = connection
+ .getProperty(XMLPropertiesSection.MAPPING_TYPE);
+ if (XMLPropertiesSection.MAPPING.equals(mt)) {
+ return parent;
+ }
+ }
+ }
+ }
+ return null;
+ }
+
+ private String generateSelectProValue(
+ AbstractXMLObject mappingTransformModel,
+ AbstractXMLObject bindingTransformModel) {
+ String select = bindingTransformModel.getName();
+ if (bindingTransformModel instanceof TagPropertyObject) {
+ select = "@" + select;
+ }
+ boolean hasParent = false;
+ AbstractXMLObject bindingParent = bindingTransformModel.getParent();
+ while (bindingParent != null && bindingParent != mappingTransformModel) {
+ hasParent = true;
+ String select1 = bindingParent.getName();
+ if (bindingParent instanceof TagPropertyObject) {
+ select1 = "@" + select1;
+ }
+ select = select1 + "/" + select;
+ bindingParent = bindingParent.getParent();
+ }
+
+ if (hasParent) {
+ select = "./" + select;
+ }
+ return select;
+ }
+
+ private Element newValueOfElement(String select) {
+ Element valueOf = new DefaultElement("xsl:value-of");
+ if (select != null) {
+ valueOf.addAttribute(XML2XMLAnalyzer.XSL_PRO_SELECT, select);
+ }
+ return valueOf;
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see
+ * org.jboss.tools.smooks.ui.gef.model.IGraphicalModelListener#modelChanged
+ * (java.lang.Object,
+ * org.jboss.tools.smooks.ui.modelparser.SmooksConfigurationFileGenerateContext
+ * , java.beans.PropertyChangeEvent)
+ */
+ public void modelChanged(Object graphicalModel,
+ SmooksConfigurationFileGenerateContext context,
+ PropertyChangeEvent event) {
+
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see
+ * org.jboss.tools.smooks.ui.gef.model.IGraphicalModelListener#modelRemoved
+ * (java.lang.Object,
+ * org.jboss.tools.smooks.ui.modelparser.SmooksConfigurationFileGenerateContext
+ * )
+ */
+ public void modelRemoved(Object graphicalModel,
+ SmooksConfigurationFileGenerateContext context) {
+ if (graphicalModel instanceof LineConnectionModel) {
+ LineConnectionModel connection = (LineConnectionModel) graphicalModel;
+ Object mt = connection
+ .getProperty(XMLPropertiesSection.MAPPING_TYPE);
+ if (XMLPropertiesSection.BINDING.equals(mt)) {
+ AbstractStructuredDataModel target = (AbstractStructuredDataModel) connection
+ .getTarget();
+ AbstractXMLObject xmlNode = (AbstractXMLObject) target
+ .getReferenceEntityModel();
+ Element element = xmlNode.getReferenceElement();
+ Element valueOf= null;
+ List elements = element.elements();
+ for (Iterator iterator = elements.iterator(); iterator
+ .hasNext();) {
+ Element e1 = (Element) iterator.next();
+ if (e1.getName().equalsIgnoreCase("value-of") ||
+ e1.getName().equalsIgnoreCase("xsl:value-of")) {
+ valueOf = e1;
+ break;
+ }
+ }
+ if(valueOf != null){
+ element.remove(valueOf);
+ }
+ setResourceCDATAViaTargetNode(element, (IConnectableModel) target);
+ }
+ if (XMLPropertiesSection.MAPPING.equals(mt)) {
+ ResourceConfigType resourceConfig = (ResourceConfigType) connection
+ .getProperty(PRO_REFERENCE_RESOURCE_CONFIG);
+ if(resourceConfig == null) return;
+ context.getSmooksResourceListModel()
+ .getAbstractResourceConfig().remove(resourceConfig);
+ }
+ }
+ }
+
+}
Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/xml2xml/XML2XMLGraphicalModelListener.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
17 years, 1 month
- 1
- 0
JBoss Tools SVN: r13668 - workspace/grid/esb-example.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2009-02-18 19:10:53 -0500 (Wed, 18 Feb 2009)
New Revision: 13668
Modified:
workspace/grid/esb-example/transform_CSV2XML.zip
workspace/grid/esb-example/transform_CSV2XML_client.zip
workspace/grid/esb-example/transform_XML2POJO.zip
workspace/grid/esb-example/transform_XML2POJO_client.zip
workspace/grid/esb-example/transform_XML2XML_date_manipulation.zip
workspace/grid/esb-example/transform_XML2XML_date_manipulation_client.zip
workspace/grid/esb-example/transform_XML2XML_simple.zip
workspace/grid/esb-example/transform_XML2XML_simple_client.zip
workspace/grid/esb-example/webservice_consumer1.zip
workspace/grid/esb-example/webservice_consumer1_client.zip
workspace/grid/esb-example/webservice_producer.zip
workspace/grid/esb-example/webservice_producer_client.zip
Log:
JBIDE-3723 Change JBoss 4.2 Runtime to JBoss EAP 4.3 Runtime in Example Projects.
Modified: workspace/grid/esb-example/transform_CSV2XML.zip
===================================================================
(Binary files differ)
Modified: workspace/grid/esb-example/transform_CSV2XML_client.zip
===================================================================
(Binary files differ)
Modified: workspace/grid/esb-example/transform_XML2POJO.zip
===================================================================
(Binary files differ)
Modified: workspace/grid/esb-example/transform_XML2POJO_client.zip
===================================================================
(Binary files differ)
Modified: workspace/grid/esb-example/transform_XML2XML_date_manipulation.zip
===================================================================
(Binary files differ)
Modified: workspace/grid/esb-example/transform_XML2XML_date_manipulation_client.zip
===================================================================
(Binary files differ)
Modified: workspace/grid/esb-example/transform_XML2XML_simple.zip
===================================================================
(Binary files differ)
Modified: workspace/grid/esb-example/transform_XML2XML_simple_client.zip
===================================================================
(Binary files differ)
Modified: workspace/grid/esb-example/webservice_consumer1.zip
===================================================================
(Binary files differ)
Modified: workspace/grid/esb-example/webservice_consumer1_client.zip
===================================================================
(Binary files differ)
Modified: workspace/grid/esb-example/webservice_producer.zip
===================================================================
(Binary files differ)
Modified: workspace/grid/esb-example/webservice_producer_client.zip
===================================================================
(Binary files differ)
17 years, 1 month
- 1
- 0
JBoss Tools SVN: r13667 - workspace/Denny/esb-example.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2009-02-18 18:58:47 -0500 (Wed, 18 Feb 2009)
New Revision: 13667
Modified:
workspace/Denny/esb-example/helloworld.zip
workspace/Denny/esb-example/helloworld_action.zip
workspace/Denny/esb-example/helloworld_action_client.zip
workspace/Denny/esb-example/helloworld_file_action.zip
workspace/Denny/esb-example/helloworld_testclient.zip
Log:
JBIDE-3723 Change JBoss 4.2 Runtime to JBoss EAP 4.3 Runtime in Example Projects.
Modified: workspace/Denny/esb-example/helloworld.zip
===================================================================
(Binary files differ)
Modified: workspace/Denny/esb-example/helloworld_action.zip
===================================================================
(Binary files differ)
Modified: workspace/Denny/esb-example/helloworld_action_client.zip
===================================================================
(Binary files differ)
Modified: workspace/Denny/esb-example/helloworld_file_action.zip
===================================================================
(Binary files differ)
Modified: workspace/Denny/esb-example/helloworld_testclient.zip
===================================================================
(Binary files differ)
17 years, 1 month
- 1
- 0
JBoss Tools SVN: r13665 - in trunk/as/plugins/org.jboss.ide.eclipse.as.ui: jbossui/org/jboss/ide/eclipse/as/ui and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2009-02-18 15:09:19 -0500 (Wed, 18 Feb 2009)
New Revision: 13665
Added:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/icons/logoEAP.gif
Removed:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/icons/logoEAP.jpg
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/icons/logo32.gif
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/icons/logo40.gif
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/icons/logo42.gif
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/icons/logo50.gif
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/JBossServerUISharedImages.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-3757 Images adjusted: height now is 66 and logoEAP.jpg converted to gif format
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/icons/logo32.gif
===================================================================
(Binary files differ)
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/icons/logo40.gif
===================================================================
(Binary files differ)
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/icons/logo42.gif
===================================================================
(Binary files differ)
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/icons/logo50.gif
===================================================================
(Binary files differ)
Added: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/icons/logoEAP.gif
===================================================================
(Binary files differ)
Property changes on: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/icons/logoEAP.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/icons/logoEAP.jpg
===================================================================
(Binary files differ)
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/JBossServerUISharedImages.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/JBossServerUISharedImages.java 2009-02-18 17:52:17 UTC (rev 13664)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/JBossServerUISharedImages.java 2009-02-18 20:09:19 UTC (rev 13665)
@@ -73,7 +73,7 @@
descriptors.put(WIZBAN_JBOSS40_LOGO, createImageDescriptor(pluginBundle, "/icons/logo40.gif"));
descriptors.put(WIZBAN_JBOSS42_LOGO, createImageDescriptor(pluginBundle, "/icons/logo42.gif"));
descriptors.put(WIZBAN_JBOSS50_LOGO, createImageDescriptor(pluginBundle, "/icons/logo50.gif"));
- descriptors.put(WIZBAN_JBOSS_EAP_LOGO, createImageDescriptor(pluginBundle, "/icons/logoEAP.jpg"));
+ descriptors.put(WIZBAN_JBOSS_EAP_LOGO, createImageDescriptor(pluginBundle, "/icons/logoEAP.gif"));
descriptors.put(WIZBAN_DEPLOY_ONLY_LOGO, createImageDescriptor(pluginBundle, "/icons/blank.gif"));
descriptors.put(TWIDDLE_IMAGE, createImageDescriptor(pluginBundle, "icons/twiddle.gif"));
descriptors.put(INACTIVE_CATEGORY_IMAGE, createImageDescriptor(pluginBundle, "/icons/inactiveCat.gif"));
17 years, 1 month
- 1
- 0
JBoss Tools SVN: r13664 - in trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse: launch and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: vyemialyanchyk
Date: 2009-02-18 12:52:17 -0500 (Wed, 18 Feb 2009)
New Revision: 13664
Modified:
trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/EclipseLaunchConsoleConfigurationPreferences.java
trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/HibernateConsoleMessages.java
trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/HibernateConsoleMessages.properties
trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/ConsoleConfigurationMainTab.java
trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/PathHelper.java
Log:
JBIDE-3788
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/EclipseLaunchConsoleConfigurationPreferences.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/EclipseLaunchConsoleConfigurationPreferences.java 2009-02-18 17:36:29 UTC (rev 13663)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/EclipseLaunchConsoleConfigurationPreferences.java 2009-02-18 17:52:17 UTC (rev 13664)
@@ -49,6 +49,14 @@
if(path==null) return null;
IResource resource = ResourcesPlugin.getWorkspace().getRoot().findMember(path);
+ if(resource == null) {
+ File file = new File(path.toOSString());
+ if (file.exists()) {
+ if (file.isFile()) {
+ return file;
+ }
+ }
+ }
return pathToFile(path.toString(), resource);
}
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/HibernateConsoleMessages.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/HibernateConsoleMessages.java 2009-02-18 17:36:29 UTC (rev 13663)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/HibernateConsoleMessages.java 2009-02-18 17:52:17 UTC (rev 13664)
@@ -514,7 +514,9 @@
public static String PathHelper_does_not_exist;
public static String PathHelper_has_invalid_variable_references;
public static String PathHelper_not_directory;
+ public static String PathHelper_not_file;
public static String PathHelper_has_to_be_folder_or_project;
+ public static String PathHelper_has_to_be_file;
public static String PathHelper_project_for_is_closed;
//
public static String HibernateRefactoringUtil_error_during_refactoring;
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/HibernateConsoleMessages.properties
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/HibernateConsoleMessages.properties 2009-02-18 17:36:29 UTC (rev 13663)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/HibernateConsoleMessages.properties 2009-02-18 17:52:17 UTC (rev 13664)
@@ -505,8 +505,10 @@
GeneralExceptionStatusHandler_generating_code=Generating code
PathHelper_does_not_exist={0} does not exist [{1}]
PathHelper_not_directory=The path {0} is not a directory
+PathHelper_not_file=The path {0} is not a file
PathHelper_has_invalid_variable_references={0} has invalid variable references [{1}]
PathHelper_has_to_be_folder_or_project={0} has to be a folder or project [{1}]
+PathHelper_has_to_be_file={0} has to be a file [{1}]
PathHelper_project_for_is_closed=Project for {0} is closed [{1}]
HibernateRefactoringUtil_error_during_refactoring=Error during refactoring
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/ConsoleConfigurationMainTab.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/ConsoleConfigurationMainTab.java 2009-02-18 17:36:29 UTC (rev 13663)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/ConsoleConfigurationMainTab.java 2009-02-18 17:52:17 UTC (rev 13664)
@@ -428,8 +428,9 @@
} */
if (propertyFilename.length() > 0) {
- IResource resource = ResourcesPlugin.getWorkspace().getRoot().findMember(propertyFilename);
- String msg = checkForFile(HibernateConsoleMessages.ConsoleConfigurationMainTab_property_file_2, resource);
+ //IResource resource = ResourcesPlugin.getWorkspace().getRoot().findMember(propertyFilename);
+ //String msg = checkForFile(HibernateConsoleMessages.ConsoleConfigurationMainTab_property_file_2, resource);
+ String msg = PathHelper.checkFile(configurationFilename, HibernateConsoleMessages.ConsoleConfigurationMainTab_property_file_2, true);
if(msg!=null) {
setErrorMessage(msg);
return false;
@@ -437,8 +438,9 @@
}
if (!configurationFileWillBeCreated && configurationFilename.length() > 0) {
- IResource resource = ResourcesPlugin.getWorkspace().getRoot().findMember(configurationFilename);
- String msg = checkForFile(HibernateConsoleMessages.ConsoleConfigurationMainTab_configuration_file_2,resource);
+ //IResource resource = ResourcesPlugin.getWorkspace().getRoot().findMember(configurationFilename);
+ //String msg = checkForFile(HibernateConsoleMessages.ConsoleConfigurationMainTab_configuration_file_2,resource);
+ String msg = PathHelper.checkFile(configurationFilename, HibernateConsoleMessages.ConsoleConfigurationMainTab_configuration_file_2, true);
if(msg!=null) {
setErrorMessage(msg);
return false;
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/PathHelper.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/PathHelper.java 2009-02-18 17:36:29 UTC (rev 13663)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/PathHelper.java 2009-02-18 17:52:17 UTC (rev 13664)
@@ -135,4 +135,57 @@
}
+ /**
+ * Checks if file exists.
+ * Handles variables replacement too.
+ *
+ * @param strpath
+ * @param name
+ * @param checkFilesystem
+ * @return
+ */
+ static public String checkFile(String strpath, String name, boolean checkFilesystem) {
+ if(strpath.indexOf("${") >= 0) { //$NON-NLS-1$
+ IStringVariableManager manager = VariablesPlugin.getDefault().getStringVariableManager();
+ try {
+ manager.validateStringVariables(strpath);
+ }
+ catch (CoreException e) {
+ String out = NLS.bind(HibernateConsoleMessages.PathHelper_has_invalid_variable_references, name, e.getMessage());
+ return out;
+ }
+ }
+
+ IPath path = pathOrNull(resolve(strpath));
+
+ if (checkFilesystem && path != null) {
+ File file = new File(path.toOSString());
+ if (file.exists()) {
+ if (file.isFile()) {
+ return null;
+ }
+ String out = NLS.bind(HibernateConsoleMessages.PathHelper_not_file, path);
+ return out;
+ }
+ }
+
+ IResource res= ResourcesPlugin.getWorkspace().getRoot().findMember(path);
+ if (res != null) {
+ int resType= res.getType();
+ if (resType == IResource.FILE) {
+ IProject proj= res.getProject();
+ if (!proj.isOpen() ) {
+ String out = NLS.bind(HibernateConsoleMessages.PathHelper_project_for_is_closed, name, path);
+ return out;
+ }
+ } else {
+ String out = NLS.bind(HibernateConsoleMessages.PathHelper_has_to_be_file, name, path);
+ return out;
+ }
+ } else {
+ String out = NLS.bind(HibernateConsoleMessages.PathHelper_does_not_exist, name, path);
+ return out;
+ }
+ return null;
+ }
}
17 years, 1 month
- 1
- 0
JBoss Tools SVN: r13663 - trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch.
by jbosstools-commits＠lists.jboss.org
Author: vyemialyanchyk
Date: 2009-02-18 12:36:29 -0500 (Wed, 18 Feb 2009)
New Revision: 13663
Modified:
trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/CodeGenerationSettingsTab.java
Log:
JBIDE-3789
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/CodeGenerationSettingsTab.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/CodeGenerationSettingsTab.java 2009-02-18 17:28:19 UTC (rev 13662)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/CodeGenerationSettingsTab.java 2009-02-18 17:36:29 UTC (rev 13663)
@@ -281,7 +281,7 @@
return;
}
- String msg = PathHelper.checkDirectory(outputdir.getText(), HibernateConsoleMessages.CodeGenerationSettingsTab_output_directory, false);
+ String msg = PathHelper.checkDirectory(outputdir.getText(), HibernateConsoleMessages.CodeGenerationSettingsTab_output_directory, true);
if (msg!=null) {
updateStatus(msg);
17 years, 1 month
- 1
- 0