Author: DartPeng Date: 2009-07-27 03:25:30 -0400 (Mon, 27 Jul 2009) New Revision: 16799 Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/javabean12/ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/javabean12/JavaBean12PropertyUICreator.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/javabean12/Javabean12ExpressionUICreator.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/javabean12/JavabeanValueBinding12UICreator.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/javabean12/JavabeanWiringBiding12UICreator.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/jms12/ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/jms12/JMSRouter12UICreator.java Modified: trunk/smooks/plugins/org.jboss.tools.smooks.core/plugin.properties 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/ValueTypeItemProvider.java trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/javabean12/provider/WiringTypeItemProvider.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/PropertyUICreatorManager.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/javabean/JavabeanExpressionUICreator.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/javabean/JavabeanValueUICreator.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/javabean/JavabeanWiringUICreator.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/javabean/PropertiesAndSetterMethodSearchFieldEditorCreator.java trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/uitls/SmooksUIUtils.java Log: JBIDE-4217 Create property details GUI for Javabean v1.2 and JMS router v1.2 Modified: trunk/smooks/plugins/org.jboss.tools.smooks.core/plugin.properties =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.core/plugin.properties 2009-07-27 07:24:17 UTC (rev 16798) +++ trunk/smooks/plugins/org.jboss.tools.smooks.core/plugin.properties 2009-07-27 07:25:30 UTC (rev 16799) @@ -535,7 +535,7 @@ _UI_HighWaterMark_type = High Water Mark _UI_Jndi_type = Jndi _UI_Message_type = Message -_UI_JMS12Router_type = JMS12 Router +_UI_JMS12Router_type = JMS Router v1.2 _UI_Session_type = Session UI_Connection_factory_feature = Factory 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-07-27 07:24:17 UTC (rev 16798) +++ trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/javabean12/provider/BeanTypeItemProvider.java 2009-07-27 07:25:30 UTC (rev 16799) @@ -10,16 +10,11 @@ import java.util.Collection; import java.util.List; - import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.Notification; - import org.eclipse.emf.common.util.ResourceLocator; - import org.eclipse.emf.ecore.EStructuralFeature; - import org.eclipse.emf.ecore.util.FeatureMapUtil; - import org.eclipse.emf.edit.provider.ComposeableAdapterFactory; import org.eclipse.emf.edit.provider.IEditingDomainItemProvider; import org.eclipse.emf.edit.provider.IItemLabelProvider; @@ -232,10 +227,11 @@ * @generated */ public String getText(Object object) { - String label = ((BeanType)object).getTargetProfile(); + String label = ((BeanType)object).getBeanId(); return label == null || label.length() == 0 ? getString("_UI_BeanType_type") : - getString("_UI_BeanType_type") + " " + label; + getString("_UI_BeanType_type") + " (" + label+")"; + } /** Modified: trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/javabean12/provider/ValueTypeItemProvider.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/javabean12/provider/ValueTypeItemProvider.java 2009-07-27 07:24:17 UTC (rev 16798) +++ trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/javabean12/provider/ValueTypeItemProvider.java 2009-07-27 07:25:30 UTC (rev 16799) @@ -11,14 +11,10 @@ import java.util.Collection; import java.util.List; - import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.Notification; - import org.eclipse.emf.common.util.ResourceLocator; - import org.eclipse.emf.ecore.EStructuralFeature; - import org.eclipse.emf.edit.provider.ComposeableAdapterFactory; import org.eclipse.emf.edit.provider.IEditingDomainItemProvider; import org.eclipse.emf.edit.provider.IItemLabelProvider; @@ -253,10 +249,10 @@ * @generated */ public String getText(Object object) { - String label = ((ValueType)object).getData(); + String label = ((ValueType)object).getProperty(); return label == null || label.length() == 0 ? getString("_UI_ValueType_type") : - getString("_UI_ValueType_type") + " " + label; + getString("_UI_ValueType_type") + " (" + label + ")"; } /** Modified: trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/javabean12/provider/WiringTypeItemProvider.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/javabean12/provider/WiringTypeItemProvider.java 2009-07-27 07:24:17 UTC (rev 16798) +++ trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/javabean12/provider/WiringTypeItemProvider.java 2009-07-27 07:25:30 UTC (rev 16799) @@ -199,10 +199,10 @@ * @generated */ public String getText(Object object) { - String label = ((WiringType)object).getBeanIdRef(); + String label = ((WiringType)object).getProperty(); return label == null || label.length() == 0 ? getString("_UI_WiringType_type") : - getString("_UI_WiringType_type") + " " + label; + getString("_UI_WiringType_type") + " (" + label+")"; } /** Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/PropertyUICreatorManager.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/PropertyUICreatorManager.java 2009-07-27 07:24:17 UTC (rev 16798) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/PropertyUICreatorManager.java 2009-07-27 07:25:30 UTC (rev 16799) @@ -43,11 +43,16 @@ import org.jboss.tools.smooks.configuration.editors.javabean.JavabeanExpressionUICreator; import org.jboss.tools.smooks.configuration.editors.javabean.JavabeanValueUICreator; import org.jboss.tools.smooks.configuration.editors.javabean.JavabeanWiringUICreator; +import org.jboss.tools.smooks.configuration.editors.javabean12.JavaBean12PropertyUICreator; +import org.jboss.tools.smooks.configuration.editors.javabean12.Javabean12ExpressionUICreator; +import org.jboss.tools.smooks.configuration.editors.javabean12.JavabeanValueBinding12UICreator; +import org.jboss.tools.smooks.configuration.editors.javabean12.JavabeanWiringBiding12UICreator; import org.jboss.tools.smooks.configuration.editors.jms.ConnectionUICreator; import org.jboss.tools.smooks.configuration.editors.jms.JmsRouterUICreator; import org.jboss.tools.smooks.configuration.editors.jms.JndiUICreator; import org.jboss.tools.smooks.configuration.editors.jms.MessageUICreator; import org.jboss.tools.smooks.configuration.editors.jms.SessionUICreator; +import org.jboss.tools.smooks.configuration.editors.jms12.JMSRouter12UICreator; import org.jboss.tools.smooks.configuration.editors.json.JsonReaderUICreator; import org.jboss.tools.smooks.configuration.editors.json.KeyMapUICreator; import org.jboss.tools.smooks.configuration.editors.json.KeyUICreator; @@ -92,11 +97,13 @@ import org.jboss.tools.smooks.model.javabean.impl.ExpressionTypeImpl; import org.jboss.tools.smooks.model.javabean.impl.ValueTypeImpl; import org.jboss.tools.smooks.model.javabean.impl.WiringTypeImpl; +import org.jboss.tools.smooks.model.javabean12.impl.BeanTypeImpl; import org.jboss.tools.smooks.model.jmsrouting.impl.ConnectionImpl; import org.jboss.tools.smooks.model.jmsrouting.impl.JmsRouterImpl; import org.jboss.tools.smooks.model.jmsrouting.impl.JndiImpl; import org.jboss.tools.smooks.model.jmsrouting.impl.MessageImpl; import org.jboss.tools.smooks.model.jmsrouting.impl.SessionImpl; +import org.jboss.tools.smooks.model.jmsrouting12.impl.JMS12RouterImpl; import org.jboss.tools.smooks.model.json.impl.JsonReaderImpl; import org.jboss.tools.smooks.model.json.impl.KeyImpl; import org.jboss.tools.smooks.model.json.impl.KeyMapImpl; @@ -153,7 +160,7 @@ map.put(BindingsTypeImpl.class, new BindingsPropertyUICreator()); map.put(ValueTypeImpl.class, new JavabeanValueUICreator()); map.put(WiringTypeImpl.class, new JavabeanWiringUICreator()); - map.put(ExpressionTypeImpl.class,new JavabeanExpressionUICreator()); + map.put(ExpressionTypeImpl.class, new JavabeanExpressionUICreator()); // for smooks models map.put(ConditionTypeImpl.class, new ConditionTypeUICreator()); @@ -173,7 +180,6 @@ map.put(SetOnTypeImpl.class, new SetOnTypeUICreator()); map.put(SmooksResourceListTypeImpl.class, new SmooksResourceListTypeUICreator()); - // for xsl models map.put(BindToImpl.class, new BindToUICreator()); map.put(OutputToImpl.class, new OutputToUICreator()); @@ -217,13 +223,13 @@ map.put(KeyImpl.class, new KeyUICreator()); map.put(KeyMapImpl.class, new KeyMapUICreator()); map.put(JsonReaderImpl.class, new JsonReaderUICreator()); - + // for CSV map.put(CsvReaderImpl.class, new CsvReaderUICreator()); - + // for IO Routing map.put(IORouterImpl.class, new IORouterUICreator()); - + // for JMS map.put(ConnectionImpl.class, new ConnectionUICreator()); map.put(HighWaterMarkImpl.class, new HighWaterMarkUICreator()); @@ -231,7 +237,7 @@ map.put(MessageImpl.class, new MessageUICreator()); map.put(JmsRouterImpl.class, new JmsRouterUICreator()); map.put(SessionImpl.class, new SessionUICreator()); - + // for DB routing map.put(ExecutorImpl.class, new ExecutorUICreator()); map.put(ResultSetImpl.class, new ResultSetUICreator()); @@ -239,7 +245,7 @@ // for calc map.put(CounterImpl.class, new CounterUICreator()); - + // for datasource map.put(DirectImpl.class, new DirectUICreator()); map.put(DataSourceJndiImpl.class, new DataSourceJndiUICreator()); @@ -250,6 +256,22 @@ * up is for smooks1.1 */ + /* + * bottom is for smooks 1.2 + */ + + // for JavaBean v1.2 + map.put(BeanTypeImpl.class, new JavaBean12PropertyUICreator()); + map + .put(org.jboss.tools.smooks.model.javabean12.impl.ValueTypeImpl.class, + new JavabeanValueBinding12UICreator()); + map.put(org.jboss.tools.smooks.model.javabean12.impl.ExpressionTypeImpl.class, + new Javabean12ExpressionUICreator()); + map.put(org.jboss.tools.smooks.model.javabean12.impl.WiringTypeImpl.class, + new JavabeanWiringBiding12UICreator()); + + // for JMS Router v1.2 + map.put(JMS12RouterImpl.class, new JMSRouter12UICreator()); } public void registePropertyUICreator(Class<?> key, IPropertyUICreator creator) { Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/javabean/JavabeanExpressionUICreator.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/javabean/JavabeanExpressionUICreator.java 2009-07-27 07:24:17 UTC (rev 16798) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/javabean/JavabeanExpressionUICreator.java 2009-07-27 07:25:30 UTC (rev 16799) @@ -29,6 +29,7 @@ import org.jboss.tools.smooks.configuration.editors.uitls.FieldAssistDisposer; import org.jboss.tools.smooks.configuration.editors.uitls.SmooksUIUtils; import org.jboss.tools.smooks.editor.ISmooksModelProvider; +import org.jboss.tools.smooks.model.javabean.BindingsType; import org.jboss.tools.smooks.model.javabean.JavabeanPackage; /** @@ -37,7 +38,15 @@ */ public class JavabeanExpressionUICreator extends PropertiesAndSetterMethodSearchFieldEditorCreator implements IPropertyUICreator { - + protected String getClassString(Object model) { + if (model instanceof EObject) { + EObject container = ((EObject) model).eContainer(); + if(container instanceof BindingsType){ + return ((BindingsType)container).getClass_(); + } + } + return super.getClassString(model); + } /* * (non-Javadoc) * Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/javabean/JavabeanValueUICreator.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/javabean/JavabeanValueUICreator.java 2009-07-27 07:24:17 UTC (rev 16798) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/javabean/JavabeanValueUICreator.java 2009-07-27 07:25:30 UTC (rev 16799) @@ -14,6 +14,7 @@ import java.util.List; import org.eclipse.emf.ecore.EAttribute; +import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain; import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; import org.eclipse.swt.widgets.Composite; @@ -22,6 +23,7 @@ import org.jboss.tools.smooks.configuration.editors.AttributeFieldEditPart; import org.jboss.tools.smooks.configuration.editors.uitls.SmooksUIUtils; import org.jboss.tools.smooks.editor.ISmooksModelProvider; +import org.jboss.tools.smooks.model.javabean.BindingsType; import org.jboss.tools.smooks.model.javabean.JavabeanPackage; /** @@ -46,7 +48,23 @@ } return super.canCreateMethodsSearchFieldEditor(feature); } + + + /* (non-Javadoc) + * @see org.jboss.tools.smooks.configuration.editors.javabean.PropertiesAndSetterMethodSearchFieldEditorCreator#getClassString(java.lang.Object) + */ + @Override + protected String getClassString(Object model) { + if (model instanceof EObject) { + EObject container = ((EObject) model).eContainer(); + if(container instanceof BindingsType){ + return ((BindingsType)container).getClass_(); + } + } + return super.getClassString(model); + } + /* * (non-Javadoc) * Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/javabean/JavabeanWiringUICreator.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/javabean/JavabeanWiringUICreator.java 2009-07-27 07:24:17 UTC (rev 16798) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/javabean/JavabeanWiringUICreator.java 2009-07-27 07:25:30 UTC (rev 16799) @@ -14,6 +14,7 @@ import java.util.List; import org.eclipse.emf.ecore.EAttribute; +import org.eclipse.emf.ecore.EObject; import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain; import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; import org.eclipse.swt.widgets.Composite; @@ -21,6 +22,7 @@ import org.eclipse.ui.forms.widgets.FormToolkit; import org.jboss.tools.smooks.configuration.editors.AttributeFieldEditPart; import org.jboss.tools.smooks.editor.ISmooksModelProvider; +import org.jboss.tools.smooks.model.javabean.BindingsType; import org.jboss.tools.smooks.model.javabean.JavabeanPackage; /** @@ -35,6 +37,16 @@ // } return false; } + + protected String getClassString(Object model) { + if (model instanceof EObject) { + EObject container = ((EObject) model).eContainer(); + if(container instanceof BindingsType){ + return ((BindingsType)container).getClass_(); + } + } + return super.getClassString(model); + } @Override protected boolean canCreateMethodsSearchFieldEditor(EAttribute feature) { Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/javabean/PropertiesAndSetterMethodSearchFieldEditorCreator.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/javabean/PropertiesAndSetterMethodSearchFieldEditorCreator.java 2009-07-27 07:24:17 UTC (rev 16798) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/javabean/PropertiesAndSetterMethodSearchFieldEditorCreator.java 2009-07-27 07:25:30 UTC (rev 16799) @@ -20,8 +20,9 @@ import org.jboss.tools.smooks.configuration.editors.PropertyUICreator; import org.jboss.tools.smooks.configuration.editors.uitls.SmooksUIUtils; import org.jboss.tools.smooks.editor.ISmooksModelProvider; -import org.jboss.tools.smooks.model.javabean.BindingsType; +//import org.jboss.tools.smooks.model.javabean.BindingsType; + /** * @author Dart Peng (dpeng(a)redhat.com) Date Apr 9, 2009 */ @@ -37,7 +38,7 @@ if (canCreateMethodsSearchFieldEditor(feature)) { return createMethodsSearchFieldEditor(toolkit, parent, propertyDescriptor, model); } - return super.createPropertyUI(toolkit, parent, propertyDescriptor, model, feature, formEditor,part); + return super.createPropertyUI(toolkit, parent, propertyDescriptor, model, feature, formEditor, part); } protected boolean canCreatePropertiesSearchFieldEditor(EAttribute feature) { @@ -60,20 +61,26 @@ IItemPropertyDescriptor propertyDescriptor, Object model) { if (model instanceof EObject) { EObject container = ((EObject) model).eContainer(); - if (container instanceof BindingsType) { - return SmooksUIUtils.createJavaPropertySearchFieldEditor((BindingsType) container, parent, toolkit, + String classString = getClassString(model); + if (classString != null) { + return SmooksUIUtils.createJavaPropertySearchFieldEditor(classString, container, parent, toolkit, propertyDescriptor, getPropertiesSearchButtonName(), (EObject) model); } } return null; } + protected String getClassString(Object model) { + return null; + } + protected AttributeFieldEditPart createMethodsSearchFieldEditor(FormToolkit toolkit, Composite parent, IItemPropertyDescriptor propertyDescriptor, Object model) { if (model instanceof EObject) { EObject container = ((EObject) model).eContainer(); - if (container instanceof BindingsType) { - return SmooksUIUtils.createJavaMethodSearchFieldEditor((BindingsType) container, parent, toolkit, + String classString = getClassString(model); + if (classString != null) { + return SmooksUIUtils.createJavaMethodSearchFieldEditor(classString, container, parent, toolkit, propertyDescriptor, getMethodsSearchButtonName(), (EObject) model); } } Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/javabean12/JavaBean12PropertyUICreator.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/javabean12/JavaBean12PropertyUICreator.java (rev 0) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/javabean12/JavaBean12PropertyUICreator.java 2009-07-27 07:25:30 UTC (rev 16799) @@ -0,0 +1,306 @@ +/******************************************************************************* + * Copyright (c) 2009 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.smooks.configuration.editors.javabean12; + +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; + +import org.eclipse.emf.common.command.Command; +import org.eclipse.emf.common.command.CompoundCommand; +import org.eclipse.emf.ecore.EAttribute; +import org.eclipse.emf.ecore.EObject; +import org.eclipse.emf.edit.command.AddCommand; +import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain; +import org.eclipse.emf.edit.domain.EditingDomain; +import org.eclipse.emf.edit.domain.IEditingDomainProvider; +import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; +import org.eclipse.jdt.core.JavaModelException; +import org.eclipse.jface.dialogs.Dialog; +import org.eclipse.jface.dialogs.MessageDialog; +import org.eclipse.swt.SWT; +import org.eclipse.swt.layout.GridData; +import org.eclipse.swt.widgets.Composite; +import org.eclipse.ui.IEditorPart; +import org.eclipse.ui.IFileEditorInput; +import org.eclipse.ui.forms.events.HyperlinkEvent; +import org.eclipse.ui.forms.events.IHyperlinkListener; +import org.eclipse.ui.forms.widgets.FormToolkit; +import org.eclipse.ui.forms.widgets.Hyperlink; +import org.jboss.tools.smooks.configuration.editors.AttributeFieldEditPart; +import org.jboss.tools.smooks.configuration.editors.PropertyUICreator; +import org.jboss.tools.smooks.configuration.editors.javabean.JavaBeanModel; +import org.jboss.tools.smooks.configuration.editors.javabean.JavaBeanModelFactory; +import org.jboss.tools.smooks.configuration.editors.javabean.ValueWiringBindingSelectionDialog; +import org.jboss.tools.smooks.configuration.editors.uitls.SmooksUIUtils; +import org.jboss.tools.smooks.editor.ISmooksModelProvider; +import org.jboss.tools.smooks.model.javabean12.BeanType; +import org.jboss.tools.smooks.model.javabean12.Javabean12Factory; +import org.jboss.tools.smooks.model.javabean12.Javabean12Package; +import org.jboss.tools.smooks.model.javabean12.ValueType; +import org.jboss.tools.smooks.model.javabean12.WiringType; + +/** + * @author Dart (dpeng(a)redhat.com) + * <p> + * Apr 8, 2009 + */ +public class JavaBean12PropertyUICreator extends PropertyUICreator { + + /* + * (non-Javadoc) + * + * @see + * org.jboss.tools.smooks.configuration.editors.IPropertyUICreator#canCreate + * (org.eclipse.emf.edit.provider.IItemPropertyDescriptor, java.lang.Object, + * org.eclipse.emf.ecore.EAttribute) + */ + public boolean canCreate(IItemPropertyDescriptor itemPropertyDescriptor, Object model, EAttribute feature) { + if (feature == Javabean12Package.eINSTANCE.getBeanType_Class()) { + return true; + } + return false; + } + + + + /* + * (non-Javadoc) + * + * @see + * org.jboss.tools.smooks.configuration.editors.PropertyUICreator#ignoreProperty + * (org.eclipse.emf.ecore.EAttribute) + */ + @Override + public boolean ignoreProperty(EAttribute feature) { + if (feature == Javabean12Package.eINSTANCE.getBeanType_CreateOnElement()) { + return true; + } + if (feature == Javabean12Package.eINSTANCE.getBeanType_CreateOnElementNS()) { + return true; + } + return super.ignoreProperty(feature); + } + + /* + * (non-Javadoc) + * + * @seeorg.jboss.tools.smooks.configuration.editors.IPropertyUICreator# + * createPropertyUI(org.eclipse.ui.forms.widgets.FormToolkit, + * org.eclipse.swt.widgets.Composite, + * org.eclipse.emf.edit.provider.IItemPropertyDescriptor, java.lang.Object, + * org.eclipse.emf.ecore.EAttribute) + */ + public AttributeFieldEditPart createPropertyUI(FormToolkit toolkit, Composite parent, + IItemPropertyDescriptor propertyDescriptor, Object model, EAttribute feature, + ISmooksModelProvider formEditor, IEditorPart part) { + if (feature == Javabean12Package.eINSTANCE.getBeanType_Class()) { + return createBeanClassTextWithButton(parent, toolkit, propertyDescriptor, model); + } + return super.createPropertyUI(toolkit, parent, propertyDescriptor, model, feature, formEditor, part); + } + + /* + * (non-Javadoc) + * + * @see + * org.jboss.tools.smooks.configuration.editors.PropertyUICreator#createExtendUI + * (org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain, + * org.eclipse.ui.forms.widgets.FormToolkit, + * org.eclipse.swt.widgets.Composite, java.lang.Object, + * org.jboss.tools.smooks.configuration.editors.SmooksMultiFormEditor) + */ + @Override + public List<AttributeFieldEditPart> createExtendUIOnTop(AdapterFactoryEditingDomain editingdomain, + FormToolkit toolkit, Composite parent, Object model, ISmooksModelProvider formEditor, IEditorPart part) { + return createElementSelectionSection("Create On Element", editingdomain, toolkit, parent, model, formEditor, + part, Javabean12Package.Literals.BEAN_TYPE__CREATE_ON_ELEMENT, + Javabean12Package.Literals.BEAN_TYPE__CREATE_ON_ELEMENT_NS); + } + + /* + * (non-Javadoc) + * + * @seeorg.jboss.tools.smooks.configuration.editors.PropertyUICreator# + * createExtendUIOnBottom + * (org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain, + * org.eclipse.ui.forms.widgets.FormToolkit, + * org.eclipse.swt.widgets.Composite, java.lang.Object, + * org.jboss.tools.smooks.configuration.editors.SmooksMultiFormEditor) + */ + @Override + public List<AttributeFieldEditPart> createExtendUIOnBottom(AdapterFactoryEditingDomain editingdomain, + FormToolkit toolkit, Composite parent, Object model, ISmooksModelProvider formEditor, IEditorPart part) { + List<AttributeFieldEditPart> lists = super.createExtendUIOnBottom(editingdomain, toolkit, parent, model, + formEditor, part); + + Composite separator = toolkit.createCompositeSeparator(parent); + GridData gd = new GridData(GridData.FILL_HORIZONTAL); + gd.heightHint = 1; + gd.horizontalSpan = 2; + separator.setLayoutData(gd); + + Hyperlink link = toolkit.createHyperlink(parent, "Add Binding", SWT.NONE); + final Composite fp = parent; + final BeanType fb = (BeanType) model; + final IEditorPart ff = part; + link.addHyperlinkListener(new IHyperlinkListener() { + + /* + * (non-Javadoc) + * + * @see + * org.eclipse.ui.forms.events.IHyperlinkListener#linkActivated( + * org.eclipse.ui.forms.events.HyperlinkEvent) + */ + public void linkActivated(HyperlinkEvent e) { + addValueWiringAuto(fp, fb, ff); + } + + /* + * (non-Javadoc) + * + * @see + * org.eclipse.ui.forms.events.IHyperlinkListener#linkEntered(org + * .eclipse.ui.forms.events.HyperlinkEvent) + */ + public void linkEntered(HyperlinkEvent e) { + // TODO Auto-generated method stub + + } + + /* + * (non-Javadoc) + * + * @see + * org.eclipse.ui.forms.events.IHyperlinkListener#linkExited(org + * .eclipse.ui.forms.events.HyperlinkEvent) + */ + public void linkExited(HyperlinkEvent e) { + // TODO Auto-generated method stub + + } + + }); + gd = new GridData(); + gd.horizontalSpan = 2; + link.setLayoutData(gd); + + return lists; + } + + private void addValueWiringAuto(Composite parent, BeanType bindings, IEditorPart formEditor) { + boolean haveClassValue = false; + if (bindings.eIsSet(Javabean12Package.Literals.BEAN_TYPE__CLASS)) { + haveClassValue = true; + } + if (!haveClassValue) { + MessageDialog.openError(parent.getShell(), "Error", "Can't get the 'class' value."); + return; + } + String className = bindings.getClass_(); + if (className == null || className.length() == 0) { + MessageDialog.openError(parent.getShell(), "Error", "The 'class' value shouldn't be empty."); + return; + } + try { + Class<?> clazz = SmooksUIUtils.loadClass(className, ((IFileEditorInput) formEditor.getEditorInput()) + .getFile()); + JavaBeanModel beanModel = JavaBeanModelFactory.getJavaBeanModelWithLazyLoad(clazz); + if (beanModel != null) { + String[] ignores = findoutIgnoreProperty(bindings); + ValueWiringBindingSelectionDialog dialog = new ValueWiringBindingSelectionDialog(parent.getShell(), + beanModel, ignores); + if (dialog.open() == Dialog.OK) { + Object[] checkedModels = dialog.getCheckedObject(); + if (checkedModels == null) + return; + if (formEditor instanceof IEditingDomainProvider) { + generateValueWiringModel(checkedModels, (IEditingDomainProvider)formEditor, bindings); + } + } + } + } catch (JavaModelException e) { + e.printStackTrace(); + } catch (ClassNotFoundException e) { + e.printStackTrace(); + } + + } + + private void generateValueWiringModel(Object[] models, IEditingDomainProvider editor, BeanType owner) { + EditingDomain domain = editor.getEditingDomain(); + CompoundCommand command = new CompoundCommand(); + command.setDescription("Add Binding"); + command.setLabel("Auto add binding"); + for (int i = 0; i < models.length; i++) { + Object model = models[i]; + if (model instanceof JavaBeanModel) { + Command c = generateAddCommand((JavaBeanModel) model, domain, owner); + command.append(c); + } + } + domain.getCommandStack().execute(command); + } + + private Command generateAddCommand(JavaBeanModel beanModel, EditingDomain domain, BeanType owner) { + if (beanModel.isPrimitive()) { + ValueType valueType = Javabean12Factory.eINSTANCE.createValueType(); + valueType.setProperty(beanModel.getName()); + return AddCommand.create(domain, owner, Javabean12Package.Literals.BEAN_TYPE__VALUE, valueType); + } else { + WiringType wiring = Javabean12Factory.eINSTANCE.createWiringType(); + wiring.setProperty(beanModel.getName()); + return AddCommand.create(domain, owner, Javabean12Package.Literals.BEAN_TYPE__WIRING, wiring); + } + } + + private String[] findoutIgnoreProperty(BeanType bindings) { + List<String> ignores = new ArrayList<String>(); + List<ValueType> valueList = bindings.getValue(); + + for (Iterator<?> iterator = valueList.iterator(); iterator.hasNext();) { + ValueType valueType = (ValueType) iterator.next(); + // boolean unset = + // valueType.eIsSet(JavabeanPackage.Literals.VALUE_TYPE__PROPERTY); + // if(unset) continue; + String pro = valueType.getProperty(); + if (pro != null && pro.length() != 0) { + ignores.add(pro); + } + } + List<WiringType> wiringList = bindings.getWiring(); + for (Iterator<?> iterator = wiringList.iterator(); iterator.hasNext();) { + WiringType wiringType = (WiringType) iterator.next(); + // boolean unset = + // wiringType.eIsSet(JavabeanPackage.Literals.WIRING_TYPE__PROPERTY); + // if(unset) continue; + String pro = wiringType.getProperty(); + if (pro != null && pro.length() != 0) { + ignores.add(pro); + } + } + if (ignores.isEmpty()) + return null; + return ignores.toArray(new String[] {}); + + } + + @Override + public boolean isSelectorFeature(EAttribute attribute) { + return super.isSelectorFeature(attribute); + } + + protected AttributeFieldEditPart createBeanClassTextWithButton(Composite composite, FormToolkit toolkit, + final IItemPropertyDescriptor propertyDescriptor, final Object model) { + return SmooksUIUtils.createJavaTypeSearchFieldEditor(composite, toolkit, propertyDescriptor, (EObject) model); + } +} Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/javabean12/JavaBean12PropertyUICreator.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/javabean12/Javabean12ExpressionUICreator.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/javabean12/Javabean12ExpressionUICreator.java (rev 0) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/javabean12/Javabean12ExpressionUICreator.java 2009-07-27 07:25:30 UTC (rev 16799) @@ -0,0 +1,162 @@ +/******************************************************************************* + * 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.configuration.editors.javabean12; + +import java.util.ArrayList; +import java.util.List; + +import org.eclipse.emf.ecore.EAttribute; +import org.eclipse.emf.ecore.EObject; +import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain; +import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; +import org.eclipse.swt.events.DisposeEvent; +import org.eclipse.swt.events.DisposeListener; +import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.Control; +import org.eclipse.swt.widgets.Text; +import org.eclipse.ui.IEditorPart; +import org.eclipse.ui.forms.widgets.FormToolkit; +import org.jboss.tools.smooks.configuration.editors.AttributeFieldEditPart; +import org.jboss.tools.smooks.configuration.editors.IPropertyUICreator; +import org.jboss.tools.smooks.configuration.editors.javabean.PropertiesAndSetterMethodSearchFieldEditorCreator; +import org.jboss.tools.smooks.configuration.editors.uitls.FieldAssistDisposer; +import org.jboss.tools.smooks.configuration.editors.uitls.SmooksUIUtils; +import org.jboss.tools.smooks.editor.ISmooksModelProvider; +import org.jboss.tools.smooks.model.javabean12.BeanType; +import org.jboss.tools.smooks.model.javabean12.Javabean12Package; + +/** + * @author Dart (dpeng(a)redhat.com) + * + */ +public class Javabean12ExpressionUICreator extends PropertiesAndSetterMethodSearchFieldEditorCreator implements + IPropertyUICreator { + + /* + * (non-Javadoc) + * + * @see + * org.jboss.tools.smooks.configuration.editors.PropertyUICreator#createExtendUI + * (org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain, + * org.eclipse.ui.forms.widgets.FormToolkit, + * org.eclipse.swt.widgets.Composite, java.lang.Object, + * org.jboss.tools.smooks.configuration.editors.SmooksMultiFormEditor) + */ + @Override + public List<AttributeFieldEditPart> createExtendUIOnBottom(AdapterFactoryEditingDomain editingdomain, + FormToolkit toolkit, Composite parent, Object model, ISmooksModelProvider formEditor, IEditorPart part) { + List<AttributeFieldEditPart> list = new ArrayList<AttributeFieldEditPart>(); + AttributeFieldEditPart cdatatext = SmooksUIUtils.createCDATAFieldEditor("Expression", editingdomain, toolkit, + parent, model, null, true); + if (cdatatext != null) { + list.add(cdatatext); + + Control c = cdatatext.getContentControl(); + + if (c instanceof Text) { + final FieldAssistDisposer disposer = SmooksUIUtils.addBindingsContextAssistToText((Text) c, + SmooksUIUtils.getSmooks11ResourceListType((EObject) model)); + c.addDisposeListener(new DisposeListener() { + + /* + * (non-Javadoc) + * + * @see + * org.eclipse.swt.events.DisposeListener#widgetDisposed + * (org.eclipse.swt.events.DisposeEvent) + */ + public void widgetDisposed(DisposeEvent e) { + disposer.dispose(); + } + + }); + } + } + return list; + } + + public List<AttributeFieldEditPart> createExtendUIOnTop(AdapterFactoryEditingDomain editingdomain, + FormToolkit toolkit, Composite parent, Object model, ISmooksModelProvider formEditor, IEditorPart part) { + + List<AttributeFieldEditPart> list = new ArrayList<AttributeFieldEditPart>(); + + AttributeFieldEditPart pEditPart = createPropertiesSearchFieldEditor(toolkit, parent, getPropertyDescriptor( + editingdomain, Javabean12Package.Literals.EXPRESSION_TYPE__PROPERTY, model), model); + AttributeFieldEditPart mEditPart = createMethodsSearchFieldEditor(toolkit, parent, getPropertyDescriptor( + editingdomain, Javabean12Package.Literals.EXPRESSION_TYPE__SETTER_METHOD, model), model); + list.add(pEditPart); + list.add(mEditPart); + list.addAll(createElementSelectionSection("Execute On Element", editingdomain, toolkit, parent, model, + formEditor, part,Javabean12Package.Literals.EXPRESSION_TYPE__EXEC_ON_ELEMENT, + Javabean12Package.Literals.EXPRESSION_TYPE__EXEC_ON_ELEMENT_NS)); + + return list; + } + + /* + * (non-Javadoc) + * @see org.jboss.tools.smooks.configuration.editors.javabean.PropertiesAndSetterMethodSearchFieldEditorCreator#getClassString(java.lang.Object) + */ + protected String getClassString(Object model) { + if (model instanceof EObject) { + EObject container = ((EObject) model).eContainer(); + if(container instanceof BeanType){ + return ((BeanType)container).getClass_(); + } + } + return super.getClassString(model); + } + + /* + * (non-Javadoc) + * + * @see + * org.jboss.tools.smooks.configuration.editors.PropertyUICreator#ignoreProperty + * (org.eclipse.emf.ecore.EAttribute) + */ + @Override + public boolean ignoreProperty(EAttribute feature) { + if (feature == Javabean12Package.Literals.EXPRESSION_TYPE__EXEC_ON_ELEMENT) { + return true; + } + if (feature == Javabean12Package.Literals.EXPRESSION_TYPE__EXEC_ON_ELEMENT_NS) { + return true; + } + if (feature == Javabean12Package.Literals.EXPRESSION_TYPE__VALUE) { + return true; + } + if (feature == Javabean12Package.Literals.EXPRESSION_TYPE__PROPERTY) { + return true; + } + if (feature == Javabean12Package.Literals.EXPRESSION_TYPE__SETTER_METHOD) { + return true; + } + return super.ignoreProperty(feature); + } + + /* + * (non-Javadoc) + * + * @seeorg.jboss.tools.smooks.configuration.editors.PropertyUICreator# + * createPropertyUI(org.eclipse.ui.forms.widgets.FormToolkit, + * org.eclipse.swt.widgets.Composite, + * org.eclipse.emf.edit.provider.IItemPropertyDescriptor, java.lang.Object, + * org.eclipse.emf.ecore.EAttribute, + * org.jboss.tools.smooks.configuration.editors.SmooksMultiFormEditor) + */ + @Override + public AttributeFieldEditPart createPropertyUI(FormToolkit toolkit, Composite parent, + IItemPropertyDescriptor propertyDescriptor, Object model, EAttribute feature, + ISmooksModelProvider formEditor, IEditorPart part) { + return super.createPropertyUI(toolkit, parent, propertyDescriptor, model, feature, formEditor,part); + } + +} Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/javabean12/Javabean12ExpressionUICreator.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/javabean12/JavabeanValueBinding12UICreator.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/javabean12/JavabeanValueBinding12UICreator.java (rev 0) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/javabean12/JavabeanValueBinding12UICreator.java 2009-07-27 07:25:30 UTC (rev 16799) @@ -0,0 +1,148 @@ +/******************************************************************************* + * Copyright (c) 2009 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.smooks.configuration.editors.javabean12; + +import java.util.Iterator; +import java.util.List; + +import org.eclipse.emf.ecore.EAttribute; +import org.eclipse.emf.ecore.EObject; +import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain; +import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; +import org.eclipse.swt.widgets.Composite; +import org.eclipse.ui.IEditorPart; +import org.eclipse.ui.forms.widgets.FormToolkit; +import org.jboss.tools.smooks.configuration.editors.AttributeFieldEditPart; +import org.jboss.tools.smooks.configuration.editors.javabean.PropertiesAndSetterMethodSearchFieldEditorCreator; +import org.jboss.tools.smooks.configuration.editors.uitls.SmooksUIUtils; +import org.jboss.tools.smooks.editor.ISmooksModelProvider; +import org.jboss.tools.smooks.model.javabean12.BeanType; +import org.jboss.tools.smooks.model.javabean12.Javabean12Package; + +/** + * @author Dart (dpeng(a)redhat.com) + * <p> + * Apr 9, 2009 + */ +public class JavabeanValueBinding12UICreator extends PropertiesAndSetterMethodSearchFieldEditorCreator { + + @Override + protected boolean canCreatePropertiesSearchFieldEditor(EAttribute feature) { + if (feature == Javabean12Package.eINSTANCE.getValueType_Property()) { + return true; + } + return false; + } + + @Override + protected boolean canCreateMethodsSearchFieldEditor(EAttribute feature) { + if (feature == Javabean12Package.eINSTANCE.getValueType_SetterMethod()) { + return true; + } + return super.canCreateMethodsSearchFieldEditor(feature); + } + + /* + * (non-Javadoc) + * + * @seeorg.jboss.tools.smooks.configuration.editors.javabean. + * PropertiesAndSetterMethodSearchFieldEditorCreator + * #createPropertyUI(org.eclipse.ui.forms.widgets.FormToolkit, + * org.eclipse.swt.widgets.Composite, + * org.eclipse.emf.edit.provider.IItemPropertyDescriptor, java.lang.Object, + * org.eclipse.emf.ecore.EAttribute, + * org.jboss.tools.smooks.configuration.editors.SmooksMultiFormEditor) + */ + @Override + public AttributeFieldEditPart createPropertyUI(FormToolkit toolkit, Composite parent, + IItemPropertyDescriptor propertyDescriptor, Object model, EAttribute feature, + ISmooksModelProvider formEditor, IEditorPart part) { + return super.createPropertyUI(toolkit, parent, propertyDescriptor, model, feature, formEditor, part); + } + + /* + * (non-Javadoc) + * + * @see + * org.jboss.tools.smooks.configuration.editors.PropertyUICreator#createExtendUI + * (org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain, + * org.eclipse.ui.forms.widgets.FormToolkit, + * org.eclipse.swt.widgets.Composite, java.lang.Object, + * org.jboss.tools.smooks.configuration.editors.SmooksMultiFormEditor) + */ + @Override + public List<AttributeFieldEditPart> createExtendUIOnBottom(AdapterFactoryEditingDomain editingdomain, + FormToolkit toolkit, Composite parent, Object model, ISmooksModelProvider formEditor, IEditorPart part) { + List<AttributeFieldEditPart> list = createElementSelectionSection("Data", editingdomain, toolkit, parent, + model, formEditor, part, Javabean12Package.eINSTANCE.getValueType_Data(), Javabean12Package.eINSTANCE + .getValueType_DataNS()); + Composite groupParent = parent; + for (Iterator<?> iterator = list.iterator(); iterator.hasNext();) { + AttributeFieldEditPart attributeFieldEditPart = (AttributeFieldEditPart) iterator.next(); + if (attributeFieldEditPart.getAttribute() == null) { + groupParent = (Composite) attributeFieldEditPart.getContentControl(); + break; + } + } + list.add(SmooksUIUtils.createStringFieldEditor(groupParent, toolkit, getPropertyDescriptor(editingdomain, + Javabean12Package.Literals.VALUE_TYPE__DEFAULT, model), model, false, false, null)); + + list.add(SmooksUIUtils.createStringFieldEditor(groupParent, toolkit, getPropertyDescriptor(editingdomain, + Javabean12Package.Literals.VALUE_TYPE__DECODER, model), model, false, false, null)); + return list; + } + + /* + * (non-Javadoc) + * + * @see + * org.jboss.tools.smooks.configuration.editors.PropertyUICreator#ignoreProperty + * (org.eclipse.emf.ecore.EAttribute) + */ + @Override + public boolean ignoreProperty(EAttribute feature) { + if (feature == Javabean12Package.eINSTANCE.getValueType_Data()) { + return true; + } + if (feature == Javabean12Package.eINSTANCE.getValueType_DataNS()) { + return true; + } + if (feature == Javabean12Package.eINSTANCE.getValueType_Decoder()) { + return true; + } + if (feature == Javabean12Package.eINSTANCE.getValueType_Default()) { + return true; + } + return super.ignoreProperty(feature); + } + + @Override + public boolean isSelectorFeature(EAttribute attribute) { + return super.isSelectorFeature(attribute); + } + + /* + * (non-Javadoc) + * + * @seeorg.jboss.tools.smooks.configuration.editors.javabean. + * PropertiesAndSetterMethodSearchFieldEditorCreator + * #getClassString(java.lang.Object) + */ + protected String getClassString(Object model) { + if (model instanceof EObject) { + EObject container = ((EObject) model).eContainer(); + if (container instanceof BeanType) { + return ((BeanType) container).getClass_(); + } + } + return super.getClassString(model); + } +} Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/javabean12/JavabeanValueBinding12UICreator.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/javabean12/JavabeanWiringBiding12UICreator.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/javabean12/JavabeanWiringBiding12UICreator.java (rev 0) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/javabean12/JavabeanWiringBiding12UICreator.java 2009-07-27 07:25:30 UTC (rev 16799) @@ -0,0 +1,139 @@ +/******************************************************************************* + * Copyright (c) 2009 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.smooks.configuration.editors.javabean12; + +import java.util.ArrayList; +import java.util.List; + +import org.eclipse.emf.ecore.EAttribute; +import org.eclipse.emf.ecore.EObject; +import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain; +import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; +import org.eclipse.swt.widgets.Composite; +import org.eclipse.ui.IEditorPart; +import org.eclipse.ui.forms.widgets.FormToolkit; +import org.jboss.tools.smooks.configuration.editors.AttributeFieldEditPart; +import org.jboss.tools.smooks.configuration.editors.javabean.PropertiesAndSetterMethodSearchFieldEditorCreator; +import org.jboss.tools.smooks.editor.ISmooksModelProvider; +import org.jboss.tools.smooks.model.javabean12.BeanType; +import org.jboss.tools.smooks.model.javabean12.Javabean12Package; + +/** + * @author Dart Peng (dpeng(a)redhat.com) Date Apr 9, 2009 + */ +public class JavabeanWiringBiding12UICreator extends PropertiesAndSetterMethodSearchFieldEditorCreator { + + @Override + protected boolean canCreatePropertiesSearchFieldEditor(EAttribute feature) { + // if (feature == JavabeanPackage.eINSTANCE.getWiringType_Property()) { + // return true; + // } + return false; + } + + /* + * (non-Javadoc) + * + * @seeorg.jboss.tools.smooks.configuration.editors.javabean. + * PropertiesAndSetterMethodSearchFieldEditorCreator + * #getClassString(java.lang.Object) + */ + protected String getClassString(Object model) { + if (model instanceof EObject) { + EObject container = ((EObject) model).eContainer(); + if (container instanceof BeanType) { + return ((BeanType) container).getClass_(); + } + } + return super.getClassString(model); + } + + @Override + protected boolean canCreateMethodsSearchFieldEditor(EAttribute feature) { + // if (feature == + // JavabeanPackage.eINSTANCE.getWiringType_SetterMethod()) { + // return true; + // } + return super.canCreateMethodsSearchFieldEditor(feature); + } + + /* + * (non-Javadoc) + * + * @see + * org.jboss.tools.smooks.configuration.editors.PropertyUICreator#ignoreProperty + * (org.eclipse.emf.ecore.EAttribute) + */ + @Override + public boolean ignoreProperty(EAttribute feature) { + if (feature == Javabean12Package.eINSTANCE.getWiringType_WireOnElement()) { + return true; + } + if (feature == Javabean12Package.eINSTANCE.getWiringType_WireOnElementNS()) { + return true; + } + if (feature == Javabean12Package.eINSTANCE.getWiringType_Property()) { + return true; + } + if (feature == Javabean12Package.eINSTANCE.getWiringType_SetterMethod()) { + return true; + } + return super.ignoreProperty(feature); + } + + /* + * (non-Javadoc) + * + * @see + * org.jboss.tools.smooks.configuration.editors.PropertyUICreator#createExtendUI + * (org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain, + * org.eclipse.ui.forms.widgets.FormToolkit, + * org.eclipse.swt.widgets.Composite, java.lang.Object, + * org.jboss.tools.smooks.configuration.editors.SmooksMultiFormEditor) + */ + @Override + public List<AttributeFieldEditPart> createExtendUIOnTop(AdapterFactoryEditingDomain editingdomain, + FormToolkit toolkit, Composite parent, Object model, ISmooksModelProvider formEditor, IEditorPart part) { + + List<AttributeFieldEditPart> list = new ArrayList<AttributeFieldEditPart>(); + + AttributeFieldEditPart pEditPart = createPropertiesSearchFieldEditor(toolkit, parent, getPropertyDescriptor( + editingdomain, Javabean12Package.eINSTANCE.getWiringType_Property(), model), model); + AttributeFieldEditPart mEditPart = createMethodsSearchFieldEditor(toolkit, parent, getPropertyDescriptor( + editingdomain, Javabean12Package.eINSTANCE.getWiringType_SetterMethod(), model), model); + list.add(pEditPart); + list.add(mEditPart); + list.addAll(createElementSelectionSection("Wrie On Element", editingdomain, toolkit, parent, model, formEditor, + part, Javabean12Package.eINSTANCE.getWiringType_WireOnElement(), + Javabean12Package.Literals.WIRING_TYPE__WIRE_ON_ELEMENT_NS)); + return list; + } + + @Override + public boolean isBeanIDRefFieldFeature(EAttribute attribute) { + if (attribute == Javabean12Package.eINSTANCE.getWiringType_BeanIdRef()) { + return true; + } + return super.isBeanIDRefFieldFeature(attribute); + } + + @Override + public boolean isSelectorFeature(EAttribute attribute) { + return super.isSelectorFeature(attribute); + } + + @Override + public AttributeFieldEditPart createPropertyUI(FormToolkit toolkit, Composite parent, + IItemPropertyDescriptor propertyDescriptor, Object model, EAttribute feature, + ISmooksModelProvider formEditor, IEditorPart part) { + return super.createPropertyUI(toolkit, parent, propertyDescriptor, model, feature, formEditor, part); + } +} Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/javabean12/JavabeanWiringBiding12UICreator.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/jms12/JMSRouter12UICreator.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/jms12/JMSRouter12UICreator.java (rev 0) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/jms12/JMSRouter12UICreator.java 2009-07-27 07:25:30 UTC (rev 16799) @@ -0,0 +1,107 @@ +/******************************************************************************* + * Copyright (c) 2009 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.smooks.configuration.editors.jms12; + +import java.util.List; + +import org.eclipse.emf.ecore.EAttribute; +import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain; +import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; +import org.eclipse.swt.widgets.Composite; +import org.eclipse.ui.IEditorPart; +import org.eclipse.ui.forms.widgets.FormToolkit; +import org.jboss.tools.smooks.configuration.editors.AttributeFieldEditPart; +import org.jboss.tools.smooks.configuration.editors.PropertyUICreator; +import org.jboss.tools.smooks.editor.ISmooksModelProvider; +import org.jboss.tools.smooks.model.jmsrouting12.Jmsrouting12Package; + +/** + * @author Dart Peng (dpeng(a)redhat.com) Date Apr 10, 2009 + */ +public class JMSRouter12UICreator extends PropertyUICreator { + + /* + * (non-Javadoc) + * + * @seeorg.jboss.tools.smooks.configuration.editors.IPropertyUICreator# + * createPropertyUI(org.eclipse.ui.forms.widgets.FormToolkit, + * org.eclipse.swt.widgets.Composite, + * org.eclipse.emf.edit.provider.IItemPropertyDescriptor, java.lang.Object, + * org.eclipse.emf.ecore.EAttribute) + */ + public AttributeFieldEditPart createPropertyUI(FormToolkit toolkit, Composite parent, + IItemPropertyDescriptor propertyDescriptor, Object model, EAttribute feature, + ISmooksModelProvider formEditor,IEditorPart part) { + + if (feature == Jmsrouting12Package.eINSTANCE.getJMS12Router_BeanId()) { + } + if (feature == Jmsrouting12Package.eINSTANCE.getJMS12Router_Destination()) { + } + if (feature == Jmsrouting12Package.eINSTANCE.getJMS12Router_ExecuteBefore()) { + } + if (feature == Jmsrouting12Package.eINSTANCE.getJMS12Router_RouteOnElement()) { + } + if (feature == Jmsrouting12Package.eINSTANCE.getJMS12Router_RouteOnElementNS()) { + } + + return super.createPropertyUI(toolkit, parent, propertyDescriptor, model, feature, formEditor,part); + } + + /* + * (non-Javadoc) + * + * @see + * org.jboss.tools.smooks.configuration.editors.PropertyUICreator#createExtendUI + * (org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain, + * org.eclipse.ui.forms.widgets.FormToolkit, + * org.eclipse.swt.widgets.Composite, java.lang.Object, + * org.jboss.tools.smooks.configuration.editors.SmooksMultiFormEditor) + */ + @Override + public List<AttributeFieldEditPart> createExtendUIOnTop(AdapterFactoryEditingDomain editingdomain, FormToolkit toolkit, + Composite parent, Object model, ISmooksModelProvider formEditor,IEditorPart part) { + return createElementSelectionSection("Route On Element", editingdomain, toolkit, parent, model, formEditor,part, + Jmsrouting12Package.eINSTANCE.getJMS12Router_RouteOnElement(), Jmsrouting12Package.eINSTANCE + .getJMS12Router_RouteOnElementNS()); + } + + + + /* (non-Javadoc) + * @see org.jboss.tools.smooks.configuration.editors.PropertyUICreator#isBeanIDRefFieldFeature(org.eclipse.emf.ecore.EAttribute) + */ + @Override + protected boolean isBeanIDRefFieldFeature(EAttribute attribute) { + if(attribute == Jmsrouting12Package.Literals.JMS12_ROUTER__BEAN_ID){ + return true; + } + return super.isBeanIDRefFieldFeature(attribute); + } + + /* + * (non-Javadoc) + * + * @see + * org.jboss.tools.smooks.configuration.editors.PropertyUICreator#ignoreProperty + * (org.eclipse.emf.ecore.EAttribute) + */ + @Override + public boolean ignoreProperty(EAttribute feature) { + if (feature == Jmsrouting12Package.eINSTANCE.getJMS12Router_RouteOnElement()) { + return true; + } + if (feature == Jmsrouting12Package.eINSTANCE.getJMS12Router_RouteOnElementNS()) { + return true; + } + return super.ignoreProperty(feature); + } + +} \ No newline at end of file Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/jms12/JMSRouter12UICreator.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/uitls/SmooksUIUtils.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/uitls/SmooksUIUtils.java 2009-07-27 07:24:17 UTC (rev 16798) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/configuration/editors/uitls/SmooksUIUtils.java 2009-07-27 07:25:30 UTC (rev 16799) @@ -1124,11 +1124,17 @@ } return null; } - + public static AttributeFieldEditPart createJavaMethodSearchFieldEditor(BindingsType container, Composite parent, FormToolkit toolkit, final IItemPropertyDescriptor propertyDescriptor, String buttonName, final EObject model) { String classString = ((BindingsType) container).getClass_(); + return createJavaMethodSearchFieldEditor(classString, container, parent, toolkit, propertyDescriptor, buttonName, model); + } + + public static AttributeFieldEditPart createJavaMethodSearchFieldEditor(String classString , EObject container, Composite parent, + FormToolkit toolkit, final IItemPropertyDescriptor propertyDescriptor, String buttonName, + final EObject model) { IJavaProject project = getJavaProject(container); Class<?> clazz = null; try { @@ -1351,10 +1357,9 @@ return fieldEditPart; } - public static AttributeFieldEditPart createJavaPropertySearchFieldEditor(BindingsType container, Composite parent, - FormToolkit toolkit, final IItemPropertyDescriptor propertyDescriptor, String buttonName, + public static AttributeFieldEditPart createJavaPropertySearchFieldEditor(String classString, EObject container, + Composite parent, FormToolkit toolkit, final IItemPropertyDescriptor propertyDescriptor, String buttonName, final EObject model) { - String classString = ((BindingsType) container).getClass_(); IJavaProject project = getJavaProject(container); JavaPropertiesSelectionDialog dialog = new JavaPropertiesSelectionDialog(project, classString); AttributeFieldEditPart editPart = SmooksUIUtils.createDialogFieldEditor(parent, toolkit, propertyDescriptor, @@ -1385,6 +1390,14 @@ return editPart; } + public static AttributeFieldEditPart createJavaPropertySearchFieldEditor(BindingsType container, Composite parent, + FormToolkit toolkit, final IItemPropertyDescriptor propertyDescriptor, String buttonName, + final EObject model) { + String classString = ((BindingsType) container).getClass_(); + return createJavaPropertySearchFieldEditor(classString, container, parent, toolkit, propertyDescriptor, + buttonName, model); + } + public static Object getEditValue(IItemPropertyDescriptor propertyDescriptor, Object model) { Object value = propertyDescriptor.getPropertyValue(model); if (value != null && value instanceof PropertyValueWrapper) {