Author: DartPeng
Date: 2009-10-21 06:06:10 -0400 (Wed, 21 Oct 2009)
New Revision: 18199
Added:
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/SmooksTaskDetailsEditorSite.java
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/editor/AbstractSmooksFormEditor.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/SmooksGraphicalEditorPaletteRootCreator.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/SmooksProcessGraphicalEditor.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/editparts/BeanReferenceConnectionEditPart.java
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/TriggerConnectionEditPart.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/editparts/ValueBindingConnectionEditPart.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/model/InputDataContianerModel.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/model/InputDataTreeNodeModel.java
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/model/JavaBeanChildGraphModel.java
Log:
JBIDE-5067
1. Change the line style.
2. Fix bug : graphical viewer can refresh when source was changed.
3. Fix bug : when change the model in graphical viewer , can't notify the source tab
change the text.
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-10-21
10:05:51 UTC (rev 18198)
+++
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/uitls/SmooksUIUtils.java 2009-10-21
10:06:10 UTC (rev 18199)
@@ -2475,9 +2475,6 @@
input.getParam().addAll(params);
Command command = AddCommand.create(domain, extType,
GraphPackage.Literals.SMOOKS_GRAPHICS_EXT_TYPE__INPUT, input);
- if (command.canExecute()) {
- System.out.println("aaa");
- }
domain.getCommandStack().execute(command);
// extType.getInput().add(input);
}
Modified:
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/editor/AbstractSmooksFormEditor.java
===================================================================
---
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/editor/AbstractSmooksFormEditor.java 2009-10-21
10:05:51 UTC (rev 18198)
+++
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/editor/AbstractSmooksFormEditor.java 2009-10-21
10:06:10 UTC (rev 18199)
@@ -160,12 +160,6 @@
}
}
});
-
- //
- // if (propertySheetPage != null &&
- // !propertySheetPage.getControl().isDisposed()) {
- // propertySheetPage.refresh();
- // }
}
});
}
@@ -526,7 +520,7 @@
ProcessType process = GraphFactory.eINSTANCE.createProcessType();
processes.setProcess(process);
smooksGraphicsExt.setProcesses(processes);
- }else{
+ } else {
if (smooksGraphicsExt.getProcesses().getProcess() == null) {
ProcessesType processes = smooksGraphicsExt.getProcesses();
ProcessType process = GraphFactory.eINSTANCE.createProcessType();
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-10-21
10:05:51 UTC (rev 18198)
+++
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/gef/tree/editparts/TreeNodeConnectionEditPart.java 2009-10-21
10:06:10 UTC (rev 18199)
@@ -149,6 +149,7 @@
@Override
public void paintFigure(Graphics graphics) {
graphics.setAlpha(alpha);
+ graphics.setLineWidth(3);
super.paintFigure(graphics);
}
@@ -191,7 +192,6 @@
return list;
}
};
-
connection.setConnectionRouter(new ManhattanConnectionRouter());
return connection;
}
Modified:
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/SmooksGraphicalEditorPaletteRootCreator.java
===================================================================
---
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/SmooksGraphicalEditorPaletteRootCreator.java 2009-10-21
10:05:51 UTC (rev 18198)
+++
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/SmooksGraphicalEditorPaletteRootCreator.java 2009-10-21
10:06:10 UTC (rev 18199)
@@ -36,12 +36,9 @@
import org.eclipse.jface.resource.ImageDescriptor;
import org.jboss.tools.smooks.configuration.editors.actions.ISmooksActionGrouper;
import org.jboss.tools.smooks.configuration.editors.actions.JavaBean11ActionGrouper;
-import org.jboss.tools.smooks.configuration.editors.actions.Templating11ActionGrouper;
import org.jboss.tools.smooks.configuration.editors.uitls.SmooksUIUtils;
import org.jboss.tools.smooks.editor.ISmooksModelProvider;
-import org.jboss.tools.smooks.gef.tree.model.BeanReferenceConnection;
import org.jboss.tools.smooks.gef.tree.model.TriggerConnection;
-import org.jboss.tools.smooks.gef.tree.model.ValueBindingConnection;
import org.jboss.tools.smooks.model.javabean.BindingsType;
import org.jboss.tools.smooks.model.javabean12.BeanType;
import org.jboss.tools.smooks.model.smooks.ConditionType;
@@ -102,33 +99,6 @@
for (Iterator<?> iterator = grouperList.iterator(); iterator.hasNext();) {
ISmooksActionGrouper iSmooksActionGrouper = (ISmooksActionGrouper) iterator.next();
PaletteDrawer drawer = new PaletteDrawer(iSmooksActionGrouper.getGroupName());
-
- if(iSmooksActionGrouper instanceof JavaBean11ActionGrouper){
- CreationFactory factory = new CreationFactory() {
-
- public Object getObjectType() {
- return BeanReferenceConnection.class;
- }
-
- public Object getNewObject() {
- return null;
- }
- };
- drawer.add(new ConnectionCreationToolEntry("Bean Ref Link", "Bean Ref
Link", factory, null, null));
-
- CreationFactory factory1 = new CreationFactory() {
-
- public Object getObjectType() {
- return ValueBindingConnection.class;
- }
-
- public Object getNewObject() {
- return null;
- }
- };
- drawer.add(new ConnectionCreationToolEntry("Value Binding Link",
"Value Binding Link", factory1, null, null));
- }
-
fillDrawer(drawer, newChildrenDescripter, iSmooksActionGrouper);
root.add(drawer);
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-10-21
10:05:51 UTC (rev 18198)
+++
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/SmooksGraphicalEditorPart.java 2009-10-21
10:06:10 UTC (rev 18199)
@@ -40,8 +40,6 @@
import org.eclipse.gef.ui.actions.SelectionAction;
import org.eclipse.gef.ui.parts.GraphicalEditorWithPalette;
import org.eclipse.gef.ui.parts.GraphicalViewerKeyHandler;
-import org.eclipse.jface.action.IAction;
-import org.eclipse.jface.action.IMenuManager;
import org.eclipse.jface.util.TransferDropTargetListener;
import org.eclipse.jface.viewers.ILabelProvider;
import org.eclipse.jface.viewers.ISelection;
@@ -50,20 +48,14 @@
import org.eclipse.jface.viewers.SelectionChangedEvent;
import org.eclipse.swt.SWT;
import org.eclipse.swt.layout.FillLayout;
-import org.eclipse.swt.layout.GridLayout;
import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
import org.eclipse.ui.IEditorInput;
import org.eclipse.ui.IEditorSite;
import org.eclipse.ui.IWorkbenchPart;
import org.eclipse.ui.PartInitException;
import org.eclipse.ui.actions.ActionFactory;
-import org.eclipse.ui.forms.events.HyperlinkEvent;
-import org.eclipse.ui.forms.events.IHyperlinkListener;
+import org.eclipse.ui.forms.editor.FormPage;
import org.eclipse.ui.forms.widgets.FormToolkit;
-import org.eclipse.ui.forms.widgets.Hyperlink;
-import org.eclipse.ui.forms.widgets.ScrolledPageBook;
-import org.jboss.tools.smooks.configuration.SmooksConstants;
import org.jboss.tools.smooks.configuration.editors.IXMLStructuredObject;
import org.jboss.tools.smooks.configuration.editors.SelectorCreationDialog;
import org.jboss.tools.smooks.configuration.editors.javabean.JavaBeanModel;
@@ -72,7 +64,6 @@
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.AbstractSmooksFormEditor;
import org.jboss.tools.smooks.editor.ISmooksModelProvider;
import org.jboss.tools.smooks.editor.ISourceSynchronizeListener;
import org.jboss.tools.smooks.gef.common.RootModel;
@@ -95,10 +86,7 @@
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.ISmooksGraphChangeListener;
-import org.jboss.tools.smooks.model.graphics.ext.ProcessType;
-import org.jboss.tools.smooks.model.graphics.ext.ProcessesType;
import org.jboss.tools.smooks.model.graphics.ext.SmooksGraphicsExtType;
-import org.jboss.tools.smooks.model.graphics.ext.TaskType;
import org.jboss.tools.smooks.model.smooks.DocumentRoot;
import org.jboss.tools.smooks.model.smooks.SmooksResourceListType;
import org.jboss.tools.smooks.model.validation10.RuleType;
@@ -110,16 +98,12 @@
public class SmooksGraphicalEditorPart extends GraphicalEditorWithPalette implements
ISelectionChangedListener,
ISourceSynchronizeListener, ISmooksGraphChangeListener {
- private List<IAction> processPanelActions = new ArrayList<IAction>();
-
public static final int EXECUTE_COMMAND = 0;
public static final int REDO_COMMAND = 1;
public static final int UNDO_COMMAND = 2;
- private Object emptyKey = new Object();
-
private DefaultEditDomain editDomain = null;
private ISmooksModelProvider smooksModelProvider = null;
@@ -134,10 +118,6 @@
private ConnectionModelFactory connectionModelFactory;
- // private GraphViewer processGraphViewer;
-
- private ScrolledPageBook pageBook;
-
public SmooksGraphicalEditorPart(ISmooksModelProvider provider) {
super();
this.editDomain = new DefaultEditDomain(this);
@@ -174,239 +154,24 @@
this.setEditDomain(editDomain);
}
- protected void createProcessGraphicalPanel(Composite parent) {
- // processGraphViewer = new GraphViewer(parent, SWT.NONE);
- // processGraphViewer.setContentProvider(new
- // ProcessGraphContentProvider());
- //
- // processGraphViewer.setLabelProvider(new LabelProvider() {
- //
- // @Override
- // public Image getImage(Object element) {
- // // TODO Auto-generated method stub
- // return super.getImage(element);
- // }
- //
- // @Override
- // public String getText(Object element) {
- // if (element instanceof TaskType) {
- // String id = ((TaskType) element).getId();
- // String name = ((TaskType) element).getName();
- // if (name == null) {
- // name = id;
- // }
- // if (name == null) {
- // name = "null";
- // }
- // return name;
- // }
- // return "";
- // }
- //
- // });
- // processGraphViewer.setConnectionStyle(ZestStyles.CONNECTIONS_DIRECTED);
- // HorizontalTreeLayoutAlgorithm layoutAlgorithm = new
- // HorizontalTreeLayoutAlgorithm(
- // LayoutStyles.NO_LAYOUT_NODE_RESIZING);
- // processGraphViewer.setLayoutAlgorithm(layoutAlgorithm, true);
- // if (parent instanceof Section) {
- // ((Section) parent).setClient(processGraphViewer.getControl());
- // }
- }
-
- protected void initProcessGraphicalViewer() {
- SmooksGraphicsExtType ext = this.smooksModelProvider.getSmooksGraphicsExt();
- ProcessesType processes = ext.getProcesses();
- ProcessType process = null;
- if (processes != null) {
- process = processes.getProcess();
- }
-
- if (process != null) {
- // getProcessGraphViewer().setInput(process);
- }
- }
-
- protected void configProcessGraphicalViewer() {
- // MenuManager manager = new MenuManager();
- //
- // initProcessGraphicalPanelActions(manager);
- //
- // Menu menu =
- // manager.createContextMenu(getProcessGraphViewer().getControl());
- // getProcessGraphViewer().getControl().setMenu(menu);
- // manager.addMenuListener(new IMenuListener() {
- //
- // public void menuAboutToShow(IMenuManager manager) {
- // for (Iterator<?> iterator = processPanelActions.iterator();
- // iterator.hasNext();) {
- // IAction a = (IAction) iterator.next();
- // if (a instanceof AbstractProcessGraphAction) {
- // ((AbstractProcessGraphAction) a).selectionChanged(new
- // SelectionChangedEvent(processGraphViewer,
- // processGraphViewer.getSelection()));
- // }
- // }
- // manager.update();
- // }
- // });
- }
-
- protected void initProcessGraphicalPanelActions(IMenuManager manager) {
-
- // AddTaskNodeAction addInputTaskAction = new
- // AddTaskNodeAction(SmooksConstants.TASK_ID_INPUT, "Add Input Task",
- // smooksModelProvider) {
- //
- // @Override
- // public void run() {
- // if (this.provider != null) {
- // SmooksGraphicsExtType graph = provider.getSmooksGraphicsExt();
- // ProcessType process = graph.getProcesses().getProcess();
- // if (process != null && process.getTask().isEmpty()) {
- // TaskType childTask = GraphFactory.eINSTANCE.createTaskType();
- // childTask.setId(taskID);
- // childTask.setName("Input Task");
- // Command command = AddCommand.create(provider.getEditingDomain(),
- // process,
- // GraphPackage.Literals.PROCESS_TYPE__TASK, childTask);
- // provider.getEditingDomain().getCommandStack().execute(command);
- // }
- // }
- // }
- //
- // @Override
- // public void update() {
- // this.setEnabled(false);
- // SmooksGraphicsExtType graph =
- // smooksModelProvider.getSmooksGraphicsExt();
- // ProcessType process = graph.getProcesses().getProcess();
- // if (process != null && process.getTask().isEmpty()) {
- // this.setEnabled(true);
- // }
- // }
- //
- // };
- // manager.add(addInputTaskAction);
- // processPanelActions.add(addInputTaskAction);
- //
- // MenuManager addNextTaskMenuManager = new
- // MenuManager("Add Next Task");
- // manager.add(addNextTaskMenuManager);
- //
- // AddNextTaskNodeAction addNextInputAction = new
- // AddNextTaskNodeAction(SmooksConstants.TASK_ID_INPUT, "Input",
- // smooksModelProvider);
- // this.processPanelActions.add(addNextInputAction);
- // addNextTaskMenuManager.add(addNextInputAction);
- //
- // AddNextTaskNodeAction addNextJavaMappingAction = new
- // AddNextTaskNodeAction(
- // SmooksConstants.TASK_ID_JAVA_MAPPING, "Java Mapping",
- // smooksModelProvider);
- // this.processPanelActions.add(addNextJavaMappingAction);
- // addNextTaskMenuManager.add(addNextJavaMappingAction);
- //
- // MenuManager addPreTaskMenuManager = new
- // MenuManager("Add Previous Task");
- // manager.add(addPreTaskMenuManager);
- //
- // AddPreviousTaskNodeAction addPreInputAction = new
- // AddPreviousTaskNodeAction(SmooksConstants.TASK_ID_INPUT,
- // "Input", smooksModelProvider);
- // this.processPanelActions.add(addPreInputAction);
- // addPreTaskMenuManager.add(addPreInputAction);
- //
- // AddPreviousTaskNodeAction addPreJavaMappingAction = new
- // AddPreviousTaskNodeAction(
- // SmooksConstants.TASK_ID_JAVA_MAPPING, "Java Mapping",
- // smooksModelProvider);
- // this.processPanelActions.add(addPreJavaMappingAction);
- // addPreTaskMenuManager.add(addPreJavaMappingAction);
- //
- // DeleteTaskNodeAction deleteAction = new
- // DeleteTaskNodeAction(smooksModelProvider);
- // manager.add(deleteAction);
- //
- // this.processPanelActions.add(deleteAction);
- //
- // getProcessGraphViewer().addSelectionChangedListener(new
- // ISelectionChangedListener() {
- //
- // public void selectionChanged(SelectionChangedEvent event) {
- // IStructuredSelection selection = (IStructuredSelection)
- // event.getSelection();
- // Object firstElement = selection.getFirstElement();
- // showTaskControl(firstElement);
- // }
- // });
- }
-
- // public GraphViewer getProcessGraphViewer() {
- // return processGraphViewer;
- // }
-
@Override
public void createPartControl(Composite parent) {
- // FormToolkit toolkit = ((AbstractSmooksFormEditor)
- // this.smooksModelProvider).getToolkit();
- // Composite composite = new Composite(parent, SWT.NONE);
- // composite.setBackground(toolkit.getColors().getBackground());
- //
- // FillLayout fillLayout = new FillLayout();
- // fillLayout.marginWidth = 5;
- // fillLayout.marginHeight = 5;
- // composite.setLayout(fillLayout);
- //
- // SashForm sashForm = new SashForm(composite, SWT.VERTICAL);
- // sashForm.SASH_WIDTH = 1;
- //
- // Section processGraphSection = toolkit.createSection(sashForm,
- // Section.DESCRIPTION | Section.TITLE_BAR);
- // processGraphSection.setText("Process Map");
- // processGraphSection.setDescription("Right-Click to open the PopMenu to add or
remove task node");
- //
- // Composite processGraphComposite =
- // toolkit.createComposite(processGraphSection);
- //
- // FillLayout processGraphFillLayout = new FillLayout();
- // processGraphFillLayout.marginWidth = 1;
- // processGraphFillLayout.marginHeight = 1;
- // processGraphComposite.setLayout(processGraphFillLayout);
- //
- // processGraphComposite.setBackground(toolkit.getColors().getBorderColor());
- //
- // processGraphSection.setClient(processGraphComposite);
- //
- // createProcessGraphicalPanel(processGraphComposite);
- // configProcessGraphicalViewer();
- // initProcessGraphicalViewer();
- //
- // Composite taskDetailsComposite = toolkit.createComposite(sashForm);
- // FillLayout taskDetailsFillLayout = new FillLayout();
- // taskDetailsFillLayout.marginWidth = 0;
- // taskDetailsFillLayout.marginHeight = 5;
- // taskDetailsComposite.setLayout(taskDetailsFillLayout);
- //
- // Section section = toolkit.createSection(taskDetailsComposite,
- // Section.DESCRIPTION | Section.TITLE_BAR);
- // section.setText("Task Configuration");
- // section.setDescription("Configurate the selected task");
- // pageBook = new ScrolledPageBook(section);
- // pageBook.setBackground(toolkit.getColors().getBackground());
- // section.setClient(pageBook);
- //
- // sashForm.setWeights(new int[] { 4, 6 });
- //
- // Composite emptyComposite = pageBook.createPage(emptyKey);
- // emptyComposite.setLayout(new FillLayout());
- // createEmptyTaskPanel(emptyComposite, toolkit);
- // pageBook.showPage(emptyKey);
- super.createPartControl(parent);
+ IEditorSite site = getEditorSite();
+ if (site instanceof SmooksTaskDetailsEditorSite) {
+ FormPage page = ((SmooksTaskDetailsEditorSite) site).getParentEditor();
+ FormToolkit tool = page.getManagedForm().getToolkit();
+ Composite mainComposite = tool.createComposite(parent);
+ mainComposite.setBackground(tool.getColors().getBorderColor());
+ FillLayout fillLayout = new FillLayout();
+ fillLayout.marginHeight = 1;
+ fillLayout.marginWidth = 1;
+ mainComposite.setLayout(fillLayout);
+ super.createPartControl(mainComposite);
+ return;
+ }
- // pageBook.showPage(pageBook);
-
+ super.createPartControl(parent);
}
private void handleCommandStack(org.eclipse.emf.common.command.CommandStack
commandStack) {
@@ -834,7 +599,7 @@
containerModel.getChildren().add((IXMLStructuredObject) object);
if (containerModel != null) {
TreeContainerModel container = new InputDataContianerModel(containerModel,
contentProvider,
- labelProvider);
+ labelProvider, getSmooksModelProvider());
root.addTreeNode(container);
inputGraphModel.add(container);
}
@@ -919,7 +684,6 @@
connections.addAll(c1);
}
this.createConnection(model.getChildren(), connections);
- List<AbstractSmooksGraphicalModel> children = model.getChildren();
// for (Iterator<?> iterator = children.iterator();
// iterator.hasNext();) {
// AbstractSmooksGraphicalModel abstractSmooksGraphicalModel =
@@ -1178,81 +942,6 @@
updateActions(getSelectionActions());
}
- protected Control createTaskPanel(Composite parent, FormToolkit toolkit, String taskID)
{
-
- if (taskID == null)
- return null;
-
- if (taskID.equals(SmooksConstants.TASK_ID_JAVA_MAPPING)) {
- parent.setBackground(toolkit.getColors().getBorderColor());
-
- FillLayout detailsFillLayout = new FillLayout();
- detailsFillLayout.marginWidth = 1;
- detailsFillLayout.marginHeight = 1;
- parent.setLayout(detailsFillLayout);
-
- super.createPartControl(parent);
- return parent;
- }
-
- if (taskID.equals(SmooksConstants.TASK_ID_INPUT)) {
- GridLayout gl = new GridLayout();
- gl.numColumns = 2;
- parent.setLayout(gl);
- toolkit.createLabel(parent,
- "Click the link to switch to the \"Input\" tab to configurate the
Smooks Input : ");
- Hyperlink link = toolkit.createHyperlink(parent, "Go to the Input page",
SWT.NONE);
- link.addHyperlinkListener(new IHyperlinkListener() {
-
- public void linkExited(HyperlinkEvent e) {
-
- }
-
- public void linkEntered(HyperlinkEvent e) {
-
- }
-
- public void linkActivated(HyperlinkEvent e) {
- if (smooksModelProvider instanceof AbstractSmooksFormEditor) {
- ((AbstractSmooksFormEditor)
smooksModelProvider).setActivePage("reader_page");
- }
- }
- });
-
- return parent;
- }
-
- return null;
- }
-
- protected void showTaskControl(Object model) {
- FormToolkit toolkit = ((AbstractSmooksFormEditor)
this.smooksModelProvider).getToolkit();
- if (model instanceof TaskType) {
- String id = ((TaskType) model).getId();
- if (id != null) {
- if (!pageBook.hasPage(id)) {
- Composite parent = pageBook.createPage(id);
- Control control = createTaskPanel(parent, toolkit, id);
- if (control != null) {
- pageBook.showPage(id);
- } else {
- pageBook.removePage(id);
- pageBook.showPage(emptyKey);
- }
- } else {
- pageBook.showPage(id);
- }
- }
- } else {
- // pageBook.showEmptyPage();
- }
- }
-
- protected Control createEmptyTaskPanel(Composite parent, FormToolkit toolkit) {
- parent.setLayout(new FillLayout());
- return toolkit.createLabel(parent, "Select the task node");
- }
-
public void sourceChange(Object model) {
initGraphicalModel();
}
Modified:
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/SmooksProcessGraphicalEditor.java
===================================================================
---
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/SmooksProcessGraphicalEditor.java 2009-10-21
10:05:51 UTC (rev 18198)
+++
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/SmooksProcessGraphicalEditor.java 2009-10-21
10:06:10 UTC (rev 18199)
@@ -56,7 +56,6 @@
import org.eclipse.ui.forms.widgets.ScrolledForm;
import org.eclipse.ui.forms.widgets.ScrolledPageBook;
import org.eclipse.ui.forms.widgets.Section;
-import org.eclipse.ui.part.MultiPageEditorSite;
import org.eclipse.zest.core.viewers.GraphViewer;
import org.eclipse.zest.core.widgets.ZestStyles;
import org.eclipse.zest.layouts.LayoutStyles;
@@ -559,7 +558,7 @@
}
protected IEditorSite createSite(IEditorPart editor) {
- return new MultiPageEditorSite(this.getEditor(), editor);
+ return new SmooksTaskDetailsEditorSite(this.getEditor(), editor, this);
}
protected void createTaskPage(IEditorPart editorPart, Composite parent) throws
PartInitException {
@@ -578,18 +577,43 @@
}
public void sourceChange(Object model) {
+ Collection<Object> editors = registedTaskPages.values();
+ for (Iterator<?> iterator = editors.iterator(); iterator.hasNext();) {
+ Object object = (Object) iterator.next();
+ if (object instanceof ISmooksGraphChangeListener) {
+ ((ISourceSynchronizeListener) object).sourceChange(model);
+ }
+ }
}
public void graphChanged(SmooksGraphicsExtType extType) {
-
+ Collection<Object> editors = registedTaskPages.values();
+ for (Iterator<?> iterator = editors.iterator(); iterator.hasNext();) {
+ Object object = (Object) iterator.next();
+ if (object instanceof ISmooksGraphChangeListener) {
+ ((ISmooksGraphChangeListener) object).graphChanged(extType);
+ }
+ }
}
public void graphPropertyChange(EStructuralFeature featre, Object value) {
-
+ Collection<Object> editors = registedTaskPages.values();
+ for (Iterator<?> iterator = editors.iterator(); iterator.hasNext();) {
+ Object object = (Object) iterator.next();
+ if (object instanceof ISmooksGraphChangeListener) {
+ ((ISmooksGraphChangeListener) object).graphPropertyChange(featre, value);
+ }
+ }
}
public void inputTypeChanged(SmooksGraphicsExtType extType) {
-
+ Collection<Object> editors = registedTaskPages.values();
+ for (Iterator<?> iterator = editors.iterator(); iterator.hasNext();) {
+ Object object = (Object) iterator.next();
+ if (object instanceof ISmooksGraphChangeListener) {
+ ((ISmooksGraphChangeListener) object).inputTypeChanged(extType);
+ }
+ }
}
public void propertyChanged(Object source, int propId) {
Added:
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/SmooksTaskDetailsEditorSite.java
===================================================================
---
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/SmooksTaskDetailsEditorSite.java
(rev 0)
+++
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/SmooksTaskDetailsEditorSite.java 2009-10-21
10:06:10 UTC (rev 18199)
@@ -0,0 +1,48 @@
+/*******************************************************************************
+ * 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;
+
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.forms.editor.FormPage;
+import org.eclipse.ui.part.MultiPageEditorPart;
+import org.eclipse.ui.part.MultiPageEditorSite;
+
+/**
+ * @author Dart
+ *
+ */
+public class SmooksTaskDetailsEditorSite extends MultiPageEditorSite {
+
+ private FormPage parentEditor = null;
+
+ public SmooksTaskDetailsEditorSite(MultiPageEditorPart multiPageEditor, IEditorPart
editor,
+ FormPage parentEditor) {
+ super(multiPageEditor, editor);
+ this.parentEditor = parentEditor;
+ }
+
+ /**
+ * @return the parentEditor
+ */
+ public FormPage getParentEditor() {
+ return parentEditor;
+ }
+
+ /**
+ * @param parentEditor the parentEditor to set
+ */
+ public void setParentEditor(FormPage parentEditor) {
+ this.parentEditor = parentEditor;
+ }
+
+
+
+}
Property changes on:
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/SmooksTaskDetailsEditorSite.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified:
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/editparts/BeanReferenceConnectionEditPart.java
===================================================================
---
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/editparts/BeanReferenceConnectionEditPart.java 2009-10-21
10:05:51 UTC (rev 18198)
+++
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/editparts/BeanReferenceConnectionEditPart.java 2009-10-21
10:06:10 UTC (rev 18199)
@@ -11,17 +11,21 @@
package org.jboss.tools.smooks.graphical.editors.editparts;
-import org.eclipse.draw2d.ColorConstants;
import org.eclipse.draw2d.Connection;
import org.eclipse.draw2d.ConnectionAnchor;
import org.eclipse.draw2d.Graphics;
-import org.eclipse.draw2d.ManhattanConnectionRouter;
import org.eclipse.draw2d.PolylineConnection;
import org.eclipse.draw2d.geometry.Point;
import org.eclipse.draw2d.geometry.PointList;
+import org.eclipse.gef.DefaultEditDomain;
import org.eclipse.swt.SWT;
+import org.eclipse.swt.graphics.LineAttributes;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.IEditorSite;
+import org.eclipse.ui.forms.editor.FormPage;
import org.jboss.tools.smooks.gef.tree.editparts.TreeNodeConnectionEditPart;
import org.jboss.tools.smooks.gef.tree.figures.LeftOrRightAnchor;
+import org.jboss.tools.smooks.graphical.editors.SmooksTaskDetailsEditorSite;
/**
* @author Dart
@@ -39,8 +43,6 @@
@Override
public void paintFigure(Graphics graphics) {
graphics.setAlpha(alpha);
- graphics.setForegroundColor(ColorConstants.darkBlue);
- graphics.setLineStyle(Graphics.LINE_DASHDOTDOT);
super.paintFigure(graphics);
}
@@ -83,8 +85,19 @@
return list;
}
};
-
- connection.setConnectionRouter(new ManhattanConnectionRouter());
+ DefaultEditDomain domain = (DefaultEditDomain) getViewer().getEditDomain();
+ IEditorPart editorPart = domain.getEditorPart();
+ IEditorSite site = editorPart.getEditorSite();
+ if(site instanceof SmooksTaskDetailsEditorSite){
+ FormPage page = ((SmooksTaskDetailsEditorSite)site).getParentEditor();
+ connection.setForegroundColor(page.getManagedForm().getToolkit().getColors().getBorderColor());
+
+ }
+ connection.setLineStyle(Graphics.LINE_CUSTOM);
+ connection.setLineDash(new float[]{10,5});
+ connection.setLineCap(SWT.CAP_ROUND);
+// connection.set
+// connection.setConnectionRouter(new ManhattanConnectionRouter());
return connection;
}
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-10-21
10:05:51 UTC (rev 18198)
+++
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/editparts/InputDataContainerEditPart.java 2009-10-21
10:06:10 UTC (rev 18199)
@@ -19,12 +19,17 @@
import org.eclipse.draw2d.Label;
import org.eclipse.draw2d.geometry.Dimension;
import org.eclipse.draw2d.geometry.Point;
+import org.eclipse.swt.graphics.Image;
import org.jboss.tools.smooks.configuration.SmooksConfigurationActivator;
import org.jboss.tools.smooks.configuration.editors.GraphicsConstants;
+import org.jboss.tools.smooks.editor.ISmooksModelProvider;
import org.jboss.tools.smooks.gef.tree.editparts.TreeContainerEditPart;
import org.jboss.tools.smooks.gef.tree.figures.TreeContainerFigure;
import org.jboss.tools.smooks.gef.tree.model.TreeContainerModel;
import org.jboss.tools.smooks.gef.tree.model.TreeNodeModel;
+import org.jboss.tools.smooks.graphical.editors.model.InputDataContianerModel;
+import org.jboss.tools.smooks.model.graphics.ext.SmooksGraphicsExtType;
+import org.jboss.tools.smooks10.model.smooks.util.SmooksModelUtils;
/**
* @author Dart
@@ -32,6 +37,8 @@
*/
public class InputDataContainerEditPart extends TreeContainerEditPart {
+ private String inputType = null;
+
@Override
public void propertyChange(PropertyChangeEvent evt) {
super.propertyChange(evt);
@@ -158,14 +165,65 @@
*/
@Override
protected void refreshVisuals() {
- TreeContainerFigure figure = (TreeContainerFigure) getFigure();
- // if(i != null){
- // figure.setIcon(i);
- // }
- figure.getLabel().setTextAlignment(Label.LEFT);
- figure.setText("Input Model");
- figure.setIcon(SmooksConfigurationActivator.getDefault().getImageRegistry().get(
- GraphicsConstants.IMAGE_INPUT_DATA_HEADER));
+ InputDataContianerModel model = (InputDataContianerModel) getModel();
+ ISmooksModelProvider provider = model.getSmooksModelProvider();
+ SmooksGraphicsExtType ext = provider.getSmooksGraphicsExt();
+ if (ext != null) {
+
+ Image image = SmooksConfigurationActivator.getDefault().getImageRegistry().get(
+ GraphicsConstants.IMAGE_INPUT_DATA_HEADER);
+
+ String text = "Input Model";
+
+ if (inputType != null) {
+ if (inputType.equals(ext.getInputType())) {
+ super.refreshVisuals();
+ return;
+ }
+ }
+ inputType = ext.getInputType();
+ if (inputType.equals(SmooksModelUtils.INPUT_TYPE_JAVA)) {
+ image = SmooksConfigurationActivator.getDefault().getImageRegistry().get(
+ GraphicsConstants.IMAGE_JAVA_FILE);
+
+ text = "Java Input Model";
+ }
+
+ if (inputType.equals(SmooksModelUtils.INPUT_TYPE_XML)) {
+ image = SmooksConfigurationActivator.getDefault().getImageRegistry().get(
+ GraphicsConstants.IMAGE_XML_FILE);
+
+ text = "XML Input Model";
+ }
+
+ if (inputType.equals(SmooksModelUtils.INPUT_TYPE_XSD)) {
+ image = SmooksConfigurationActivator.getDefault().getImageRegistry().get(
+ GraphicsConstants.IMAGE_XSD_FILE);
+
+ text = "XSD Input Model";
+ }
+
+ if (inputType.equals(SmooksModelUtils.INPUT_TYPE_CSV)) {
+
+ text = "CSV Input Model";
+ }
+
+ if (inputType.equals(SmooksModelUtils.INPUT_TYPE_EDI_1_1)) {
+
+ text = "EDI Input Model";
+ }
+
+ if (inputType.equals(SmooksModelUtils.INPUT_TYPE_JSON_1_1)) {
+
+ text = "JSON Input Model";
+ }
+
+ TreeContainerFigure figure = (TreeContainerFigure) getFigure();
+ figure.getLabel().setTextAlignment(Label.LEFT);
+ figure.setText(text);
+ figure.setIcon(image);
+ }
+
super.refreshVisuals();
}
Modified:
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/editparts/TriggerConnectionEditPart.java
===================================================================
---
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/editparts/TriggerConnectionEditPart.java 2009-10-21
10:05:51 UTC (rev 18198)
+++
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/editparts/TriggerConnectionEditPart.java 2009-10-21
10:06:10 UTC (rev 18199)
@@ -11,20 +11,28 @@
package org.jboss.tools.smooks.graphical.editors.editparts;
import org.eclipse.draw2d.Connection;
+import org.eclipse.draw2d.Shape;
import org.jboss.tools.smooks.gef.tree.editparts.TreeNodeConnectionEditPart;
/**
* @author Dart
- *
+ *
*/
public class TriggerConnectionEditPart extends TreeNodeConnectionEditPart {
- /* (non-Javadoc)
- * @see
org.jboss.tools.smooks.gef.tree.editparts.TreeNodeConnectionEditPart#createConnectionFigure()
+ /*
+ * (non-Javadoc)
+ *
+ * @see
+ * org.jboss.tools.smooks.gef.tree.editparts.TreeNodeConnectionEditPart#
+ * createConnectionFigure()
*/
@Override
protected Connection createConnectionFigure() {
- return super.createConnectionFigure();
+ Connection c = super.createConnectionFigure();
+ if (c instanceof Shape) {
+ ((Shape) c).setLineWidth(2);
+ }
+ return c;
}
-
}
Modified:
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/editparts/ValueBindingConnectionEditPart.java
===================================================================
---
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/editparts/ValueBindingConnectionEditPart.java 2009-10-21
10:05:51 UTC (rev 18198)
+++
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/editparts/ValueBindingConnectionEditPart.java 2009-10-21
10:06:10 UTC (rev 18199)
@@ -11,7 +11,6 @@
package org.jboss.tools.smooks.graphical.editors.editparts;
import org.eclipse.draw2d.Connection;
-import org.jboss.tools.smooks.configuration.editors.GraphicsConstants;
import org.jboss.tools.smooks.gef.tree.editparts.TreeNodeConnectionEditPart;
/**
@@ -26,7 +25,7 @@
@Override
protected Connection createConnectionFigure() {
Connection connection = super.createConnectionFigure();
- connection.setForegroundColor(GraphicsConstants.BORDER_CORLOER);
+// connection.setForegroundColor(GraphicsConstants.BORDER_CORLOER);
return connection;
}
}
Modified:
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/model/InputDataContianerModel.java
===================================================================
---
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/model/InputDataContianerModel.java 2009-10-21
10:05:51 UTC (rev 18198)
+++
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/model/InputDataContianerModel.java 2009-10-21
10:06:10 UTC (rev 18199)
@@ -12,37 +12,68 @@
import org.eclipse.jface.viewers.ILabelProvider;
import org.eclipse.jface.viewers.ITreeContentProvider;
+import org.jboss.tools.smooks.editor.ISmooksModelProvider;
import org.jboss.tools.smooks.gef.tree.model.TreeContainerModel;
import org.jboss.tools.smooks.gef.tree.model.TreeNodeModel;
-import org.jboss.tools.smooks.gef.tree.model.TriggerConnection;
-import org.jboss.tools.smooks.gef.tree.model.ValueBindingConnection;
/**
* @author Dart
*
*/
public class InputDataContianerModel extends TreeContainerModel {
+
+ private ISmooksModelProvider smooksModelProvider;
- public InputDataContianerModel(Object data, ITreeContentProvider contentProvider,
ILabelProvider labelProvider) {
+ public InputDataContianerModel(Object data, ITreeContentProvider contentProvider,
ILabelProvider labelProvider, ISmooksModelProvider modelProvider) {
super(data, contentProvider, labelProvider);
- // TODO Auto-generated constructor stub
+ this.smooksModelProvider = modelProvider;
}
@Override
protected TreeNodeModel createChildModel(Object model, ITreeContentProvider
contentProvider,
- ILabelProvider labelProvider) {
+ ILabelProvider labelProvider ) {
return new InputDataTreeNodeModel(model, contentProvider, labelProvider);
}
+
+
+ /**
+ * @return the smooksModelProvider
+ */
+ public ISmooksModelProvider getSmooksModelProvider() {
+ return smooksModelProvider;
+ }
+
+ /**
+ * @param smooksModelProvider the smooksModelProvider to set
+ */
+ public void setSmooksModelProvider(ISmooksModelProvider smooksModelProvider) {
+ this.smooksModelProvider = smooksModelProvider;
+ }
+
/* (non-Javadoc)
* @see
org.jboss.tools.smooks.gef.model.AbstractSmooksGraphicalModel#isLinkable(java.lang.Class)
*/
@Override
public boolean isLinkable(Class<?> connectionType) {
- if(connectionType == TriggerConnection.class || connectionType ==
ValueBindingConnection.class){
- return true;
- }
+ return true;
+ }
+
+ /* (non-Javadoc)
+ * @see
org.jboss.tools.smooks.gef.tree.model.TreeNodeModel#canLinkWithSource(java.lang.Object)
+ */
+ @Override
+ public boolean canLinkWithSource(Object model) {
+ return super.canLinkWithSource(model);
+ }
+
+ /* (non-Javadoc)
+ * @see
org.jboss.tools.smooks.gef.tree.model.TreeNodeModel#canLinkWithTarget(java.lang.Object)
+ */
+ @Override
+ public boolean canLinkWithTarget(Object model) {
return false;
}
+
}
Modified:
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/model/InputDataTreeNodeModel.java
===================================================================
---
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/model/InputDataTreeNodeModel.java 2009-10-21
10:05:51 UTC (rev 18198)
+++
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/model/InputDataTreeNodeModel.java 2009-10-21
10:06:10 UTC (rev 18199)
@@ -10,15 +10,17 @@
******************************************************************************/
package org.jboss.tools.smooks.graphical.editors.model;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;
import org.eclipse.jface.viewers.ILabelProvider;
import org.eclipse.jface.viewers.ITreeContentProvider;
+import org.jboss.tools.smooks.configuration.editors.uitls.SmooksUIUtils;
+import org.jboss.tools.smooks.gef.model.AbstractSmooksGraphicalModel;
import org.jboss.tools.smooks.gef.tree.model.TreeNodeModel;
-import org.jboss.tools.smooks.gef.tree.model.TriggerConnection;
-import org.jboss.tools.smooks.gef.tree.model.ValueBindingConnection;
/**
* @author Dart
- *
+ *
*/
public class InputDataTreeNodeModel extends TreeNodeModel {
@@ -32,18 +34,46 @@
ILabelProvider labelProvider) {
return new InputDataTreeNodeModel(model, contentProvider, labelProvider);
}
-
- /* (non-Javadoc)
- * @see
org.jboss.tools.smooks.gef.model.AbstractSmooksGraphicalModel#isLinkable(java.lang.Class)
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see
+ * org.jboss.tools.smooks.gef.model.AbstractSmooksGraphicalModel#isLinkable
+ * (java.lang.Class)
*/
@Override
public boolean isLinkable(Class<?> connectionType) {
- if(connectionType == null){
+ return true;
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see
+ * org.jboss.tools.smooks.gef.tree.model.TreeNodeModel#canLinkWithSource
+ * (java.lang.Object)
+ */
+ @Override
+ public boolean canLinkWithSource(Object model) {
+ return super.canLinkWithSource(model);
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see
+ * org.jboss.tools.smooks.gef.tree.model.TreeNodeModel#canLinkWithTarget
+ * (java.lang.Object)
+ */
+ @Override
+ public boolean canLinkWithTarget(Object model) {
+ Object data = ((AbstractSmooksGraphicalModel)model).getData();
+ data = AdapterFactoryEditingDomain.unwrap(data);
+ if (SmooksUIUtils.getSelectorFeature((EObject)data) != null) {
return true;
}
- if(connectionType == TriggerConnection.class || connectionType ==
ValueBindingConnection.class){
- return true;
- }
return false;
}
+
}
Modified:
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 2009-10-21
10:05:51 UTC (rev 18198)
+++
trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/model/JavaBeanChildGraphModel.java 2009-10-21
10:06:10 UTC (rev 18199)
@@ -23,7 +23,7 @@
import org.jboss.tools.smooks.configuration.editors.GraphicsConstants;
import org.jboss.tools.smooks.configuration.editors.uitls.ProjectClassLoader;
import org.jboss.tools.smooks.configuration.editors.uitls.SmooksUIUtils;
-import org.jboss.tools.smooks.gef.tree.model.BeanReferenceConnection;
+import org.jboss.tools.smooks.gef.tree.model.TreeNodeConnection;
import org.jboss.tools.smooks.model.javabean.BindingsType;
import org.jboss.tools.smooks.model.javabean12.BeanType;
@@ -50,7 +50,7 @@
if (connectionType == null) {
return true;
}
- if (connectionType == BeanReferenceConnection.class) {
+ if (TreeNodeConnection.class.isAssignableFrom(connectionType)) {
Object data = this.getData();
data = AdapterFactoryEditingDomain.unwrap(data);
if (SmooksUIUtils.getBeanIDRefFeature((EObject)data) != null) {