Author: DartPeng Date: 2009-08-27 03:08:47 -0400 (Thu, 27 Aug 2009) New Revision: 17288 Added: trunk/smooks/plugins/org.jboss.tools.smooks.core/icons/full/obj16/java_bean.png trunk/smooks/plugins/org.jboss.tools.smooks.ui/icons/full/obj16/java_bean.png trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/gef/tree/command/GEFAdapterCommand.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/commands/ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/commands/SmooksModelRemoveCommand.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/editparts/AbstractResourceConfigChildNodeEditPart.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/editparts/AbstractResourceConfigEditPart.java 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/JavaBeanEditPart.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/editparts/ResourceConfigEditFactory.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/model/AbstractResourceConfigChildNodeGraphModel.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/model/AbstractResourceConfigGraphModel.java Removed: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/edimap/editor/GEFAdapterCommand.java 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/model/AbstractResourceGraphModel.java Modified: trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/javabean/provider/BindingsTypeItemProvider.java trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/javabean12/provider/BeanTypeItemProvider.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/SmooksConfigurationActivator.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/GraphicsConstants.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/SmooksConfigurationFormPage.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/SmooksConfigurationReaderPage.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/SmooksConfigurationResourceConfigPage.java 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/edimap/actions/AbstractEDIMappingAction.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/edimap/actions/AddComponentAction.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/edimap/actions/AddFieldAction.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/edimap/actions/AddSegmentAction.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/edimap/actions/AddSubComponentAction.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/edimap/actions/EDIGEFAdpaterCommand.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/gef/model/AbstractSmooksGraphicalModel.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/gef/tree/editparts/TreeContainerEditPart.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/gef/tree/editpolicy/RootPanelXYLayoutEditPolicy.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/gef/tree/figures/TreeContainerFigure.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/gef/tree/model/TreeNodeModel.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/GraphicalModelFactoryImpl.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/model/JavaBeanChildGraphModel.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/model/JavaBeanGraphModel.java Log: JBIDE-4648 Add remove the graphical figure feature Added: trunk/smooks/plugins/org.jboss.tools.smooks.core/icons/full/obj16/java_bean.png =================================================================== (Binary files differ) Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.core/icons/full/obj16/java_bean.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/javabean/provider/BindingsTypeItemProvider.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/javabean/provider/BindingsTypeItemProvider.java 2009-08-27 02:39:01 UTC (rev 17287) +++ trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/javabean/provider/BindingsTypeItemProvider.java 2009-08-27 07:08:47 UTC (rev 17288) @@ -222,7 +222,7 @@ */ @Override public Object getImage(Object object) { - return overlayImage(object, getResourceLocator().getImage("full/obj16/BindingsType")); + return overlayImage(object, getResourceLocator().getImage("full/obj16/java_bean.png")); } /** Modified: trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/javabean12/provider/BeanTypeItemProvider.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/javabean12/provider/BeanTypeItemProvider.java 2009-08-27 02:39:01 UTC (rev 17287) +++ trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/javabean12/provider/BeanTypeItemProvider.java 2009-08-27 07:08:47 UTC (rev 17288) @@ -217,7 +217,7 @@ * @generated */ public Object getImage(Object object) { - return overlayImage(object, getResourceLocator().getImage("full/obj16/BeanType")); + return overlayImage(object, getResourceLocator().getImage("full/obj16/java_bean.png")); } /** Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/icons/full/obj16/java_bean.png =================================================================== (Binary files differ) Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/icons/full/obj16/java_bean.png ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/SmooksConfigurationActivator.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/SmooksConfigurationActivator.java 2009-08-27 02:39:01 UTC (rev 17287) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/SmooksConfigurationActivator.java 2009-08-27 07:08:47 UTC (rev 17288) @@ -79,6 +79,8 @@ reg.put(GraphicsConstants.IMAGE_WARNING, getImageDescriptor(GraphicsConstants.IMAGE_PATH_WARNING)); // regist java images + reg.put(GraphicsConstants.IMAGE_JAVA_BEAN, imageDescriptorFromPlugin(PLUGIN_ID, + GraphicsConstants.IMAGE_JAVA_BEAN)); reg.put(GraphicsConstants.IMAGE_JAVA_INTERFACE, imageDescriptorFromPlugin(PLUGIN_ID, GraphicsConstants.IMAGE_JAVA_INTERFACE)); reg.put(GraphicsConstants.IMAGE_JAVA_ATTRIBUTE, imageDescriptorFromPlugin(PLUGIN_ID, Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/GraphicsConstants.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/GraphicsConstants.java 2009-08-27 02:39:01 UTC (rev 17287) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/GraphicsConstants.java 2009-08-27 07:08:47 UTC (rev 17288) @@ -20,6 +20,8 @@ public static final String IMAGE_JAVA_COLLECTION = "icons/full/obj16/javalistmodel.gif"; + public static final String IMAGE_JAVA_BEAN = "icons/full/obj16/java_bean.png"; + public static final String IMAGE_JAVA_ARRAY = "icons/full/obj16/javaarraymodel.gif"; public static final String IMAGE_CHECKBOX_CHECK = "icons/full/obj16/checkbox_checked.gif"; Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/SmooksConfigurationFormPage.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/SmooksConfigurationFormPage.java 2009-08-27 02:39:01 UTC (rev 17287) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/SmooksConfigurationFormPage.java 2009-08-27 07:08:47 UTC (rev 17288) @@ -75,9 +75,13 @@ form.setText(title); } + protected SmooksMasterDetailBlock createSmooksMasterDetailsBlock() { + return new SmooksMasterDetailBlock(getEditor(), + (AdapterFactoryEditingDomain) ((SmooksMultiFormEditor) getEditor()).getEditingDomain()); + } + protected void createMasterDetailBlock(IManagedForm managedForm) { - masterDetailBlock = new SmooksMasterDetailBlock(getEditor(), - (AdapterFactoryEditingDomain) ((SmooksMultiFormEditor) getEditor()).getEditingDomain()); + masterDetailBlock = createSmooksMasterDetailsBlock(); ViewerFilter[] filters = createViewerFilters(); masterDetailBlock.setViewerFilters(filters); masterDetailBlock.setMainSectionDescription(getMainSectionDescription()); Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/SmooksConfigurationReaderPage.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/SmooksConfigurationReaderPage.java 2009-08-27 02:39:01 UTC (rev 17287) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/SmooksConfigurationReaderPage.java 2009-08-27 07:08:47 UTC (rev 17288) @@ -12,7 +12,11 @@ import java.io.IOException; import java.util.Collections; +import java.util.Iterator; +import java.util.List; +import org.eclipse.emf.ecore.EObject; +import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.viewers.TableViewer; import org.eclipse.jface.viewers.ViewerFilter; @@ -33,10 +37,12 @@ import org.jboss.tools.smooks.configuration.SmooksConfigurationActivator; import org.jboss.tools.smooks.model.graphics.ext.InputType; import org.jboss.tools.smooks.model.graphics.ext.SmooksGraphicsExtType; +import org.jboss.tools.smooks.model.smooks.AbstractReader; +import org.jboss.tools.smooks.model.smooks.SmooksResourceListType; /** * @author Dart - * + * */ public class SmooksConfigurationReaderPage extends SmooksConfigurationFormPage { @@ -52,10 +58,28 @@ @Override protected ViewerFilter[] createViewerFilters() { - return new ViewerFilter[]{new OnlyReaderViewerFilter()}; + return new ViewerFilter[] { new OnlyReaderViewerFilter() }; } - + @Override + protected SmooksMasterDetailBlock createSmooksMasterDetailsBlock() { + return new SmooksMasterDetailBlock(getEditor(), + (AdapterFactoryEditingDomain) ((SmooksMultiFormEditor) getEditor()).getEditingDomain()) { + @Override + protected Object getEmptyDefaultSelection(EObject smooksTreeViewerInput) { + List<EObject> contents = smooksTreeViewerInput.eContents(); + for (Iterator<?> iterator = contents.iterator(); iterator.hasNext();) { + EObject eObject = (EObject) iterator.next(); + if (smooksTreeViewerInput instanceof SmooksResourceListType && eObject instanceof AbstractReader) { + return eObject; + } + } + return super.getEmptyDefaultSelection(smooksTreeViewerInput); + } + }; + } + + @Override protected String getNewSmooksElementDescription() { return "create new smooks reader"; } @@ -79,13 +103,13 @@ protected void setPageTitle(ScrolledForm form) { form.setText("Reader/Input"); } - + protected void createFormContent(IManagedForm managedForm) { super.createFormContent(managedForm); // create extention UI for add/remove extention data createExtentionArea(managedForm); } - + protected void createExtentionArea(IManagedForm managedForm) { FormToolkit toolkit = managedForm.getToolkit(); final ScrolledForm form = managedForm.getForm(); @@ -118,12 +142,11 @@ TableColumn pathColumn = new TableColumn(inputDataViewer.getTable(), SWT.NONE); pathColumn.setText("Path"); pathColumn.setWidth(300); - + TableColumn extColumn = new TableColumn(inputDataViewer.getTable(), SWT.NONE); extColumn.setText("Extension Paramers"); extColumn.setWidth(400); - - + inputDataViewer.setContentProvider(new ExtentionInputContentProvider()); inputDataViewer.setLabelProvider(new ExtentionInputLabelProvider()); inputDataViewer.getTable().setHeaderVisible(true); @@ -181,10 +204,9 @@ } }); } - + public void saveComplete(SmooksGraphicsExtType extType) { inputDataViewer.refresh(); } - } Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/SmooksConfigurationResourceConfigPage.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/SmooksConfigurationResourceConfigPage.java 2009-08-27 02:39:01 UTC (rev 17287) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/SmooksConfigurationResourceConfigPage.java 2009-08-27 07:08:47 UTC (rev 17288) @@ -10,19 +10,26 @@ ******************************************************************************/ package org.jboss.tools.smooks.configuration.editors; +import java.util.Iterator; +import java.util.List; + +import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain; import org.eclipse.jface.viewers.Viewer; import org.eclipse.jface.viewers.ViewerFilter; +import org.eclipse.ui.forms.IManagedForm; import org.eclipse.ui.forms.editor.FormEditor; import org.eclipse.ui.forms.widgets.ScrolledForm; import org.jboss.tools.smooks.model.smooks.AbstractReader; +import org.jboss.tools.smooks.model.smooks.AbstractResourceConfig; import org.jboss.tools.smooks.model.smooks.ConditionsType; import org.jboss.tools.smooks.model.smooks.ParamsType; import org.jboss.tools.smooks.model.smooks.ProfilesType; +import org.jboss.tools.smooks.model.smooks.SmooksResourceListType; /** * @author Dart - * + * */ public class SmooksConfigurationResourceConfigPage extends SmooksConfigurationFormPage { @@ -35,62 +42,91 @@ } @Override + protected void createMasterDetailBlock(IManagedForm managedForm) { + // TODO Auto-generated method stub + super.createMasterDetailBlock(managedForm); + } + + @Override + protected SmooksMasterDetailBlock createSmooksMasterDetailsBlock() { + return new SmooksMasterDetailBlock(getEditor(), + (AdapterFactoryEditingDomain) ((SmooksMultiFormEditor) getEditor()).getEditingDomain()) { + @Override + protected Object getEmptyDefaultSelection(EObject smooksTreeViewerInput) { + List<EObject> contents = smooksTreeViewerInput.eContents(); + for (Iterator<?> iterator = contents.iterator(); iterator.hasNext();) { + EObject eObject = (EObject) iterator.next(); + if (smooksTreeViewerInput instanceof SmooksResourceListType + && eObject instanceof AbstractResourceConfig) { + return eObject; + } + + if (smooksTreeViewerInput instanceof org.jboss.tools.smooks10.model.smooks.SmooksResourceListType + && eObject instanceof org.jboss.tools.smooks10.model.smooks.AbstractResourceConfig) { + return eObject; + } + } + return super.getEmptyDefaultSelection(smooksTreeViewerInput); + } + }; + } + + @Override protected ViewerFilter[] createViewerFilters() { ViewerFilter filter = new ViewerFilter() { - + @Override public boolean select(Viewer viewer, Object parentElement, Object element) { Object obj = element; obj = AdapterFactoryEditingDomain.unwrap(obj); - if(obj instanceof ParamsType){ + if (obj instanceof ParamsType) { return false; } - if(obj instanceof ConditionsType){ + if (obj instanceof ConditionsType) { return false; } - if(obj instanceof AbstractReader){ + if (obj instanceof AbstractReader) { return false; } - if(obj instanceof ProfilesType){ + if (obj instanceof ProfilesType) { return false; } - if(obj instanceof org.jboss.tools.smooks10.model.smooks.ProfilesType){ + if (obj instanceof org.jboss.tools.smooks10.model.smooks.ProfilesType) { return false; } return true; } }; - + ViewerFilter[] filters = super.createViewerFilters(); ViewerFilter[] newFilters = new ViewerFilter[filters.length + 1]; newFilters[0] = filter; - System.arraycopy(filters, 0, newFilters,1, filters.length); + System.arraycopy(filters, 0, newFilters, 1, filters.length); return newFilters; } - - - @Override protected void setPageTitle(ScrolledForm form) { -// EObject smooksModel = ((ISmooksModelProvider) getEditor()).getSmooksModel(); -// if (smooksModel != null) { -// EObject parent = smooksModel; -// while (parent != null) { -// EObject old = parent; -// parent = parent.eContainer(); -// if (parent == null) { -// parent = old; -// break; -// } -// } -// if (parent instanceof DocumentRoot) { -// title = "Smooks 1.1 - " + title; -// } -// if (parent instanceof org.jboss.tools.smooks10.model.smooks.DocumentRoot) { -// title = "Smooks 1.0 - " + title; -// } -// } + // EObject smooksModel = ((ISmooksModelProvider) + // getEditor()).getSmooksModel(); + // if (smooksModel != null) { + // EObject parent = smooksModel; + // while (parent != null) { + // EObject old = parent; + // parent = parent.eContainer(); + // if (parent == null) { + // parent = old; + // break; + // } + // } + // if (parent instanceof DocumentRoot) { + // title = "Smooks 1.1 - " + title; + // } + // if (parent instanceof + // org.jboss.tools.smooks10.model.smooks.DocumentRoot) { + // title = "Smooks 1.0 - " + title; + // } + // } form.setText("Message Filter"); } 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-08-27 02:39:01 UTC (rev 17287) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/SmooksMasterDetailBlock.java 2009-08-27 07:08:47 UTC (rev 17288) @@ -74,9 +74,9 @@ private Button downButton; private String newSmooksElementTitle; - + private String newSmooksElementDescription; - + private AdapterFactoryEditingDomain editingDomain = null; private ViewerFilter[] viewerFilters = null; @@ -349,8 +349,6 @@ // } // return l; } - - public String getNewSmooksElementTitle() { return newSmooksElementTitle; @@ -375,7 +373,7 @@ public void widgetSelected(SelectionEvent e) { super.widgetSelected(e); NewSmooksElementWizard wizard = new NewSmooksElementWizard(editingDomain, getTreeViewerInput(), - getViewerFilters(),getNewSmooksElementTitle(), getNewSmooksElementDescription()); + getViewerFilters(), getNewSmooksElementTitle(), getNewSmooksElementDescription()); WizardDialog dialog = new WizardDialog(formEditor.getSite().getShell(), wizard); dialog.open(); } @@ -500,6 +498,15 @@ objList.add(obj); } if (objList.isEmpty()) { + Object input = smooksTreeViewer.getInput(); + if (input instanceof EObject) { + Object defaultObj = getEmptyDefaultSelection((EObject) input); + if (defaultObj != null) { + objList.add(defaultObj); + } + } + } + if (objList.isEmpty()) { sectionPart.getManagedForm().fireSelectionChanged(sectionPart, event.getSelection()); } else { sectionPart.getManagedForm().fireSelectionChanged(sectionPart, @@ -507,10 +514,18 @@ } updateButtons(objList); } - - if(formEditor instanceof ISelectionProvider){ - ((ISelectionProvider)formEditor).setSelection(event.getSelection()); + + if (formEditor instanceof ISelectionProvider) { + ((ISelectionProvider) formEditor).setSelection(event.getSelection()); } } + protected Object getEmptyDefaultSelection(EObject smooksTreeViewerInput) { + return null; +// if (((EObject) smooksTreeViewerInput).eContents().isEmpty()) { +// return AdapterFactoryEditingDomain.unwrap(((EObject) smooksTreeViewerInput).eContents().get(0)); +// } +// return null; + } + } Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/edimap/actions/AbstractEDIMappingAction.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/edimap/actions/AbstractEDIMappingAction.java 2009-08-27 02:39:01 UTC (rev 17287) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/edimap/actions/AbstractEDIMappingAction.java 2009-08-27 07:08:47 UTC (rev 17288) @@ -18,8 +18,8 @@ import org.eclipse.gef.editparts.AbstractGraphicalEditPart; import org.eclipse.gef.ui.actions.SelectionAction; import org.eclipse.ui.IWorkbenchPart; -import org.jboss.tools.smooks.edimap.editor.GEFAdapterCommand; import org.jboss.tools.smooks.editor.ISmooksModelProvider; +import org.jboss.tools.smooks.gef.tree.command.GEFAdapterCommand; import org.jboss.tools.smooks.gef.tree.model.TreeNodeModel; /** Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/edimap/actions/AddComponentAction.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/edimap/actions/AddComponentAction.java 2009-08-27 02:39:01 UTC (rev 17287) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/edimap/actions/AddComponentAction.java 2009-08-27 07:08:47 UTC (rev 17288) @@ -14,8 +14,8 @@ import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.edit.domain.EditingDomain; import org.eclipse.ui.IWorkbenchPart; -import org.jboss.tools.smooks.edimap.editor.GEFAdapterCommand; import org.jboss.tools.smooks.editor.ISmooksModelProvider; +import org.jboss.tools.smooks.gef.tree.command.GEFAdapterCommand; import org.jboss.tools.smooks.gef.tree.editparts.TreeNodeEditPart; import org.jboss.tools.smooks.model.medi.Component; import org.jboss.tools.smooks.model.medi.MEdiFactory; Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/edimap/actions/AddFieldAction.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/edimap/actions/AddFieldAction.java 2009-08-27 02:39:01 UTC (rev 17287) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/edimap/actions/AddFieldAction.java 2009-08-27 07:08:47 UTC (rev 17288) @@ -13,8 +13,8 @@ import org.eclipse.emf.common.command.Command; import org.eclipse.emf.edit.domain.EditingDomain; import org.eclipse.ui.IWorkbenchPart; -import org.jboss.tools.smooks.edimap.editor.GEFAdapterCommand; import org.jboss.tools.smooks.editor.ISmooksModelProvider; +import org.jboss.tools.smooks.gef.tree.command.GEFAdapterCommand; import org.jboss.tools.smooks.gef.tree.editparts.TreeNodeEditPart; import org.jboss.tools.smooks.model.medi.Field; import org.jboss.tools.smooks.model.medi.MEdiFactory; Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/edimap/actions/AddSegmentAction.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/edimap/actions/AddSegmentAction.java 2009-08-27 02:39:01 UTC (rev 17287) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/edimap/actions/AddSegmentAction.java 2009-08-27 07:08:47 UTC (rev 17288) @@ -13,8 +13,8 @@ import org.eclipse.emf.common.command.Command; import org.eclipse.emf.edit.domain.EditingDomain; import org.eclipse.ui.IWorkbenchPart; -import org.jboss.tools.smooks.edimap.editor.GEFAdapterCommand; import org.jboss.tools.smooks.editor.ISmooksModelProvider; +import org.jboss.tools.smooks.gef.tree.command.GEFAdapterCommand; import org.jboss.tools.smooks.gef.tree.editparts.TreeNodeEditPart; import org.jboss.tools.smooks.model.medi.Field; import org.jboss.tools.smooks.model.medi.MEdiFactory; Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/edimap/actions/AddSubComponentAction.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/edimap/actions/AddSubComponentAction.java 2009-08-27 02:39:01 UTC (rev 17287) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/edimap/actions/AddSubComponentAction.java 2009-08-27 07:08:47 UTC (rev 17288) @@ -13,8 +13,8 @@ import org.eclipse.emf.common.command.Command; import org.eclipse.emf.edit.domain.EditingDomain; import org.eclipse.ui.IWorkbenchPart; -import org.jboss.tools.smooks.edimap.editor.GEFAdapterCommand; import org.jboss.tools.smooks.editor.ISmooksModelProvider; +import org.jboss.tools.smooks.gef.tree.command.GEFAdapterCommand; import org.jboss.tools.smooks.gef.tree.editparts.TreeNodeEditPart; import org.jboss.tools.smooks.model.medi.MEdiFactory; import org.jboss.tools.smooks.model.medi.MEdiPackage; Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/edimap/actions/EDIGEFAdpaterCommand.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/edimap/actions/EDIGEFAdpaterCommand.java 2009-08-27 02:39:01 UTC (rev 17287) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/edimap/actions/EDIGEFAdpaterCommand.java 2009-08-27 07:08:47 UTC (rev 17288) @@ -12,7 +12,7 @@ import org.eclipse.emf.common.command.Command; import org.eclipse.emf.edit.domain.EditingDomain; -import org.jboss.tools.smooks.edimap.editor.GEFAdapterCommand; +import org.jboss.tools.smooks.gef.tree.command.GEFAdapterCommand; import org.jboss.tools.smooks.gef.tree.editparts.TreeNodeEditPart; /** Deleted: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/edimap/editor/GEFAdapterCommand.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/edimap/editor/GEFAdapterCommand.java 2009-08-27 02:39:01 UTC (rev 17287) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/edimap/editor/GEFAdapterCommand.java 2009-08-27 07:08:47 UTC (rev 17288) @@ -1,159 +0,0 @@ -/******************************************************************************* - * 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.edimap.editor; - -import org.eclipse.emf.edit.domain.EditingDomain; -import org.eclipse.gef.commands.Command; - -/** - * @author Dart (dpeng(a)redhat.com) - * - */ -public class GEFAdapterCommand extends Command { - - protected org.eclipse.emf.common.command.Command emfCommand; - - protected EditingDomain domain; - - public GEFAdapterCommand(EditingDomain domain, org.eclipse.emf.common.command.Command emfCommand) { - this.emfCommand = emfCommand; - this.domain = domain; - } - - /* - * (non-Javadoc) - * - * @see org.eclipse.gef.commands.Command#canExecute() - */ - @Override - public boolean canExecute() { - if (emfCommand != null) { - return emfCommand.canExecute(); - } - return super.canExecute(); - } - - /* - * (non-Javadoc) - * - * @see org.eclipse.gef.commands.Command#canUndo() - */ - @Override - public boolean canUndo() { - if (emfCommand != null && domain != null) { - if (domain.getCommandStack().getUndoCommand() == emfCommand) { - return emfCommand.canUndo(); - } - } - return super.canUndo(); - } - - /* - * (non-Javadoc) - * - * @see org.eclipse.gef.commands.Command#dispose() - */ - @Override - public void dispose() { - if (emfCommand != null) { - emfCommand.dispose(); - return; - } - super.dispose(); - } - - /* - * (non-Javadoc) - * - * @see org.eclipse.gef.commands.Command#execute() - */ - @Override - public void execute() { - if (emfCommand != null && domain != null) { - domain.getCommandStack().execute(emfCommand); - return; - } - super.execute(); - } - - /* - * (non-Javadoc) - * - * @see org.eclipse.gef.commands.Command#getDebugLabel() - */ - @Override - public String getDebugLabel() { - return super.getDebugLabel(); - } - - /* - * (non-Javadoc) - * - * @see org.eclipse.gef.commands.Command#getLabel() - */ - @Override - public String getLabel() { - if (emfCommand != null) { - return emfCommand.getLabel(); - } - return super.getLabel(); - } - - /* - * (non-Javadoc) - * - * @see org.eclipse.gef.commands.Command#redo() - */ - @Override - public void redo() { - if (emfCommand != null && domain != null) { - if (domain.getCommandStack().getRedoCommand() == emfCommand) { - domain.getCommandStack().redo(); - } - } - } - - /* - * (non-Javadoc) - * - * @see org.eclipse.gef.commands.Command#setDebugLabel(java.lang.String) - */ - @Override - public void setDebugLabel(String label) { - super.setDebugLabel(label); - } - - /* - * (non-Javadoc) - * - * @see org.eclipse.gef.commands.Command#setLabel(java.lang.String) - */ - @Override - public void setLabel(String label) { - super.setLabel(label); - } - - /* - * (non-Javadoc) - * - * @see org.eclipse.gef.commands.Command#undo() - */ - @Override - public void undo() { - if (emfCommand != null && domain != null) { - if (domain.getCommandStack().getUndoCommand() == emfCommand) { - domain.getCommandStack().undo(); - } - } - super.undo(); - } - -} Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/gef/model/AbstractSmooksGraphicalModel.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/gef/model/AbstractSmooksGraphicalModel.java 2009-08-27 02:39:01 UTC (rev 17287) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/gef/model/AbstractSmooksGraphicalModel.java 2009-08-27 07:08:47 UTC (rev 17288) @@ -109,12 +109,17 @@ for (Iterator<?> iterator2 = tempTargetConnections.iterator(); iterator2.hasNext();) { TreeNodeConnection treeNodeConnection = (TreeNodeConnection) iterator2.next(); - treeNodeConnection.disconnectSource(); + AbstractSmooksGraphicalModel sourceNode = treeNodeConnection.getSourceNode(); + sourceNode.getSourceConnections().remove(treeNodeConnection); + sourceNode.fireConnectionChanged(); } for (Iterator<?> iterator2 = tempSourceConnections.iterator(); iterator2.hasNext();) { TreeNodeConnection treeNodeConnection = (TreeNodeConnection) iterator2.next(); - treeNodeConnection.disconnectTarget(); +// treeNodeConnection.disconnectTarget(); + AbstractSmooksGraphicalModel targetNode = treeNodeConnection.getTargetNode(); + targetNode.getTargetConnections().remove(treeNodeConnection); + targetNode.fireConnectionChanged(); } tempSourceConnections.clear(); Copied: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/gef/tree/command/GEFAdapterCommand.java (from rev 17033, trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/edimap/editor/GEFAdapterCommand.java) =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/gef/tree/command/GEFAdapterCommand.java (rev 0) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/gef/tree/command/GEFAdapterCommand.java 2009-08-27 07:08:47 UTC (rev 17288) @@ -0,0 +1,165 @@ +/******************************************************************************* + * 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.gef.tree.command; + +import org.eclipse.emf.edit.domain.EditingDomain; +import org.eclipse.gef.commands.Command; + +/** + * @author Dart (dpeng(a)redhat.com) + * + */ +public class GEFAdapterCommand extends Command { + + protected org.eclipse.emf.common.command.Command emfCommand; + + protected EditingDomain domain; + + public GEFAdapterCommand(EditingDomain domain, org.eclipse.emf.common.command.Command emfCommand) { + this.emfCommand = emfCommand; + this.domain = domain; + } + + /* + * (non-Javadoc) + * + * @see org.eclipse.gef.commands.Command#canExecute() + */ + @Override + public boolean canExecute() { + if (emfCommand != null) { + return emfCommand.canExecute(); + } + return super.canExecute(); + } + + /* + * (non-Javadoc) + * + * @see org.eclipse.gef.commands.Command#canUndo() + */ + @Override + public boolean canUndo() { + if (emfCommand != null && domain != null) { + if (domain.getCommandStack().getUndoCommand().equals(emfCommand)) { + return emfCommand.canUndo(); + } + } + return super.canUndo(); + } + + /* + * (non-Javadoc) + * + * @see org.eclipse.gef.commands.Command#dispose() + */ + @Override + public void dispose() { + if (emfCommand != null) { + emfCommand.dispose(); + return; + } + super.dispose(); + } + + /* + * (non-Javadoc) + * + * @see org.eclipse.gef.commands.Command#execute() + */ + @Override + public void execute() { + if (emfCommand != null && domain != null) { + domain.getCommandStack().execute(emfCommand); + return; + } + super.execute(); + } + + /* + * (non-Javadoc) + * + * @see org.eclipse.gef.commands.Command#getDebugLabel() + */ + @Override + public String getDebugLabel() { + return super.getDebugLabel(); + } + + /* + * (non-Javadoc) + * + * @see org.eclipse.gef.commands.Command#getLabel() + */ + @Override + public String getLabel() { + if (emfCommand != null) { + return emfCommand.getLabel(); + } + return super.getLabel(); + } + + /* + * (non-Javadoc) + * + * @see org.eclipse.gef.commands.Command#redo() + */ + @Override + public void redo() { + if (emfCommand != null && domain != null) { + if (domain.getCommandStack().getRedoCommand().equals(emfCommand)) { + domain.getCommandStack().redo(); + } + } + } + + /* + * (non-Javadoc) + * + * @see org.eclipse.gef.commands.Command#setDebugLabel(java.lang.String) + */ + @Override + public void setDebugLabel(String label) { + super.setDebugLabel(label); + } + + /* + * (non-Javadoc) + * + * @see org.eclipse.gef.commands.Command#setLabel(java.lang.String) + */ + @Override + public void setLabel(String label) { + super.setLabel(label); + } + + /* + * (non-Javadoc) + * + * @see org.eclipse.gef.commands.Command#undo() + */ + @Override + public void undo() { + if (emfCommand != null && domain != null) { + org.eclipse.emf.common.command.Command ccc = domain.getCommandStack().getUndoCommand(); + if (domain.getCommandStack().getUndoCommand().equals(emfCommand)) { + try { + domain.getCommandStack().undo(); + } catch (Exception e) { + e.printStackTrace(); + } + } else { + } + } + super.undo(); + } + +} Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/gef/tree/command/GEFAdapterCommand.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/gef/tree/editparts/TreeContainerEditPart.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/gef/tree/editparts/TreeContainerEditPart.java 2009-08-27 02:39:01 UTC (rev 17287) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/gef/tree/editparts/TreeContainerEditPart.java 2009-08-27 07:08:47 UTC (rev 17288) @@ -13,6 +13,7 @@ import org.eclipse.gef.DefaultEditDomain; import org.eclipse.gef.EditPolicy; import org.eclipse.gef.GraphicalEditPart; +import org.eclipse.swt.graphics.Image; import org.eclipse.ui.IEditorPart; import org.jboss.tools.smooks.editor.ISmooksModelProvider; import org.jboss.tools.smooks.gef.tree.editpolicy.TreeNodeGraphicalNodeEditPolicy; @@ -50,6 +51,10 @@ String text = getLabelText(); if (text != null && model.isHeaderVisable() && getFigure() instanceof TreeContainerFigure) { TreeContainerFigure figure = (TreeContainerFigure) getFigure(); + Image i = model.getImage(); + if(i != null){ + figure.setIcon(i); + } figure.setText(text); } boolean isSource = this.isSourceLinkNodeEditPart(); Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/gef/tree/editpolicy/RootPanelXYLayoutEditPolicy.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/gef/tree/editpolicy/RootPanelXYLayoutEditPolicy.java 2009-08-27 02:39:01 UTC (rev 17287) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/gef/tree/editpolicy/RootPanelXYLayoutEditPolicy.java 2009-08-27 07:08:47 UTC (rev 17288) @@ -13,7 +13,6 @@ import org.eclipse.gef.editpolicies.NonResizableEditPolicy; import org.eclipse.gef.requests.ChangeBoundsRequest; import org.eclipse.gef.requests.CreateRequest; -import org.jboss.tools.smooks.editor.ISmooksModelProvider; import org.jboss.tools.smooks.gef.tree.editparts.ChangeConstraintCommand; import org.jboss.tools.smooks.gef.tree.figures.IMoveableModel; Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/gef/tree/figures/TreeContainerFigure.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/gef/tree/figures/TreeContainerFigure.java 2009-08-27 02:39:01 UTC (rev 17287) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/gef/tree/figures/TreeContainerFigure.java 2009-08-27 07:08:47 UTC (rev 17288) @@ -12,6 +12,7 @@ import org.eclipse.draw2d.geometry.Dimension; import org.eclipse.draw2d.geometry.Rectangle; import org.eclipse.swt.graphics.Color; +import org.eclipse.swt.graphics.Image; import org.jboss.tools.smooks.gef.tree.model.TreeContainerModel; /** @@ -23,13 +24,13 @@ private IFigure headerFigure; private IFigure contentFigure; - + private Label label; - + private TreeContainerModel model; - + private Color headerColor = ColorConstants.button; - + public TreeContainerFigure(TreeContainerModel model) { super(); this.model = model; @@ -43,15 +44,15 @@ graphics.setBackgroundColor(ColorConstants.white); graphics.fillGradient(getBounds(), true); graphics.setForegroundColor(headerColor); - graphics.drawLine(getBounds().getBottomLeft().translate(0, -1), - getBounds().getBottomRight().translate(0, -1)); + graphics.drawLine(getBounds().getBottomLeft().translate(0, -1), getBounds().getBottomRight().translate( + 0, -1)); graphics.popState(); } @Override public Dimension getPreferredSize(int hint, int hint2) { Dimension size = super.getPreferredSize(hint, hint2); - return new Dimension(size.width,25); + return new Dimension(size.width, 25); } }; label = new Label(); @@ -67,9 +68,10 @@ contentFigure.setLayoutManager(new ToolbarLayout()); this.add(headerFigure); this.add(contentFigure); - this.setLayoutManager(new ToolbarLayout()); + ToolbarLayout tl = new ToolbarLayout(); + tl.setMinorAlignment(ToolbarLayout.ALIGN_CENTER); + this.setLayoutManager(tl); } - /** * @return the label */ @@ -78,7 +80,8 @@ } /** - * @param label the label to set + * @param label + * the label to set */ public void setLabel(Label label) { this.label = label; @@ -87,7 +90,7 @@ public IFigure getContentFigure() { return contentFigure; } - + public Color getHeaderColor() { return headerColor; } @@ -108,17 +111,17 @@ @Override protected void paintBorder(Graphics graphics) { graphics.setForegroundColor(ColorConstants.buttonDarker); - Rectangle drawnRectangle = new Rectangle(getBounds().x, getBounds().y, - getBounds().width - 1, getBounds().height - 1); + Rectangle drawnRectangle = new Rectangle(getBounds().x, getBounds().y, getBounds().width - 1, + getBounds().height - 1); graphics.drawRoundRectangle(drawnRectangle, 5, 5); } - - public void setText(String text){ - if(label != null){ + + public void setText(String text) { + if (label != null) { label.setText(text); } } - + public TreeContainerModel getModel() { return model; } @@ -136,4 +139,9 @@ graphics.fillRectangle(getBounds()); graphics.popState(); } + public void setIcon(Image i) { + if(label != null){ + label.setIcon(i); + } + } } Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/gef/tree/model/TreeNodeModel.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/gef/tree/model/TreeNodeModel.java 2009-08-27 02:39:01 UTC (rev 17287) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/gef/tree/model/TreeNodeModel.java 2009-08-27 07:08:47 UTC (rev 17288) @@ -5,7 +5,6 @@ import java.util.Iterator; import java.util.List; -import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain; import org.eclipse.jface.viewers.ILabelProvider; import org.eclipse.jface.viewers.ITreeContentProvider; import org.eclipse.swt.graphics.Image; Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/GraphicalModelFactoryImpl.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/GraphicalModelFactoryImpl.java 2009-08-27 02:39:01 UTC (rev 17287) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/GraphicalModelFactoryImpl.java 2009-08-27 07:08:47 UTC (rev 17288) @@ -15,36 +15,113 @@ import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider; import org.eclipse.jface.viewers.ILabelProvider; import org.eclipse.jface.viewers.ITreeContentProvider; +import org.eclipse.jface.viewers.LabelProvider; +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.model.AbstractSmooksGraphicalModel; import org.jboss.tools.smooks.graphical.editors.model.JavaBeanGraphModel; -import org.jboss.tools.smooks.model.common.AbstractAnyType; import org.jboss.tools.smooks.model.javabean.BindingsType; +import org.jboss.tools.smooks.model.javabean.ExpressionType; +import org.jboss.tools.smooks.model.javabean.ValueType; +import org.jboss.tools.smooks.model.javabean.WiringType; import org.jboss.tools.smooks.model.javabean12.BeanType; /** * @author Dart * */ -public class GraphicalModelFactoryImpl implements GraphicalModelFactory{ +public class GraphicalModelFactoryImpl implements GraphicalModelFactory { public Object createGraphicalModel(Object model, ISmooksModelProvider provider) { AbstractSmooksGraphicalModel graphModel = null; if (model instanceof BindingsType || model instanceof BeanType) { - AdapterFactoryEditingDomain editingDomain = (AdapterFactoryEditingDomain) provider - .getEditingDomain(); + AdapterFactoryEditingDomain editingDomain = (AdapterFactoryEditingDomain) provider.getEditingDomain(); ITreeContentProvider contentProvider = new AdapterFactoryContentProvider(editingDomain.getAdapterFactory()); - ILabelProvider labelProvider = new AdapterFactoryLabelProvider(editingDomain.getAdapterFactory()) { + final ILabelProvider labelProvider = new AdapterFactoryLabelProvider(editingDomain.getAdapterFactory()); + LabelProvider labelProvider1 = new LabelProvider() { + @Override - public String getText(Object object) { - Object obj = AdapterFactoryEditingDomain.unwrap(object); - if (obj instanceof AbstractAnyType) { - return super.getText(obj); + public Image getImage(Object element) { + element = AdapterFactoryEditingDomain.unwrap(element); + if (element instanceof BeanType || element instanceof BindingsType) { + return SmooksConfigurationActivator.getDefault().getImageRegistry().get( + GraphicsConstants.IMAGE_JAVA_BEAN); } - return super.getText(object); + Image img = super.getImage(element); + if (img == null) { + return labelProvider.getImage(element); + } + return img; } + @Override + public String getText(Object element) { + Object obj = AdapterFactoryEditingDomain.unwrap(element); + if (obj instanceof BeanType) { + String p = ((BeanType) obj).getBeanId(); + if (p == null) { + p = ""; + } + return p; + } + if (obj instanceof BindingsType) { + String p = ((BindingsType) obj).getBeanId(); + if (p == null) { + p = ""; + } + return p; + } + + if (obj instanceof ValueType) { + String p = ((ValueType) obj).getProperty(); + if (p == null) { + p = ""; + } + return p; + } + if (obj instanceof WiringType) { + String p = ((WiringType) obj).getProperty(); + if (p == null) { + p = ""; + } + return p; + } + if (obj instanceof ExpressionType) { + String p = ((ExpressionType) obj).getProperty(); + if (p == null) { + p = ""; + } + return p; + } + + if (obj instanceof org.jboss.tools.smooks.model.javabean12.ValueType) { + String p = ((org.jboss.tools.smooks.model.javabean12.ValueType) obj).getProperty(); + if (p == null) { + p = ""; + } + return p; + } + if (obj instanceof org.jboss.tools.smooks.model.javabean12.WiringType) { + String p = ((org.jboss.tools.smooks.model.javabean12.WiringType) obj).getProperty(); + if (p == null) { + p = ""; + } + return p; + } + if (obj instanceof org.jboss.tools.smooks.model.javabean12.ExpressionType) { + String p = ((org.jboss.tools.smooks.model.javabean12.ExpressionType) obj).getProperty(); + if (p == null) { + p = ""; + } + return p; + } + + return super.getText(element); + } + }; - graphModel = new JavaBeanGraphModel(model, contentProvider, labelProvider, provider); + graphModel = new JavaBeanGraphModel(model, contentProvider, labelProvider1, provider); ((JavaBeanGraphModel) graphModel).setHeaderVisable(true); } return graphModel; 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-08-27 02:39:01 UTC (rev 17287) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/SmooksEditFactory.java 2009-08-27 07:08:47 UTC (rev 17288) @@ -23,50 +23,50 @@ 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.editparts.ResourceConfigEditFactory; +import org.jboss.tools.smooks.graphical.editors.model.AbstractResourceConfigChildNodeGraphModel; +import org.jboss.tools.smooks.graphical.editors.model.AbstractResourceConfigGraphModel; 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 - * + * */ -public class SmooksEditFactory extends SmooksGEFEditFactory implements EditPartFactory{ +public class SmooksEditFactory extends SmooksGEFEditFactory implements EditPartFactory { + private ResourceConfigEditFactory resourceConfigFactory; public SmooksEditFactory() { super(); - // TODO Auto-generated constructor stub + resourceConfigFactory = new ResourceConfigEditFactory(); } public EditPart createEditPart(EditPart context, Object model) { EditPart editPart = null; - if(model instanceof RootModel){ + if (model instanceof RootModel) { editPart = new RootEditPart(); } - if(model.getClass() == TreeNodeModel.class){ + if (model.getClass() == TreeNodeModel.class) { editPart = new TreeNodeEditPart(); - }if(model.getClass() == TreeContainerModel.class){ + } + if (model.getClass() == TreeContainerModel.class) { editPart = new TreeContainerEditPart(); } - if(model.getClass() == InputDataTreeNodeModel.class){ + if (model.getClass() == InputDataTreeNodeModel.class) { editPart = new InputDataTreeNodeEditPart(); - }if(model.getClass() == InputDataContianerModel.class){ + } + 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 instanceof AbstractResourceConfigGraphModel + || model instanceof AbstractResourceConfigChildNodeGraphModel) { + editPart = resourceConfigFactory.createEditPart(model); } - if(model.getClass() == TreeNodeConnection.class){ + if (model.getClass() == TreeNodeConnection.class) { editPart = new TreeNodeConnectionEditPart(); } - if(editPart != null){ + if (editPart != null) { editPart.setModel(model); } return editPart; 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-08-27 02:39:01 UTC (rev 17287) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/SmooksGraphicalEditorPart.java 2009-08-27 07:08:47 UTC (rev 17288) @@ -24,6 +24,7 @@ import org.eclipse.emf.ecore.EStructuralFeature; import org.eclipse.emf.edit.command.AddCommand; import org.eclipse.emf.edit.command.DeleteCommand; +import org.eclipse.emf.edit.command.RemoveCommand; import org.eclipse.emf.edit.command.SetCommand; import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain; import org.eclipse.gef.DefaultEditDomain; @@ -126,20 +127,22 @@ public void run() { if (mostRecentCommand != null) { Command rawCommand = mostRecentCommand; + while (rawCommand instanceof CommandWrapper) { + rawCommand = ((CommandWrapper) rawCommand).getCommand(); + } int commandType = EXECUTE_COMMAND; - if (rawCommand == ((org.eclipse.emf.common.command.CommandStack) fe.getSource()) - .getUndoCommand()) { + Command undoCommand = ((org.eclipse.emf.common.command.CommandStack) fe.getSource()) + .getUndoCommand(); + Command redoCommand = ((org.eclipse.emf.common.command.CommandStack) fe.getSource()) + .getRedoCommand(); + if (undoCommand != null || rawCommand.equals(undoCommand)) { commandType = EXECUTE_COMMAND; } - if (rawCommand == ((org.eclipse.emf.common.command.CommandStack) fe.getSource()) - .getRedoCommand()) { + if (redoCommand != null || rawCommand.equals(redoCommand)) { commandType = UNDO_COMMAND; } - while (rawCommand instanceof CommandWrapper) { - rawCommand = ((CommandWrapper) rawCommand).getCommand(); - } if (rawCommand instanceof SetCommand || rawCommand instanceof AddCommand - || rawCommand instanceof DeleteCommand) { + || rawCommand instanceof DeleteCommand || rawCommand instanceof RemoveCommand) { refershRecentAffectedModel(rawCommand, mostRecentCommand.getAffectedObjects(), commandType); } @@ -295,8 +298,14 @@ expandConnectedModels(connections); } } - if (command instanceof DeleteCommand) { - Collection<?> colletion = ((DeleteCommand) command).getCollection(); + if (command instanceof DeleteCommand || command instanceof RemoveCommand) { + Collection<?> colletion = null; + if (command instanceof DeleteCommand) { + colletion = ((DeleteCommand) command).getCollection(); + } + if (command instanceof RemoveCommand) { + colletion = ((RemoveCommand) command).getCollection(); + } for (Iterator<?> iterator2 = colletion.iterator(); iterator2.hasNext();) { Object childModel = (Object) iterator2.next(); childModel = AdapterFactoryEditingDomain.unwrap(childModel); @@ -345,7 +354,7 @@ node.fireChildrenChanged(); node.fireConnectionChanged(); } - if (command instanceof DeleteCommand) { + if (command instanceof DeleteCommand || command instanceof RemoveCommand) { if (node != null) { node.fireChildrenChanged(); } @@ -388,11 +397,14 @@ expandConnectedModels(connections); } } - if (command instanceof DeleteCommand) { + if (command instanceof DeleteCommand || command instanceof RemoveCommand) { Collection<?> cccc = null; if (command instanceof DeleteCommand) { cccc = ((DeleteCommand) command).getCollection(); } + if (command instanceof RemoveCommand) { + cccc = ((RemoveCommand) command).getCollection(); + } for (Iterator<?> iterator2 = cccc.iterator(); iterator2.hasNext();) { Object object2 = (Object) iterator2.next(); object2 = AdapterFactoryEditingDomain.unwrap(object2); Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/commands/SmooksModelRemoveCommand.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/commands/SmooksModelRemoveCommand.java (rev 0) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/commands/SmooksModelRemoveCommand.java 2009-08-27 07:08:47 UTC (rev 17288) @@ -0,0 +1,28 @@ +/******************************************************************************* + * 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.commands; + +import org.eclipse.emf.ecore.EObject; +import org.eclipse.emf.edit.command.DeleteCommand; +import org.eclipse.emf.edit.domain.EditingDomain; +import org.jboss.tools.smooks.gef.tree.command.GEFAdapterCommand; + +/** + * @author Dart + * + */ +public class SmooksModelRemoveCommand extends GEFAdapterCommand { + + public SmooksModelRemoveCommand(EditingDomain domain,EObject model){ + super(domain,DeleteCommand.create(domain, model)); + } + +} Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/commands/SmooksModelRemoveCommand.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/editparts/AbstractResourceConfigChildNodeEditPart.java (from rev 17224, 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/AbstractResourceConfigChildNodeEditPart.java (rev 0) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/editparts/AbstractResourceConfigChildNodeEditPart.java 2009-08-27 07:08:47 UTC (rev 17288) @@ -0,0 +1,100 @@ +/******************************************************************************* + * 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.Iterator; +import java.util.List; + +import org.eclipse.emf.ecore.EObject; +import org.eclipse.emf.ecore.EStructuralFeature; +import org.eclipse.emf.edit.command.RemoveCommand; +import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain; +import org.eclipse.emf.edit.domain.EditingDomain; +import org.eclipse.emf.edit.domain.IEditingDomainProvider; +import org.eclipse.gef.EditPart; +import org.eclipse.gef.EditPolicy; +import org.eclipse.gef.commands.Command; +import org.eclipse.gef.commands.CompoundCommand; +import org.eclipse.gef.editpolicies.ComponentEditPolicy; +import org.eclipse.gef.requests.GroupRequest; +import org.jboss.tools.smooks.configuration.editors.uitls.SmooksUIUtils; +import org.jboss.tools.smooks.gef.model.AbstractSmooksGraphicalModel; +import org.jboss.tools.smooks.gef.tree.command.GEFAdapterCommand; +import org.jboss.tools.smooks.gef.tree.editparts.TreeNodeEditPart; +import org.jboss.tools.smooks.graphical.editors.model.AbstractResourceConfigChildNodeGraphModel; + +/** + * @author Dart + * + */ +public class AbstractResourceConfigChildNodeEditPart extends TreeNodeEditPart { + + @Override + protected boolean isDragLink() { + AbstractSmooksGraphicalModel model = (AbstractSmooksGraphicalModel) getModel(); + if (model != null) { + Object data = model.getData(); + data = AdapterFactoryEditingDomain.unwrap(data); + if (data != null && data instanceof EObject) { + EStructuralFeature idRefFeature = SmooksUIUtils.getBeanIDRefFeature((EObject) data); + if (idRefFeature != null) { + if (((EObject) data).eGet(idRefFeature) == null || !((EObject) data).eIsSet(idRefFeature)) { + return true; + } + } + } + } + return false; + } + + @Override + protected void createEditPolicies() { + super.createEditPolicies(); + this.installEditPolicy(EditPolicy.COMPONENT_ROLE, new ComponentEditPolicy() { + + @Override + protected Command getDeleteCommand(GroupRequest request) { + List<?> editParts = request.getEditParts(); + CompoundCommand command = new CompoundCommand(); + for (Iterator<?> iterator = editParts.iterator(); iterator.hasNext();) { + EditPart editPart = (EditPart) iterator.next(); + AbstractSmooksGraphicalModel graphModel = (AbstractSmooksGraphicalModel) editPart.getModel(); + Object data = graphModel.getData(); + data = AdapterFactoryEditingDomain.unwrap(data); + if (data instanceof EObject && graphModel instanceof AbstractResourceConfigChildNodeGraphModel) { + IEditingDomainProvider provider = ((AbstractResourceConfigChildNodeGraphModel) graphModel) + .getDomainProvider(); + if (provider != null) { + EStructuralFeature feature = getFeature((EObject) data); + if (feature != null) { + EditingDomain domain = provider.getEditingDomain(); + org.eclipse.emf.common.command.Command c = RemoveCommand.create(domain, + ((EObject) data).eContainer(), feature, data); + if (c != null && c.canExecute()) { + GEFAdapterCommand rc = new GEFAdapterCommand(domain, c); + command.add(rc); + } + } + } + } + } + if (command.isEmpty()) + return null; + return command; + } + }); + } + + protected EStructuralFeature getFeature(EObject model) { + return null; + } + +} Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/editparts/AbstractResourceConfigChildNodeEditPart.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/editparts/AbstractResourceConfigEditPart.java (from rev 17033, 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/AbstractResourceConfigEditPart.java (rev 0) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/editparts/AbstractResourceConfigEditPart.java 2009-08-27 07:08:47 UTC (rev 17288) @@ -0,0 +1,94 @@ +/******************************************************************************* + * 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.Iterator; +import java.util.List; + +import org.eclipse.emf.ecore.EObject; +import org.eclipse.emf.ecore.EStructuralFeature; +import org.eclipse.emf.ecore.util.FeatureMapUtil; +import org.eclipse.emf.edit.command.RemoveCommand; +import org.eclipse.emf.edit.domain.EditingDomain; +import org.eclipse.emf.edit.domain.IEditingDomainProvider; +import org.eclipse.gef.EditPart; +import org.eclipse.gef.EditPolicy; +import org.eclipse.gef.commands.Command; +import org.eclipse.gef.commands.CompoundCommand; +import org.eclipse.gef.editpolicies.ComponentEditPolicy; +import org.eclipse.gef.requests.GroupRequest; +import org.jboss.tools.smooks.gef.model.AbstractSmooksGraphicalModel; +import org.jboss.tools.smooks.gef.tree.command.GEFAdapterCommand; +import org.jboss.tools.smooks.gef.tree.editparts.TreeContainerEditPart; +import org.jboss.tools.smooks.gef.tree.model.TreeNodeModel; +import org.jboss.tools.smooks.graphical.editors.model.AbstractResourceConfigGraphModel; +import org.jboss.tools.smooks.model.smooks.SmooksPackage; + +/** + * @author Dart + * + */ +public class AbstractResourceConfigEditPart extends TreeContainerEditPart { + + @Override + protected String generateFigureID() { + return SmooksGraphUtil.generateFigureID((TreeNodeModel) getModel()); + } + + @Override + protected void createEditPolicies() { + super.createEditPolicies(); + this.installEditPolicy(EditPolicy.COMPONENT_ROLE, new ComponentEditPolicy() { + + @Override + protected Command getDeleteCommand(GroupRequest request) { + List<?> editParts = request.getEditParts(); + CompoundCommand command = new CompoundCommand(); + for (Iterator<?> iterator = editParts.iterator(); iterator.hasNext();) { + EditPart editPart = (EditPart) iterator.next(); + AbstractSmooksGraphicalModel graphModel = (AbstractSmooksGraphicalModel) editPart.getModel(); + Object data = graphModel.getData(); + if (data instanceof EObject && graphModel instanceof AbstractResourceConfigGraphModel) { + IEditingDomainProvider provider = ((AbstractResourceConfigGraphModel) graphModel) + .getDomainProvider(); + if (provider != null) { + EditingDomain domain = provider.getEditingDomain(); + + EStructuralFeature feature = getFeature((EObject) data); + if (feature != null) { + // FeatureMapUtil + // .createEntry(Javabean12Package.Literals.JAVABEAN12_DOCUMENT_ROOT__BEAN,data); + org.eclipse.emf.common.command.Command c = RemoveCommand + .create( + domain, + ((EObject) data).eContainer(), + SmooksPackage.Literals.SMOOKS_RESOURCE_LIST_TYPE__ABSTRACT_RESOURCE_CONFIG_GROUP, + FeatureMapUtil.createEntry(feature, data)); + if (c != null && c.canExecute()) { + GEFAdapterCommand rc = new GEFAdapterCommand(domain, c); + command.add(rc); + } + } + } + } + } + if (command.isEmpty()) + return null; + return command; + } + }); + } + + protected EStructuralFeature getFeature(EObject model) { + return null; + } + +} Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/editparts/AbstractResourceConfigEditPart.java ___________________________________________________________________ Name: svn:mime-type + text/plain Deleted: 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 2009-08-27 02:39:01 UTC (rev 17287) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/editparts/JavaBeanChildNodeEditPart.java 2009-08-27 07:08:47 UTC (rev 17288) @@ -1,44 +0,0 @@ -/******************************************************************************* - * 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.eclipse.emf.ecore.EObject; -import org.eclipse.emf.ecore.EStructuralFeature; -import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain; -import org.jboss.tools.smooks.configuration.editors.uitls.SmooksUIUtils; -import org.jboss.tools.smooks.gef.model.AbstractSmooksGraphicalModel; -import org.jboss.tools.smooks.gef.tree.editparts.TreeNodeEditPart; - -/** - * @author Dart - * - */ -public class JavaBeanChildNodeEditPart extends TreeNodeEditPart { - - @Override - protected boolean isDragLink() { - AbstractSmooksGraphicalModel model = (AbstractSmooksGraphicalModel) getModel(); - if (model != null) { - Object data = model.getData(); - data = AdapterFactoryEditingDomain.unwrap(data); - if (data != null && data instanceof EObject) { - EStructuralFeature idRefFeature = SmooksUIUtils.getBeanIDRefFeature((EObject) data); - if (idRefFeature != null) { - if (((EObject) data).eGet(idRefFeature) == null || !((EObject) data).eIsSet(idRefFeature)) { - return true; - } - } - } - } - return false; - } - -} 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-08-27 07:08:47 UTC (rev 17288) @@ -0,0 +1,75 @@ +/******************************************************************************* + * 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.List; + +import org.eclipse.emf.ecore.EObject; +import org.eclipse.emf.ecore.EStructuralFeature; +import org.jboss.tools.smooks.model.javabean.ExpressionType; +import org.jboss.tools.smooks.model.javabean.JavabeanPackage; +import org.jboss.tools.smooks.model.javabean.ValueType; +import org.jboss.tools.smooks.model.javabean.WiringType; +import org.jboss.tools.smooks.model.javabean12.Javabean12Package; + +/** + * @author Dart + * + */ +public class JavaBeanChildNodeEditPart extends AbstractResourceConfigChildNodeEditPart { + + private List<Object> supportTypes = new ArrayList<Object>(); + + + + public JavaBeanChildNodeEditPart() { + super(); + supportTypes.add(ValueType.class); + supportTypes.add(ExpressionType.class); + supportTypes.add(WiringType.class); + + supportTypes.add(org.jboss.tools.smooks.model.javabean12.ValueType.class); + supportTypes.add(org.jboss.tools.smooks.model.javabean12.ExpressionType.class); + supportTypes.add(org.jboss.tools.smooks.model.javabean12.WiringType.class); + } + + + + @Override + protected EStructuralFeature getFeature(EObject model) { + if(model instanceof WiringType){ + return JavabeanPackage.Literals.BINDINGS_TYPE__WIRING; + } + + if(model instanceof ValueType){ + return JavabeanPackage.Literals.BINDINGS_TYPE__VALUE; + } + + if(model instanceof ExpressionType){ + return JavabeanPackage.Literals.BINDINGS_TYPE__EXPRESSION; + } + + if(model instanceof org.jboss.tools.smooks.model.javabean12.WiringType){ + return Javabean12Package.Literals.BEAN_TYPE__WIRING; + } + + if(model instanceof org.jboss.tools.smooks.model.javabean12.ValueType){ + return Javabean12Package.Literals.BEAN_TYPE__VALUE; + } + + if(model instanceof org.jboss.tools.smooks.model.javabean12.ExpressionType){ + return Javabean12Package.Literals.BEAN_TYPE__EXPRESSION; + } + return null; + } + +} 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 Deleted: 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 2009-08-27 02:39:01 UTC (rev 17287) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/editparts/JavaBeanContainerEditPart.java 2009-08-27 07:08:47 UTC (rev 17288) @@ -1,27 +0,0 @@ -/******************************************************************************* - * 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()); - } - -} Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/editparts/JavaBeanEditPart.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/editparts/JavaBeanEditPart.java (rev 0) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/editparts/JavaBeanEditPart.java 2009-08-27 07:08:47 UTC (rev 17288) @@ -0,0 +1,47 @@ +/******************************************************************************* + * 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.List; + +import org.eclipse.emf.ecore.EObject; +import org.eclipse.emf.ecore.EStructuralFeature; +import org.jboss.tools.smooks.model.javabean.BindingsType; +import org.jboss.tools.smooks.model.javabean.JavabeanPackage; +import org.jboss.tools.smooks.model.javabean12.BeanType; +import org.jboss.tools.smooks.model.javabean12.Javabean12Package; + +/** + * @author Dart + * + */ +public class JavaBeanEditPart extends AbstractResourceConfigEditPart { + private List<Object> supportTypes = new ArrayList<Object>(); + + public JavaBeanEditPart() { + super(); + supportTypes.add(BindingsType.class); + supportTypes.add(BeanType.class); + } + + @Override + protected EStructuralFeature getFeature(EObject model) { + if(model instanceof BindingsType){ + return JavabeanPackage.Literals.DOCUMENT_ROOT__BINDINGS; + } + if(model instanceof BeanType){ + return Javabean12Package.Literals.JAVABEAN12_DOCUMENT_ROOT__BEAN; + } + return null; + } + +} Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/editparts/JavaBeanEditPart.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/editparts/ResourceConfigEditFactory.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/editparts/ResourceConfigEditFactory.java (rev 0) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/editparts/ResourceConfigEditFactory.java 2009-08-27 07:08:47 UTC (rev 17288) @@ -0,0 +1,31 @@ +/******************************************************************************* + * 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.eclipse.gef.EditPart; +import org.jboss.tools.smooks.graphical.editors.model.JavaBeanChildGraphModel; +import org.jboss.tools.smooks.graphical.editors.model.JavaBeanGraphModel; + +/** + * @author Dart + * + */ +public class ResourceConfigEditFactory { + public EditPart createEditPart(Object model){ + if(model instanceof JavaBeanGraphModel){ + return new JavaBeanEditPart(); + } + if(model instanceof JavaBeanChildGraphModel){ + return new JavaBeanChildNodeEditPart(); + } + return null; + } +} Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/editparts/ResourceConfigEditFactory.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/model/AbstractResourceConfigChildNodeGraphModel.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/model/AbstractResourceConfigChildNodeGraphModel.java (rev 0) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/model/AbstractResourceConfigChildNodeGraphModel.java 2009-08-27 07:08:47 UTC (rev 17288) @@ -0,0 +1,179 @@ +/******************************************************************************* + * 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.emf.common.command.Command; +import org.eclipse.emf.ecore.EObject; +import org.eclipse.emf.ecore.EStructuralFeature; +import org.eclipse.emf.edit.command.SetCommand; +import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain; +import org.eclipse.emf.edit.domain.IEditingDomainProvider; +import org.eclipse.jface.viewers.ILabelProvider; +import org.eclipse.jface.viewers.ITreeContentProvider; +import org.jboss.tools.smooks.configuration.editors.IXMLStructuredObject; +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.TreeNodeConnection; +import org.jboss.tools.smooks.gef.tree.model.TreeNodeModel; + +/** + * @author Dart + * + */ +public class AbstractResourceConfigChildNodeGraphModel extends TreeNodeModel { + protected IEditingDomainProvider domainProvider = null; + + public AbstractResourceConfigChildNodeGraphModel(Object data, ITreeContentProvider contentProvider, + ILabelProvider labelProvider, IEditingDomainProvider domainProvider) { + super(data, contentProvider, labelProvider); + this.domainProvider = domainProvider; + } + + @Override + public boolean hasChildren() { + return false; + } + + public IEditingDomainProvider getDomainProvider() { + return domainProvider; + } + + @Override + public boolean canLinkWithSource(Object model) { + if (model instanceof AbstractSmooksGraphicalModel) { + Object sourceModel = ((AbstractSmooksGraphicalModel) model).getData(); + sourceModel = AdapterFactoryEditingDomain.unwrap(sourceModel); + Object targetModel = getData(); + targetModel = AdapterFactoryEditingDomain.unwrap(targetModel); + if (sourceModel instanceof EObject && targetModel instanceof EObject) { + EStructuralFeature idFeature = SmooksUIUtils.getBeanIDFeature((EObject) targetModel); + EStructuralFeature idRefFeature = SmooksUIUtils.getBeanIDRefFeature((EObject) sourceModel); + if (idFeature != null && idRefFeature != null) { + return true; + } + } + + if (sourceModel instanceof IXMLStructuredObject && targetModel instanceof EObject) { + EStructuralFeature selectorFeature = SmooksUIUtils.getSelectorFeature((EObject) targetModel); + if (selectorFeature != null) { + return true; + } + } + } + return false; + } + + @Override + public boolean canLinkWithTarget(Object model) { + if (model instanceof AbstractSmooksGraphicalModel) { + Object targetModel = ((AbstractSmooksGraphicalModel) model).getData(); + targetModel = AdapterFactoryEditingDomain.unwrap(targetModel); + Object sourceModel = getData(); + sourceModel = AdapterFactoryEditingDomain.unwrap(sourceModel); + if (sourceModel instanceof EObject && targetModel instanceof EObject) { + EStructuralFeature idFeature = SmooksUIUtils.getBeanIDFeature((EObject) targetModel); + EStructuralFeature idRefFeature = SmooksUIUtils.getBeanIDRefFeature((EObject) sourceModel); + if (idFeature != null && idRefFeature != null) { + return true; + } + } + } + return false; + } + + @Override + public void addSourceConnection(TreeNodeConnection connection) { + super.addSourceConnection(connection); + Object sourceModel = getData(); + sourceModel = AdapterFactoryEditingDomain.unwrap(sourceModel); + if (sourceModel instanceof EObject) { + EStructuralFeature feature = SmooksUIUtils.getBeanIDRefFeature((EObject) sourceModel); + Object model = connection.getTargetNode().getData(); + if (feature != null) { + EStructuralFeature idFeature = SmooksUIUtils.getBeanIDFeature((EObject) model); + if (idFeature == null) + return; + // it's bean id connection + Object iddata = ((EObject) model).eGet(idFeature); + if (iddata != null) { + Command command = SetCommand.create(domainProvider.getEditingDomain(), (EObject) sourceModel, + feature, iddata); + domainProvider.getEditingDomain().getCommandStack().execute(command); + return; + } + } + } + } + + @Override + public void removeSourceConnection(TreeNodeConnection connection) { + super.removeSourceConnection(connection); + Object sourceModel = getData(); + sourceModel = AdapterFactoryEditingDomain.unwrap(sourceModel); + if (sourceModel instanceof EObject) { + EStructuralFeature feature = SmooksUIUtils.getBeanIDRefFeature((EObject) sourceModel); + Object model = connection.getTargetNode().getData(); + if (feature != null) { + EStructuralFeature idFeature = SmooksUIUtils.getBeanIDFeature((EObject) model); + if (idFeature == null) + return; + // it's bean id connection + if (idFeature != null) { + try { + Command command = SetCommand.create(domainProvider.getEditingDomain(), (EObject) sourceModel, + feature, null); + domainProvider.getEditingDomain().getCommandStack().execute(command); + } catch (Exception e) { + e.printStackTrace(); + } + return; + } + } + } + } + + @Override + public void addTargetConnection(TreeNodeConnection connection) { + super.addTargetConnection(connection); + Object model = getData(); + model = AdapterFactoryEditingDomain.unwrap(model); + if (model instanceof EObject) { + // for the javabean children , there is only "Selector" target + // connection; + EStructuralFeature feature = SmooksUIUtils.getSelectorFeature((EObject) model); + if (feature == null) + return; + EObject owner = (EObject) model; + AbstractSmooksGraphicalModel targetGraphModel = connection.getSourceNode(); + Object tm = targetGraphModel.getData(); + if (tm instanceof IXMLStructuredObject) { + String selector = SmooksUIUtils.generateFullPath((IXMLStructuredObject) tm, "/"); + Command command = SetCommand.create(domainProvider.getEditingDomain(), owner, feature, selector); + domainProvider.getEditingDomain().getCommandStack().execute(command); + } + } + } + + @Override + public void removeTargetConnection(TreeNodeConnection connection) { + super.removeTargetConnection(connection); + Object model = getData(); + model = AdapterFactoryEditingDomain.unwrap(model); + if (model instanceof EObject) { + EStructuralFeature feature = SmooksUIUtils.getSelectorFeature((EObject) model); + if (feature == null) + return; + EObject owner = (EObject) model; + Command command = SetCommand.create(domainProvider.getEditingDomain(), owner, feature, null); + domainProvider.getEditingDomain().getCommandStack().execute(command); + } + } +} Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/model/AbstractResourceConfigChildNodeGraphModel.java ___________________________________________________________________ Name: svn:mime-type + text/plain Copied: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/model/AbstractResourceConfigGraphModel.java (from rev 17033, 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/AbstractResourceConfigGraphModel.java (rev 0) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/model/AbstractResourceConfigGraphModel.java 2009-08-27 07:08:47 UTC (rev 17288) @@ -0,0 +1,145 @@ +/******************************************************************************* + * 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.emf.common.command.Command; +import org.eclipse.emf.ecore.EObject; +import org.eclipse.emf.ecore.EStructuralFeature; +import org.eclipse.emf.edit.command.SetCommand; +import org.eclipse.emf.edit.domain.IEditingDomainProvider; +import org.eclipse.jface.viewers.ILabelProvider; +import org.eclipse.jface.viewers.ITreeContentProvider; +import org.jboss.tools.smooks.configuration.editors.IXMLStructuredObject; +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.TreeContainerModel; +import org.jboss.tools.smooks.gef.tree.model.TreeNodeConnection; +import org.jboss.tools.smooks.gef.tree.model.TreeNodeModel; + +/** + * @author Dart + * + */ +public abstract class AbstractResourceConfigGraphModel extends TreeContainerModel { + + protected IEditingDomainProvider domainProvider = null; + + public AbstractResourceConfigGraphModel(Object data, ITreeContentProvider contentProvider, + ILabelProvider labelProvider, IEditingDomainProvider domainProvider) { + super(data, contentProvider, labelProvider); + this.domainProvider = domainProvider; + } + + + + public IEditingDomainProvider getDomainProvider() { + return domainProvider; + } + + + + public void setDomainProvider(IEditingDomainProvider domainProvider) { + this.domainProvider = domainProvider; + } + + + + @Override + protected abstract TreeNodeModel createChildModel(Object model, ITreeContentProvider contentProvider, + ILabelProvider labelProvider); + + @Override + public void addTargetConnection(TreeNodeConnection connection) { + super.addTargetConnection(connection); + Object model = getData(); + if (model instanceof EObject) { + EStructuralFeature feature = null; + // judge the source model's type: + AbstractSmooksGraphicalModel sourceGraphModel = connection.getSourceNode(); + if (sourceGraphModel instanceof InputDataTreeNodeModel + || sourceGraphModel instanceof InputDataContianerModel) { + // it's "Selector" connection + feature = SmooksUIUtils.getSelectorFeature((EObject) model); + if (feature != null) { + EObject owner = (EObject) model; + AbstractSmooksGraphicalModel targetGraphModel = connection.getSourceNode(); + Object tm = targetGraphModel.getData(); + if (tm instanceof IXMLStructuredObject) { + String selector = SmooksUIUtils.generateFullPath((IXMLStructuredObject) tm, "/"); + Command command = SetCommand + .create(domainProvider.getEditingDomain(), owner, feature, selector); + domainProvider.getEditingDomain().getCommandStack().execute(command); + return; + } + } + } + + // Object sourceModel = sourceGraphModel.getData(); + // sourceModel = AdapterFactoryEditingDomain.unwrap(sourceModel); + // if (sourceModel instanceof EObject) { + // feature = SmooksUIUtils.getBeanIDRefFeature((EObject) + // sourceModel); + // if (feature != null) { + // // it's bean id connection + // EStructuralFeature idFeature = + // SmooksUIUtils.getBeanIDFeature((EObject) model); + // Object iddata = ((EObject) model).eGet(idFeature); + // if (iddata != null) { + // Command command = + // SetCommand.create(domainProvider.getEditingDomain(), (EObject) + // sourceModel, + // feature, iddata); + // domainProvider.getEditingDomain().getCommandStack().execute(command); + // return; + // } + // } + // } + } + } + + @Override + public void removeTargetConnection(TreeNodeConnection connection) { + super.removeTargetConnection(connection); + Object model = getData(); + if (model instanceof EObject) { + EStructuralFeature feature = null; + AbstractSmooksGraphicalModel sourceGraphModel = connection.getSourceNode(); + if (sourceGraphModel instanceof InputDataTreeNodeModel + || sourceGraphModel instanceof InputDataContianerModel) { + // it's "Selector" connection + feature = SmooksUIUtils.getSelectorFeature((EObject) model); + if (feature != null) { + EObject owner = (EObject) model; + Command command = SetCommand.create(domainProvider.getEditingDomain(), owner, feature, null); + domainProvider.getEditingDomain().getCommandStack().execute(command); + return; + } + } + + // Object sourceModel = sourceGraphModel.getData(); + // sourceModel = AdapterFactoryEditingDomain.unwrap(sourceModel); + // if (sourceModel instanceof EObject) { + // feature = SmooksUIUtils.getBeanIDRefFeature((EObject) + // sourceModel); + // if (feature != null) { + // // it's bean id connection + // Command command = + // SetCommand.create(domainProvider.getEditingDomain(), (EObject) + // sourceModel, + // feature, null); + // domainProvider.getEditingDomain().getCommandStack().execute(command); + // return; + // } + // } + } + } + +} Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/model/AbstractResourceConfigGraphModel.java ___________________________________________________________________ Name: svn:mime-type + text/plain Deleted: 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 2009-08-27 02:39:01 UTC (rev 17287) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/model/AbstractResourceGraphModel.java 2009-08-27 07:08:47 UTC (rev 17288) @@ -1,27 +0,0 @@ -/******************************************************************************* - * 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); - } - -} 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-08-27 02:39:01 UTC (rev 17287) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/model/JavaBeanChildGraphModel.java 2009-08-27 07:08:47 UTC (rev 17288) @@ -10,164 +10,19 @@ ******************************************************************************/ package org.jboss.tools.smooks.graphical.editors.model; -import org.eclipse.emf.common.command.Command; -import org.eclipse.emf.ecore.EObject; -import org.eclipse.emf.ecore.EStructuralFeature; -import org.eclipse.emf.edit.command.SetCommand; -import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain; import org.eclipse.emf.edit.domain.IEditingDomainProvider; import org.eclipse.jface.viewers.ILabelProvider; import org.eclipse.jface.viewers.ITreeContentProvider; -import org.jboss.tools.smooks.configuration.editors.IXMLStructuredObject; -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.TreeNodeConnection; -import org.jboss.tools.smooks.gef.tree.model.TreeNodeModel; /** * @author Dart * */ -public class JavaBeanChildGraphModel extends TreeNodeModel { +public class JavaBeanChildGraphModel extends AbstractResourceConfigChildNodeGraphModel { - protected IEditingDomainProvider domainProvider = null; public JavaBeanChildGraphModel(Object data, ITreeContentProvider contentProvider, ILabelProvider labelProvider, IEditingDomainProvider domainProvider) { - super(data, contentProvider, labelProvider); - this.domainProvider = domainProvider; + super(data, contentProvider, labelProvider,domainProvider); } - - @Override - public boolean hasChildren() { - return false; - } - - @Override - public boolean canLinkWithSource(Object model) { - if (model instanceof AbstractSmooksGraphicalModel) { - Object sourceModel = ((AbstractSmooksGraphicalModel) model).getData(); - sourceModel = AdapterFactoryEditingDomain.unwrap(sourceModel); - Object targetModel = getData(); - targetModel = AdapterFactoryEditingDomain.unwrap(targetModel); - if (sourceModel instanceof EObject && targetModel instanceof EObject) { - EStructuralFeature idFeature = SmooksUIUtils.getBeanIDFeature((EObject) targetModel); - EStructuralFeature idRefFeature = SmooksUIUtils.getBeanIDRefFeature((EObject) sourceModel); - if (idFeature != null && idRefFeature != null) { - return true; - } - } - - if(sourceModel instanceof IXMLStructuredObject && targetModel instanceof EObject){ - EStructuralFeature selectorFeature = SmooksUIUtils.getSelectorFeature((EObject)targetModel); - if(selectorFeature != null){ - return true; - } - } - } - return false; - } - - @Override - public boolean canLinkWithTarget(Object model) { - if (model instanceof AbstractSmooksGraphicalModel) { - Object targetModel = ((AbstractSmooksGraphicalModel) model).getData(); - targetModel = AdapterFactoryEditingDomain.unwrap(targetModel); - Object sourceModel = getData(); - sourceModel = AdapterFactoryEditingDomain.unwrap(sourceModel); - if (sourceModel instanceof EObject && targetModel instanceof EObject) { - EStructuralFeature idFeature = SmooksUIUtils.getBeanIDFeature((EObject) targetModel); - EStructuralFeature idRefFeature = SmooksUIUtils.getBeanIDRefFeature((EObject) sourceModel); - if (idFeature != null && idRefFeature != null) { - return true; - } - } - } - return false; - } - - @Override - public void addSourceConnection(TreeNodeConnection connection) { - super.addSourceConnection(connection); - Object sourceModel = getData(); - sourceModel = AdapterFactoryEditingDomain.unwrap(sourceModel); - if (sourceModel instanceof EObject) { - EStructuralFeature feature = SmooksUIUtils.getBeanIDRefFeature((EObject) sourceModel); - Object model = connection.getTargetNode().getData(); - if (feature != null) { - EStructuralFeature idFeature = SmooksUIUtils.getBeanIDFeature((EObject) model); - if (idFeature == null) - return; - // it's bean id connection - Object iddata = ((EObject) model).eGet(idFeature); - if (iddata != null) { - Command command = SetCommand.create(domainProvider.getEditingDomain(), (EObject) sourceModel, - feature, iddata); - domainProvider.getEditingDomain().getCommandStack().execute(command); - return; - } - } - } - } - - @Override - public void removeSourceConnection(TreeNodeConnection connection) { - super.removeSourceConnection(connection); - Object sourceModel = getData(); - sourceModel = AdapterFactoryEditingDomain.unwrap(sourceModel); - if (sourceModel instanceof EObject) { - EStructuralFeature feature = SmooksUIUtils.getBeanIDRefFeature((EObject) sourceModel); - Object model = connection.getTargetNode().getData(); - if (feature != null) { - EStructuralFeature idFeature = SmooksUIUtils.getBeanIDFeature((EObject) model); - if (idFeature == null) - return; - // it's bean id connection - if (idFeature != null) { - Command command = SetCommand.create(domainProvider.getEditingDomain(), (EObject) sourceModel, - feature, null); - domainProvider.getEditingDomain().getCommandStack().execute(command); - return; - } - } - } - } - - @Override - public void addTargetConnection(TreeNodeConnection connection) { - super.addTargetConnection(connection); - Object model = getData(); - model = AdapterFactoryEditingDomain.unwrap(model); - if (model instanceof EObject) { - // for the javabean children , there is only "Selector" target - // connection; - EStructuralFeature feature = SmooksUIUtils.getSelectorFeature((EObject) model); - if (feature == null) - return; - EObject owner = (EObject) model; - AbstractSmooksGraphicalModel targetGraphModel = connection.getSourceNode(); - Object tm = targetGraphModel.getData(); - if (tm instanceof IXMLStructuredObject) { - String selector = SmooksUIUtils.generateFullPath((IXMLStructuredObject) tm, "/"); - Command command = SetCommand.create(domainProvider.getEditingDomain(), owner, feature, selector); - domainProvider.getEditingDomain().getCommandStack().execute(command); - } - } - } - - @Override - public void removeTargetConnection(TreeNodeConnection connection) { - super.removeTargetConnection(connection); - Object model = getData(); - model = AdapterFactoryEditingDomain.unwrap(model); - if (model instanceof EObject) { - EStructuralFeature feature = SmooksUIUtils.getSelectorFeature((EObject) model); - if (feature == null) - return; - EObject owner = (EObject) model; - Command command = SetCommand.create(domainProvider.getEditingDomain(), owner, feature, null); - domainProvider.getEditingDomain().getCommandStack().execute(command); - } - } - } Modified: 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 2009-08-27 02:39:01 UTC (rev 17287) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/model/JavaBeanGraphModel.java 2009-08-27 07:08:47 UTC (rev 17288) @@ -10,32 +10,20 @@ ******************************************************************************/ package org.jboss.tools.smooks.graphical.editors.model; -import org.eclipse.emf.common.command.Command; -import org.eclipse.emf.ecore.EObject; -import org.eclipse.emf.ecore.EStructuralFeature; -import org.eclipse.emf.edit.command.SetCommand; import org.eclipse.emf.edit.domain.IEditingDomainProvider; import org.eclipse.jface.viewers.ILabelProvider; import org.eclipse.jface.viewers.ITreeContentProvider; -import org.jboss.tools.smooks.configuration.editors.IXMLStructuredObject; -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.TreeContainerModel; -import org.jboss.tools.smooks.gef.tree.model.TreeNodeConnection; import org.jboss.tools.smooks.gef.tree.model.TreeNodeModel; /** * @author Dart * */ -public class JavaBeanGraphModel extends TreeContainerModel { +public class JavaBeanGraphModel extends AbstractResourceConfigGraphModel { - protected IEditingDomainProvider domainProvider = null; - public JavaBeanGraphModel(Object data, ITreeContentProvider contentProvider, ILabelProvider labelProvider, IEditingDomainProvider domainProvider) { - super(data, contentProvider, labelProvider); - this.domainProvider = domainProvider; + super(data,contentProvider,labelProvider,domainProvider); } @Override @@ -43,83 +31,4 @@ ILabelProvider labelProvider) { return new JavaBeanChildGraphModel(model, contentProvider, labelProvider, this.domainProvider); } - - @Override - public void addTargetConnection(TreeNodeConnection connection) { - super.addTargetConnection(connection); - Object model = getData(); - if (model instanceof EObject) { - EStructuralFeature feature = null; - // judge the source model's type: - AbstractSmooksGraphicalModel sourceGraphModel = connection.getSourceNode(); - if (sourceGraphModel instanceof InputDataTreeNodeModel - || sourceGraphModel instanceof InputDataContianerModel) { - // it's "Selector" connection - feature = SmooksUIUtils.getSelectorFeature((EObject) model); - if (feature != null) { - EObject owner = (EObject) model; - AbstractSmooksGraphicalModel targetGraphModel = connection.getSourceNode(); - Object tm = targetGraphModel.getData(); - if (tm instanceof IXMLStructuredObject) { - String selector = SmooksUIUtils.generateFullPath((IXMLStructuredObject) tm, "/"); - Command command = SetCommand - .create(domainProvider.getEditingDomain(), owner, feature, selector); - domainProvider.getEditingDomain().getCommandStack().execute(command); - return; - } - } - } - -// Object sourceModel = sourceGraphModel.getData(); -// sourceModel = AdapterFactoryEditingDomain.unwrap(sourceModel); -// if (sourceModel instanceof EObject) { -// feature = SmooksUIUtils.getBeanIDRefFeature((EObject) sourceModel); -// if (feature != null) { -// // it's bean id connection -// EStructuralFeature idFeature = SmooksUIUtils.getBeanIDFeature((EObject) model); -// Object iddata = ((EObject) model).eGet(idFeature); -// if (iddata != null) { -// Command command = SetCommand.create(domainProvider.getEditingDomain(), (EObject) sourceModel, -// feature, iddata); -// domainProvider.getEditingDomain().getCommandStack().execute(command); -// return; -// } -// } -// } - } - } - - @Override - public void removeTargetConnection(TreeNodeConnection connection) { - super.removeTargetConnection(connection); - Object model = getData(); - if (model instanceof EObject) { - EStructuralFeature feature = null; - AbstractSmooksGraphicalModel sourceGraphModel = connection.getSourceNode(); - if (sourceGraphModel instanceof InputDataTreeNodeModel - || sourceGraphModel instanceof InputDataContianerModel) { - // it's "Selector" connection - feature = SmooksUIUtils.getSelectorFeature((EObject) model); - if (feature != null) { - EObject owner = (EObject) model; - Command command = SetCommand.create(domainProvider.getEditingDomain(), owner, feature, null); - domainProvider.getEditingDomain().getCommandStack().execute(command); - return; - } - } - -// Object sourceModel = sourceGraphModel.getData(); -// sourceModel = AdapterFactoryEditingDomain.unwrap(sourceModel); -// if (sourceModel instanceof EObject) { -// feature = SmooksUIUtils.getBeanIDRefFeature((EObject) sourceModel); -// if (feature != null) { -// // it's bean id connection -// Command command = SetCommand.create(domainProvider.getEditingDomain(), (EObject) sourceModel, -// feature, null); -// domainProvider.getEditingDomain().getCommandStack().execute(command); -// return; -// } -// } - } - } }