Author: DartPeng
Date: 2009-07-30 04:35:56 -0400 (Thu, 30 Jul 2009)
New Revision: 16891
Added:
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/editparts/JavaBeanChildNodeEditPart.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/editparts/JavaBeanContainerEditPart.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/editparts/SmooksGraphUtil.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/model/AbstractResourceGraphModel.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/model/InputDataRootModel.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/model/JavaBeanChildGraphModel.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/model/JavaBeanGraphModel.java
Modified:
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/SmooksMasterDetailBlock.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/edi/EDIDataParser.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/uitls/SmooksUIUtils.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/xml/XMLStructuredDataContentProvider.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/validate/SmooksModelValidator.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/edimap/editor/EDIMapFormPage.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/gef/common/RootModel.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/gef/tree/editparts/TreeNodeConnectionEditPart.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/SmooksEditFactory.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/SmooksGraphicalEditorPart.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/editparts/InputDataContainerEditPart.java
Log:
JBIDE-4648
create input message figure and Bean figure
Modified:
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/SmooksMasterDetailBlock.java
===================================================================
---
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/SmooksMasterDetailBlock.java 2009-07-30
07:55:55 UTC (rev 16890)
+++
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/SmooksMasterDetailBlock.java 2009-07-30
08:35:56 UTC (rev 16891)
@@ -133,6 +133,9 @@
}
protected void refreshSmooksTreeViewer() {
+ if (smooksTreeViewer.getControl().isDisposed()) {
+ return;
+ }
smooksTreeViewer.refresh();
}
Modified:
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/edi/EDIDataParser.java
===================================================================
---
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/edi/EDIDataParser.java 2009-07-30
07:55:55 UTC (rev 16890)
+++
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/edi/EDIDataParser.java 2009-07-30
08:35:56 UTC (rev 16891)
@@ -171,6 +171,7 @@
SmooksResourceConfiguration readerConfig = new
SmooksResourceConfiguration("org.xml.sax.driver",
SmooksEDIReader.class.getName());
+ if(mappingModel == null) return null;
File f = new File(mappingModel);
String modelPath = mappingModel;
if (f.exists()) {
Modified:
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/uitls/SmooksUIUtils.java
===================================================================
---
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/uitls/SmooksUIUtils.java 2009-07-30
07:55:55 UTC (rev 16890)
+++
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/uitls/SmooksUIUtils.java 2009-07-30
08:35:56 UTC (rev 16891)
@@ -2309,15 +2309,16 @@
continue;
parentList.remove(parentList.size() - 1);
((TreeNodeEditPart) rootEditPart).expandNode();
+ TreeNodeEditPart tempEditPart = rootEditPart;
for (int i = parentList.size() - 1; i >= 0; i--) {
boolean expanded = false;
TreeNodeModel parentNode = parentList.get(i);
- List<?> editParts = rootEditPart.getChildren();
+ List<?> editParts = tempEditPart.getChildren();
for (Iterator<?> iterator2 = editParts.iterator(); iterator2.hasNext();) {
EditPart editPart = (EditPart) iterator2.next();
if (editPart instanceof TreeNodeEditPart && editPart.getModel() ==
parentNode) {
((TreeNodeEditPart) editPart).expandNode();
- rootEditPart = (TreeNodeEditPart) editPart;
+ tempEditPart = (TreeNodeEditPart) editPart;
expanded = true;
break;
}
Modified:
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/xml/XMLStructuredDataContentProvider.java
===================================================================
---
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/xml/XMLStructuredDataContentProvider.java 2009-07-30
07:55:55 UTC (rev 16890)
+++
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/xml/XMLStructuredDataContentProvider.java 2009-07-30
08:35:56 UTC (rev 16891)
@@ -15,6 +15,7 @@
import org.eclipse.jface.viewers.ITreeContentProvider;
import org.eclipse.jface.viewers.Viewer;
+import org.jboss.tools.smooks.configuration.editors.IXMLStructuredObject;
/**
* @author Dart Peng
@@ -36,9 +37,12 @@
List pros = ((TagObject)obj).getProperties();
c.addAll(pros);
c.addAll(((TagObject)obj).getXMLNodeChildren());
-
return c.toArray();
}
+
+ if(obj instanceof IXMLStructuredObject){
+ return ((IXMLStructuredObject)obj).getChildren().toArray();
+ }
return new Object[] {};
}
@@ -48,8 +52,8 @@
* @see org.eclipse.jface.viewers.ITreeContentProvider#getParent(java.lang.Object )
*/
public Object getParent(Object arg0) {
- if(arg0 instanceof AbstractXMLObject){
- return ((AbstractXMLObject)arg0).getParent();
+ if(arg0 instanceof IXMLStructuredObject){
+ return ((IXMLStructuredObject)arg0).getParent();
}
return null;
}
@@ -67,8 +71,8 @@
return true;
}
if(obj instanceof TagObject){
- List pros = ((TagObject)obj).getProperties();
- List c = (((TagObject)obj).getXMLNodeChildren());
+ List<?> pros = ((TagObject)obj).getProperties();
+ List<?> c = (((TagObject)obj).getXMLNodeChildren());
return !pros.isEmpty() || !c.isEmpty();
}
return false;
@@ -84,6 +88,9 @@
if(arg0 instanceof TagList){
return ((TagList)arg0).getRootTagList().toArray();
}
+ if(arg0 instanceof IXMLStructuredObject){
+ return ((IXMLStructuredObject)arg0).getChildren().toArray();
+ }
return new Object[] {};
}
Modified:
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/validate/SmooksModelValidator.java
===================================================================
---
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/validate/SmooksModelValidator.java 2009-07-30
07:55:55 UTC (rev 16890)
+++
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/validate/SmooksModelValidator.java 2009-07-30
08:35:56 UTC (rev 16891)
@@ -77,7 +77,7 @@
private boolean waiting = false;
private Object lock = new Object();
private AdapterFactoryEditingDomain innerEditingDomain;
-
+
private SmooksMarkerHelper markerHelper = new SmooksMarkerHelper();
private long watingTime = 300;
@@ -222,18 +222,21 @@
for (Iterator<?> iterator = listeners.iterator(); iterator.hasNext();) {
final ISmooksModelValidateListener l = (ISmooksModelValidateListener)
iterator.next();
- Display.getDefault().syncExec(new Runnable() {
+ Display dis = Display.getDefault();
+ if (dis != null && !dis.isDisposed()) {
+ dis.syncExec(new Runnable() {
- /*
- * (non-Javadoc)
- *
- * @see java.lang.Runnable#run()
- */
- public void run() {
- l.validateEnd(d);
- }
+ /*
+ * (non-Javadoc)
+ *
+ * @see java.lang.Runnable#run()
+ */
+ public void run() {
+ l.validateEnd(d);
+ }
- });
+ });
+ }
}
} finally {
waiting = false;
@@ -247,7 +250,7 @@
private AdapterFactoryEditingDomain newEditingDomain() {
BasicCommandStack commandStack = new BasicCommandStack();
- if(innerEditingDomain == null){
+ if (innerEditingDomain == null) {
innerEditingDomain = new AdapterFactoryEditingDomain(getAdapterFactory(),
commandStack,
new HashMap<Resource, Boolean>());
}
@@ -255,9 +258,8 @@
}
public ComposedAdapterFactory getAdapterFactory() {
- if(adapterFactory == null){
- adapterFactory = new ComposedAdapterFactory(
- ComposedAdapterFactory.Descriptor.Registry.INSTANCE);
+ if (adapterFactory == null) {
+ adapterFactory = new
ComposedAdapterFactory(ComposedAdapterFactory.Descriptor.Registry.INSTANCE);
adapterFactory.addAdapterFactory(new ResourceItemProviderAdapterFactory());
adapterFactory.addAdapterFactory(new XslItemProviderAdapterFactory());
@@ -301,19 +303,19 @@
}
List<Object> list = new ArrayList<Object>();
list.add(smooksModel);
-
+
final List<Diagnostic> d = this.validate(list, editingDomain, monitor);
- try{
- markerHelper.deleteMarkers(smooksResource);
- for (Iterator<?> iterator = d.iterator(); iterator.hasNext();) {
- Diagnostic diagnostic = (Diagnostic) iterator.next();
- if (resource != null && diagnostic.getSeverity() != Diagnostic.OK) {
- for (Diagnostic childDiagnostic : diagnostic.getChildren()) {
- markerHelper.createMarkers(smooksResource, childDiagnostic);
+ try {
+ markerHelper.deleteMarkers(smooksResource);
+ for (Iterator<?> iterator = d.iterator(); iterator.hasNext();) {
+ Diagnostic diagnostic = (Diagnostic) iterator.next();
+ if (resource != null && diagnostic.getSeverity() != Diagnostic.OK) {
+ for (Diagnostic childDiagnostic : diagnostic.getChildren()) {
+ markerHelper.createMarkers(smooksResource, childDiagnostic);
+ }
}
}
- }
- }catch(Exception e){
+ } catch (Exception e) {
e.printStackTrace();
}
return null;
@@ -328,6 +330,6 @@
public void initValidator(Collection<?> selectedObjects, EditingDomain
editingDomain) {
// TODO Auto-generated method stub
-
+
}
}
Modified:
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/edimap/editor/EDIMapFormPage.java
===================================================================
---
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/edimap/editor/EDIMapFormPage.java 2009-07-30
07:55:55 UTC (rev 16890)
+++
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/edimap/editor/EDIMapFormPage.java 2009-07-30
08:35:56 UTC (rev 16891)
@@ -300,9 +300,9 @@
if (graph == null)
return;
- List<TreeNodeModel> list = graphicalRootModel.getChildren();
+ List<AbstractSmooksGraphicalModel> list = graphicalRootModel.getChildren();
for (Iterator<?> iterator = list.iterator(); iterator.hasNext();) {
- TreeNodeModel treeNodeModel = (TreeNodeModel) iterator.next();
+ AbstractSmooksGraphicalModel treeNodeModel = (AbstractSmooksGraphicalModel)
iterator.next();
if (treeNodeModel instanceof IMoveableModel) {
Object data = treeNodeModel.getData();
String id = EDISegementsEditPart.generateFigureId(data);
@@ -416,10 +416,10 @@
}
private void removeEDIGraphModel() {
- List<TreeNodeModel> children = this.graphicalRootModel.getChildren();
- List<TreeNodeModel> temp = new ArrayList<TreeNodeModel>(children);
+ List<AbstractSmooksGraphicalModel> children =
this.graphicalRootModel.getChildren();
+ List<AbstractSmooksGraphicalModel> temp = new
ArrayList<AbstractSmooksGraphicalModel>(children);
for (Iterator<?> iterator = temp.iterator(); iterator.hasNext();) {
- TreeNodeModel treeNodeModel = (TreeNodeModel) iterator.next();
+ AbstractSmooksGraphicalModel treeNodeModel = (AbstractSmooksGraphicalModel)
iterator.next();
if (treeNodeModel.getData() instanceof TagObject) {
graphicalRootModel.removeTreeNode(treeNodeModel);
}
@@ -1050,7 +1050,7 @@
Segment segment = (Segment) obj;
TreeNodeModel segmentGraphicalModel = findEDIGraphicalModel(segment);
String code = segment.getSegcode();
- TreeNodeModel model = findEDIDataGraphicalModel(code);
+ AbstractSmooksGraphicalModel model = findEDIDataGraphicalModel(code);
if (segmentGraphicalModel != null && model != null) {
if (!isLinked(segmentGraphicalModel, model)) {
new TreeNodeConnection(segmentGraphicalModel, model).connect();
@@ -1065,7 +1065,7 @@
return sourceLinkedModel;
}
- private boolean isLinked(TreeNodeModel source, TreeNodeModel target) {
+ private boolean isLinked(AbstractSmooksGraphicalModel source,
AbstractSmooksGraphicalModel target) {
List<TreeNodeConnection> connections = source.getSourceConnections();
for (Iterator<?> iterator = connections.iterator(); iterator.hasNext();) {
TreeNodeConnection treeNodeConnection = (TreeNodeConnection) iterator.next();
@@ -1110,7 +1110,7 @@
*/
private TreeNodeModel findEDIGraphicalModel(Object model) {
if (graphicalRootModel != null) {
- List<TreeNodeModel> treeNodeList = graphicalRootModel.getChildren();
+ List<AbstractSmooksGraphicalModel> treeNodeList =
graphicalRootModel.getChildren();
return (TreeNodeModel)findEDIGraphicalModel(model, treeNodeList);
}
return null;
@@ -1131,13 +1131,13 @@
return null;
}
- private TreeNodeModel findEDIDataGraphicalModel(String code) {
+ private AbstractSmooksGraphicalModel findEDIDataGraphicalModel(String code) {
if (code == null)
return null;
if (graphicalRootModel != null) {
- List<TreeNodeModel> treeNodeList = graphicalRootModel.getChildren();
+ List<AbstractSmooksGraphicalModel> treeNodeList =
graphicalRootModel.getChildren();
for (Iterator<?> iterator = treeNodeList.iterator(); iterator.hasNext();) {
- TreeNodeModel treeNodeModel = (TreeNodeModel) iterator.next();
+ AbstractSmooksGraphicalModel treeNodeModel = (AbstractSmooksGraphicalModel)
iterator.next();
Object model = treeNodeModel.getData();
if (model instanceof TagObject) {
String name = ((TagObject) model).getName();
Modified:
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/gef/common/RootModel.java
===================================================================
---
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/gef/common/RootModel.java 2009-07-30
07:55:55 UTC (rev 16890)
+++
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/gef/common/RootModel.java 2009-07-30
08:35:56 UTC (rev 16891)
@@ -5,6 +5,7 @@
import java.util.ArrayList;
import java.util.List;
+import org.jboss.tools.smooks.gef.model.AbstractSmooksGraphicalModel;
import org.jboss.tools.smooks.gef.tree.model.TreeNodeModel;
public class RootModel {
@@ -15,11 +16,11 @@
private PropertyChangeSupport support = new PropertyChangeSupport(this);
- private List<TreeNodeModel> children;
+ private List<AbstractSmooksGraphicalModel> children;
- public List<TreeNodeModel> getChildren() {
+ public List<AbstractSmooksGraphicalModel> getChildren() {
if (children == null) {
- children = new ArrayList<TreeNodeModel>();
+ children = new ArrayList<AbstractSmooksGraphicalModel>();
}
return children;
}
@@ -29,7 +30,7 @@
support.firePropertyChange(REMOVE_CHILDREN, new Object(), null);
}
- public void removeTreeNode(TreeNodeModel node) {
+ public void removeTreeNode(AbstractSmooksGraphicalModel node) {
this.getChildren().remove(node);
support.firePropertyChange(REMOVE_CHILDREN, node, null);
}
@@ -42,7 +43,7 @@
support.removePropertyChangeListener(listener);
}
- public void addTreeNode(TreeNodeModel node) {
+ public void addTreeNode(AbstractSmooksGraphicalModel node) {
this.getChildren().add(node);
support.firePropertyChange(ADD_CHILDREN, null, node);
}
Modified:
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/gef/tree/editparts/TreeNodeConnectionEditPart.java
===================================================================
---
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/gef/tree/editparts/TreeNodeConnectionEditPart.java 2009-07-30
07:55:55 UTC (rev 16890)
+++
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/gef/tree/editparts/TreeNodeConnectionEditPart.java 2009-07-30
08:35:56 UTC (rev 16891)
@@ -64,6 +64,7 @@
public PointList getPoints() {
PointList list = super.getPoints();
+ if(list.size() == 0) return list;
Point start = getStart();
Point start2 = new Point(start.x + 20, start.y);
Point end = getEnd();
Modified:
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/SmooksEditFactory.java
===================================================================
---
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/SmooksEditFactory.java 2009-07-30
07:55:55 UTC (rev 16890)
+++
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/SmooksEditFactory.java 2009-07-30
08:35:56 UTC (rev 16891)
@@ -23,8 +23,12 @@
import org.jboss.tools.smooks.gef.tree.model.TreeNodeModel;
import org.jboss.tools.smooks.graphical.editors.editparts.InputDataContainerEditPart;
import org.jboss.tools.smooks.graphical.editors.editparts.InputDataTreeNodeEditPart;
+import org.jboss.tools.smooks.graphical.editors.editparts.JavaBeanChildNodeEditPart;
+import org.jboss.tools.smooks.graphical.editors.editparts.JavaBeanContainerEditPart;
import org.jboss.tools.smooks.graphical.editors.model.InputDataContianerModel;
import org.jboss.tools.smooks.graphical.editors.model.InputDataTreeNodeModel;
+import org.jboss.tools.smooks.graphical.editors.model.JavaBeanChildGraphModel;
+import org.jboss.tools.smooks.graphical.editors.model.JavaBeanGraphModel;
/**
* @author Dart
@@ -52,6 +56,13 @@
}if(model.getClass() == InputDataContianerModel.class){
editPart = new InputDataContainerEditPart();
}
+
+ // for javabean
+ if(model.getClass() == JavaBeanChildGraphModel.class){
+ editPart = new JavaBeanChildNodeEditPart();
+ }if(model.getClass() == JavaBeanGraphModel.class){
+ editPart = new JavaBeanContainerEditPart();
+ }
if(model.getClass() == TreeNodeConnection.class){
editPart = new TreeNodeConnectionEditPart();
}
Modified:
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/SmooksGraphicalEditorPart.java
===================================================================
---
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/SmooksGraphicalEditorPart.java 2009-07-30
07:55:55 UTC (rev 16890)
+++
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/SmooksGraphicalEditorPart.java 2009-07-30
08:35:56 UTC (rev 16891)
@@ -10,32 +10,58 @@
******************************************************************************/
package org.jboss.tools.smooks.graphical.editors;
+import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.draw2d.geometry.Point;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;
+import org.eclipse.emf.edit.ui.provider.AdapterFactoryContentProvider;
+import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;
import org.eclipse.gef.DefaultEditDomain;
+import org.eclipse.gef.EditDomain;
+import org.eclipse.gef.EditPart;
import org.eclipse.gef.commands.CommandStackEvent;
import org.eclipse.gef.commands.CommandStackEventListener;
import org.eclipse.gef.editparts.FreeformGraphicalRootEditPart;
import org.eclipse.gef.ui.parts.GraphicalEditor;
import org.eclipse.jface.viewers.ILabelProvider;
import org.eclipse.jface.viewers.ITreeContentProvider;
+import org.eclipse.ui.IEditorInput;
+import org.eclipse.ui.IEditorSite;
+import org.eclipse.ui.PartInitException;
+import org.jboss.tools.smooks.configuration.editors.IXMLStructuredObject;
import org.jboss.tools.smooks.configuration.editors.SelectoreSelectionDialog;
-import org.jboss.tools.smooks.configuration.editors.SmooksMultiFormEditor;
-import org.jboss.tools.smooks.configuration.editors.javabean.JavaBeanList;
import org.jboss.tools.smooks.configuration.editors.javabean.JavaBeanModel;
import org.jboss.tools.smooks.configuration.editors.javabean.JavabeanContentProvider;
import org.jboss.tools.smooks.configuration.editors.javabean.JavabeanlabelProvider;
-import org.jboss.tools.smooks.configuration.editors.xml.TagList;
-import org.jboss.tools.smooks.configuration.editors.xml.TagObject;
+import org.jboss.tools.smooks.configuration.editors.uitls.SmooksUIUtils;
import
org.jboss.tools.smooks.configuration.editors.xml.XMLStructuredDataContentProvider;
import org.jboss.tools.smooks.configuration.editors.xml.XMLStructuredDataLabelProvider;
import org.jboss.tools.smooks.editor.ISmooksModelProvider;
import org.jboss.tools.smooks.gef.common.RootModel;
+import org.jboss.tools.smooks.gef.model.AbstractSmooksGraphicalModel;
+import org.jboss.tools.smooks.gef.tree.figures.IMoveableModel;
import org.jboss.tools.smooks.gef.tree.model.TreeContainerModel;
+import org.jboss.tools.smooks.gef.tree.model.TreeNodeConnection;
+import org.jboss.tools.smooks.gef.tree.model.TreeNodeModel;
+import org.jboss.tools.smooks.graphical.editors.editparts.InputDataContainerEditPart;
+import org.jboss.tools.smooks.graphical.editors.editparts.SmooksGraphUtil;
import org.jboss.tools.smooks.graphical.editors.model.InputDataContianerModel;
+import org.jboss.tools.smooks.graphical.editors.model.InputDataRootModel;
+import org.jboss.tools.smooks.graphical.editors.model.JavaBeanChildGraphModel;
+import org.jboss.tools.smooks.graphical.editors.model.JavaBeanGraphModel;
+import org.jboss.tools.smooks.model.common.AbstractAnyType;
+import org.jboss.tools.smooks.model.graphics.ext.FigureType;
+import org.jboss.tools.smooks.model.graphics.ext.GraphType;
+import org.jboss.tools.smooks.model.graphics.ext.SmooksGraphicsExtType;
+import org.jboss.tools.smooks.model.javabean.BindingsType;
import org.jboss.tools.smooks.model.smooks.DocumentRoot;
+import org.jboss.tools.smooks.model.smooks.SmooksResourceListType;
+import org.jboss.tools.smooks10.model.smooks.util.SmooksModelUtils;
/**
* @author Dart
@@ -45,18 +71,24 @@
private DefaultEditDomain editDomain = null;
- private SmooksMultiFormEditor formEditor = null;
+ private ISmooksModelProvider smooksModelProvider = null;
- public SmooksGraphicalEditorPart(SmooksMultiFormEditor formEditor) {
+ private RootModel root;
+
+ private SmooksResourceListType smooksResourceList;
+
+ private List<Object> inputDataList = null;
+
+ public SmooksGraphicalEditorPart(ISmooksModelProvider provider) {
super();
this.editDomain = new DefaultEditDomain(this);
this.editDomain.getCommandStack().addCommandStackEventListener(new
CommandStackEventListener() {
-
+
public void stackChanged(CommandStackEvent event) {
firePropertyChange(PROP_DIRTY);
}
});
- this.formEditor = formEditor;
+ this.smooksModelProvider = provider;
this.setEditDomain(editDomain);
}
@@ -73,50 +105,255 @@
getGraphicalViewer().setRootEditPart(new FreeformGraphicalRootEditPart());
}
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.gef.ui.parts.GraphicalEditor#initializeGraphicalViewer()
- */
- @Override
- protected void initializeGraphicalViewer() {
- Object obj = formEditor.getSmooksModel();
- if (obj instanceof DocumentRoot) {
- List<Object> inputDatas =
SelectoreSelectionDialog.generateInputData(formEditor.getSmooksGraphicsExt(),
- ((DocumentRoot) obj).getSmooksResourceList());
- RootModel root = new RootModel();
- for (Iterator<?> iterator = inputDatas.iterator(); iterator.hasNext();) {
+ protected void initGraphicalModel() {
+ if (root == null) {
+ root = new RootModel();
+ } else {
+ root.removeAllTreeNode();
+ }
+ Object obj = smooksModelProvider.getSmooksModel();
+ AdapterFactoryEditingDomain editingDomain = (AdapterFactoryEditingDomain)
smooksModelProvider
+ .getEditingDomain();
+ if (inputDataList != null && obj != null && obj instanceof DocumentRoot
&& editingDomain != null) {
+ for (Iterator<?> iterator = inputDataList.iterator(); iterator.hasNext();) {
Object object = (Object) iterator.next();
ITreeContentProvider contentProvider = new XMLStructuredDataContentProvider();
ILabelProvider labelProvider = new XMLStructuredDataLabelProvider();
- Object containerModel = null;
+ InputDataRootModel containerModel = new InputDataRootModel();
if (object instanceof JavaBeanModel) {
contentProvider = new JavabeanContentProvider();
labelProvider = new JavabeanlabelProvider();
- containerModel = new JavaBeanList();
- ((JavaBeanList) containerModel).addJavaBean((JavaBeanModel) object);
+
}
- if (object instanceof TagObject) {
- containerModel = new TagList();
- ((TagList) containerModel).addRootTag((TagObject) object);
- }
+ // if(object instanceof TagObject){
+ // TagList tl = new TagList();
+ // tl.addRootTag((TagObject)object);
+ // TreeContainerModel container = new
+ // InputDataContianerModel(tl, contentProvider,
+ // labelProvider);
+ // root.addTreeNode(container);
+ // }
+ containerModel.getChildren().add((IXMLStructuredObject) object);
if (containerModel != null) {
TreeContainerModel container = new InputDataContianerModel(containerModel,
contentProvider,
labelProvider);
root.addTreeNode(container);
}
}
+ // to find Bean v1.2
+ SmooksResourceListType listType = ((DocumentRoot) obj).getSmooksResourceList();
+ List<?> arcList = listType.getAbstractResourceConfig();
+ ITreeContentProvider contentProvider = new
AdapterFactoryContentProvider(editingDomain.getAdapterFactory());
+ ILabelProvider labelProvider = new
AdapterFactoryLabelProvider(editingDomain.getAdapterFactory()) {
+ @Override
+ public String getText(Object object) {
+ Object obj = AdapterFactoryEditingDomain.unwrap(object);
+ if (obj instanceof AbstractAnyType) {
+ return super.getText(obj);
+ }
+ return super.getText(object);
+ }
+
+ };
+ for (Iterator<?> iterator = arcList.iterator(); iterator.hasNext();) {
+ Object object = (Object) iterator.next();
+ if (object instanceof BindingsType) {
+ JavaBeanGraphModel graphModel = new JavaBeanGraphModel(object, contentProvider,
labelProvider);
+ graphModel.setHeaderVisable(true);
+ root.addTreeNode(graphModel);
+ }
+ }
+
getGraphicalViewer().setContents(root);
}
+
+ // create connection
+ List<TreeNodeConnection> connections = createConnectionModel();
+
+ // init position
+
+ initModelGraphicsInformation(smooksModelProvider.getSmooksGraphicsExt());
+
+ // expand connected models
+ expandConnectedModels(connections);
}
-
-
+ protected List<TreeNodeConnection> createConnectionModel() {
+ List<TreeNodeConnection> connections = new
ArrayList<TreeNodeConnection>();
+ if (root != null) {
+ createConnection(root.getChildren(), connections);
+ }
+ return connections;
+ }
+
+ private List<TreeNodeConnection> createConnection(AbstractSmooksGraphicalModel
model) {
+ List<TreeNodeConnection> cs = new ArrayList<TreeNodeConnection>();
+ if (hasSelectorConnection(model)) {
+ List<TreeNodeConnection> cList = createSelectorConnection(model);
+ if (cList != null) {
+ cs.addAll(cList);
+ }
+ }
+ if (hasBeanIDReferenceConnection(model)) {
+ TreeNodeConnection c = createBeanIDReferenceConnection(model);
+ if (c != null) {
+ cs.add(c);
+ }
+ }
+ if (cs.isEmpty())
+ return null;
+ return cs;
+ }
+
+ private TreeNodeConnection createBeanIDReferenceConnection(AbstractSmooksGraphicalModel
model) {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ private List<TreeNodeConnection>
createSelectorConnection(AbstractSmooksGraphicalModel model) {
+ Object data = model.getData();
+ data = AdapterFactoryEditingDomain.unwrap(data);
+ List<TreeNodeConnection> connections = new
ArrayList<TreeNodeConnection>();
+ if (data != null && data instanceof EObject) {
+ EStructuralFeature feature = SmooksGraphUtil.getSelectorFeature((EObject) data);
+ Object sd = ((EObject) data).eGet(feature);
+ if (sd != null) {
+ String selector = sd.toString();
+ if (inputDataList != null) {
+ for (Iterator<?> iterator = inputDataList.iterator(); iterator.hasNext();) {
+ Object obj = (Object) iterator.next();
+ if (obj instanceof IXMLStructuredObject) {
+ AbstractSmooksGraphicalModel sourceGraphModel =
SmooksGraphUtil.findInputGraphModel(
+ selector, (IXMLStructuredObject) obj, root);
+ if (sourceGraphModel != null) {
+ TreeNodeConnection connection = new TreeNodeConnection(sourceGraphModel, model);
+ connection.connect();
+ connections.add(connection);
+ }
+ }
+ }
+ }
+ }
+ }
+ return connections;
+ }
+
+ private boolean hasSelectorConnection(AbstractSmooksGraphicalModel model) {
+ Object data = model.getData();
+ data = AdapterFactoryEditingDomain.unwrap(data);
+ if (data instanceof EObject) {
+ return (SmooksGraphUtil.getSelectorFeature((EObject) data) != null);
+ }
+ return false;
+ }
+
+ private boolean hasBeanIDReferenceConnection(AbstractSmooksGraphicalModel model) {
+ return false;
+ }
+
+ private void createConnection(List<AbstractSmooksGraphicalModel> children,
List<TreeNodeConnection> connections) {
+ for (Iterator<?> iterator = children.iterator(); iterator.hasNext();) {
+ AbstractSmooksGraphicalModel abstractSmooksGraphicalModel =
(AbstractSmooksGraphicalModel) iterator.next();
+ if (!(abstractSmooksGraphicalModel instanceof InputDataContianerModel)) {
+ if (canCreateConnection(abstractSmooksGraphicalModel)) {
+ List<TreeNodeConnection> c = createConnection(abstractSmooksGraphicalModel);
+ if (c != null) {
+ connections.addAll(c);
+ }
+ }
+ List<AbstractSmooksGraphicalModel> cchildren =
abstractSmooksGraphicalModel.getChildren();
+ createConnection(cchildren, connections);
+ }
+ }
+ }
+
+ private boolean canCreateConnection(AbstractSmooksGraphicalModel model) {
+ if (model instanceof JavaBeanGraphModel) {
+ return true;
+ }
+ if (model instanceof JavaBeanChildGraphModel) {
+ return true;
+ }
+ return false;
+ }
+
+ protected void initSmooksData() {
+ if (smooksModelProvider != null) {
+ Object obj = smooksModelProvider.getSmooksModel();
+ smooksResourceList = null;
+ if (obj instanceof DocumentRoot) {
+ smooksResourceList = ((DocumentRoot) obj).getSmooksResourceList();
+ inputDataList =
SelectoreSelectionDialog.generateInputData(smooksModelProvider.getSmooksGraphicsExt(),
+ smooksResourceList);
+ }
+ }
+ }
+
@Override
+ public void init(IEditorSite site, IEditorInput input) throws PartInitException {
+ super.init(site, input);
+ initSmooksData();
+ }
+
+ protected void expandConnectedModels(List<TreeNodeConnection> connections) {
+ List<TreeNodeModel> expanedTreeNodeList = new ArrayList<TreeNodeModel>();
+ for (Iterator<?> iterator = connections.iterator(); iterator.hasNext();) {
+ TreeNodeConnection treeNodeConnection = (TreeNodeConnection) iterator.next();
+ AbstractSmooksGraphicalModel source = treeNodeConnection.getSourceNode();
+ Object data = source.getData();
+ if (source instanceof TreeNodeModel && data instanceof IXMLStructuredObject)
{
+ expanedTreeNodeList.add((TreeNodeModel) source);
+ }
+ }
+ EditPart rootEditPart = getGraphicalViewer().getContents();
+ List<?> childrenEditPart = rootEditPart.getChildren();
+ for (Iterator<?> iterator = childrenEditPart.iterator(); iterator.hasNext();) {
+ Object object = (Object) iterator.next();
+ if (object instanceof InputDataContainerEditPart) {
+ SmooksUIUtils.expandGraphTree(expanedTreeNodeList, (InputDataContainerEditPart)
object);
+ }
+ }
+
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.eclipse.gef.ui.parts.GraphicalEditor#initializeGraphicalViewer()
+ */
+ @Override
+ protected void initializeGraphicalViewer() {
+ initGraphicalModel();
+ }
+
+ protected void initModelGraphicsInformation(SmooksGraphicsExtType ext) {
+ GraphType graph = ext.getGraph();
+ if (graph == null)
+ return;
+ List<AbstractSmooksGraphicalModel> list = root.getChildren();
+ for (Iterator<?> iterator = list.iterator(); iterator.hasNext();) {
+ AbstractSmooksGraphicalModel treeNodeModel = (AbstractSmooksGraphicalModel)
iterator.next();
+ if (treeNodeModel instanceof IMoveableModel) {
+ String id = SmooksGraphUtil.generateFigureID(treeNodeModel);
+ if (id != null) {
+ FigureType ft = SmooksModelUtils.findFigureType(graph, id);
+ try {
+ int x = Integer.parseInt(ft.getX());
+ int y = Integer.parseInt(ft.getY());
+ ((IMoveableModel) treeNodeModel).setLocation(new Point(x, y));
+ } catch (Throwable t) {
+ continue;
+ }
+ }
+ }
+ }
+ }
+
+ @Override
public Object getAdapter(Class type) {
- if(type == ISmooksModelProvider.class){
- return this.formEditor;
+ if (type == ISmooksModelProvider.class) {
+ return this.smooksModelProvider;
}
return super.getAdapter(type);
}
Modified:
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/editparts/InputDataContainerEditPart.java
===================================================================
---
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/editparts/InputDataContainerEditPart.java 2009-07-30
07:55:55 UTC (rev 16890)
+++
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/editparts/InputDataContainerEditPart.java 2009-07-30
08:35:56 UTC (rev 16891)
@@ -12,7 +12,6 @@
import java.beans.PropertyChangeEvent;
-import org.jboss.tools.smooks.configuration.editors.IXMLStructuredObject;
import org.jboss.tools.smooks.gef.tree.editparts.TreeContainerEditPart;
import org.jboss.tools.smooks.gef.tree.model.TreeNodeModel;
@@ -29,12 +28,7 @@
@Override
protected String generateFigureID() {
- TreeNodeModel model = (TreeNodeModel)this.getModel();
- Object data = model.getData();
- if(data instanceof IXMLStructuredObject){
- return ((IXMLStructuredObject)data).getID().toString();
- }
- return null;
+ return SmooksGraphUtil.generateFigureID((TreeNodeModel)getModel());
}
}
Added:
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/editparts/JavaBeanChildNodeEditPart.java
===================================================================
---
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/editparts/JavaBeanChildNodeEditPart.java
(rev 0)
+++
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/editparts/JavaBeanChildNodeEditPart.java 2009-07-30
08:35:56 UTC (rev 16891)
@@ -0,0 +1,26 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.smooks.graphical.editors.editparts;
+
+import org.jboss.tools.smooks.gef.tree.editparts.TreeNodeEditPart;
+
+/**
+ * @author Dart
+ *
+ */
+public class JavaBeanChildNodeEditPart extends TreeNodeEditPart {
+
+ @Override
+ protected boolean isDragLink() {
+ return false;
+ }
+
+}
Property changes on:
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/editparts/JavaBeanChildNodeEditPart.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added:
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/editparts/JavaBeanContainerEditPart.java
===================================================================
---
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/editparts/JavaBeanContainerEditPart.java
(rev 0)
+++
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/editparts/JavaBeanContainerEditPart.java 2009-07-30
08:35:56 UTC (rev 16891)
@@ -0,0 +1,27 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.smooks.graphical.editors.editparts;
+
+import org.jboss.tools.smooks.gef.tree.editparts.TreeContainerEditPart;
+import org.jboss.tools.smooks.gef.tree.model.TreeNodeModel;
+
+/**
+ * @author Dart
+ *
+ */
+public class JavaBeanContainerEditPart extends TreeContainerEditPart {
+
+ @Override
+ protected String generateFigureID() {
+ return SmooksGraphUtil.generateFigureID((TreeNodeModel) getModel());
+ }
+
+}
Property changes on:
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/editparts/JavaBeanContainerEditPart.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added:
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/editparts/SmooksGraphUtil.java
===================================================================
---
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/editparts/SmooksGraphUtil.java
(rev 0)
+++
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/editparts/SmooksGraphUtil.java 2009-07-30
08:35:56 UTC (rev 16891)
@@ -0,0 +1,144 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.smooks.graphical.editors.editparts;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.jboss.tools.smooks.configuration.editors.IXMLStructuredObject;
+import org.jboss.tools.smooks.configuration.editors.uitls.SmooksUIUtils;
+import org.jboss.tools.smooks.gef.common.RootModel;
+import org.jboss.tools.smooks.gef.model.AbstractSmooksGraphicalModel;
+import org.jboss.tools.smooks.graphical.editors.model.InputDataContianerModel;
+import org.jboss.tools.smooks.model.javabean.BindingsType;
+import org.jboss.tools.smooks.model.javabean.JavabeanPackage;
+import org.jboss.tools.smooks.model.javabean.ValueType;
+import org.jboss.tools.smooks.model.javabean.WiringType;
+
+/**
+ * @author Dart
+ *
+ */
+public class SmooksGraphUtil {
+
+ public static String generateFigureID(AbstractSmooksGraphicalModel model) {
+ Object data = model.getData();
+ if (data instanceof BindingsType) {
+ String beanId = ((BindingsType) data).getBeanId();
+ if (beanId == null) {
+ return null;
+ }
+ beanId = beanId.trim();
+ return "BindingsType_" + beanId;
+ }
+ if (data instanceof IXMLStructuredObject) {
+ List<?> children = ((IXMLStructuredObject) data).getChildren();
+ if (children == null || children.isEmpty()) {
+
+ } else {
+ Object child = children.get(0);
+ if (child != null && child instanceof IXMLStructuredObject) {
+ return ((IXMLStructuredObject) child).getID().toString();
+ }
+ }
+ return ((IXMLStructuredObject) data).getID().toString();
+ }
+ return null;
+ }
+
+ public static EStructuralFeature getSelectorFeature(EObject obj) {
+ if (obj == null)
+ return null;
+ if (obj instanceof BindingsType) {
+ return JavabeanPackage.Literals.BINDINGS_TYPE__CREATE_ON_ELEMENT;
+ }
+ if(obj instanceof ValueType){
+ return JavabeanPackage.Literals.VALUE_TYPE__DATA;
+ }
+ if(obj instanceof WiringType){
+ return JavabeanPackage.Literals.WIRING_TYPE__WIRE_ON_ELEMENT;
+ }
+ return null;
+ }
+
+ public static AbstractSmooksGraphicalModel findInputGraphModel(String selector,
IXMLStructuredObject root,
+ RootModel graphRoot) {
+ IXMLStructuredObject model = null;
+ model = SmooksUIUtils.localXMLNodeWithPath(selector, root, "/", false);
+ if (model == null) {
+ SmooksUIUtils.localXMLNodeWithPath(selector, root, " ", false);
+ }
+ if(model == null) return null;
+ IXMLStructuredObject p = model;
+ List<IXMLStructuredObject> parentList = new
ArrayList<IXMLStructuredObject>();
+ IXMLStructuredObject rootParent = SmooksUIUtils.getRootParent(model);
+ while (p != null) {
+ parentList.add(p);
+ if(p == rootParent){
+ break;
+ }
+ p = p.getParent();
+ if (p == null) {
+ break;
+ }
+ }
+ List<AbstractSmooksGraphicalModel> children = graphRoot.getChildren();
+ if (model != null) {
+ AbstractSmooksGraphicalModel parentGraph = null;
+ for (Iterator<?> iterator = children.iterator(); iterator.hasNext();) {
+ AbstractSmooksGraphicalModel abstractSmooksGraphicalModel =
(AbstractSmooksGraphicalModel) iterator
+ .next();
+ if (abstractSmooksGraphicalModel instanceof InputDataContianerModel) {
+ List<AbstractSmooksGraphicalModel> cs = ((InputDataContianerModel)
abstractSmooksGraphicalModel)
+ .getChildren();
+ if (cs.isEmpty()) {
+ continue;
+ }
+ AbstractSmooksGraphicalModel childGraph = cs.get(0);
+ if (childGraph.getData() == parentList.get(parentList.size() - 1)) {
+ parentGraph = childGraph;
+ break;
+ }
+ }
+ }
+ int index = parentList.size() - 2;
+ if (index < 0) {
+ return parentGraph;
+ }
+ if (parentGraph != null) {
+ AbstractSmooksGraphicalModel tempParent = parentGraph;
+ for (int i = index; i >= 0; i--) {
+ IXMLStructuredObject m = parentList.get(i);
+ List<AbstractSmooksGraphicalModel> nc = tempParent.getChildren();
+ boolean find = false;
+ for (Iterator<?> iterator = nc.iterator(); iterator.hasNext();) {
+ AbstractSmooksGraphicalModel abstractSmooksGraphicalModel =
(AbstractSmooksGraphicalModel) iterator
+ .next();
+ if (abstractSmooksGraphicalModel.getData() == m) {
+ tempParent = abstractSmooksGraphicalModel;
+ find = true;
+ break;
+ }
+ }
+ if (!find) {
+ return null;
+ }
+ }
+ return tempParent;
+ }
+ }
+ return null;
+ }
+
+}
Property changes on:
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/editparts/SmooksGraphUtil.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added:
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/model/AbstractResourceGraphModel.java
===================================================================
---
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/model/AbstractResourceGraphModel.java
(rev 0)
+++
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/model/AbstractResourceGraphModel.java 2009-07-30
08:35:56 UTC (rev 16891)
@@ -0,0 +1,27 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.smooks.graphical.editors.model;
+
+import org.eclipse.jface.viewers.ILabelProvider;
+import org.eclipse.jface.viewers.ITreeContentProvider;
+import org.jboss.tools.smooks.gef.tree.model.TreeNodeModel;
+
+/**
+ * @author Dart
+ *
+ */
+public class AbstractResourceGraphModel extends TreeNodeModel {
+
+ public AbstractResourceGraphModel(Object data, ITreeContentProvider contentProvider,
ILabelProvider labelProvider) {
+ super(data, contentProvider, labelProvider);
+ }
+
+}
Property changes on:
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/model/AbstractResourceGraphModel.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added:
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/model/InputDataRootModel.java
===================================================================
---
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/model/InputDataRootModel.java
(rev 0)
+++
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/model/InputDataRootModel.java 2009-07-30
08:35:56 UTC (rev 16891)
@@ -0,0 +1,82 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.smooks.graphical.editors.model;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.jboss.tools.smooks.configuration.editors.IXMLStructuredObject;
+
+/**
+ * @author Dart
+ *
+ */
+public class InputDataRootModel implements IXMLStructuredObject {
+
+ private String type = null;
+
+ private List<IXMLStructuredObject> children;
+
+
+ public String getType() {
+ return type;
+ }
+
+ public void setType(String type) {
+ this.type = type;
+ }
+
+ /* (non-Javadoc)
+ * @see org.jboss.tools.smooks.configuration.editors.IXMLStructuredObject#getChildren()
+ */
+ public List<IXMLStructuredObject> getChildren() {
+ if(children == null){
+ children = new ArrayList<IXMLStructuredObject>();
+ }
+ return children;
+ }
+
+ /* (non-Javadoc)
+ * @see org.jboss.tools.smooks.configuration.editors.IXMLStructuredObject#getID()
+ */
+ public Object getID() {
+ return null;
+ }
+
+ /* (non-Javadoc)
+ * @see org.jboss.tools.smooks.configuration.editors.IXMLStructuredObject#getNodeName()
+ */
+ public String getNodeName() {
+ return null;
+ }
+
+ /* (non-Javadoc)
+ * @see org.jboss.tools.smooks.configuration.editors.IXMLStructuredObject#getParent()
+ */
+ public IXMLStructuredObject getParent() {
+ return null;
+ }
+
+ /* (non-Javadoc)
+ * @see org.jboss.tools.smooks.configuration.editors.IXMLStructuredObject#isAttribute()
+ */
+ public boolean isAttribute() {
+ return false;
+ }
+
+ /* (non-Javadoc)
+ * @see org.jboss.tools.smooks.configuration.editors.IXMLStructuredObject#isRootNode()
+ */
+ public boolean isRootNode() {
+ return false;
+ }
+
+}
Property changes on:
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/model/InputDataRootModel.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added:
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/model/JavaBeanChildGraphModel.java
===================================================================
---
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/model/JavaBeanChildGraphModel.java
(rev 0)
+++
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/model/JavaBeanChildGraphModel.java 2009-07-30
08:35:56 UTC (rev 16891)
@@ -0,0 +1,33 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.smooks.graphical.editors.model;
+
+import org.eclipse.jface.viewers.ILabelProvider;
+import org.eclipse.jface.viewers.ITreeContentProvider;
+import org.jboss.tools.smooks.gef.tree.model.TreeNodeModel;
+
+/**
+ * @author Dart
+ *
+ */
+public class JavaBeanChildGraphModel extends TreeNodeModel {
+
+ public JavaBeanChildGraphModel(Object data, ITreeContentProvider contentProvider,
ILabelProvider labelProvider) {
+ super(data, contentProvider, labelProvider);
+ }
+
+ @Override
+ public boolean hasChildren() {
+ return false;
+ }
+
+
+}
Property changes on:
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/model/JavaBeanChildGraphModel.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Added:
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/model/JavaBeanGraphModel.java
===================================================================
---
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/model/JavaBeanGraphModel.java
(rev 0)
+++
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/model/JavaBeanGraphModel.java 2009-07-30
08:35:56 UTC (rev 16891)
@@ -0,0 +1,34 @@
+/*******************************************************************************
+ * Copyright (c) 2008 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
+ *
+ * Contributors:
+ * Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.jboss.tools.smooks.graphical.editors.model;
+
+import org.eclipse.jface.viewers.ILabelProvider;
+import org.eclipse.jface.viewers.ITreeContentProvider;
+import org.jboss.tools.smooks.gef.tree.model.TreeContainerModel;
+import org.jboss.tools.smooks.gef.tree.model.TreeNodeModel;
+
+/**
+ * @author Dart
+ *
+ */
+public class JavaBeanGraphModel extends TreeContainerModel {
+
+ public JavaBeanGraphModel(Object data, ITreeContentProvider contentProvider,
ILabelProvider labelProvider) {
+ super(data, contentProvider, labelProvider);
+ }
+
+ @Override
+ protected TreeNodeModel createChildModel(Object model, ITreeContentProvider
contentProvider,
+ ILabelProvider labelProvider) {
+ return new JavaBeanChildGraphModel(model, contentProvider, labelProvider);
+ }
+
+}
Property changes on:
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/model/JavaBeanGraphModel.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain