JBoss Tools SVN: r13622 - in trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4: icons/16 and 6 other directories.
by jbosstools-commits＠lists.jboss.org
Author: koen.aers(a)jboss.com
Date: 2009-02-13 15:28:00 -0500 (Fri, 13 Feb 2009)
New Revision: 13622
Added:
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/16/node_elements_multiple.gif
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/16/transitions_multiple.gif
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editor/JpdlSelectionSynchronizer.java
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/JpdlGraphicalEditPart.java
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/JpdlGraphicalEditPartFactory.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/ProcessGraphicalEditPart.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/util/SharedImages.java
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/view/
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/view/DetailsPage.java
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/IDetailsPage.java
Removed:
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/JpdlEditPartFactory.java
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/ProcessEditPart.java
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/ProcessNodeEditPart.java
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/SequenceFlowEditPart.java
Modified:
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/plugin.xml
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/JpdlSerializer.java
trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/properties/TypeMapper.java
Log:
implement details view
Added: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/16/node_elements_multiple.gif
===================================================================
(Binary files differ)
Property changes on: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/16/node_elements_multiple.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/16/transitions_multiple.gif
===================================================================
(Binary files differ)
Property changes on: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/icons/16/transitions_multiple.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/plugin.xml
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/plugin.xml 2009-02-13 20:27:37 UTC (rev 13621)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/plugin.xml 2009-02-13 20:28:00 UTC (rev 13622)
@@ -278,6 +278,16 @@
<input type="org.jboss.tools.flow.jpdl4.model.Process"/>
</propertySection>
</propertySections>
+ </extension>
+ <extension
+ point="org.eclipse.ui.views">
+ <view
+ class="org.jboss.tools.flow.jpdl4.view.DetailsView"
+ icon="icons/process.gif"
+ id="org.jboss.tools.flow.jpdl4.details"
+ name="Details"
+ restorable="true">
+ </view>
</extension>
</plugin>
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-13 20:27:37 UTC (rev 13621)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editor/JpdlEditor.java 2009-02-13 20:28:00 UTC (rev 13622)
@@ -4,26 +4,35 @@
import java.io.InputStream;
import java.io.OutputStream;
+import org.eclipse.gef.DefaultEditDomain;
import org.eclipse.gef.commands.CommandStack;
import org.eclipse.gef.palette.PaletteRoot;
+import org.eclipse.gef.ui.parts.SelectionSynchronizer;
+import org.eclipse.gef.ui.parts.TreeViewer;
import org.eclipse.ui.views.properties.IPropertySheetPage;
import org.eclipse.ui.views.properties.tabbed.ITabbedPropertySheetPageContributor;
import org.jboss.tools.flow.common.editor.GenericModelEditor;
import org.jboss.tools.flow.common.registry.ElementRegistry;
import org.jboss.tools.flow.common.wrapper.Wrapper;
-import org.jboss.tools.flow.jpdl4.editpart.JpdlEditPartFactory;
+import org.jboss.tools.flow.jpdl4.editpart.JpdlGraphicalEditPartFactory;
+import org.jboss.tools.flow.jpdl4.editpart.JpdlTreeEditPartFactory;
import org.jboss.tools.flow.jpdl4.properties.JpdlPropertySheetPage;
+import org.jboss.tools.flow.jpdl4.view.DetailsPage;
+import org.jboss.tools.flow.jpdl4.view.IDetailsPage;
public class JpdlEditor extends GenericModelEditor implements ITabbedPropertySheetPageContributor {
public static String ID = "org.jboss.tools.flow.jpdl4.editor";
+ protected SelectionSynchronizer selectionSynchronizer;
+ private DetailsPage detailsPage;
+
protected PaletteRoot createPalette() {
return new JpdlPaletteFactory().createPalette();
}
protected org.eclipse.gef.EditPartFactory createEditPartFactory() {
- return new JpdlEditPartFactory();
+ return new JpdlGraphicalEditPartFactory();
}
protected Object createModel() {
@@ -47,6 +56,14 @@
setModel(empty ? createModel() : new JpdlDeserializer().deserialize(is));
}
+ public SelectionSynchronizer getSelectionSynchronizer() {
+ if (selectionSynchronizer == null) {
+ selectionSynchronizer = new JpdlSelectionSynchronizer();
+ selectionSynchronizer.addViewer(getGraphicalViewer());
+ }
+ return selectionSynchronizer;
+ }
+
public String getContributorId() {
return getSite().getId();
}
@@ -55,10 +72,32 @@
return super.getCommandStack();
}
+ public DefaultEditDomain getEditDomain() {
+ return super.getEditDomain();
+ }
+
+ protected DetailsPage getDetailsPage() {
+ if (detailsPage == null) {
+ initDetailsPage();
+ }
+ return detailsPage;
+ }
+
+ protected void initDetailsPage() {
+ TreeViewer treeViewer = new TreeViewer();
+ treeViewer.setEditPartFactory(new JpdlTreeEditPartFactory());
+ getEditDomain().addViewer(treeViewer);
+ getSelectionSynchronizer().addViewer(treeViewer);
+ detailsPage = new DetailsPage(treeViewer) ;
+ getSite().getSelectionProvider().addSelectionChangedListener(detailsPage);
+ }
+
@SuppressWarnings("unchecked")
public Object getAdapter(Class adapter) {
if (adapter == IPropertySheetPage.class)
return new JpdlPropertySheetPage(this, getCommandStack());
+ else if (adapter == IDetailsPage.class)
+ return getDetailsPage();
return super.getAdapter(adapter);
}
Added: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editor/JpdlSelectionSynchronizer.java
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editor/JpdlSelectionSynchronizer.java (rev 0)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editor/JpdlSelectionSynchronizer.java 2009-02-13 20:28:00 UTC (rev 13622)
@@ -0,0 +1,29 @@
+package org.jboss.tools.flow.jpdl4.editor;
+
+import java.util.Iterator;
+
+import org.eclipse.gef.EditPart;
+import org.eclipse.gef.EditPartViewer;
+import org.eclipse.gef.GraphicalViewer;
+import org.eclipse.gef.editparts.AbstractTreeEditPart;
+import org.eclipse.gef.ui.parts.SelectionSynchronizer;
+import org.jboss.tools.flow.common.wrapper.Wrapper;
+
+public class JpdlSelectionSynchronizer extends SelectionSynchronizer {
+
+ @SuppressWarnings("unchecked")
+ protected EditPart convert(EditPartViewer viewer, EditPart part) {
+ if (!(viewer instanceof GraphicalViewer)) return null;
+ if (!(part instanceof AbstractTreeEditPart)) return null;
+ Iterator<EditPart> iterator = viewer.getEditPartRegistry().values().iterator();
+ while (iterator.hasNext()) {
+ EditPart editPart = iterator.next();
+ Wrapper wrapper = (Wrapper)editPart.getModel();
+ if (part.getModel() == wrapper.getElement()) {
+ return editPart;
+ }
+ }
+ return null;
+ }
+
+}
Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editor/JpdlSerializer.java
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editor/JpdlSerializer.java 2009-02-13 20:27:37 UTC (rev 13621)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editor/JpdlSerializer.java 2009-02-13 20:28:00 UTC (rev 13622)
@@ -89,25 +89,27 @@
private void appendNodeList(StringBuffer buffer, ArrayList<Node> nodeList) {
- if (transformer == null) {
- Logger.logInfo("Skipping append nodes as transformer is not initialized.");
- return;
- }
- DOMSource domSource = new DOMSource();
- for (Node node : nodeList) {
- StringWriter writer = new StringWriter();
- domSource.setNode(node);
- Result result = new StreamResult(writer);
- try {
+ if (transformer == null) {
+ Logger.logInfo("Skipping append nodes as transformer is not initialized.");
+ return;
+ }
+ DOMSource domSource = new DOMSource();
+ for (Node node : nodeList) {
+ StringWriter writer = new StringWriter();
+ domSource.setNode(node);
+ Result result = new StreamResult(writer);
+ try {
transformer.transform(domSource, result);
} catch (TransformerException e) {
Logger.logError("Exception while transforming xml.", e);
}
- buffer.append(writer.getBuffer());
- }
- }
-
- interface WrapperSerializer {
+ buffer.append(writer.getBuffer());
+ }
+ }
+
+
+
+ interface WrapperSerializer {
void appendOpening(StringBuffer buffer, Wrapper wrapper, int level);
}
@@ -356,12 +358,39 @@
}
- private void appendPadding(StringBuffer buffer, int level) {
- for (int i = 0; i < level; i++) {
- buffer.append(" ");
- }
- }
-
+ @SuppressWarnings("unchecked")
+ private void appendBody(StringBuffer buffer, Wrapper wrapper, int level) {
+ if (wrapper instanceof ContainerWrapper) {
+ ContainerWrapper containerWrapper = (ContainerWrapper)wrapper;
+ List<NodeWrapper> children = containerWrapper.getElements();
+ for (NodeWrapper nodeWrapper : children) {
+ appendToBuffer(buffer, nodeWrapper, level+1);
+ }
+ }
+ if (wrapper instanceof NodeWrapper) {
+ NodeWrapper nodeWrapper = (NodeWrapper)wrapper;
+ List<ConnectionWrapper> children = nodeWrapper.getOutgoingConnections();
+ for (ConnectionWrapper connectionWrapper : children) {
+ appendToBuffer(buffer, connectionWrapper, level+1);
+ }
+ }
+ Element element = (Element)wrapper.getElement();
+ ArrayList<Node> trailingNodeList = (ArrayList<Node>)element.getMetaData("trailingNodes");
+ boolean appendTrailingNodes = trailingNodeList != null && !trailingNodeList.isEmpty();
+ if (appendTrailingNodes) {
+ appendNodeList(buffer, trailingNodeList);
+ } else if (buffer.length() > 0){
+ buffer.append("\n");
+ appendPadding(buffer, level);
+ }
+ }
+
+ private void appendPadding(StringBuffer buffer, int level) {
+ for (int i = 0; i < level; i++) {
+ buffer.append(" ");
+ }
+ }
+
private void appendClosing(StringBuffer buffer, Wrapper wrapper, int level) {
Element element = (Element)wrapper.getElement();
if (element instanceof SequenceFlow) {
@@ -401,33 +430,6 @@
}
}
- @SuppressWarnings("unchecked")
- private void appendBody(StringBuffer buffer, Wrapper wrapper, int level) {
- if (wrapper instanceof ContainerWrapper) {
- ContainerWrapper containerWrapper = (ContainerWrapper)wrapper;
- List<NodeWrapper> children = containerWrapper.getElements();
- for (NodeWrapper nodeWrapper : children) {
- appendToBuffer(buffer, nodeWrapper, level+1);
- }
- }
- if (wrapper instanceof NodeWrapper) {
- NodeWrapper nodeWrapper = (NodeWrapper)wrapper;
- List<ConnectionWrapper> children = nodeWrapper.getOutgoingConnections();
- for (ConnectionWrapper connectionWrapper : children) {
- appendToBuffer(buffer, connectionWrapper, level+1);
- }
- }
- Element element = (Element)wrapper.getElement();
- ArrayList<Node> trailingNodeList = (ArrayList<Node>)element.getMetaData("trailingNodes");
- boolean appendTrailingNodes = trailingNodeList != null && !trailingNodeList.isEmpty();
- if (appendTrailingNodes) {
- appendNodeList(buffer, trailingNodeList);
- } else if (buffer.length() > 0){
- buffer.append("\n");
- appendPadding(buffer, level);
- }
- }
-
private boolean isEmpty(String str) {
return str == null || "".equals(str);
}
Deleted: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/JpdlEditPartFactory.java
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/JpdlEditPartFactory.java 2009-02-13 20:27:37 UTC (rev 13621)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/JpdlEditPartFactory.java 2009-02-13 20:28:00 UTC (rev 13622)
@@ -1,31 +0,0 @@
-package org.jboss.tools.flow.jpdl4.editpart;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.gef.EditPart;
-import org.jboss.tools.flow.common.editpart.EditPartFactory;
-import org.jboss.tools.flow.common.figure.IFigureFactory;
-import org.jboss.tools.flow.common.figure.NodeFigureFactory;
-import org.jboss.tools.flow.common.model.Element;
-
-public class JpdlEditPartFactory extends EditPartFactory {
-
- protected EditPart createNodeEditPart(Element element) {
- IConfigurationElement configurationElement =
- (IConfigurationElement)element.getMetaData("configurationElement");
- if (configurationElement == null) return null;
- ProcessNodeEditPart result = new ProcessNodeEditPart();
- IFigureFactory figureFactory = new NodeFigureFactory(configurationElement);
- result.setFigureFactory(figureFactory);
- return result;
- }
-
- protected EditPart createFlowEditPart(Element element) {
- return new ProcessEditPart();
- }
-
- protected EditPart createConnectionEditPart(Element element) {
- return new SequenceFlowEditPart();
- }
-
-
-}
Added: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/JpdlGraphicalEditPart.java
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/JpdlGraphicalEditPart.java (rev 0)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/JpdlGraphicalEditPart.java 2009-02-13 20:28:00 UTC (rev 13622)
@@ -0,0 +1,7 @@
+package org.jboss.tools.flow.jpdl4.editpart;
+
+import org.eclipse.gef.EditPart;
+
+public interface JpdlGraphicalEditPart extends EditPart {
+
+}
Copied: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/JpdlGraphicalEditPartFactory.java (from rev 13503, trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/JpdlEditPartFactory.java)
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/JpdlGraphicalEditPartFactory.java (rev 0)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/JpdlGraphicalEditPartFactory.java 2009-02-13 20:28:00 UTC (rev 13622)
@@ -0,0 +1,31 @@
+package org.jboss.tools.flow.jpdl4.editpart;
+
+import org.eclipse.core.runtime.IConfigurationElement;
+import org.eclipse.gef.EditPart;
+import org.jboss.tools.flow.common.editpart.EditPartFactory;
+import org.jboss.tools.flow.common.figure.IFigureFactory;
+import org.jboss.tools.flow.common.figure.NodeFigureFactory;
+import org.jboss.tools.flow.common.model.Element;
+
+public class JpdlGraphicalEditPartFactory extends EditPartFactory {
+
+ protected EditPart createNodeEditPart(Element element) {
+ IConfigurationElement configurationElement =
+ (IConfigurationElement)element.getMetaData("configurationElement");
+ if (configurationElement == null) return null;
+ ProcessNodeGraphicalEditPart result = new ProcessNodeGraphicalEditPart();
+ IFigureFactory figureFactory = new NodeFigureFactory(configurationElement);
+ result.setFigureFactory(figureFactory);
+ return result;
+ }
+
+ protected EditPart createFlowEditPart(Element element) {
+ return new ProcessGraphicalEditPart();
+ }
+
+ protected EditPart createConnectionEditPart(Element element) {
+ return new SequenceFlowGraphicalEditPart();
+ }
+
+
+}
Property changes on: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/JpdlGraphicalEditPartFactory.java
___________________________________________________________________
Name: svn:mergeinfo
+
Added: 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 (rev 0)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/JpdlTreeEditPartFactory.java 2009-02-13 20:28:00 UTC (rev 13622)
@@ -0,0 +1,15 @@
+package org.jboss.tools.flow.jpdl4.editpart;
+
+import org.eclipse.gef.EditPart;
+import org.eclipse.gef.EditPartFactory;
+import org.jboss.tools.flow.jpdl4.model.Process;
+
+public class JpdlTreeEditPartFactory implements EditPartFactory {
+
+ public EditPart createEditPart(EditPart context, Object model) {
+ if (model instanceof Process) return new ProcessTreeRootEditPart((Process)model);
+ if (model instanceof ProcessNodeListTreeEditPart) return (EditPart)model;
+ return null;
+ }
+
+}
Deleted: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/ProcessEditPart.java
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/ProcessEditPart.java 2009-02-13 20:27:37 UTC (rev 13621)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/ProcessEditPart.java 2009-02-13 20:28:00 UTC (rev 13622)
@@ -1,34 +0,0 @@
-package org.jboss.tools.flow.jpdl4.editpart;
-
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.editpolicies.RootComponentEditPolicy;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.jboss.tools.flow.common.editpart.RootEditPart;
-import org.jboss.tools.flow.common.wrapper.ContainerWrapper;
-import org.jboss.tools.flow.common.wrapper.ModelEvent;
-import org.jboss.tools.flow.jpdl4.policy.ProcessLayoutEditPolicy;
-
-public class ProcessEditPart extends RootEditPart {
-
- protected void createEditPolicies() {
- installEditPolicy(EditPolicy.LAYOUT_ROLE, new ProcessLayoutEditPolicy());
- installEditPolicy(EditPolicy.COMPONENT_ROLE, new RootComponentEditPolicy());
- }
-
- public void modelChanged(ModelEvent event) {
- super.modelChanged(event);
- if (event.getChange() == ContainerWrapper.ADD_ELEMENT) {
- Object changedObject = event.getChangedObject();
- if (changedObject != null) {
- EditPart editPart = (EditPart)getViewer().getEditPartRegistry().get(changedObject);
- if (editPart instanceof ProcessNodeEditPart) {
- ((ProcessNodeEditPart)editPart).performDirectEdit();
- // force selection to update the properties view
- getViewer().setSelection(new StructuredSelection(editPart));
- }
- }
- }
- }
-
-}
Copied: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/ProcessGraphicalEditPart.java (from rev 13496, trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/ProcessEditPart.java)
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/ProcessGraphicalEditPart.java (rev 0)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/ProcessGraphicalEditPart.java 2009-02-13 20:28:00 UTC (rev 13622)
@@ -0,0 +1,34 @@
+package org.jboss.tools.flow.jpdl4.editpart;
+
+import org.eclipse.gef.EditPart;
+import org.eclipse.gef.EditPolicy;
+import org.eclipse.gef.editpolicies.RootComponentEditPolicy;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.jboss.tools.flow.common.editpart.RootEditPart;
+import org.jboss.tools.flow.common.wrapper.ContainerWrapper;
+import org.jboss.tools.flow.common.wrapper.ModelEvent;
+import org.jboss.tools.flow.jpdl4.policy.ProcessLayoutEditPolicy;
+
+public class ProcessGraphicalEditPart extends RootEditPart implements JpdlGraphicalEditPart {
+
+ protected void createEditPolicies() {
+ installEditPolicy(EditPolicy.LAYOUT_ROLE, new ProcessLayoutEditPolicy());
+ installEditPolicy(EditPolicy.COMPONENT_ROLE, new RootComponentEditPolicy());
+ }
+
+ public void modelChanged(ModelEvent event) {
+ super.modelChanged(event);
+ if (event.getChange() == ContainerWrapper.ADD_ELEMENT) {
+ Object changedObject = event.getChangedObject();
+ if (changedObject != null) {
+ EditPart editPart = (EditPart)getViewer().getEditPartRegistry().get(changedObject);
+ if (editPart instanceof ProcessNodeGraphicalEditPart) {
+ ((ProcessNodeGraphicalEditPart)editPart).performDirectEdit();
+ // force selection to update the properties view
+ getViewer().setSelection(new StructuredSelection(editPart));
+ }
+ }
+ }
+ }
+
+}
Property changes on: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/ProcessGraphicalEditPart.java
___________________________________________________________________
Name: svn:mergeinfo
+
Deleted: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/ProcessNodeEditPart.java
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/ProcessNodeEditPart.java 2009-02-13 20:27:37 UTC (rev 13621)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/ProcessNodeEditPart.java 2009-02-13 20:28:00 UTC (rev 13622)
@@ -1,33 +0,0 @@
-package org.jboss.tools.flow.jpdl4.editpart;
-
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.jboss.tools.flow.common.editpart.NodeEditPart;
-import org.jboss.tools.flow.common.wrapper.ModelEvent;
-import org.jboss.tools.flow.common.wrapper.Wrapper;
-import org.jboss.tools.flow.jpdl4.policy.ProcessNodeGraphicalNodeEditPolicy;
-
-public class ProcessNodeEditPart extends NodeEditPart {
-
- protected void createEditPolicies() {
- super.createEditPolicies();
- installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new ProcessNodeGraphicalNodeEditPolicy());
- }
-
- public void modelChanged(ModelEvent event) {
- super.modelChanged(event);
- if (event.getChange() == Wrapper.ADD_INCOMING_CONNECTION) {
- Object object = getViewer().getEditPartRegistry().get(event.getChangedObject());
- if (object != null && object instanceof SequenceFlowEditPart) {
- getViewer().select((EditPart)object);
- ((SequenceFlowEditPart)object).performDirectEdit();
- }
- }
- }
-
- // make performDirectEdit public
- public void performDirectEdit() {
- super.performDirectEdit();
- }
-
-}
Copied: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/ProcessNodeGraphicalEditPart.java (from rev 13524, trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/ProcessNodeEditPart.java)
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/ProcessNodeGraphicalEditPart.java (rev 0)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/ProcessNodeGraphicalEditPart.java 2009-02-13 20:28:00 UTC (rev 13622)
@@ -0,0 +1,33 @@
+package org.jboss.tools.flow.jpdl4.editpart;
+
+import org.eclipse.gef.EditPart;
+import org.eclipse.gef.EditPolicy;
+import org.jboss.tools.flow.common.editpart.NodeEditPart;
+import org.jboss.tools.flow.common.wrapper.ModelEvent;
+import org.jboss.tools.flow.common.wrapper.Wrapper;
+import org.jboss.tools.flow.jpdl4.policy.ProcessNodeGraphicalNodeEditPolicy;
+
+public class ProcessNodeGraphicalEditPart extends NodeEditPart implements JpdlGraphicalEditPart {
+
+ protected void createEditPolicies() {
+ super.createEditPolicies();
+ installEditPolicy(EditPolicy.GRAPHICAL_NODE_ROLE, new ProcessNodeGraphicalNodeEditPolicy());
+ }
+
+ public void modelChanged(ModelEvent event) {
+ super.modelChanged(event);
+ if (event.getChange() == Wrapper.ADD_INCOMING_CONNECTION) {
+ Object object = getViewer().getEditPartRegistry().get(event.getChangedObject());
+ if (object != null && object instanceof SequenceFlowGraphicalEditPart) {
+ getViewer().select((EditPart)object);
+ ((SequenceFlowGraphicalEditPart)object).performDirectEdit();
+ }
+ }
+ }
+
+ // make performDirectEdit public
+ public void performDirectEdit() {
+ super.performDirectEdit();
+ }
+
+}
Property changes on: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/ProcessNodeGraphicalEditPart.java
___________________________________________________________________
Name: svn:mergeinfo
+
Added: 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 (rev 0)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/ProcessNodeListTreeEditPart.java 2009-02-13 20:28:00 UTC (rev 13622)
@@ -0,0 +1,27 @@
+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 ProcessNodeListTreeEditPart(Process process) {
+ super(process);
+ }
+
+ protected Image getImage() {
+ String iconPath = "icons/16/node_elements_multiple.gif";
+ ImageDescriptor descriptor = ImageDescriptor.createFromURL(
+ Platform.getBundle("org.jboss.tools.flow.jpdl4").getEntry(iconPath));
+ return SharedImages.INSTANCE.getImage(descriptor);
+ }
+
+ protected String getText() {
+ return "Nodes";
+ }
+
+}
Added: 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 (rev 0)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/ProcessTreeRootEditPart.java 2009-02-13 20:28:00 UTC (rev 13622)
@@ -0,0 +1,24 @@
+package org.jboss.tools.flow.jpdl4.editpart;
+
+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 ProcessTreeRootEditPart(Process process) {
+ super(process);
+ }
+
+ protected void createEditPolicies() {
+ }
+
+ protected List<Object> getModelChildren() {
+ List<Object> result = new ArrayList<Object>();
+ result.add(new ProcessNodeListTreeEditPart((Process)getModel()));
+ return result;
+ }
+
+}
Deleted: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/SequenceFlowEditPart.java
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/SequenceFlowEditPart.java 2009-02-13 20:27:37 UTC (rev 13621)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/SequenceFlowEditPart.java 2009-02-13 20:28:00 UTC (rev 13622)
@@ -1,65 +0,0 @@
-package org.jboss.tools.flow.jpdl4.editpart;
-
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.draw2d.PolylineConnection;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPolicy;
-import org.eclipse.gef.Request;
-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;
-import org.jboss.tools.flow.common.wrapper.ConnectionWrapper;
-import org.jboss.tools.flow.common.wrapper.LabelWrapper;
-import org.jboss.tools.flow.common.wrapper.ModelEvent;
-import org.jboss.tools.flow.common.wrapper.Wrapper;
-import org.jboss.tools.flow.jpdl4.model.SequenceFlow;
-
-public class SequenceFlowEditPart extends ConnectionEditPart {
-
- protected void createEditPolicies() {
- super.createEditPolicies();
- installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new ElementDirectEditPolicy());
- }
-
- protected IFigure createFigure() {
- PolylineConnection result = (PolylineConnection)super.createFigure();
- Element element = ((Wrapper)getModel()).getElement();
- if (element instanceof SequenceFlow) {
- SequenceFlow sequenceFlow = (SequenceFlow)element;
- if (sequenceFlow.isDefault()) {
- result.setSourceDecoration(new CrossHairDecoration());
- } else if (sequenceFlow.isConditional()) {
- result.setSourceDecoration(new DiamondDecoration());
- }
- }
- return result;
- }
-
- public void performRequest(Request request) {
- if (request.getType() == RequestConstants.REQ_DIRECT_EDIT) {
- performDirectEdit();
- } else {
- super.performRequest(request);
- }
- }
-
- protected void performDirectEdit() {
- ConnectionWrapper connectionWrapper = getElementConnection();
- LabelWrapper labelWrapper = connectionWrapper.getLabel();
- if (labelWrapper != null) {
- EditPart editPart = (EditPart)getViewer().getEditPartRegistry().get(labelWrapper);
- if (editPart != null) {
- editPart.performRequest(new DirectEditRequest());
- }
- }
- }
-
- public void modelChanged(ModelEvent event) {
- refresh();
- }
-
-}
Copied: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/SequenceFlowGraphicalEditPart.java (from rev 13569, trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/SequenceFlowEditPart.java)
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/SequenceFlowGraphicalEditPart.java (rev 0)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/SequenceFlowGraphicalEditPart.java 2009-02-13 20:28:00 UTC (rev 13622)
@@ -0,0 +1,65 @@
+package org.jboss.tools.flow.jpdl4.editpart;
+
+import org.eclipse.draw2d.IFigure;
+import org.eclipse.draw2d.PolylineConnection;
+import org.eclipse.gef.EditPart;
+import org.eclipse.gef.EditPolicy;
+import org.eclipse.gef.Request;
+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;
+import org.jboss.tools.flow.common.wrapper.ConnectionWrapper;
+import org.jboss.tools.flow.common.wrapper.LabelWrapper;
+import org.jboss.tools.flow.common.wrapper.ModelEvent;
+import org.jboss.tools.flow.common.wrapper.Wrapper;
+import org.jboss.tools.flow.jpdl4.model.SequenceFlow;
+
+public class SequenceFlowGraphicalEditPart extends ConnectionEditPart implements JpdlGraphicalEditPart {
+
+ protected void createEditPolicies() {
+ super.createEditPolicies();
+ installEditPolicy(EditPolicy.DIRECT_EDIT_ROLE, new ElementDirectEditPolicy());
+ }
+
+ protected IFigure createFigure() {
+ PolylineConnection result = (PolylineConnection)super.createFigure();
+ Element element = ((Wrapper)getModel()).getElement();
+ if (element instanceof SequenceFlow) {
+ SequenceFlow sequenceFlow = (SequenceFlow)element;
+ if (sequenceFlow.isDefault()) {
+ result.setSourceDecoration(new CrossHairDecoration());
+ } else if (sequenceFlow.isConditional()) {
+ result.setSourceDecoration(new DiamondDecoration());
+ }
+ }
+ return result;
+ }
+
+ public void performRequest(Request request) {
+ if (request.getType() == RequestConstants.REQ_DIRECT_EDIT) {
+ performDirectEdit();
+ } else {
+ super.performRequest(request);
+ }
+ }
+
+ protected void performDirectEdit() {
+ ConnectionWrapper connectionWrapper = getElementConnection();
+ LabelWrapper labelWrapper = connectionWrapper.getLabel();
+ if (labelWrapper != null) {
+ EditPart editPart = (EditPart)getViewer().getEditPartRegistry().get(labelWrapper);
+ if (editPart != null) {
+ editPart.performRequest(new DirectEditRequest());
+ }
+ }
+ }
+
+ public void modelChanged(ModelEvent event) {
+ refresh();
+ }
+
+}
Property changes on: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/editpart/SequenceFlowGraphicalEditPart.java
___________________________________________________________________
Name: svn:mergeinfo
+
Modified: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/properties/TypeMapper.java
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/properties/TypeMapper.java 2009-02-13 20:27:37 UTC (rev 13621)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/properties/TypeMapper.java 2009-02-13 20:28:00 UTC (rev 13622)
@@ -2,6 +2,7 @@
import org.eclipse.gef.EditPart;
import org.eclipse.ui.views.properties.tabbed.AbstractTypeMapper;
+import org.jboss.tools.flow.common.model.Element;
import org.jboss.tools.flow.common.wrapper.Wrapper;
public class TypeMapper extends AbstractTypeMapper {
@@ -9,12 +10,14 @@
@SuppressWarnings("unchecked")
public Class mapType(Object object) {
if (object instanceof EditPart) {
- Object wrapper = ((EditPart)object).getModel();
- if (wrapper instanceof Wrapper) {
- Object element = ((Wrapper)wrapper).getElement();
+ Object model = ((EditPart)object).getModel();
+ if (model instanceof Wrapper) {
+ Object element = ((Wrapper)model).getElement();
if (element != null) {
return element.getClass();
}
+ } else if (model instanceof Element) {
+ return model.getClass();
}
}
return super.mapType(object);
Added: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/util/SharedImages.java
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/util/SharedImages.java (rev 0)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/util/SharedImages.java 2009-02-13 20:28:00 UTC (rev 13622)
@@ -0,0 +1,36 @@
+package org.jboss.tools.flow.jpdl4.util;
+
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.swt.graphics.Image;
+
+public class SharedImages {
+
+ public static final SharedImages INSTANCE = new SharedImages();
+
+ private final Map<ImageDescriptor, Image> imageMap = new HashMap<ImageDescriptor, Image>();
+
+ public Image getImage(ImageDescriptor imageDescriptor) {
+ if (imageDescriptor == null) {
+ return null;
+ }
+ Image image = imageMap.get(imageDescriptor);
+ if (image == null) {
+ image = imageDescriptor.createImage();
+ imageMap.put(imageDescriptor, image);
+ }
+ return image;
+ }
+
+ public void dispose() {
+ Iterator<Image> iterator = imageMap.values().iterator();
+ while (iterator.hasNext()) {
+ iterator.next().dispose();
+ }
+ imageMap.clear();
+ }
+
+}
Added: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/view/DetailsPage.java
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/view/DetailsPage.java (rev 0)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/view/DetailsPage.java 2009-02-13 20:28:00 UTC (rev 13622)
@@ -0,0 +1,78 @@
+package org.jboss.tools.flow.jpdl4.view;
+
+import org.eclipse.gef.EditPart;
+import org.eclipse.gef.EditPartViewer;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.ISelectionChangedListener;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.SelectionChangedEvent;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
+import org.eclipse.ui.part.Page;
+import org.jboss.tools.flow.common.wrapper.Wrapper;
+
+public class DetailsPage extends Page implements IDetailsPage, ISelectionChangedListener {
+
+ private EditPartViewer viewer;
+ private Control control;
+
+ public DetailsPage(EditPartViewer viewer) {
+ this.viewer = viewer;
+ }
+
+ public Control getControl() {
+ return control;
+ }
+
+ protected EditPartViewer getViewer() {
+ return viewer;
+ }
+
+ public void addSelectionChangedListener(ISelectionChangedListener listener) {
+ getViewer().addSelectionChangedListener(listener);
+ }
+
+ public void removeSelectionChangedListener(ISelectionChangedListener listener) {
+ getViewer().removeSelectionChangedListener(listener);
+ }
+
+ public void createControl(Composite parent) {
+ control = getViewer().createControl(parent);
+ }
+
+ public ISelection getSelection() {
+ if (getViewer() == null) {
+ return StructuredSelection.EMPTY;
+ }
+ return getViewer().getSelection();
+ }
+
+ public void setFocus() {
+ if (getControl() != null) {
+ getControl().setFocus();
+ }
+ }
+
+ public void setSelection(ISelection selection) {
+ if (getViewer() != null) {
+ getViewer().setSelection(selection);
+ }
+ }
+
+ public void selectionChanged(SelectionChangedEvent event) {
+ ISelection selection = event.getSelection();
+ if (selection instanceof IStructuredSelection) {
+ Object object = ((IStructuredSelection)selection).getFirstElement();
+ if (object instanceof EditPart) {
+ object = ((EditPart)object).getModel();
+ }
+ if (object instanceof Wrapper) {
+ object = ((Wrapper)object).getElement();
+ }
+ if (getViewer() != null) {
+ getViewer().setContents(object);
+ }
+ }
+ }
+}
Added: 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 (rev 0)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/view/DetailsView.java 2009-02-13 20:28:00 UTC (rev 13622)
@@ -0,0 +1,94 @@
+package org.jboss.tools.flow.jpdl4.view;
+
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.ISelectionChangedListener;
+import org.eclipse.jface.viewers.ISelectionProvider;
+import org.eclipse.jface.viewers.SelectionChangedEvent;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.IWorkbenchPage;
+import org.eclipse.ui.IWorkbenchPart;
+import org.eclipse.ui.part.IPage;
+import org.eclipse.ui.part.IPageBookViewPage;
+import org.eclipse.ui.part.IPageSite;
+import org.eclipse.ui.part.MessagePage;
+import org.eclipse.ui.part.PageBook;
+import org.eclipse.ui.part.PageBookView;
+
+public class DetailsView extends PageBookView implements ISelectionProvider,
+ ISelectionChangedListener {
+
+ public void addSelectionChangedListener(ISelectionChangedListener listener) {
+ getSelectionProvider().addSelectionChangedListener(listener);
+ }
+
+ protected IPage createDefaultPage(PageBook book) {
+ MessagePage page = new MessagePage();
+ initPage(page);
+ page.createControl(book);
+ page.setMessage("Details are not available.");
+ return page;
+ }
+
+ protected PageRec doCreatePage(IWorkbenchPart part) {
+ Object obj = part.getAdapter(IDetailsPage.class);
+ if (obj instanceof IDetailsPage) {
+ IDetailsPage page = (IDetailsPage)obj;
+ if (page instanceof IPageBookViewPage) {
+ initPage((IPageBookViewPage)page);
+ }
+ page.createControl(getPageBook());
+ return new PageRec(part, page);
+ }
+ return null;
+ }
+
+ protected void doDestroyPage(IWorkbenchPart part, PageRec rec) {
+ IDetailsPage page = (IDetailsPage) rec.page;
+ page.dispose();
+ rec.dispose();
+ }
+
+ protected IWorkbenchPart getBootstrapPart() {
+ IWorkbenchPage page = getSite().getPage();
+ if (page != null) {
+ return page.getActiveEditor();
+ }
+ return null;
+ }
+
+ public ISelection getSelection() {
+ return getSelectionProvider().getSelection();
+ }
+
+ protected boolean isImportant(IWorkbenchPart part) {
+ return (part instanceof IEditorPart);
+ }
+
+ public void partBroughtToTop(IWorkbenchPart part) {
+ partActivated(part);
+ }
+
+ public void removeSelectionChangedListener(
+ ISelectionChangedListener listener) {
+ getSelectionProvider().removeSelectionChangedListener(listener);
+ }
+
+ public void selectionChanged(SelectionChangedEvent event) {
+ getSelectionProvider().selectionChanged(event);
+ }
+
+ public void setSelection(ISelection selection) {
+ getSelectionProvider().setSelection(selection);
+ }
+
+ protected void showPageRec(PageRec pageRec) {
+ IPageSite pageSite = getPageSite(pageRec.page);
+ ISelectionProvider provider = pageSite.getSelectionProvider();
+ if (provider == null && (pageRec.page instanceof IDetailsPage)) {
+ // This means that the page did not set a provider during its initialization
+ // so for backward compatibility we will set the page itself as the provider.
+ pageSite.setSelectionProvider((IDetailsPage) pageRec.page);
+ }
+ super.showPageRec(pageRec);
+ }
+}
Added: trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/view/IDetailsPage.java
===================================================================
--- trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/view/IDetailsPage.java (rev 0)
+++ trunk/jbpm/plugins/org.jboss.tools.flow.jpdl4/src/org/jboss/tools/flow/jpdl4/view/IDetailsPage.java 2009-02-13 20:28:00 UTC (rev 13622)
@@ -0,0 +1,8 @@
+package org.jboss.tools.flow.jpdl4.view;
+
+import org.eclipse.jface.viewers.ISelectionProvider;
+import org.eclipse.ui.part.IPage;
+
+public interface IDetailsPage extends IPage, ISelectionProvider {
+
+}
17 years, 2 months
- 1
- 0
JBoss Tools SVN: r13621 - trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/figure.
by jbosstools-commits＠lists.jboss.org
Author: koen.aers(a)jboss.com
Date: 2009-02-13 15:27:37 -0500 (Fri, 13 Feb 2009)
New Revision: 13621
Modified:
trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/figure/CrossHairDecoration.java
Log:
change visual aspect of crosshair decoration
Modified: trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/figure/CrossHairDecoration.java
===================================================================
--- trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/figure/CrossHairDecoration.java 2009-02-13 20:26:35 UTC (rev 13620)
+++ trunk/flow/plugins/org.jboss.tools.flow.common/src/org/jboss/tools/flow/common/figure/CrossHairDecoration.java 2009-02-13 20:27:37 UTC (rev 13621)
@@ -16,12 +16,11 @@
CROSSHAIR_TIP.addPoint(-1, 0);
CROSSHAIR_TIP.addPoint(-1, 1);
CROSSHAIR_TIP.addPoint(-1, 0);
-
}
-
+
public CrossHairDecoration() {
setTemplate(CROSSHAIR_TIP);
- setScale(3.5, 2);
+ setScale(4, 4);
setFill(false);
}
17 years, 2 months
- 1
- 0
JBoss Tools SVN: r13620 - trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions.
by jbosstools-commits＠lists.jboss.org
Author: dgolovin
Date: 2009-02-13 15:26:35 -0500 (Fri, 13 Feb 2009)
New Revision: 13620
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/XPathActionProvider.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-3812 instanceof check added to newXPathAction
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/XPathActionProvider.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/XPathActionProvider.java 2009-02-13 18:17:56 UTC (rev 13619)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/XPathActionProvider.java 2009-02-13 20:26:35 UTC (rev 13620)
@@ -98,28 +98,30 @@
newXPathAction = new Action() {
public void run() {
- XPathCategory category = (XPathCategory) selectedNode;
- if (category != null) {
- String categoryName = category.getName();
- XPathDialog d = new XPathDialog(Display.getCurrent()
- .getActiveShell(), getServer(), categoryName);
- if (d.open() == Window.OK) {
- XPathCategory[] categoryList = XPathModel.getDefault()
- .getCategories(getServer());
- XPathCategory categoryItem = null;
- for (int i = 0; i < categoryList.length; i++) {
- if (categoryList[i].getName().equals(
- category.getName()))
- categoryItem = categoryList[i];
+ if(selectedNode instanceof XPathCategory) {
+ XPathCategory category = (XPathCategory) selectedNode;
+ if (category != null) {
+ String categoryName = category.getName();
+ XPathDialog d = new XPathDialog(Display.getCurrent()
+ .getActiveShell(), getServer(), categoryName);
+ if (d.open() == Window.OK) {
+ XPathCategory[] categoryList = XPathModel.getDefault()
+ .getCategories(getServer());
+ XPathCategory categoryItem = null;
+ for (int i = 0; i < categoryList.length; i++) {
+ if (categoryList[i].getName().equals(
+ category.getName()))
+ categoryItem = categoryList[i];
+ }
+ if (categoryItem != null) {
+ XPathQuery query = new XPathQuery(d.getName(),
+ XPathDialogs.getConfigFolder(getServer()),
+ null, d.getXpath(), d.getAttribute());
+ categoryItem.addQuery(query);
+ XPathModel.getDefault().save(getServer());
+ refreshViewer();
+ }
}
- if (categoryItem != null) {
- XPathQuery query = new XPathQuery(d.getName(),
- XPathDialogs.getConfigFolder(getServer()),
- null, d.getXpath(), d.getAttribute());
- categoryItem.addQuery(query);
- XPathModel.getDefault().save(getServer());
- refreshViewer();
- }
}
}
}
17 years, 2 months
- 1
- 0
JBoss Tools SVN: r13619 - trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template.
by jbosstools-commits＠lists.jboss.org
Author: yradtsevich
Date: 2009-02-13 13:17:56 -0500 (Fri, 13 Feb 2009)
New Revision: 13619
Modified:
trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesSubTableTemplate.java
Log:
RESOLVED - issue JBIDE-3797: columClasses doesn't work in rich:columnGroup
https://jira.jboss.org/jira/browse/JBIDE-3797
- support of the attribute was added
- JUnit tests were corrected
Modified: trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesSubTableTemplate.java
===================================================================
--- trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesSubTableTemplate.java 2009-02-13 17:44:05 UTC (rev 13618)
+++ trunk/jsf/plugins/org.jboss.tools.jsf.vpe.richfaces/src/org/jboss/tools/jsf/vpe/richfaces/template/RichFacesSubTableTemplate.java 2009-02-13 18:17:56 UTC (rev 13619)
@@ -14,6 +14,7 @@
import java.util.List;
import org.jboss.tools.jsf.vpe.richfaces.ComponentUtil;
+import org.jboss.tools.jsf.vpe.richfaces.RichFacesTemplatesActivator;
import org.jboss.tools.jsf.vpe.richfaces.template.util.RichFaces;
import org.jboss.tools.vpe.editor.context.VpePageContext;
import org.jboss.tools.vpe.editor.template.VpeAbstractTemplate;
@@ -33,7 +34,7 @@
public class RichFacesSubTableTemplate extends VpeAbstractTemplate {
- private static final String DEAFAULT_CELL_CLASS = "dr-subtable-cell rich-subtable-cell"; //$NON-NLS-1$
+ private static final String DEAFAULT_CELL_CLASS = "dr-subtable-cell"; //$NON-NLS-1$
private static List<String> rowClasses;
private static List<String> columnClasses;
@@ -146,40 +147,37 @@
nsIDOMNode visualNode = creationData.getNode();
if (visualNode != null && visualNode.getNodeName().equals(HTML.TAG_TBODY)) {
// we are called by VpeVisualDomBuilder
- addStylesToCells(visualDocument, visualNode.getChildNodes());
+ addStylesToCells(visualDocument, visualNode);
} else {
- // we are called by a validator of another template
- // TODO: this case should be removed when no one template will call the method
- final List<VpeChildrenInfo> childrenInfoList = creationData.getChildrenInfoList();
- if (childrenInfoList != null) {
- for (final VpeChildrenInfo childrenInfo : childrenInfoList) {
- final List<Node> sourceChildren = childrenInfo.getSourceChildren();
- if (sourceChildren != null
- && sourceChildren.size() > 0
- && sourceChildren.get(0).getParentNode() == sourceNode) {
- final nsIDOMNodeList visualChildren = childrenInfo.getVisualParent().getChildNodes();
- addStylesToCells(visualDocument, visualChildren);
- }
- }
- }
+ RuntimeException e = new RuntimeException("This is probably a bug. The main tag of subTable shuld be 'TBODY'.");//$NON-NLS-1$
+ RichFacesTemplatesActivator.getPluginLog().logError(e);
}
}
- /** Adds HTML style classes names to all TDs from the list <code>visualChildren</code>
- * according to <code>columnClasses</code> attribute of the tag. */
- private void addStylesToCells(nsIDOMDocument visualDocument, nsIDOMNodeList visualChildren) {
- int column = 0;
- for (int i = 0; i < visualChildren.getLength(); i++) {
- final nsIDOMNode visualChild = visualChildren.item(i);
- if ( visualChild.getNodeType() == nsIDOMNode.ELEMENT_NODE && HTML.TAG_TD.equalsIgnoreCase(visualChild.getNodeName()) ) {
- final nsIDOMNode tableCell = visualChild;
- nsIDOMNode columnStyle = tableCell.getAttributes().getNamedItem(HTML.ATTR_CLASS);
- if (columnStyle == null) {
- columnStyle = visualDocument.createAttribute(HTML.ATTR_CLASS);
+ /**
+ * Adds HTML style classes names to all TDs from the <code>rowsContainer</code>
+ * according to <code>columnClasses</code> attribute of the tag.
+ */
+ private void addStylesToCells(nsIDOMDocument visualDocument, nsIDOMNode rowsContainer) {
+ nsIDOMNodeList rowsContainerChildren = rowsContainer.getChildNodes();
+ for (int j = 0; j < rowsContainerChildren.getLength(); j++) {
+ nsIDOMNode tBodyChild = rowsContainerChildren.item(j);
+ if (tBodyChild.getNodeType() == nsIDOMNode.ELEMENT_NODE && HTML.TAG_TR.equalsIgnoreCase(tBodyChild.getNodeName())) {
+ nsIDOMNodeList rowChildren = tBodyChild.getChildNodes();
+ int column = 0;
+ for (int i = 0; i < rowChildren.getLength(); i++) {
+ final nsIDOMNode visualChild = rowChildren.item(i);
+ if ( visualChild.getNodeType() == nsIDOMNode.ELEMENT_NODE && HTML.TAG_TD.equalsIgnoreCase(visualChild.getNodeName()) ) {
+ final nsIDOMNode tableCell = visualChild;
+ nsIDOMNode columnStyle = tableCell.getAttributes().getNamedItem(HTML.ATTR_CLASS);
+ if (columnStyle == null) {
+ columnStyle = visualDocument.createAttribute(HTML.ATTR_CLASS);
+ }
+ columnStyle.setNodeValue(columnStyle.getNodeValue() + HTML.VALUE_CLASS_DELIMITER
+ + getColumnClass(column));
+ column++;
+ }
}
- columnStyle.setNodeValue(columnStyle.getNodeValue() + HTML.VALUE_CLASS_DELIMITER
- + getColumnClass(column));
- column++;
}
}
}
17 years, 2 months
- 1
- 0
JBoss Tools SVN: r13618 - trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal.
by jbosstools-commits＠lists.jboss.org
Author: snjeza
Date: 2009-02-13 12:44:05 -0500 (Fri, 13 Feb 2009)
New Revision: 13618
Modified:
trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal/PortletRuntimeComponentProvider.java
Log:
JBIDE-3811 Error calling delegate RuntimeComponentProviderWrapper[org.jboss.tools.portlet.core.runtimes] exception is occured while opening New Seam Project Wizard.
Modified: trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal/PortletRuntimeComponentProvider.java
===================================================================
--- trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal/PortletRuntimeComponentProvider.java 2009-02-13 16:48:40 UTC (rev 13617)
+++ trunk/portlet/plugins/org.jboss.tools.portlet.core/src/org/jboss/tools/portlet/core/internal/PortletRuntimeComponentProvider.java 2009-02-13 17:44:05 UTC (rev 13618)
@@ -30,13 +30,15 @@
.getVersion("1.0"); //$NON-NLS-1$
public List<IRuntimeComponent> getRuntimeComponents(final IRuntime runtime) {
- final File location = runtime.getLocation().toFile();
- final List<IRuntimeComponent> components = new ArrayList<IRuntimeComponent>();
-
- if (isPortalPresent(location,runtime)) {
- final IRuntimeComponent portalComponent = RuntimeManager
- .createRuntimeComponent(PORTAL_VERSION_1, null);
- components.add(portalComponent);
+ List<IRuntimeComponent> components = new ArrayList<IRuntimeComponent>();
+ if (runtime != null && runtime.getLocation() != null) {
+ File location = runtime.getLocation().toFile();
+
+ if (isPortalPresent(location, runtime)) {
+ final IRuntimeComponent portalComponent = RuntimeManager
+ .createRuntimeComponent(PORTAL_VERSION_1, null);
+ components.add(portalComponent);
+ }
}
return components;
}
17 years, 2 months
- 1
- 0
JBoss Tools SVN: r13617 - in trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test: resources/jsfTest/WebContent/pages/JBIDE/3650 and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: mareshkau
Date: 2009-02-13 11:48:40 -0500 (Fri, 13 Feb 2009)
New Revision: 13617
Added:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/3650/
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/3650/jbide3650Test.xhtml
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE3650Test.java
Modified:
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfAllTests.java
trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE3030Test.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-3650, junit test
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/3650/jbide3650Test.xhtml
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/3650/jbide3650Test.xhtml (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/resources/jsfTest/WebContent/pages/JBIDE/3650/jbide3650Test.xhtml 2009-02-13 16:48:40 UTC (rev 13617)
@@ -0,0 +1,15 @@
+<!DOCTYPE composition PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core">
+<body>
+©20sasd asdsadas asdsaded.
+ 1 a•
+ Design by <a href="sdfsdfzxc"> CSS Templates</a>
+ •
+ Icons by <a href="asdasdasd">zxczxczxc</a>.
+ <h1> d123456789 1</h1>
+ <h:outputText value="<>JBIDE-3650<>" />
+</body>
+</html>
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfAllTests.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfAllTests.java 2009-02-13 15:35:32 UTC (rev 13616)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfAllTests.java 2009-02-13 16:48:40 UTC (rev 13617)
@@ -51,6 +51,7 @@
import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE3482Test;
import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE3617Test;
import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE3632Test;
+import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE3650Test;
import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE3734Test;
import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE675Test;
import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE788Test;
@@ -129,8 +130,8 @@
suite.addTestSuite(JBIDE3396Test.class);
suite.addTestSuite(JBIDE3482Test.class);
suite.addTestSuite(JBIDE3632Test.class);
+ suite.addTestSuite(JBIDE3650Test.class);
-
// $JUnit-END$
// added by Max Areshkau
// add here projects which should be imported for junit tests
Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE3030Test.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE3030Test.java 2009-02-13 15:35:32 UTC (rev 13616)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE3030Test.java 2009-02-13 16:48:40 UTC (rev 13617)
@@ -39,7 +39,7 @@
fileNames.add(jbide3030Path+"test.jsp"); //$NON-NLS-1$
fileNames.add(jbide3030Path+"test.html"); //$NON-NLS-1$
fileNames.add(jbide3030Path+"test.xhtml"); //$NON-NLS-1$
- fileNames.add(jbide3030Path+"jbide3385.jsp");
+ fileNames.add(jbide3030Path+"jbide3385.jsp"); //$NON-NLS-1$
}
Added: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE3650Test.java
===================================================================
--- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE3650Test.java (rev 0)
+++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JBIDE3650Test.java 2009-02-13 16:48:40 UTC (rev 13617)
@@ -0,0 +1,87 @@
+/*******************************************************************************
+ * Copyright (c) 2007-2009 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributor:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.jsf.vpe.jsf.test.jbide;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.ui.IEditorInput;
+import org.eclipse.ui.part.FileEditorInput;
+import org.eclipse.wst.xml.core.internal.document.NodeImpl;
+import org.jboss.tools.jsf.vpe.jsf.test.JsfAllTests;
+import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor;
+import org.jboss.tools.vpe.editor.VpeController;
+import org.jboss.tools.vpe.editor.util.NodesManagingUtil;
+import org.jboss.tools.vpe.editor.util.TextUtil;
+import org.jboss.tools.vpe.ui.test.TestUtil;
+import org.jboss.tools.vpe.ui.test.VpeTest;
+import org.mozilla.interfaces.nsIDOMNode;
+import org.w3c.dom.Element;
+
+/**
+ * junit for https://jira.jboss.org/jira/browse/JBIDE-3650
+ * @author mareshkau
+ *
+ */
+public class JBIDE3650Test extends VpeTest {
+
+ public JBIDE3650Test(String name) {
+ super(name);
+ }
+
+ @Override
+ protected void setUp() throws Exception {
+ super.setUp();
+ setException(null);
+ }
+
+ @Override
+ protected void tearDown() throws Exception {
+ if(getException()!=null) {
+ throw new Exception(getException());
+ }
+ super.tearDown();
+ }
+
+ public void testJBIDE3650inTextNodes() throws Exception {
+ testSelection("JBIDE/3650/jbide3650Test.xhtml", null, 12, 7, 17); //$NON-NLS-1$
+ }
+
+ public void testJBIDE3650inAttributNodes() throws Exception {
+ testSelection("JBIDE/3650/jbide3650Test.xhtml", "value", 7, 13, 43); //$NON-NLS-1$//$NON-NLS-2$
+ }
+
+ private void testSelection(String pageName, String attributeName, int expectedVisualPosition, int srcLine, int srcLinePos) throws Exception{
+ IFile ifile = (IFile) TestUtil.getComponentPath(pageName,
+ JsfAllTests.IMPORT_PROJECT_NAME);
+ IEditorInput input = new FileEditorInput(ifile);
+ JSPMultiPageEditor part = openEditor(input);
+ //wait for initialization of editor
+ VpeController vpeController = TestUtil.getVpeController(part);
+ int focusOffcetInSourceDocument = TestUtil.getLinePositionOffcet(part.getSourceEditor().getTextViewer(), srcLine, srcLinePos);
+ part.getSourceEditor().getTextViewer().getTextWidget().setCaretOffset(focusOffcetInSourceDocument);
+ vpeController.getPageContext().getSourceBuilder().getStructuredTextViewer().setSelectedRange(focusOffcetInSourceDocument, 0);
+ nsIDOMNode lastSelectedNode = vpeController.getXulRunnerEditor().getLastSelectedNode();
+ NodeImpl sourceSelectedNode=null;
+ //was selected source el
+ if(attributeName!=null) {
+ Element sourceSelectedElement = (Element) vpeController.getDomMapping().getNearSourceNode(lastSelectedNode);
+ sourceSelectedNode = (NodeImpl) sourceSelectedElement.getAttributeNode(attributeName);
+ } else {
+ sourceSelectedNode = (NodeImpl) vpeController.getDomMapping().getNearSourceNode(lastSelectedNode);
+ }
+ int focusOffcetReferenceToSourceNode = focusOffcetInSourceDocument
+ - NodesManagingUtil.getStartOffsetNode(sourceSelectedNode);
+ int visualPosition = TextUtil.visualPosition(sourceSelectedNode.getValueSource(), focusOffcetReferenceToSourceNode);
+ assertEquals("Visual Position should be ", expectedVisualPosition , visualPosition); //$NON-NLS-1$
+ int calculatedSourcePositon = TextUtil.sourcePosition(sourceSelectedNode.getValueSource(), lastSelectedNode.getNodeValue(), visualPosition);
+ assertEquals("calculated Source position and visual position should be equals", calculatedSourcePositon,focusOffcetReferenceToSourceNode); //$NON-NLS-1$
+ closeEditors();
+ }
+}
17 years, 2 months
- 1
- 0
JBoss Tools SVN: r13616 - trunk/seam/docs/reference/en/modules.
by jbosstools-commits＠lists.jboss.org
Author: ochikvina
Date: 2009-02-13 10:35:32 -0500 (Fri, 13 Feb 2009)
New Revision: 13616
Modified:
trunk/seam/docs/reference/en/modules/creating_new_seam.xml
Log:
https://jira.jboss.org/jira/browse/JBDS-616 - updating the chapter as "JBoss, a division of Red HAt" category in the New Server wizard was changed to "JBoss Community";
Modified: trunk/seam/docs/reference/en/modules/creating_new_seam.xml
===================================================================
--- trunk/seam/docs/reference/en/modules/creating_new_seam.xml 2009-02-13 15:33:49 UTC (rev 13615)
+++ trunk/seam/docs/reference/en/modules/creating_new_seam.xml 2009-02-13 15:35:32 UTC (rev 13616)
@@ -39,6 +39,7 @@
where the required datasource and driver libraries need to go.</para>
<para>Let's get through the wizard step-by-step. First, you should enter a name and
a location directory for your new project.</para>
+
<figure id="figure_create_seam1">
<title>New Seam Project Wizard</title>
<mediaobject>
@@ -48,13 +49,14 @@
</mediaobject>
</figure>
+ <para>On the figure above you can see the runtime and the server already created.</para>
- <para>Clicking on <emphasis>
+ <para>If you need to create a new runtime, click on the <emphasis>
<property>New...</property>
- </emphasis> button in the <property>Target Runtime</property> section will bring you to
- another dialog. Here, you can specify a new JBoss Server Runtime environment or the
- other type of runtime appropriate for configuring your project. Let's create one more
- JBoss 4.2 Runtime. Hence, after choosing it click on <emphasis>
+ </emphasis> button in the <property>Target Runtime</property> section. It brings up the
+ wizard where you can specify a new JBoss Server Runtime environment or the other type of
+ runtime appropriate for configuring your project. Let's create one more JBoss 4.2
+ Runtime. Hence, after choosing it click on <emphasis>
<property>Next</property>
</emphasis> button.</para>
@@ -85,15 +87,17 @@
<para> Clicking on <emphasis>
<property>Finish</property>
</emphasis> returns you to the <link linkend="figure_create_seam1">New Seam Project
- wizard page</link>. The next step is to define a Server that you can do
- by clicking on <emphasis>
+ wizard page</link>.</para>
+
+ <para>The next step is to define a Server that you can do by clicking
+ on <emphasis>
<property>New...</property>
- </emphasis> button in the <property>Target Server</property> section. In appeared <property>New Server
- dialog</property> the last server which matches the runtime will be selected.</para>
+ </emphasis> button in the <property>Target Server</property> section. In appeared
+ <property>New Server dialog</property> the last server which matches the runtime
+ will be selected.</para>
- <para>All declared runtimes are listed in the combo box
- under the servers view. Here, you can indicate a server
- runtime that you need. Click <emphasis>
+ <para>All declared runtimes are listed in the combo box under the servers view. Here, you
+ can indicate a server runtime that you need. Click <emphasis>
<property>Add</property>
</emphasis> if you want to add a new Server Runtime.</para>
@@ -106,8 +110,8 @@
</mediaobject>
</figure>
- <para>Next page allows you to verify the information for chosen server.
- Leave everything as it is and click on <emphasis>
+ <para>Next page allows you to verify the information for chosen server. Leave everything as
+ it is and click on <emphasis>
<property>Next</property>
</emphasis>.</para>
@@ -120,7 +124,8 @@
</mediaobject>
</figure>
- <para>On the last wizard step you can modify your projects to configure them on the Server.</para>
+ <para>On the last wizard step you can modify your projects to configure them on the
+ Server.</para>
<figure>
<title>Project Modification for Configuring on the Server</title>
@@ -153,7 +158,9 @@
</figure>
<para>The last section on this wizard step is <property>Configuration</property>. Here, you
- can select one of the pre-defined project configurations either associated with Seam 1.2, Seam 2.0 or with Seam 2.1. Furthermore, you can create your own configuration by pressing the <emphasis>
+ can select one of the pre-defined project configurations either associated with Seam
+ 1.2, Seam 2.0 or with Seam 2.1. Furthermore, you can create your own configuration by
+ pressing the <emphasis>
<property>Modify...</property>
</emphasis> button. It will open the dialog which allows to configure your own set of
facets for adding extra functionality to your project.</para>
17 years, 2 months
- 1
- 0
JBoss Tools SVN: r13615 - trunk/seam/docs/reference/en/images/create_new_seam.
by jbosstools-commits＠lists.jboss.org
Author: ochikvina
Date: 2009-02-13 10:33:49 -0500 (Fri, 13 Feb 2009)
New Revision: 13615
Modified:
trunk/seam/docs/reference/en/images/create_new_seam/create_seam_2.png
Log:
https://jira.jboss.org/jira/browse/JBDS-616 - updating the screen;
Modified: trunk/seam/docs/reference/en/images/create_new_seam/create_seam_2.png
===================================================================
(Binary files differ)
17 years, 2 months
- 1
- 0
JBoss Tools SVN: r13614 - trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util.
by jbosstools-commits＠lists.jboss.org
Author: mareshkau
Date: 2009-02-13 09:31:42 -0500 (Fri, 13 Feb 2009)
New Revision: 13614
Modified:
trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/TextUtil.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-3650
Modified: trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/TextUtil.java
===================================================================
--- trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/TextUtil.java 2009-02-13 14:22:50 UTC (rev 13613)
+++ trunk/vpe/plugins/org.jboss.tools.vpe/src/org/jboss/tools/vpe/editor/util/TextUtil.java 2009-02-13 14:31:42 UTC (rev 13614)
@@ -262,6 +262,9 @@
public static int visualPosition(String sourceText, int sourcePosition) {
int calcPosition = sourcePosition;
+ if(sourceText==null) {
+ return 0;
+ }
int start = sourceText.indexOf(CHR_ESC_START);
while (start != -1 && start < sourcePosition && start + 1 < sourceText.length()) {
int stop = sourceText.indexOf(CHR_ESC_STOP, start + 1);
17 years, 2 months
- 1
- 0
JBoss Tools SVN: r13613 - trunk/as/docs/reference/en/modules.
by jbosstools-commits＠lists.jboss.org
Author: ochikvina
Date: 2009-02-13 09:22:50 -0500 (Fri, 13 Feb 2009)
New Revision: 13613
Modified:
trunk/as/docs/reference/en/modules/runtimes_servers.xml
Log:
https://jira.jboss.org/jira/browse/JBDS-616 - adding the info on separation of .org and product styles;
Modified: trunk/as/docs/reference/en/modules/runtimes_servers.xml
===================================================================
--- trunk/as/docs/reference/en/modules/runtimes_servers.xml 2009-02-13 14:21:40 UTC (rev 13612)
+++ trunk/as/docs/reference/en/modules/runtimes_servers.xml 2009-02-13 14:22:50 UTC (rev 13613)
@@ -17,15 +17,16 @@
<para>First of all it's necessary to mention that the JBoss AS plugin makes use of WTP.
This includes starting and stopping servers in run or debug mode. It also includes targeting WTP
projects, such as Dynamic Web Projects, to certain server runtimes in order to ensure that the
- proper jars from a specific server are added to the project's classpath properly.</para>
+ proper jars from a specific server are added to the project's classpath
+ properly.</para>
<para>In order to get started creating, running, and debugging J2EE applications, we should create
our <property>runtime</property> and <property>server</property> instances.</para>
<section>
<title>Runtimes</title>
- <para>In JBoss Tools, the main purpose of Server Runtimes is to point to a server installation
- somewhere on disk. In our case, this will be a JBoss installation, and it can then be used for
- two primary purposes:</para>
+ <para>In <property>JBoss Tools</property>, the main purpose of Server Runtimes is to point to a
+ server installation somewhere on disk. In our case, this will be a JBoss installation, and it
+ can then be used for two primary purposes:</para>
<itemizedlist>
<listitem>
<para>it provides classpath additions to WTP projects that require them.</para>
@@ -38,12 +39,12 @@
</itemizedlist>
<section id="InstNewRuntime">
- <title>Installing a new Runtime</title>
+ <title>Installing a New Runtime</title>
<para>You can install runtimes into eclipse from the <emphasis>
- <property>Window > Preferences... </property>
+ <property>Window > Preferences </property>
</emphasis> menu, and then select <emphasis>
- <property>Server > Installed Runtimes</property>
- </emphasis> from the categories available.</para>
+ <property>Server > Runtime Environments</property>
+ </emphasis> from the categories available on the left.</para>
<figure>
<title>Installed Runtimes</title>
<mediaobject>
@@ -53,12 +54,14 @@
</mediaobject>
</figure>
<para>From this preference page you can see all declared runtimes and their types as well.
- Figure above shows two declared runtimes that include a JBoss 4.2 instance. Here,
- it's possible to edit or remove existing runtimes as well as add a new one.</para>
+ Here, it's possible to edit or remove existing runtimes as well as add a new
+ one.</para>
<para>To create a JBoss runtime click <emphasis>
<property>Add</property>
- </emphasis> button and choose a necessary type of runtime from the appeared dialog. </para>
+ </emphasis> button and choose a necessary type of runtime from the <emphasis>
+ <property>JBoss Community</property>
+ </emphasis> category.</para>
<figure>
<title>Adding a Runtime</title>
@@ -69,12 +72,22 @@
</mediaobject>
</figure>
+ <note>
+ <title>Note:</title>
+
+ <para>Now there is a separation between .org servers (the <emphasis>
+ <property>JBoss Community</property>
+ </emphasis> category) and product server that comes with JBoss EAP in JBDS ( the <emphasis>
+ <property>JBoss Enterprise Middleware</property>
+ </emphasis> category).</para>
+ </note>
+
<para>As you can see, <property>JBoss Tools</property> provide its own adapters such as JBoss
3.2, 4.0, 4.2 and 5.0 as well. The last one comes with its own new feature, that is a safer
incremental deployment, which prevents partial deployments to be picked up by the server. It
means that scanning for auto-deployment is suspended while files are being copied to the
deployment location and resumed when the copy is completed.</para>
-
+
<note>
<title>Note:</title>
<para>Currently we recommend you to use a fully supported JBoss 4.2 server adapter.</para>
@@ -94,7 +107,8 @@
</mediaobject>
</figure>
- <para>The following table describes all the available options of the wizard.</para>
+ <para>The following table describes all the available options of the currant wizard
+ page.</para>
<table>
<title>Server Runtime Wizard Parameters</title>
<tgroup cols="2">
@@ -167,7 +181,8 @@
<para>As a result of having each runtime represent a specific configuration rather than the
server installation as a whole, it is very likely you'll create several different
runtimes to test each of your configurations. It becomes important to ensure your runtimes,
- and later your servers, are given descriptive names that help you remember which is which.</para>
+ and later your servers, are given descriptive names that help you remember which is
+ which.</para>
<para>Press <emphasis>
<property>Finish</property>
@@ -182,14 +197,14 @@
start or stop servers, deploy to servers, or debug code that will run on the server. They keep
track of the modules (jars, wars, etc) you deploy to the server and also allow you to undeploy
those modules (see <link linkend="run_on_server_wizard">Deploying with Run On Server
- Wizard</link> section). </para>
+ Wizard</link> section). </para>
<para>Servers can be started or stopped with different <link linkend="com_line_arg">command-line
arguments</link>. They are often backed by a runtime object representing that server's
- location.</para>
-
+ location.</para>
+
<section>
<title>Creating a New Server</title>
-
+
<para>There are many ways to get to the new server wizard. One way is to use the old standard <emphasis>
<property>File > New > Other... </property>
</emphasis> and then <emphasis>
@@ -209,24 +224,16 @@
<para>From the list of already declared runtimes in the combo box below the view it's
possible to select which runtime you want your server to be backed by. If there is no
- runtime that matches your needs just press <emphasis>
- <property>Installed Runtimes... </property>
- </emphasis> to bring up the familiar preference page like in <link linkend="InstNewRuntime">
- the previous section</link>. Here, it becomes possible to edit already existing runtime or
- add a new one with necessary configuration.</para>
+ runtime that matches your needs just press the <emphasis>
+ <property>Add...</property>
+ </emphasis> link nearby to bring up the wizard for creating a new runtime (see the <link
+ linkend="add_runtime_figure">previous section</link>). To configure the already installed
+ runtimes you should go to server preferences that you can easily do by pressing the <emphasis>
+ <property>Configure runtime environments...</property></emphasis> link.</para>
- <figure>
- <title>Installed Server Runtime Environments</title>
- <mediaobject>
- <imageobject>
- <imagedata fileref="images/runtimes_servers/runtimes_servers_5.png"/>
- </imageobject>
- </mediaobject>
- </figure>
+ <para>If the server you want to create doesn't have any installed runtime yet, the combo box
+ and the links are absent.</para>
- <para>If the server you want to create doesn't have any installed runtime yet, the combo box
- and button will disappear.</para>
-
<figure>
<title>Installed Server Runtime Environments</title>
<mediaobject>
17 years, 2 months
- 1
- 0