August 2009 - jbosstools-commits - Jboss List Archives

JBoss Tools SVN: r17290 - trunk/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/com/jboss/tools.

by jbosstools-commits＠lists.jboss.org

Author: ochikvina Date: 2009-08-27 04:35:38 -0400 (Thu, 27 Aug 2009) New Revision: 17290 Modified: trunk/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/com/jboss/tools/pdf.xsl Log: https://jira.jboss.org/jira/browse/JBDS-810 - correcting xsl; Modified: trunk/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/com/jboss/tools/pdf.xsl =================================================================== --- trunk/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/com/jboss/tools/pdf.xsl 2009-08-27 07:35:52 UTC (rev 17289) +++ trunk/documentation/jbosstools-docbook-xslt/src/main/resources/xslt/com/jboss/tools/pdf.xsl 2009-08-27 08:35:38 UTC (rev 17290) @@ -170,7 +170,9 @@ </xsl:attribute> </xsl:attribute-set> - + +<xsl:template match="//corpauthor/inlinemediaobject" /> +  <xsl:template match="property">

16 years, 3 months

1
0
0 / 0

JBoss Tools SVN: r17289 - in trunk/smooks/plugins: org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/javabean/provider and 2 other directories.

by jbosstools-commits＠lists.jboss.org

Author: DartPeng Date: 2009-08-27 03:35:52 -0400 (Thu, 27 Aug 2009) New Revision: 17289 Added: trunk/smooks/plugins/org.jboss.tools.smooks.core/icons/full/obj16/expression_binding.gif trunk/smooks/plugins/org.jboss.tools.smooks.core/icons/full/obj16/value_binding.gif trunk/smooks/plugins/org.jboss.tools.smooks.core/icons/full/obj16/wiring_binding.gif Modified: trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/javabean/provider/ExpressionTypeItemProvider.java trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/javabean/provider/ValueTypeItemProvider.java trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/javabean/provider/WiringTypeItemProvider.java trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/javabean12/provider/ExpressionTypeItemProvider.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/graphical/editors/GraphicalModelFactoryImpl.java Log: JBIDE-4648 change some images Added: trunk/smooks/plugins/org.jboss.tools.smooks.core/icons/full/obj16/expression_binding.gif =================================================================== (Binary files differ) Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.core/icons/full/obj16/expression_binding.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/smooks/plugins/org.jboss.tools.smooks.core/icons/full/obj16/value_binding.gif =================================================================== (Binary files differ) Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.core/icons/full/obj16/value_binding.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/smooks/plugins/org.jboss.tools.smooks.core/icons/full/obj16/wiring_binding.gif =================================================================== (Binary files differ) Property changes on: trunk/smooks/plugins/org.jboss.tools.smooks.core/icons/full/obj16/wiring_binding.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/javabean/provider/ExpressionTypeItemProvider.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/javabean/provider/ExpressionTypeItemProvider.java 2009-08-27 07:08:47 UTC (rev 17288) +++ trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/javabean/provider/ExpressionTypeItemProvider.java 2009-08-27 07:35:52 UTC (rev 17289) @@ -189,7 +189,7 @@ */ @Override public Object getImage(Object object) { - return overlayImage(object, getResourceLocator().getImage("full/obj16/ExpressionType")); + return overlayImage(object, getResourceLocator().getImage("full/obj16/expression_binding")); } /** Modified: trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/javabean/provider/ValueTypeItemProvider.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/javabean/provider/ValueTypeItemProvider.java 2009-08-27 07:08:47 UTC (rev 17288) +++ trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/javabean/provider/ValueTypeItemProvider.java 2009-08-27 07:35:52 UTC (rev 17289) @@ -244,7 +244,7 @@ */ @Override public Object getImage(Object object) { - return overlayImage(object, getResourceLocator().getImage("full/obj16/ValueType")); + return overlayImage(object, getResourceLocator().getImage("full/obj16/value_binding")); } /** Modified: trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/javabean/provider/WiringTypeItemProvider.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/javabean/provider/WiringTypeItemProvider.java 2009-08-27 07:08:47 UTC (rev 17288) +++ trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/javabean/provider/WiringTypeItemProvider.java 2009-08-27 07:35:52 UTC (rev 17289) @@ -189,7 +189,7 @@ */ @Override public Object getImage(Object object) { - return overlayImage(object, getResourceLocator().getImage("full/obj16/WiringType")); + return overlayImage(object, getResourceLocator().getImage("full/obj16/wiring_binding")); } /** Modified: trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/javabean12/provider/ExpressionTypeItemProvider.java =================================================================== --- trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/javabean12/provider/ExpressionTypeItemProvider.java 2009-08-27 07:08:47 UTC (rev 17288) +++ trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/javabean12/provider/ExpressionTypeItemProvider.java 2009-08-27 07:35:52 UTC (rev 17289) @@ -11,12 +11,9 @@ 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.edit.provider.ComposeableAdapterFactory; import org.eclipse.emf.edit.provider.IEditingDomainItemProvider; import org.eclipse.emf.edit.provider.IItemLabelProvider; @@ -212,7 +209,7 @@ * @generated */ public Object getImage(Object object) { - return overlayImage(object, getResourceLocator().getImage("full/obj16/ExpressionType")); + return overlayImage(object, getResourceLocator().getImage("full/obj16/expression_binding")); } /** 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-08-27 07:08:47 UTC (rev 17288) +++ trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/javabean12/provider/ValueTypeItemProvider.java 2009-08-27 07:35:52 UTC (rev 17289) @@ -239,7 +239,7 @@ * @generated */ public Object getImage(Object object) { - return overlayImage(object, getResourceLocator().getImage("full/obj16/ValueType")); + return overlayImage(object, getResourceLocator().getImage("full/obj16/value_binding")); } /** 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-08-27 07:08:47 UTC (rev 17288) +++ trunk/smooks/plugins/org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/javabean12/provider/WiringTypeItemProvider.java 2009-08-27 07:35:52 UTC (rev 17289) @@ -6,17 +6,12 @@ */ package org.jboss.tools.smooks.model.javabean12.provider; - - 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.edit.provider.ComposeableAdapterFactory; import org.eclipse.emf.edit.provider.IEditingDomainItemProvider; import org.eclipse.emf.edit.provider.IItemLabelProvider; @@ -30,23 +25,18 @@ import org.jboss.tools.smooks.model.javabean12.WiringType; /** - * This is the item provider adapter for a {@link org.jboss.tools.smooks.model.javabean12.WiringType} object. - *  - *  + * This is the item provider adapter for a + * {@link org.jboss.tools.smooks.model.javabean12.WiringType} object.   + * * @generated */ -public class WiringTypeItemProvider - extends AbstractAnyTypeItemProvider - implements - IEditingDomainItemProvider, - IStructuredItemContentProvider, - ITreeItemContentProvider, - IItemLabelProvider, - IItemPropertySource { +public class WiringTypeItemProvider extends AbstractAnyTypeItemProvider implements IEditingDomainItemProvider, + IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource { /** - * This constructs an instance from a factory and a notifier. - *  - *  + * This constructs an instance from a factory and a notifier.   + * * @generated */ public WiringTypeItemProvider(AdapterFactory adapterFactory) { @@ -54,9 +44,9 @@ } /** - * This returns the property descriptors for the adapted class. - *  - *  + * This returns the property descriptors for the adapted class.   + * * @generated */ public List getPropertyDescriptors(Object object) { @@ -73,165 +63,125 @@ } /** - * This adds a property descriptor for the Bean Id Ref feature. - *  - *  + * This adds a property descriptor for the Bean Id Ref feature.   + * * @generated */ protected void addBeanIdRefPropertyDescriptor(Object object) { - itemPropertyDescriptors.add - (createItemPropertyDescriptor - (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), - getResourceLocator(), - getString("_UI_WiringType_beanIdRef_feature"), - getString("_UI_PropertyDescriptor_description", "_UI_WiringType_beanIdRef_feature", "_UI_WiringType_type"), - Javabean12Package.Literals.WIRING_TYPE__BEAN_ID_REF, - true, - false, - false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, - null, - null)); + itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory) + .getRootAdapterFactory(), getResourceLocator(), getString("_UI_WiringType_beanIdRef_feature"), + getString("_UI_PropertyDescriptor_description", "_UI_WiringType_beanIdRef_feature", + "_UI_WiringType_type"), Javabean12Package.Literals.WIRING_TYPE__BEAN_ID_REF, true, false, + false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); } /** - * This adds a property descriptor for the Property feature. - *  - *  + * This adds a property descriptor for the Property feature.   + * * @generated */ protected void addPropertyPropertyDescriptor(Object object) { - itemPropertyDescriptors.add - (createItemPropertyDescriptor - (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), - getResourceLocator(), - getString("_UI_WiringType_property_feature"), - getString("_UI_PropertyDescriptor_description", "_UI_WiringType_property_feature", "_UI_WiringType_type"), - Javabean12Package.Literals.WIRING_TYPE__PROPERTY, - true, - false, - false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, - null, - null)); + itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory) + .getRootAdapterFactory(), getResourceLocator(), getString("_UI_WiringType_property_feature"), + getString("_UI_PropertyDescriptor_description", "_UI_WiringType_property_feature", + "_UI_WiringType_type"), Javabean12Package.Literals.WIRING_TYPE__PROPERTY, true, false, false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); } /** - * This adds a property descriptor for the Setter Method feature. - *  - *  + * This adds a property descriptor for the Setter Method feature.   + * * @generated */ protected void addSetterMethodPropertyDescriptor(Object object) { - itemPropertyDescriptors.add - (createItemPropertyDescriptor - (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), - getResourceLocator(), - getString("_UI_WiringType_setterMethod_feature"), - getString("_UI_PropertyDescriptor_description", "_UI_WiringType_setterMethod_feature", "_UI_WiringType_type"), - Javabean12Package.Literals.WIRING_TYPE__SETTER_METHOD, - true, - false, - false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, - null, - null)); + itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory) + .getRootAdapterFactory(), getResourceLocator(), getString("_UI_WiringType_setterMethod_feature"), + getString("_UI_PropertyDescriptor_description", "_UI_WiringType_setterMethod_feature", + "_UI_WiringType_type"), Javabean12Package.Literals.WIRING_TYPE__SETTER_METHOD, true, false, + false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); } /** - * This adds a property descriptor for the Wire On Element feature. - *  - *  + * This adds a property descriptor for the Wire On Element feature.   + * * @generated */ protected void addWireOnElementPropertyDescriptor(Object object) { - itemPropertyDescriptors.add - (createItemPropertyDescriptor - (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), - getResourceLocator(), - getString("_UI_WiringType_wireOnElement_feature"), - getString("_UI_PropertyDescriptor_description", "_UI_WiringType_wireOnElement_feature", "_UI_WiringType_type"), - Javabean12Package.Literals.WIRING_TYPE__WIRE_ON_ELEMENT, - true, - false, - false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, - null, - null)); + itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory) + .getRootAdapterFactory(), getResourceLocator(), getString("_UI_WiringType_wireOnElement_feature"), + getString("_UI_PropertyDescriptor_description", "_UI_WiringType_wireOnElement_feature", + "_UI_WiringType_type"), Javabean12Package.Literals.WIRING_TYPE__WIRE_ON_ELEMENT, true, false, + false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); } /** - * This adds a property descriptor for the Wire On Element NS feature. - *  - *  + * This adds a property descriptor for the Wire On Element NS feature.   + * * @generated */ protected void addWireOnElementNSPropertyDescriptor(Object object) { - itemPropertyDescriptors.add - (createItemPropertyDescriptor - (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), - getResourceLocator(), - getString("_UI_WiringType_wireOnElementNS_feature"), - getString("_UI_PropertyDescriptor_description", "_UI_WiringType_wireOnElementNS_feature", "_UI_WiringType_type"), - Javabean12Package.Literals.WIRING_TYPE__WIRE_ON_ELEMENT_NS, - true, - false, - false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, - null, - null)); + itemPropertyDescriptors.add(createItemPropertyDescriptor(((ComposeableAdapterFactory) adapterFactory) + .getRootAdapterFactory(), getResourceLocator(), getString("_UI_WiringType_wireOnElementNS_feature"), + getString("_UI_PropertyDescriptor_description", "_UI_WiringType_wireOnElementNS_feature", + "_UI_WiringType_type"), Javabean12Package.Literals.WIRING_TYPE__WIRE_ON_ELEMENT_NS, true, + false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); } /** - * This returns WiringType.gif. - *  - *  + * This returns WiringType.gif.   + * * @generated */ public Object getImage(Object object) { - return overlayImage(object, getResourceLocator().getImage("full/obj16/WiringType")); + return overlayImage(object, getResourceLocator().getImage("full/obj16/wiring_binding")); } /** - * This returns the label text for the adapted class. - *  - *  + * This returns the label text for the adapted class.   + * * @generated */ public String getText(Object object) { - String label = ((WiringType)object).getProperty(); - return label == null || label.length() == 0 ? - getString("_UI_WiringType_type") : - getString("_UI_WiringType_type") + " (" + label+")"; + String label = ((WiringType) object).getProperty(); + return label == null || label.length() == 0 ? getString("_UI_WiringType_type") + : getString("_UI_WiringType_type") + " (" + label + ")"; } /** - * This handles model notifications by calling {@link #updateChildren} to update any cached - * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}. - *  - *  + * This handles model notifications by calling {@link #updateChildren} to + * update any cached children and by creating a viewer notification, which + * it passes to {@link #fireNotifyChanged}.   + * * @generated */ public void notifyChanged(Notification notification) { updateChildren(notification); switch (notification.getFeatureID(WiringType.class)) { - case Javabean12Package.WIRING_TYPE__BEAN_ID_REF: - case Javabean12Package.WIRING_TYPE__PROPERTY: - case Javabean12Package.WIRING_TYPE__SETTER_METHOD: - case Javabean12Package.WIRING_TYPE__WIRE_ON_ELEMENT: - case Javabean12Package.WIRING_TYPE__WIRE_ON_ELEMENT_NS: - fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true)); - return; + case Javabean12Package.WIRING_TYPE__BEAN_ID_REF: + case Javabean12Package.WIRING_TYPE__PROPERTY: + case Javabean12Package.WIRING_TYPE__SETTER_METHOD: + case Javabean12Package.WIRING_TYPE__WIRE_ON_ELEMENT: + case Javabean12Package.WIRING_TYPE__WIRE_ON_ELEMENT_NS: + fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true)); + return; } super.notifyChanged(notification); } /** - * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children - * that can be created under this object. - *  - *  + * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s + * describing the children that can be created under this object.   + * * @generated */ protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) { @@ -239,9 +189,9 @@ } /** - * Return the resource locator for this item provider's resources. - *  - *  + * Return the resource locator for this item provider's resources.   + * * @generated */ public ResourceLocator getResourceLocator() { 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 07:08:47 UTC (rev 17288) +++ trunk/smooks/plugins/org.jboss.tools.smooks.ui/src/org/jboss/tools/smooks/graphical/editors/GraphicalModelFactoryImpl.java 2009-08-27 07:35:52 UTC (rev 17289) @@ -61,14 +61,14 @@ if (obj instanceof BeanType) { String p = ((BeanType) obj).getBeanId(); if (p == null) { - p = ""; + p = "<NULL>"; } return p; } if (obj instanceof BindingsType) { String p = ((BindingsType) obj).getBeanId(); if (p == null) { - p = ""; + p = "<NULL>"; } return p; } @@ -76,21 +76,21 @@ if (obj instanceof ValueType) { String p = ((ValueType) obj).getProperty(); if (p == null) { - p = ""; + p = "<NULL>"; } return p; } if (obj instanceof WiringType) { String p = ((WiringType) obj).getProperty(); if (p == null) { - p = ""; + p = "<NULL>"; } return p; } if (obj instanceof ExpressionType) { String p = ((ExpressionType) obj).getProperty(); if (p == null) { - p = ""; + p = "<NULL>"; } return p; } @@ -98,21 +98,21 @@ 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 = ""; + p = "<NULL>"; } 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 = ""; + p = "<NULL>"; } 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 = ""; + p = "<NULL>"; } return p; }

16 years, 3 months

1
0
0 / 0

JBoss Tools SVN: r17288 - in trunk/smooks/plugins: org.jboss.tools.smooks.core/src/org/jboss/tools/smooks/model/javabean/provider and 16 other directories.

by jbosstools-commits＠lists.jboss.org

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; -// } -// } - } - } }

16 years, 3 months

1
0
0 / 0

JBoss Tools SVN: r17287 - in trunk/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.ui: src/org/eclipse/bpel/apache/ode/deploy/ui/wizards and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: dennyxu Date: 2009-08-26 22:39:01 -0400 (Wed, 26 Aug 2009) New Revision: 17287 Modified: trunk/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.ui/plugin.xml trunk/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.ui/src/org/eclipse/bpel/apache/ode/deploy/ui/wizards/ODEDeployWizardPage.java Log: JBIDE-4825: rolled back Modified: trunk/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.ui/plugin.xml =================================================================== --- trunk/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.ui/plugin.xml 2009-08-26 22:52:38 UTC (rev 17286) +++ trunk/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.ui/plugin.xml 2009-08-27 02:39:01 UTC (rev 17287) @@ -10,7 +10,7 @@ filenames="bpel-deploy.xml,deploy.xml" icon="icons/obj16/ode.gif" id="org.eclipse.bpel.apache.ode.deploy.ui.editors.ODEDeployMultiPageEditor" - name="JBoss BPEL Descriptor Editor"> + name="ODE Deployment Descriptor Editor"> <contentTypeBinding contentTypeId="org.eclipse.bpel.apache.ode.deploy.ui.content-type"> </contentTypeBinding> @@ -20,7 +20,7 @@ <extension point="org.eclipse.ui.newWizards"> <wizard - name="JBoss BPEL Deployment Descriptor" + name="Apache ODE Deployment Descriptor" icon="icons/obj16/ode.gif" category="org.eclipse.bpel.wizards" class="org.eclipse.bpel.apache.ode.deploy.ui.wizards.NewODEDeployWizard" @@ -34,7 +34,7 @@ default-charset="UTF-8" file-names="deploy.xml,bpel-deploy.xml" id="org.eclipse.bpel.apache.ode.deploy.ui.content-type" - name="JBoss BPEL Deployment Descriptor" + name="ODE BPEL Deployment Descriptor" priority="normal"> </content-type> </extension> @@ -44,7 +44,7 @@ adaptable="true" icon="icons/obj16/ode.gif" id="org.eclipse.bpel.apache.ode.deploy.ui.icondecorator" - label="JBoss BPEL DD Resource Decorator" + label="ODE DD Resource Decorator" lightweight="true" location="TOP_LEFT" state="true"> Modified: trunk/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.ui/src/org/eclipse/bpel/apache/ode/deploy/ui/wizards/ODEDeployWizardPage.java =================================================================== --- trunk/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.ui/src/org/eclipse/bpel/apache/ode/deploy/ui/wizards/ODEDeployWizardPage.java 2009-08-26 22:52:38 UTC (rev 17286) +++ trunk/bpel/plugins/org.eclipse.bpel.apache.ode.deploy.ui/src/org/eclipse/bpel/apache/ode/deploy/ui/wizards/ODEDeployWizardPage.java 2009-08-27 02:39:01 UTC (rev 17287) @@ -40,8 +40,8 @@ */ public ODEDeployWizardPage(ISelection selection) { super("ODEDeployDescriptorWizardPage"); - setTitle("JBoss BPEL Deployment Descriptor"); - setDescription("This wizard creates a new JBoss BPEL descriptor file (bpel-deploy.xml). Note that the file name cannot be changed."); + setTitle("Apache ODE Deployment Descriptor"); + setDescription("This wizard creates a new Apache ODE descriptor file (bpel-deploy.xml). Note that the file name cannot be changed."); this.selection = selection; }

16 years, 3 months

1
0
0 / 0

JBoss Tools SVN: r17286 - branches/jbosstools-3.0.x/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards.

by jbosstools-commits＠lists.jboss.org

Author: rob.stryker(a)jboss.com Date: 2009-08-26 18:52:38 -0400 (Wed, 26 Aug 2009) New Revision: 17286 Modified: branches/jbosstools-3.0.x/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeWizardFragment.java Log: JBDS-844 - error message issue resolved in branch Modified: branches/jbosstools-3.0.x/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeWizardFragment.java =================================================================== --- branches/jbosstools-3.0.x/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeWizardFragment.java 2009-08-26 22:41:25 UTC (rev 17285) +++ branches/jbosstools-3.0.x/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeWizardFragment.java 2009-08-26 22:52:38 UTC (rev 17286) @@ -332,12 +332,12 @@ String currentVM = jreCombo.getText(); if (showPreferencePage()) { updateJREs(); - updateErrorMessage(); jreCombo.setItems(jreNames); jreCombo.setText(currentVM); if (jreCombo.getSelectionIndex() == -1) jreCombo.select(defaultVMIndex); jreComboIndex = jreCombo.getSelectionIndex(); + updateErrorMessage(); } } });

16 years, 4 months

1
0
0 / 0

JBoss Tools SVN: r17285 - trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards.

by jbosstools-commits＠lists.jboss.org

Author: rob.stryker(a)jboss.com Date: 2009-08-26 18:41:25 -0400 (Wed, 26 Aug 2009) New Revision: 17285 Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeWizardFragment.java Log: JBDS-844 - error message doesn't disappear, trunk Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeWizardFragment.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeWizardFragment.java 2009-08-26 19:28:30 UTC (rev 17284) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeWizardFragment.java 2009-08-26 22:41:25 UTC (rev 17285) @@ -357,12 +357,12 @@ String currentVM = jreCombo.getText(); if (showPreferencePage()) { updateJREs(); - updateErrorMessage(); jreCombo.setItems(jreNames); jreCombo.setText(currentVM); if (jreCombo.getSelectionIndex() == -1) jreCombo.select(defaultVMIndex); jreComboIndex = jreCombo.getSelectionIndex(); + updateErrorMessage(); } } });

16 years, 4 months

1
0
0 / 0

JBoss Tools SVN: r17284 - workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test.

by jbosstools-commits＠lists.jboss.org

Author: yzhishko Date: 2009-08-26 15:28:30 -0400 (Wed, 26 Aug 2009) New Revision: 17284 Modified: workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/VPEAutoTestCase.java Log: Modified: workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/VPEAutoTestCase.java =================================================================== --- workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/VPEAutoTestCase.java 2009-08-26 19:28:20 UTC (rev 17283) +++ workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/VPEAutoTestCase.java 2009-08-26 19:28:30 UTC (rev 17284) @@ -133,6 +133,7 @@ } } waitForJobs(); + setException(null); } /**

16 years, 4 months

1
0
0 / 0

JBoss Tools SVN: r17283 - in workspace/yzhishko: org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences and 1 other directory.

by jbosstools-commits＠lists.jboss.org

Author: yzhishko Date: 2009-08-26 15:28:20 -0400 (Wed, 26 Aug 2009) New Revision: 17283 Modified: workspace/yzhishko/org.jboss.tools.ui.bot.test/src/org/jboss/tools/ui/bot/test/JBTSWTBotTestCase.java workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/ChangeEditorTabForTheFirstOpenPageTest.java Log: Small correction Modified: workspace/yzhishko/org.jboss.tools.ui.bot.test/src/org/jboss/tools/ui/bot/test/JBTSWTBotTestCase.java =================================================================== --- workspace/yzhishko/org.jboss.tools.ui.bot.test/src/org/jboss/tools/ui/bot/test/JBTSWTBotTestCase.java 2009-08-26 19:23:44 UTC (rev 17282) +++ workspace/yzhishko/org.jboss.tools.ui.bot.test/src/org/jboss/tools/ui/bot/test/JBTSWTBotTestCase.java 2009-08-26 19:28:20 UTC (rev 17283) @@ -212,7 +212,6 @@ } } } - setException(null); } } Modified: workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/ChangeEditorTabForTheFirstOpenPageTest.java =================================================================== --- workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/ChangeEditorTabForTheFirstOpenPageTest.java 2009-08-26 19:23:44 UTC (rev 17282) +++ workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/ChangeEditorTabForTheFirstOpenPageTest.java 2009-08-26 19:28:20 UTC (rev 17283) @@ -51,7 +51,6 @@ bot.shell("Preferences (Filtered)").activate(); bot.comboBoxWithLabel("Select the default active editor's tab\nfor files that haven't been previously\nopened in the VPE:").setSelection("Visual/Source"); bot.button("OK").click(); - bot.editorByTitle(TEST_PAGE).close(); } @Override @@ -67,6 +66,14 @@ bot.button("OK").click(); } catch (WidgetNotFoundException e) { } + //Set default pref value + try{ + bot.toolbarButtonWithTooltip("Preferences").click(); + bot.shell("Preferences (Filtered)").activate(); + bot.comboBoxWithLabel("Select the default active editor's tab\nfor files that haven't been previously\nopened in the VPE:").setSelection("Visual/Source"); + bot.button("OK").click(); + }catch (WidgetNotFoundException e) { + } waitForJobs(); super.tearDown(); }

16 years, 4 months

1
0
0 / 0

JBoss Tools SVN: r17282 - in trunk/as/plugins: org.jboss.ide.eclipse.as.core and 6 other directories.

by jbosstools-commits＠lists.jboss.org

Author: rob.stryker(a)jboss.com Date: 2009-08-26 15:23:44 -0400 (Wed, 26 Aug 2009) New Revision: 17282 Added: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/LocalPublishMethod.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IJBossServerPublishMethod.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/schema/publishMethod.exsd Modified: trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/PackagesPublisher.java trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/WTPZippedPublisher.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/ExtensionManager.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/JstPublisher.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/NullPublisher.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/SingleFilePublisher.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IJBossServerPublisher.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/DeployableServerBehavior.java trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/ModuleActionProvider.java Log: Preparing for multiple publish types Modified: trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/PackagesPublisher.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/PackagesPublisher.java 2009-08-26 19:21:00 UTC (rev 17281) +++ trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/PackagesPublisher.java 2009-08-26 19:23:44 UTC (rev 17282) @@ -58,8 +58,8 @@ return IServer.PUBLISH_STATE_NONE; } - public boolean accepts(IServer server, IModule[] module) { - if( module != null && module.length > 0 + public boolean accepts(String method, IServer server, IModule[] module) { + if( "local".equals(method) && module != null && module.length > 0 //$NON-NLS-1$ && PackageModuleFactory.MODULE_TYPE.equals(module[0].getModuleType().getId())) return true; return false; Modified: trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/WTPZippedPublisher.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/WTPZippedPublisher.java 2009-08-26 19:21:00 UTC (rev 17281) +++ trunk/as/plugins/org.jboss.ide.eclipse.archives.webtools/src/org/jboss/ide/eclipse/archives/webtools/modules/WTPZippedPublisher.java 2009-08-26 19:23:44 UTC (rev 17282) @@ -37,9 +37,10 @@ public class WTPZippedPublisher extends PublishUtil implements IJBossServerPublisher { private int moduleState = IServer.PUBLISH_STATE_NONE; - public boolean accepts(IServer server, IModule[] module) { + public boolean accepts(String method, IServer server, IModule[] module) { // TODO check for zip preference - return ModuleCoreNature.isFlexibleProject(module[0].getProject()); + return "local".equals(method) && //$NON-NLS-1$ + ModuleCoreNature.isFlexibleProject(module[0].getProject()); } public int getPublishState() { Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/ExtensionManager.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/ExtensionManager.java 2009-08-26 19:21:00 UTC (rev 17281) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/ExtensionManager.java 2009-08-26 19:23:44 UTC (rev 17282) @@ -140,14 +140,14 @@ } - public IJBossServerPublisher getPublisher(IServer server, IModule[] module) { + public IJBossServerPublisher getPublisher(IServer server, IModule[] module, String deployMethod) { if( publishers == null ) loadPublishers(); Iterator<PublisherWrapper> i = publishers.iterator(); PublisherWrapper wrapper; while(i.hasNext()) { wrapper = i.next(); - if( wrapper.publisher.accepts(server, module)) + if( wrapper.publisher.accepts(deployMethod, server, module)) return wrapper.getNewInstance(); } return null; Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/JstPublisher.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/JstPublisher.java 2009-08-26 19:21:00 UTC (rev 17281) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/JstPublisher.java 2009-08-26 19:23:44 UTC (rev 17282) @@ -319,7 +319,8 @@ } } } - public boolean accepts(IServer server, IModule[] module) { - return ModuleCoreNature.isFlexibleProject(module[0].getProject()); + public boolean accepts(String type, IServer server, IModule[] module) { + return "local".equals(type) && //$NON-NLS-1$ + ModuleCoreNature.isFlexibleProject(module[0].getProject()); } } Added: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/LocalPublishMethod.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/LocalPublishMethod.java (rev 0) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/LocalPublishMethod.java 2009-08-26 19:23:44 UTC (rev 17282) @@ -0,0 +1,77 @@ +package org.jboss.ide.eclipse.as.core.publishers; + +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.core.runtime.IStatus; +import org.eclipse.wst.server.core.IModule; +import org.eclipse.wst.server.core.IServer; +import org.eclipse.wst.server.core.model.IModuleResourceDelta; +import org.eclipse.wst.server.core.model.ServerBehaviourDelegate; +import org.jboss.ide.eclipse.as.core.ExtensionManager; +import org.jboss.ide.eclipse.as.core.extensions.events.ServerLogger; +import org.jboss.ide.eclipse.as.core.server.IJBossServerPublishMethod; +import org.jboss.ide.eclipse.as.core.server.IJBossServerPublisher; +import org.jboss.ide.eclipse.as.core.server.internal.DeployableServerBehavior; + +public class LocalPublishMethod implements IJBossServerPublishMethod { + + public boolean accepts(String methodType) { + return "local".equals(methodType); //$NON-NLS-1$ + } + + public void publishStart(DeployableServerBehavior behaviour, + IProgressMonitor monitor) throws CoreException { + } + + public int publishFinish(DeployableServerBehavior behaviour, + IProgressMonitor monitor) throws CoreException { + IModule[] modules = behaviour.getServer().getModules(); + boolean allpublished= true; + for (int i = 0; i < modules.length; i++) { + if(behaviour.getServer().getModulePublishState(new IModule[]{modules[i]})!=IServer.PUBLISH_STATE_NONE) + allpublished=false; + } + return allpublished ? IServer.PUBLISH_STATE_NONE : IServer.PUBLISH_STATE_INCREMENTAL; + } + + public int getServerPublishState(DeployableServerBehavior behaviour) { + IModule[] modules = behaviour.getServer().getModules(); + boolean allpublished= true; + for (int i = 0; i < modules.length; i++) { + if(behaviour.getServer().getModulePublishState(new IModule[]{modules[i]})!=IServer.PUBLISH_STATE_NONE) + allpublished=false; + } + if(allpublished) + return IServer.PUBLISH_STATE_NONE; + return IServer.PUBLISH_STATE_INCREMENTAL; + } + + public int publishModule(DeployableServerBehavior behaviour, int kind, + int deltaKind, IModule[] module, IProgressMonitor monitor) + throws CoreException { + // kind = [incremental, full, auto, clean] = [1,2,3,4] + // delta = [no_change, added, changed, removed] = [0,1,2,3] + if( module.length == 0 ) return IServer.PUBLISH_STATE_NONE; + int modulePublishState = behaviour.getServer().getModulePublishState(module); + int publishType = behaviour.getPublishType(kind, deltaKind, modulePublishState); + IJBossServerPublisher publisher; + + // Let the publisher decide what to do + if( module.length > 0 ) { + publisher = ExtensionManager.getDefault().getPublisher(behaviour.getServer(), module, "local"); //$NON-NLS-1$ + IModuleResourceDelta[] deltas = new IModuleResourceDelta[]{}; + if( deltaKind != ServerBehaviourDelegate.REMOVED) + deltas = behaviour.getPublishedResourceDelta(module); + if( publisher != null ) { + IStatus result = publisher.publishModule(behaviour.getServer(), module, + publishType, deltas, monitor); + if( result != null ) + ServerLogger.getDefault().log(behaviour.getServer(), result); + return publisher.getPublishState(); + } + return IServer.PUBLISH_STATE_INCREMENTAL; + } + return IServer.PUBLISH_STATE_NONE; + } + +} Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/NullPublisher.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/NullPublisher.java 2009-08-26 19:21:00 UTC (rev 17281) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/NullPublisher.java 2009-08-26 19:23:44 UTC (rev 17282) @@ -31,7 +31,7 @@ public int getPublishState() { return IServer.PUBLISH_STATE_NONE; } - public boolean accepts(IServer server, IModule[] module) { + public boolean accepts(String method, IServer server, IModule[] module) { return true; } Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/SingleFilePublisher.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/SingleFilePublisher.java 2009-08-26 19:21:00 UTC (rev 17281) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/publishers/SingleFilePublisher.java 2009-08-26 19:23:44 UTC (rev 17282) @@ -46,8 +46,8 @@ return publishState; } - public boolean accepts(IServer server, IModule[] module) { - if( module != null && module.length > 0 + public boolean accepts(String method, IServer server, IModule[] module) { + if( "local".equals(method) && module != null && module.length > 0 //$NON-NLS-1$ && module[module.length-1] != null && module[module.length-1].getModuleType().getId().equals(SingleDeployableFactory.MODULE_TYPE)) return true; Added: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IJBossServerPublishMethod.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IJBossServerPublishMethod.java (rev 0) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IJBossServerPublishMethod.java 2009-08-26 19:23:44 UTC (rev 17282) @@ -0,0 +1,13 @@ +package org.jboss.ide.eclipse.as.core.server; + +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.wst.server.core.IModule; +import org.jboss.ide.eclipse.as.core.server.internal.DeployableServerBehavior; + +public interface IJBossServerPublishMethod { + public boolean accepts(String methodType); + public void publishStart(DeployableServerBehavior behaviour, IProgressMonitor monitor) throws CoreException; + public int publishFinish(DeployableServerBehavior behaviour, IProgressMonitor monitor) throws CoreException; + public int publishModule(DeployableServerBehavior behaviour, int kind, int deltaKind, IModule[] module, IProgressMonitor monitor) throws CoreException; +} Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IJBossServerPublisher.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IJBossServerPublisher.java 2009-08-26 19:21:00 UTC (rev 17281) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/IJBossServerPublisher.java 2009-08-26 19:23:44 UTC (rev 17282) @@ -30,12 +30,9 @@ // pre-publish - public boolean accepts(IServer server, IModule[] module); - - - public IStatus publishModule(IServer server, IModule[] module, - int publishType, IModuleResourceDelta[] delta, IProgressMonitor monitor) throws CoreException; - + public boolean accepts(String method, IServer server, IModule[] module); // post publish public int getPublishState(); + public IStatus publishModule(IServer server, IModule[] module, + int publishType, IModuleResourceDelta[] delta, IProgressMonitor monitor) throws CoreException; } Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/DeployableServerBehavior.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/DeployableServerBehavior.java 2009-08-26 19:21:00 UTC (rev 17281) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/internal/DeployableServerBehavior.java 2009-08-26 19:23:44 UTC (rev 17282) @@ -14,7 +14,6 @@ import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.IStatus; import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy; import org.eclipse.wst.server.core.IModule; import org.eclipse.wst.server.core.IServer; @@ -22,8 +21,8 @@ import org.eclipse.wst.server.core.ServerEvent; import org.eclipse.wst.server.core.model.IModuleResourceDelta; import org.eclipse.wst.server.core.model.ServerBehaviourDelegate; -import org.jboss.ide.eclipse.as.core.ExtensionManager; -import org.jboss.ide.eclipse.as.core.extensions.events.ServerLogger; +import org.jboss.ide.eclipse.as.core.publishers.LocalPublishMethod; +import org.jboss.ide.eclipse.as.core.server.IJBossServerPublishMethod; import org.jboss.ide.eclipse.as.core.server.IJBossServerPublisher; import org.jboss.ide.eclipse.as.core.server.internal.launch.DeployableLaunchConfiguration; @@ -41,59 +40,31 @@ } protected void publishStart(IProgressMonitor monitor) throws CoreException { + IJBossServerPublishMethod method = getPublishMethod(); + method.publishStart(this, monitor); } protected void publishFinish(IProgressMonitor monitor) throws CoreException { - IModule[] modules = this.getServer().getModules(); - boolean allpublished= true; - for (int i = 0; i < modules.length; i++) { - if(this.getServer().getModulePublishState(new IModule[]{modules[i]})!=IServer.PUBLISH_STATE_NONE) - allpublished=false; - } - if(allpublished) - setServerPublishState(IServer.PUBLISH_STATE_NONE); + IJBossServerPublishMethod method = getPublishMethod(); + int result = method.publishFinish(this, monitor); + setServerPublishState(result); } - - /* - * The module is a list of module trail points, from parent to child - * Thus: - * {ear, war} for the war portion, {ear, ejb} for the ejb portion - * - * (non-Javadoc) - * @see org.eclipse.wst.server.core.model.ServerBehaviourDelegate#publishModule(int, int, org.eclipse.wst.server.core.IModule[], org.eclipse.core.runtime.IProgressMonitor) - */ protected void publishModule(int kind, int deltaKind, IModule[] module, IProgressMonitor monitor) throws CoreException { - // kind = [incremental, full, auto, clean] = [1,2,3,4] - // delta = [no_change, added, changed, removed] = [0,1,2,3] - if( module.length == 0 ) return; - int modulePublishState = getServer().getModulePublishState(module); - int publishType = getPublishType(kind, deltaKind, modulePublishState); - IJBossServerPublisher publisher; - - // Let the publisher decide what to do - if( module.length > 0 ) { - publisher = ExtensionManager.getDefault().getPublisher(getServer(), module); - IModuleResourceDelta[] deltas = new IModuleResourceDelta[]{}; - if( deltaKind != ServerBehaviourDelegate.REMOVED) - deltas = getPublishedResourceDelta(module); - if( publisher != null ) { - try { - IStatus result = publisher.publishModule(getServer(), module, - publishType, deltas, monitor); - if( result != null ) - ServerLogger.getDefault().log(getServer(), result); - } catch( CoreException ce ) { - throw ce; - } finally { - setModulePublishState(module, publisher.getPublishState()); - } - } - } + IJBossServerPublishMethod method = getPublishMethod(); + int result = method.publishModule(this, kind, deltaKind, module, monitor); + setModulePublishState(module, result); } + protected IJBossServerPublishMethod getPublishMethod() { + return new LocalPublishMethod(); // TODO FIX THIS + } - protected int getPublishType(int kind, int deltaKind, int modulePublishState) { + public IModuleResourceDelta[] getPublishedResourceDelta(IModule[] module) { + return super.getPublishedResourceDelta(module); + } + + public int getPublishType(int kind, int deltaKind, int modulePublishState) { if (ServerBehaviourDelegate.REMOVED == deltaKind) { return IJBossServerPublisher.REMOVE_PUBLISH; } else if (kind == IServer.PUBLISH_FULL || modulePublishState == IServer.PUBLISH_STATE_FULL || kind == IServer.PUBLISH_CLEAN ) { Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml 2009-08-26 19:21:00 UTC (rev 17281) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml 2009-08-26 19:23:44 UTC (rev 17282) @@ -5,6 +5,7 @@ <extension-point id="pollers" name="org.jboss.ide.eclipse.as.core.runtime.server.pollers" schema="schema/pollers.exsd"/> <extension-point id="pollerFailureHandler" name="org.jboss.ide.eclipse.as.core.runtime.server.pollerFailureHandler" schema="schema/pollerFailureHandler.exsd"/> <extension-point id="publishers" name="org.jboss.ide.eclipse.as.core.publishers" schema="schema/publishers.exsd"/> + <extension-point id="publishMethod" name="org.jboss.ide.eclipse.as.core.publishMethod" schema="schema/publishMethod.exsd"/> <extension point="org.eclipse.wst.server.core.serverTypes"> Added: trunk/as/plugins/org.jboss.ide.eclipse.as.core/schema/publishMethod.exsd =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/schema/publishMethod.exsd (rev 0) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/schema/publishMethod.exsd 2009-08-26 19:23:44 UTC (rev 17282) @@ -0,0 +1,102 @@ +<?xml version='1.0' encoding='UTF-8'?> + +<schema targetNamespace="org.jboss.ide.eclipse.as.core" xmlns="http://www.w3.org/2001/XMLSchema"> +<annotation> + <appInfo> + <meta.schema plugin="org.jboss.ide.eclipse.as.core" id="publishMethod" name="org.jboss.ide.eclipse.as.core.publishMethod"/> + </appInfo> + <documentation> + [Enter description of this extension point.] + </documentation> + </annotation> + + <element name="extension"> + <annotation> + <appInfo> + <meta.element /> + </appInfo> + </annotation> + <complexType> + <sequence minOccurs="1" maxOccurs="unbounded"> + <element ref="publishMethod" minOccurs="1" maxOccurs="unbounded"/> + </sequence> + <attribute name="point" type="string" use="required"> + <annotation> + <documentation> + + </documentation> + </annotation> + </attribute> + <attribute name="id" type="string"> + <annotation> + <documentation> + + </documentation> + </annotation> + </attribute> + <attribute name="name" type="string"> + <annotation> + <documentation> + + </documentation> + <appInfo> + <meta.attribute translatable="true"/> + </appInfo> + </annotation> + </attribute> + </complexType> + </element> + + <element name="publishMethod"> + <complexType> + <attribute name="class" type="string" use="required"> + <annotation> + <documentation> + + </documentation> + <appInfo> + <meta.attribute kind="java" basedOn=":org.jboss.ide.eclipse.as.core.server.IJBossServerPublishMethod"/> + </appInfo> + </annotation> + </attribute> + </complexType> + </element> + + <annotation> + <appInfo> + <meta.section type="since"/> + </appInfo> + <documentation> + [Enter the first release in which this extension point appears.] + </documentation> + </annotation> + + <annotation> + <appInfo> + <meta.section type="examples"/> + </appInfo> + <documentation> + [Enter extension point usage example here.] + </documentation> + </annotation> + + <annotation> + <appInfo> + <meta.section type="apiinfo"/> + </appInfo> + <documentation> + [Enter API information here.] + </documentation> + </annotation> + + <annotation> + <appInfo> + <meta.section type="implementation"/> + </appInfo> + <documentation> + [Enter information about supplied implementation of this extension point.] + </documentation> + </annotation> + + +</schema> Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/ModuleActionProvider.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/ModuleActionProvider.java 2009-08-26 19:21:00 UTC (rev 17281) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/server/extensions/ModuleActionProvider.java 2009-08-26 19:23:44 UTC (rev 17282) @@ -194,7 +194,7 @@ ModuleServer ms = selection[0]; IModule[] module = ms.module; IJBossServerPublisher publisher = ExtensionManager.getDefault() - .getPublisher(ms.getServer(), module); + .getPublisher(ms.getServer(), module, "local"); IPath path = null; IDeployableServer deployableServer = ServerConverter .getDeployableServer(ms.server);

16 years, 4 months

1
0
0 / 0

JBoss Tools SVN: r17281 - in workspace/yzhishko: org.jboss.tools.vpe.ui.bot.test/resources and 8 other directories.

by jbosstools-commits＠lists.jboss.org

Author: yzhishko Date: 2009-08-26 15:21:00 -0400 (Wed, 26 Aug 2009) New Revision: 17281 Added: workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/editor/ workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/editor/BlockCommentTestLinesToggle.xml workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/editor/BlockCommentTestToggle.xml workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/editor/CommentTestUntoggle.xml workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/editor/ToggleCommentTestToggle.xml workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/editor/VerificationOfNameSpaces.xml workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/pagedesign/ workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/pagedesign/AddSubstitutedELExpressionHelloPage.xml workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/pagedesign/AddSubstitutedELExpressionTestPage.xml workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/pagedesign/RemoveSubstitutedELExpressionHelloPage.xml workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/pagedesign/RemoveSubstitutedELExpressionTestPage.xml workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/preferences/ workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/preferences/DumpedTestPage.xml workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/preferences/HideBorderForUnknownTag.xml workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/preferences/HideResourceBundlesUsageasELExpressions.xml workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/preferences/ShowBorderForUnknownTag.xml workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/preferences/ShowNonVisualTags.xml workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/preferences/ShowResourceBundlesUsageasELExpressions.xml workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/VPEEditorTestCase.java workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/pagedesign/ workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/pagedesign/AddSubstitutedELExpressionFolderScopeTest.java workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/pagedesign/PageDesignTestCase.java workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/pagedesign/SubstitutedELTestCase.java workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/ChangeEditorTabForTheFirstOpenPageTest.java Removed: workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/BlockCommentTestLinesToggle.xml workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/BlockCommentTestToggle.xml workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/CommentTestUntoggle.xml workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/DumpedTestPage.xml workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/HideBorderForUnknownTag.xml workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/HideResourceBundlesUsageasELExpressions.xml workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/ShowBorderForUnknownTag.xml workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/ShowNonVisualTags.xml workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/ShowResourceBundlesUsageasELExpressions.xml workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/ToggleCommentTestToggle.xml workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/VerificationOfNameSpaces.xml workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/ChangeEditorTabForTheFirstOpenPageTest.java workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/jbide/JBIDE4306Test.java Modified: workspace/yzhishko/org.jboss.tools.ui.bot.test/src/org/jboss/tools/ui/bot/test/JBTSWTBotTestCase.java workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/projectProperties.properties workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/TestUtil.java workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/VPEAllTests.java workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/VPEAutoTestCase.java workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/BlockCommentTest.java workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/ToggleCommentTest.java workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/VerificationOfNameSpacesTest.java workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/PreferencesTestCase.java Log: Modified: workspace/yzhishko/org.jboss.tools.ui.bot.test/src/org/jboss/tools/ui/bot/test/JBTSWTBotTestCase.java =================================================================== --- workspace/yzhishko/org.jboss.tools.ui.bot.test/src/org/jboss/tools/ui/bot/test/JBTSWTBotTestCase.java 2009-08-26 17:13:46 UTC (rev 17280) +++ workspace/yzhishko/org.jboss.tools.ui.bot.test/src/org/jboss/tools/ui/bot/test/JBTSWTBotTestCase.java 2009-08-26 19:21:00 UTC (rev 17281) @@ -175,7 +175,7 @@ protected void openPackageExplorer() { try { - bot.viewByTitle(WidgetVariables.PACKAGE_EXPLORER); + bot.viewByTitle(WidgetVariables.PACKAGE_EXPLORER).setFocus(); } catch (WidgetNotFoundException e) { bot.menu("Window").menu("Show View").menu("Other...").click(); SWTBotTree viewTree = bot.tree(); @@ -204,15 +204,15 @@ protected void waitForJobs(){ delay(); - while (!Job.getJobManager().isIdle()) { - Job[] jobs = Job.getJobManager().find(null); - for (Job job : jobs) { - if ("Updating indexes".equals(job.getName())) { - job.cancel(); - } - } - delay(); - } + while (!Job.getJobManager().isIdle()) { + Job[] jobs = Job.getJobManager().find(null); + for (Job job : jobs) { + if ("Updating indexes".equals(job.getName())) { + job.cancel(); + } + } + } + setException(null); } } Deleted: workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/BlockCommentTestLinesToggle.xml =================================================================== --- workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/BlockCommentTestLinesToggle.xml 2009-08-26 17:13:46 UTC (rev 17280) +++ workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/BlockCommentTestLinesToggle.xml 2009-08-26 19:21:00 UTC (rev 17281) @@ -1,34 +0,0 @@ -<tests> - <test id="bodyId"> - <DIV ID="bodyId"> -<TABLE STYLE="border: 1px dotted rgb(255, 102, 0); padding: 5px; width: 100%;"> -<TR> -<TD> -<DIV> -<H1 STYLE="-moz-user-modify: read-write;"> -<SPAN CLASS="vpe-text"> -Hello Demo Application -</SPAN> -</H1> -<UL STYLE="color: red; -moz-user-modify: read-only;"> -<LI> -Error Messages -</LI> -</UL> -<FORM STYLE="border: 1px dotted rgb(255, 102, 0); padding: 5px;"> -<SPAN CLASS="vpe-text"> -Name: -</SPAN> - -<INPUT TYPE="button" VALUE="Say Hello!" STYLE="-moz-user-modify: read-only;"/> - -</FORM> -</DIV> -</TD> -</TR> -</TABLE> -</DIV> - </test> -</tests> \ No newline at end of file Deleted: workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/BlockCommentTestToggle.xml =================================================================== --- workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/BlockCommentTestToggle.xml 2009-08-26 17:13:46 UTC (rev 17280) +++ workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/BlockCommentTestToggle.xml 2009-08-26 19:21:00 UTC (rev 17281) @@ -1,36 +0,0 @@ -<tests> - <test id="bodyId"> - <DIV ID="bodyId"> -<TABLE STYLE="border: 1px dotted rgb(255, 102, 0); padding: 5px; width: 100%;"> -<TR> -<TD> -<DIV> -<H1 STYLE="-moz-user-modify: read-write;"> -<SPAN CLASS="vpe-text"> -Hello Demo Application -</SPAN> -</H1> -<UL STYLE="color: red; -moz-user-modify: read-only;"> -<LI> -Error Messages -</LI> -</UL> -<FORM STYLE="border: 1px dotted rgb(255, 102, 0); padding: 5px;"> -<SPAN CLASS="vpe-text"> -Name: -</SPAN> -<SPAN CLASS="vpe-text"> -<SPAN CLASS="vpe-text"> -</SPAN> -<INPUT VALUE="#{user.name}"/> - -</SPAN> - -</FORM> -</DIV> -</TD> -</TR> -</TABLE> -</DIV> - </test> -</tests> \ No newline at end of file Deleted: workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/CommentTestUntoggle.xml =================================================================== --- workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/CommentTestUntoggle.xml 2009-08-26 17:13:46 UTC (rev 17280) +++ workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/CommentTestUntoggle.xml 2009-08-26 19:21:00 UTC (rev 17281) @@ -1,37 +0,0 @@ -<tests> - <test id="bodyId"> - <DIV ID="bodyId"> -<TABLE STYLE="border: 1px dotted rgb(255, 102, 0); padding: 5px; width: 100%;"> -<TR> -<TD> -<DIV> -<H1 STYLE="-moz-user-modify: read-write;"> -<SPAN CLASS="vpe-text"> -Hello Demo Application -</SPAN> -</H1> -<UL STYLE="color: red; -moz-user-modify: read-only;"> -<LI> -Error Messages -</LI> -</UL> -<FORM STYLE="border: 1px dotted rgb(255, 102, 0); padding: 5px;"> -<SPAN CLASS="vpe-text"> -Name: -</SPAN> -<SPAN CLASS="vpe-text"> -<SPAN CLASS="vpe-text"> -</SPAN> -<INPUT VALUE="#{user.name}"/> - -</SPAN> -<INPUT TYPE="button" VALUE="Say Hello!" STYLE="-moz-user-modify: read-only;"/> - -</FORM> -</DIV> -</TD> -</TR> -</TABLE> -</DIV> - </test> -</tests> \ No newline at end of file Deleted: workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/DumpedTestPage.xml =================================================================== --- workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/DumpedTestPage.xml 2009-08-26 17:13:46 UTC (rev 17280) +++ workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/DumpedTestPage.xml 2009-08-26 19:21:00 UTC (rev 17281) @@ -1,43 +0,0 @@ -<BODY ID="__content__area__"> - -<DIV STYLE="-moz-user-modify: read-write;"> -<DIV STYLE="display: none; -moz-user-modify: read-only;"> -<H1 STYLE="-moz-user-modify: read-write;"> -Input User Name Page -</H1> -</DIV> -<DIV> -<TABLE STYLE="border: 1px dotted rgb(255, 102, 0); padding: 5px; width: 100%;"> -<TR> -<TD> -<DIV> -<H1 STYLE="-moz-user-modify: read-write;" > -<SPAN CLASS="vpe-text"> -Hello Demo Application -</SPAN> -</H1> -<UL STYLE="color: red; -moz-user-modify: read-only;"> -<LI> -Error Messages -</LI> -</UL> -<FORM STYLE="border: 1px dotted rgb(255, 102, 0); padding: 5px;"> -<SPAN CLASS="vpe-text"> -Name: -</SPAN> -<SPAN CLASS="vpe-text"> -<SPAN CLASS="vpe-text"> -</SPAN> -<INPUT VALUE="#{user.name}"/> - -</SPAN> -<INPUT TYPE="button" VALUE="Say Hello!" STYLE="-moz-user-modify: read-only;"/> - -</FORM> -</DIV> -</TD> -</TR> -</TABLE> -</DIV> -</DIV> -</BODY> \ No newline at end of file Deleted: workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/HideBorderForUnknownTag.xml =================================================================== --- workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/HideBorderForUnknownTag.xml 2009-08-26 17:13:46 UTC (rev 17280) +++ workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/HideBorderForUnknownTag.xml 2009-08-26 19:21:00 UTC (rev 17281) @@ -1,41 +0,0 @@ -<tests> - <test id="bodyId"> - <DIV ID="bodyId"> -<TABLE STYLE="border: 1px dotted rgb(255, 102, 0); padding: 5px; width: 100%;"> -<TR> -<TD> -<DIV> -<H1 STYLE="-moz-user-modify: read-write;"> -<SPAN CLASS="vpe-text"> -Hello Demo Application -</SPAN> -</H1> -<DIV CLASS="__any__tag__caption" STYLE="-moz-user-modify: read-only;"> -tagunknown<BR VPE:PSEUDO-ELEMENT="yes" STYLE="font-style: italic; color: green; -moz-user-modify: read-only;"/> - -</DIV> -<UL STYLE="color: red; -moz-user-modify: read-only;"> -<LI> -Error Messages -</LI> -</UL> -<FORM STYLE="border: 1px dotted rgb(255, 102, 0); padding: 5px;"> -<SPAN CLASS="vpe-text"> -Name: -</SPAN> -<SPAN CLASS="vpe-text"> -<SPAN CLASS="vpe-text"> -</SPAN> -<INPUT VALUE="#{user.name}"/> - -</SPAN> -<INPUT TYPE="button" VALUE="Say Hello!" STYLE="-moz-user-modify: read-only;"/> - -</FORM> -</DIV> -</TD> -</TR> -</TABLE> -</DIV> - </test> -</tests> Deleted: workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/HideResourceBundlesUsageasELExpressions.xml =================================================================== --- workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/HideResourceBundlesUsageasELExpressions.xml 2009-08-26 17:13:46 UTC (rev 17280) +++ workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/HideResourceBundlesUsageasELExpressions.xml 2009-08-26 19:21:00 UTC (rev 17281) @@ -1,37 +0,0 @@ -<tests> - <test id="bodyId"> - <DIV ID="bodyId"> -<TABLE STYLE="border: 1px dotted rgb(255, 102, 0); padding: 5px; width: 100%;"> -<TR> -<TD> -<DIV> -<H1 STYLE="-moz-user-modify: read-write;"> -<SPAN CLASS="vpe-text"> -Hello Demo Application -</SPAN> -</H1> -<UL STYLE="color: red; -moz-user-modify: read-only;"> -<LI> -Error Messages -</LI> -</UL> -<FORM STYLE="border: 1px dotted rgb(255, 102, 0); padding: 5px;"> -<SPAN CLASS="vpe-text"> -Name: -</SPAN> -<SPAN CLASS="vpe-text"> -<SPAN CLASS="vpe-text"> -</SPAN> -<INPUT VALUE="#{user.name}"/> - -</SPAN> -<INPUT TYPE="button" VALUE="Say Hello!" STYLE="-moz-user-modify: read-only;"/> - -</FORM> -</DIV> -</TD> -</TR> -</TABLE> -</DIV> - </test> -</tests> \ No newline at end of file Deleted: workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/ShowBorderForUnknownTag.xml =================================================================== --- workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/ShowBorderForUnknownTag.xml 2009-08-26 17:13:46 UTC (rev 17280) +++ workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/ShowBorderForUnknownTag.xml 2009-08-26 19:21:00 UTC (rev 17281) @@ -1,41 +0,0 @@ -<tests> - <test id="bodyId"> - <DIV ID="bodyId"> -<TABLE STYLE="border: 1px dotted rgb(255, 102, 0); padding: 5px; width: 100%;"> -<TR> -<TD> -<DIV> -<H1 STYLE="-moz-user-modify: read-write;"> -<SPAN CLASS="vpe-text"> -Hello Demo Application -</SPAN> -</H1> -<DIV CLASS="__any__tag__caption" STYLE="border: 1px solid green; -moz-user-modify: read-only;"> -tagunknown<BR VPE:PSEUDO-ELEMENT="yes" STYLE="font-style: italic; color: green; -moz-user-modify: read-only;"/> - -</DIV> -<UL STYLE="color: red; -moz-user-modify: read-only;"> -<LI> -Error Messages -</LI> -</UL> -<FORM STYLE="border: 1px dotted rgb(255, 102, 0); padding: 5px;"> -<SPAN CLASS="vpe-text"> -Name: -</SPAN> -<SPAN CLASS="vpe-text"> -<SPAN CLASS="vpe-text"> -</SPAN> -<INPUT VALUE="#{user.name}"/> - -</SPAN> -<INPUT TYPE="button" VALUE="Say Hello!" STYLE="-moz-user-modify: read-only;"/> - -</FORM> -</DIV> -</TD> -</TR> -</TABLE> -</DIV> - </test> -</tests> \ No newline at end of file Deleted: workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/ShowNonVisualTags.xml =================================================================== --- workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/ShowNonVisualTags.xml 2009-08-26 17:13:46 UTC (rev 17280) +++ workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/ShowNonVisualTags.xml 2009-08-26 19:21:00 UTC (rev 17281) @@ -1,80 +0,0 @@ -<BODY ID="__content__area__"> - -<SPAN> -<SPAN STYLE="border: 1px dashed GREY; color: GREY; font-size: 12px;"> -jsp:directive.taglib -</SPAN><BR VPE:PSEUDO-ELEMENT="yes" STYLE="font-style: italic; color: green; -moz-user-modify: read-only;"/> - -</SPAN> -<SPAN> -<SPAN STYLE="border: 1px dashed GREY; color: GREY; font-size: 12px;"> -jsp:directive.taglib -</SPAN><BR VPE:PSEUDO-ELEMENT="yes" STYLE="font-style: italic; color: green; -moz-user-modify: read-only;"/> - -</SPAN> -<SPAN> -<SPAN STYLE="border: 1px dashed GREY; color: GREY; font-size: 12px;"> -f:loadBundle -</SPAN><BR VPE:PSEUDO-ELEMENT="yes" STYLE="font-style: italic; color: green; -moz-user-modify: read-only;"/> - -</SPAN> -<DIV STYLE="-moz-user-modify: read-write;"> -<DIV STYLE="display: none; -moz-user-modify: read-only;"> -<SPAN> -<H1 STYLE="-moz-user-modify: read-write;"> -Input User Name Page -</H1> -<SPAN CLASS="vpe-text"> -Input User Name Page -</SPAN> -</SPAN> -</DIV> -<DIV> -<TABLE STYLE="border: 1px dotted rgb(255, 102, 0); padding: 5px; width: 100%;"> -<TR> -<TD> -<DIV> -<H1 STYLE="-moz-user-modify: read-write;"> -<SPAN CLASS="vpe-text"> -Hello Demo Application -</SPAN> -</H1> -<SPAN> -<UL STYLE="color: red; -moz-user-modify: read-only;"> -<LI> -Error Messages -</LI> -</UL><BR VPE:PSEUDO-ELEMENT="yes" STYLE="font-style: italic; color: green; -moz-user-modify: read-only;"/> - -</SPAN> -<FORM STYLE="border: 1px dotted rgb(255, 102, 0); padding: 5px;"> -<SPAN CLASS="vpe-text"> -Name: -</SPAN> -<SPAN> -<SPAN CLASS="vpe-text"> -<SPAN CLASS="vpe-text"> -</SPAN> -<INPUT VALUE="#{user.name}"/> - -</SPAN> -<SPAN> -<SPAN STYLE="border: 1px dashed GREY; color: GREY; font-size: 12px;"> -f:validateLength -</SPAN><BR VPE:PSEUDO-ELEMENT="yes" STYLE="font-style: italic; color: green; -moz-user-modify: read-only;"/> - -</SPAN> -</SPAN> -<SPAN> -<INPUT TYPE="button" VALUE="Say Hello!" STYLE="-moz-user-modify: read-only;"/> -<BR VPE:PSEUDO-ELEMENT="yes" STYLE="font-style: italic; color: green; -moz-user-modify: read-only;"/> - -</SPAN> -</FORM> -</DIV> -</TD> -</TR> -</TABLE> -</DIV> -</DIV> -</BODY> \ No newline at end of file Deleted: workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/ShowResourceBundlesUsageasELExpressions.xml =================================================================== --- workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/ShowResourceBundlesUsageasELExpressions.xml 2009-08-26 17:13:46 UTC (rev 17280) +++ workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/ShowResourceBundlesUsageasELExpressions.xml 2009-08-26 19:21:00 UTC (rev 17281) @@ -1,37 +0,0 @@ -<tests> - <test id="bodyId"> - <DIV ID="bodyId"> -<TABLE STYLE="border: 1px dotted rgb(255, 102, 0); padding: 5px; width: 100%;"> -<TR> -<TD> -<DIV> -<H1 STYLE="-moz-user-modify: read-write;"> -<SPAN CLASS="vpe-text"> -#{Message.header} -</SPAN> -</H1> -<UL STYLE="color: red; -moz-user-modify: read-only;"> -<LI> -Error Messages -</LI> -</UL> -<FORM STYLE="border: 1px dotted rgb(255, 102, 0); padding: 5px;"> -<SPAN CLASS="vpe-text"> -#{Message.prompt_message} -</SPAN> -<SPAN CLASS="vpe-text"> -<SPAN CLASS="vpe-text"> -</SPAN> -<INPUT VALUE="#{user.name}"/> - -</SPAN> -<INPUT TYPE="button" VALUE="Say Hello!" STYLE="-moz-user-modify: read-only;"/> - -</FORM> -</DIV> -</TD> -</TR> -</TABLE> -</DIV> - </test> -</tests> \ No newline at end of file Deleted: workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/ToggleCommentTestToggle.xml =================================================================== --- workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/ToggleCommentTestToggle.xml 2009-08-26 17:13:46 UTC (rev 17280) +++ workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/ToggleCommentTestToggle.xml 2009-08-26 19:21:00 UTC (rev 17281) @@ -1,36 +0,0 @@ -<tests> - <test id="bodyId"> - <DIV ID="bodyId"> -<TABLE STYLE="border: 1px dotted rgb(255, 102, 0); padding: 5px; width: 100%;"> -<TR> -<TD> -<DIV> -<H1 STYLE="-moz-user-modify: read-write;"> -<SPAN CLASS="vpe-text"> -Hello Demo Application -</SPAN> -</H1> -<UL STYLE="color: red; -moz-user-modify: read-only;"> -<LI> -Error Messages -</LI> -</UL> -<FORM STYLE="border: 1px dotted rgb(255, 102, 0); padding: 5px;"> -<SPAN CLASS="vpe-text"> -Name: -</SPAN> -<SPAN CLASS="vpe-text"> -<SPAN CLASS="vpe-text"> -</SPAN> -<INPUT VALUE="#{user.name}"/> - -</SPAN> - -</FORM> -</DIV> -</TD> -</TR> -</TABLE> -</DIV> - </test> -</tests> \ No newline at end of file Deleted: workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/VerificationOfNameSpaces.xml =================================================================== --- workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/VerificationOfNameSpaces.xml 2009-08-26 17:13:46 UTC (rev 17280) +++ workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/VerificationOfNameSpaces.xml 2009-08-26 19:21:00 UTC (rev 17281) @@ -1,6 +0,0 @@ -<BODY ID="__content__area__"> -<SPAN CLASS="vpe-text"> -... -</SPAN><BR VPE:PSEUDO-ELEMENT="yes" STYLE="font-style: italic; color: green; -moz-user-modify: read-only;"/> - -</BODY> \ No newline at end of file Copied: workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/editor/BlockCommentTestLinesToggle.xml (from rev 17192, workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/BlockCommentTestLinesToggle.xml) =================================================================== --- workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/editor/BlockCommentTestLinesToggle.xml (rev 0) +++ workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/editor/BlockCommentTestLinesToggle.xml 2009-08-26 19:21:00 UTC (rev 17281) @@ -0,0 +1,34 @@ +<tests> + <test id="bodyId"> + <DIV ID="bodyId"> +<TABLE STYLE="border: 1px dotted rgb(255, 102, 0); padding: 5px; width: 100%;"> +<TR> +<TD> +<DIV> +<H1 STYLE="-moz-user-modify: read-write;"> +<SPAN CLASS="vpe-text"> +Hello Demo Application +</SPAN> +</H1> +<UL STYLE="color: red; -moz-user-modify: read-only;"> +<LI> +Error Messages +</LI> +</UL> +<FORM STYLE="border: 1px dotted rgb(255, 102, 0); padding: 5px;"> +<SPAN CLASS="vpe-text"> +Name: +</SPAN> + +<INPUT TYPE="button" VALUE="Say Hello!" STYLE="-moz-user-modify: read-only;"/> + +</FORM> +</DIV> +</TD> +</TR> +</TABLE> +</DIV> + </test> +</tests> \ No newline at end of file Copied: workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/editor/BlockCommentTestToggle.xml (from rev 17192, workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/BlockCommentTestToggle.xml) =================================================================== --- workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/editor/BlockCommentTestToggle.xml (rev 0) +++ workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/editor/BlockCommentTestToggle.xml 2009-08-26 19:21:00 UTC (rev 17281) @@ -0,0 +1,36 @@ +<tests> + <test id="bodyId"> + <DIV ID="bodyId"> +<TABLE STYLE="border: 1px dotted rgb(255, 102, 0); padding: 5px; width: 100%;"> +<TR> +<TD> +<DIV> +<H1 STYLE="-moz-user-modify: read-write;"> +<SPAN CLASS="vpe-text"> +Hello Demo Application +</SPAN> +</H1> +<UL STYLE="color: red; -moz-user-modify: read-only;"> +<LI> +Error Messages +</LI> +</UL> +<FORM STYLE="border: 1px dotted rgb(255, 102, 0); padding: 5px;"> +<SPAN CLASS="vpe-text"> +Name: +</SPAN> +<SPAN CLASS="vpe-text"> +<SPAN CLASS="vpe-text"> +</SPAN> +<INPUT VALUE="#{user.name}"/> + +</SPAN> + +</FORM> +</DIV> +</TD> +</TR> +</TABLE> +</DIV> + </test> +</tests> \ No newline at end of file Copied: workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/editor/CommentTestUntoggle.xml (from rev 17192, workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/CommentTestUntoggle.xml) =================================================================== --- workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/editor/CommentTestUntoggle.xml (rev 0) +++ workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/editor/CommentTestUntoggle.xml 2009-08-26 19:21:00 UTC (rev 17281) @@ -0,0 +1,37 @@ +<tests> + <test id="bodyId"> + <DIV ID="bodyId"> +<TABLE STYLE="border: 1px dotted rgb(255, 102, 0); padding: 5px; width: 100%;"> +<TR> +<TD> +<DIV> +<H1 STYLE="-moz-user-modify: read-write;"> +<SPAN CLASS="vpe-text"> +Hello Demo Application +</SPAN> +</H1> +<UL STYLE="color: red; -moz-user-modify: read-only;"> +<LI> +Error Messages +</LI> +</UL> +<FORM STYLE="border: 1px dotted rgb(255, 102, 0); padding: 5px;"> +<SPAN CLASS="vpe-text"> +Name: +</SPAN> +<SPAN CLASS="vpe-text"> +<SPAN CLASS="vpe-text"> +</SPAN> +<INPUT VALUE="#{user.name}"/> + +</SPAN> +<INPUT TYPE="button" VALUE="Say Hello!" STYLE="-moz-user-modify: read-only;"/> + +</FORM> +</DIV> +</TD> +</TR> +</TABLE> +</DIV> + </test> +</tests> \ No newline at end of file Copied: workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/editor/ToggleCommentTestToggle.xml (from rev 17192, workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/ToggleCommentTestToggle.xml) =================================================================== --- workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/editor/ToggleCommentTestToggle.xml (rev 0) +++ workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/editor/ToggleCommentTestToggle.xml 2009-08-26 19:21:00 UTC (rev 17281) @@ -0,0 +1,36 @@ +<tests> + <test id="bodyId"> + <DIV ID="bodyId"> +<TABLE STYLE="border: 1px dotted rgb(255, 102, 0); padding: 5px; width: 100%;"> +<TR> +<TD> +<DIV> +<H1 STYLE="-moz-user-modify: read-write;"> +<SPAN CLASS="vpe-text"> +Hello Demo Application +</SPAN> +</H1> +<UL STYLE="color: red; -moz-user-modify: read-only;"> +<LI> +Error Messages +</LI> +</UL> +<FORM STYLE="border: 1px dotted rgb(255, 102, 0); padding: 5px;"> +<SPAN CLASS="vpe-text"> +Name: +</SPAN> +<SPAN CLASS="vpe-text"> +<SPAN CLASS="vpe-text"> +</SPAN> +<INPUT VALUE="#{user.name}"/> + +</SPAN> + +</FORM> +</DIV> +</TD> +</TR> +</TABLE> +</DIV> + </test> +</tests> \ No newline at end of file Copied: workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/editor/VerificationOfNameSpaces.xml (from rev 17192, workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/VerificationOfNameSpaces.xml) =================================================================== --- workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/editor/VerificationOfNameSpaces.xml (rev 0) +++ workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/editor/VerificationOfNameSpaces.xml 2009-08-26 19:21:00 UTC (rev 17281) @@ -0,0 +1,6 @@ +<BODY ID="__content__area__"> +<SPAN CLASS="vpe-text"> +... +</SPAN><BR VPE:PSEUDO-ELEMENT="yes" STYLE="font-style: italic; color: green; -moz-user-modify: read-only;"/> + +</BODY> \ No newline at end of file Added: workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/pagedesign/AddSubstitutedELExpressionHelloPage.xml =================================================================== --- workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/pagedesign/AddSubstitutedELExpressionHelloPage.xml (rev 0) +++ workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/pagedesign/AddSubstitutedELExpressionHelloPage.xml 2009-08-26 19:21:00 UTC (rev 17281) @@ -0,0 +1,28 @@ +<tests> + <test id="bodyId"> + <DIV ID="bodyId"> +<TABLE STYLE="border: 1px dotted rgb(255, 102, 0); padding: 5px; width: 100%;"> +<TR> +<TD> +<DIV> +<H3 STYLE="-moz-user-modify: read-write;"> +<SPAN CLASS="vpe-text"> +Hello +</SPAN> +<SPAN CLASS="vpe-text"> +, +</SPAN> +<SPAN CLASS="vpe-text"> +Any Name +</SPAN> +<SPAN CLASS="vpe-text"> +! +</SPAN> +</H3> +</DIV> +</TD> +</TR> +</TABLE> +</DIV> + </test> +</tests> \ No newline at end of file Added: workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/pagedesign/AddSubstitutedELExpressionTestPage.xml =================================================================== --- workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/pagedesign/AddSubstitutedELExpressionTestPage.xml (rev 0) +++ workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/pagedesign/AddSubstitutedELExpressionTestPage.xml 2009-08-26 19:21:00 UTC (rev 17281) @@ -0,0 +1,37 @@ +<tests> + <test id="bodyId"> + <DIV id="bodyId"> +<TABLE STYLE="border: 1px dotted rgb(255, 102, 0); padding: 5px; width: 100%;"> +<TR> +<TD> +<DIV> +<H1 STYLE="-moz-user-modify: read-write;"> +<SPAN CLASS="vpe-text"> +Hello Demo Application +</SPAN> +</H1> +<UL STYLE="color: red; -moz-user-modify: read-only;"> +<LI> +Error Messages +</LI> +</UL> +<FORM STYLE="border: 1px dotted rgb(255, 102, 0); padding: 5px;"> +<SPAN CLASS="vpe-text"> +Name: +</SPAN> +<SPAN CLASS="vpe-text"> +<SPAN CLASS="vpe-text"> +</SPAN> +<INPUT VALUE="Any Name"/> + +</SPAN> +<INPUT TYPE="button" VALUE="Say Hello!" STYLE="-moz-user-modify: read-only;"/> + +</FORM> +</DIV> +</TD> +</TR> +</TABLE> +</DIV> + </test> +</tests> \ No newline at end of file Added: workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/pagedesign/RemoveSubstitutedELExpressionHelloPage.xml =================================================================== --- workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/pagedesign/RemoveSubstitutedELExpressionHelloPage.xml (rev 0) +++ workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/pagedesign/RemoveSubstitutedELExpressionHelloPage.xml 2009-08-26 19:21:00 UTC (rev 17281) @@ -0,0 +1,28 @@ +<tests> + <test id="bodyId"> + <DIV ID="bodyId"> +<TABLE STYLE="border: 1px dotted rgb(255, 102, 0); padding: 5px; width: 100%;"> +<TR> +<TD> +<DIV> +<H3 STYLE="-moz-user-modify: read-write;"> +<SPAN CLASS="vpe-text"> +Hello +</SPAN> +<SPAN CLASS="vpe-text"> +, +</SPAN> +<SPAN CLASS="vpe-text"> +#{user.name} +</SPAN> +<SPAN CLASS="vpe-text"> +! +</SPAN> +</H3> +</DIV> +</TD> +</TR> +</TABLE> +</DIV> + </test> +</tests> \ No newline at end of file Added: workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/pagedesign/RemoveSubstitutedELExpressionTestPage.xml =================================================================== --- workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/pagedesign/RemoveSubstitutedELExpressionTestPage.xml (rev 0) +++ workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/pagedesign/RemoveSubstitutedELExpressionTestPage.xml 2009-08-26 19:21:00 UTC (rev 17281) @@ -0,0 +1,37 @@ +<tests> + <test id="bodyId"> + <DIV ID="bodyId"> +<TABLE STYLE="border: 1px dotted rgb(255, 102, 0); padding: 5px; width: 100%;"> +<TR> +<TD> +<DIV> +<H1 STYLE="-moz-user-modify: read-write;"> +<SPAN CLASS="vpe-text"> +Hello Demo Application +</SPAN> +</H1> +<UL STYLE="color: red; -moz-user-modify: read-only;"> +<LI> +Error Messages +</LI> +</UL> +<FORM STYLE="border: 1px dotted rgb(255, 102, 0); padding: 5px;"> +<SPAN CLASS="vpe-text"> +Name: +</SPAN> +<SPAN CLASS="vpe-text"> +<SPAN CLASS="vpe-text"> +</SPAN> +<INPUT VALUE="#{user.name}"/> + +</SPAN> +<INPUT TYPE="button" VALUE="Say Hello!" STYLE="-moz-user-modify: read-only;"/> + +</FORM> +</DIV> +</TD> +</TR> +</TABLE> +</DIV> + </test> +</tests> Copied: workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/preferences/DumpedTestPage.xml (from rev 17192, workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/DumpedTestPage.xml) =================================================================== --- workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/preferences/DumpedTestPage.xml (rev 0) +++ workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/preferences/DumpedTestPage.xml 2009-08-26 19:21:00 UTC (rev 17281) @@ -0,0 +1,43 @@ +<BODY ID="__content__area__"> + +<DIV STYLE="-moz-user-modify: read-write;"> +<DIV STYLE="display: none; -moz-user-modify: read-only;"> +<H1 STYLE="-moz-user-modify: read-write;"> +Input User Name Page +</H1> +</DIV> +<DIV> +<TABLE STYLE="border: 1px dotted rgb(255, 102, 0); padding: 5px; width: 100%;"> +<TR> +<TD> +<DIV> +<H1 STYLE="-moz-user-modify: read-write;" > +<SPAN CLASS="vpe-text"> +Hello Demo Application +</SPAN> +</H1> +<UL STYLE="color: red; -moz-user-modify: read-only;"> +<LI> +Error Messages +</LI> +</UL> +<FORM STYLE="border: 1px dotted rgb(255, 102, 0); padding: 5px;"> +<SPAN CLASS="vpe-text"> +Name: +</SPAN> +<SPAN CLASS="vpe-text"> +<SPAN CLASS="vpe-text"> +</SPAN> +<INPUT VALUE="#{user.name}"/> + +</SPAN> +<INPUT TYPE="button" VALUE="Say Hello!" STYLE="-moz-user-modify: read-only;"/> + +</FORM> +</DIV> +</TD> +</TR> +</TABLE> +</DIV> +</DIV> +</BODY> \ No newline at end of file Copied: workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/preferences/HideBorderForUnknownTag.xml (from rev 17192, workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/HideBorderForUnknownTag.xml) =================================================================== --- workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/preferences/HideBorderForUnknownTag.xml (rev 0) +++ workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/preferences/HideBorderForUnknownTag.xml 2009-08-26 19:21:00 UTC (rev 17281) @@ -0,0 +1,41 @@ +<tests> + <test id="bodyId"> + <DIV ID="bodyId"> +<TABLE STYLE="border: 1px dotted rgb(255, 102, 0); padding: 5px; width: 100%;"> +<TR> +<TD> +<DIV> +<H1 STYLE="-moz-user-modify: read-write;"> +<SPAN CLASS="vpe-text"> +Hello Demo Application +</SPAN> +</H1> +<DIV CLASS="__any__tag__caption" STYLE="-moz-user-modify: read-only;"> +tagunknown<BR VPE:PSEUDO-ELEMENT="yes" STYLE="font-style: italic; color: green; -moz-user-modify: read-only;"/> + +</DIV> +<UL STYLE="color: red; -moz-user-modify: read-only;"> +<LI> +Error Messages +</LI> +</UL> +<FORM STYLE="border: 1px dotted rgb(255, 102, 0); padding: 5px;"> +<SPAN CLASS="vpe-text"> +Name: +</SPAN> +<SPAN CLASS="vpe-text"> +<SPAN CLASS="vpe-text"> +</SPAN> +<INPUT VALUE="#{user.name}"/> + +</SPAN> +<INPUT TYPE="button" VALUE="Say Hello!" STYLE="-moz-user-modify: read-only;"/> + +</FORM> +</DIV> +</TD> +</TR> +</TABLE> +</DIV> + </test> +</tests> Copied: workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/preferences/HideResourceBundlesUsageasELExpressions.xml (from rev 17192, workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/HideResourceBundlesUsageasELExpressions.xml) =================================================================== --- workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/preferences/HideResourceBundlesUsageasELExpressions.xml (rev 0) +++ workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/preferences/HideResourceBundlesUsageasELExpressions.xml 2009-08-26 19:21:00 UTC (rev 17281) @@ -0,0 +1,37 @@ +<tests> + <test id="bodyId"> + <DIV ID="bodyId"> +<TABLE STYLE="border: 1px dotted rgb(255, 102, 0); padding: 5px; width: 100%;"> +<TR> +<TD> +<DIV> +<H1 STYLE="-moz-user-modify: read-write;"> +<SPAN CLASS="vpe-text"> +Hello Demo Application +</SPAN> +</H1> +<UL STYLE="color: red; -moz-user-modify: read-only;"> +<LI> +Error Messages +</LI> +</UL> +<FORM STYLE="border: 1px dotted rgb(255, 102, 0); padding: 5px;"> +<SPAN CLASS="vpe-text"> +Name: +</SPAN> +<SPAN CLASS="vpe-text"> +<SPAN CLASS="vpe-text"> +</SPAN> +<INPUT VALUE="#{user.name}"/> + +</SPAN> +<INPUT TYPE="button" VALUE="Say Hello!" STYLE="-moz-user-modify: read-only;"/> + +</FORM> +</DIV> +</TD> +</TR> +</TABLE> +</DIV> + </test> +</tests> \ No newline at end of file Copied: workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/preferences/ShowBorderForUnknownTag.xml (from rev 17192, workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/ShowBorderForUnknownTag.xml) =================================================================== --- workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/preferences/ShowBorderForUnknownTag.xml (rev 0) +++ workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/preferences/ShowBorderForUnknownTag.xml 2009-08-26 19:21:00 UTC (rev 17281) @@ -0,0 +1,41 @@ +<tests> + <test id="bodyId"> + <DIV ID="bodyId"> +<TABLE STYLE="border: 1px dotted rgb(255, 102, 0); padding: 5px; width: 100%;"> +<TR> +<TD> +<DIV> +<H1 STYLE="-moz-user-modify: read-write;"> +<SPAN CLASS="vpe-text"> +Hello Demo Application +</SPAN> +</H1> +<DIV CLASS="__any__tag__caption" STYLE="border: 1px solid green; -moz-user-modify: read-only;"> +tagunknown<BR VPE:PSEUDO-ELEMENT="yes" STYLE="font-style: italic; color: green; -moz-user-modify: read-only;"/> + +</DIV> +<UL STYLE="color: red; -moz-user-modify: read-only;"> +<LI> +Error Messages +</LI> +</UL> +<FORM STYLE="border: 1px dotted rgb(255, 102, 0); padding: 5px;"> +<SPAN CLASS="vpe-text"> +Name: +</SPAN> +<SPAN CLASS="vpe-text"> +<SPAN CLASS="vpe-text"> +</SPAN> +<INPUT VALUE="#{user.name}"/> + +</SPAN> +<INPUT TYPE="button" VALUE="Say Hello!" STYLE="-moz-user-modify: read-only;"/> + +</FORM> +</DIV> +</TD> +</TR> +</TABLE> +</DIV> + </test> +</tests> \ No newline at end of file Copied: workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/preferences/ShowNonVisualTags.xml (from rev 17192, workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/ShowNonVisualTags.xml) =================================================================== --- workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/preferences/ShowNonVisualTags.xml (rev 0) +++ workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/preferences/ShowNonVisualTags.xml 2009-08-26 19:21:00 UTC (rev 17281) @@ -0,0 +1,80 @@ +<BODY ID="__content__area__"> + +<SPAN> +<SPAN STYLE="border: 1px dashed GREY; color: GREY; font-size: 12px;"> +jsp:directive.taglib +</SPAN><BR VPE:PSEUDO-ELEMENT="yes" STYLE="font-style: italic; color: green; -moz-user-modify: read-only;"/> + +</SPAN> +<SPAN> +<SPAN STYLE="border: 1px dashed GREY; color: GREY; font-size: 12px;"> +jsp:directive.taglib +</SPAN><BR VPE:PSEUDO-ELEMENT="yes" STYLE="font-style: italic; color: green; -moz-user-modify: read-only;"/> + +</SPAN> +<SPAN> +<SPAN STYLE="border: 1px dashed GREY; color: GREY; font-size: 12px;"> +f:loadBundle +</SPAN><BR VPE:PSEUDO-ELEMENT="yes" STYLE="font-style: italic; color: green; -moz-user-modify: read-only;"/> + +</SPAN> +<DIV STYLE="-moz-user-modify: read-write;"> +<DIV STYLE="display: none; -moz-user-modify: read-only;"> +<SPAN> +<H1 STYLE="-moz-user-modify: read-write;"> +Input User Name Page +</H1> +<SPAN CLASS="vpe-text"> +Input User Name Page +</SPAN> +</SPAN> +</DIV> +<DIV> +<TABLE STYLE="border: 1px dotted rgb(255, 102, 0); padding: 5px; width: 100%;"> +<TR> +<TD> +<DIV> +<H1 STYLE="-moz-user-modify: read-write;"> +<SPAN CLASS="vpe-text"> +Hello Demo Application +</SPAN> +</H1> +<SPAN> +<UL STYLE="color: red; -moz-user-modify: read-only;"> +<LI> +Error Messages +</LI> +</UL><BR VPE:PSEUDO-ELEMENT="yes" STYLE="font-style: italic; color: green; -moz-user-modify: read-only;"/> + +</SPAN> +<FORM STYLE="border: 1px dotted rgb(255, 102, 0); padding: 5px;"> +<SPAN CLASS="vpe-text"> +Name: +</SPAN> +<SPAN> +<SPAN CLASS="vpe-text"> +<SPAN CLASS="vpe-text"> +</SPAN> +<INPUT VALUE="#{user.name}"/> + +</SPAN> +<SPAN> +<SPAN STYLE="border: 1px dashed GREY; color: GREY; font-size: 12px;"> +f:validateLength +</SPAN><BR VPE:PSEUDO-ELEMENT="yes" STYLE="font-style: italic; color: green; -moz-user-modify: read-only;"/> + +</SPAN> +</SPAN> +<SPAN> +<INPUT TYPE="button" VALUE="Say Hello!" STYLE="-moz-user-modify: read-only;"/> +<BR VPE:PSEUDO-ELEMENT="yes" STYLE="font-style: italic; color: green; -moz-user-modify: read-only;"/> + +</SPAN> +</FORM> +</DIV> +</TD> +</TR> +</TABLE> +</DIV> +</DIV> +</BODY> \ No newline at end of file Copied: workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/preferences/ShowResourceBundlesUsageasELExpressions.xml (from rev 17192, workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/ShowResourceBundlesUsageasELExpressions.xml) =================================================================== --- workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/preferences/ShowResourceBundlesUsageasELExpressions.xml (rev 0) +++ workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/preferences/ShowResourceBundlesUsageasELExpressions.xml 2009-08-26 19:21:00 UTC (rev 17281) @@ -0,0 +1,37 @@ +<tests> + <test id="bodyId"> + <DIV ID="bodyId"> +<TABLE STYLE="border: 1px dotted rgb(255, 102, 0); padding: 5px; width: 100%;"> +<TR> +<TD> +<DIV> +<H1 STYLE="-moz-user-modify: read-write;"> +<SPAN CLASS="vpe-text"> +#{Message.header} +</SPAN> +</H1> +<UL STYLE="color: red; -moz-user-modify: read-only;"> +<LI> +Error Messages +</LI> +</UL> +<FORM STYLE="border: 1px dotted rgb(255, 102, 0); padding: 5px;"> +<SPAN CLASS="vpe-text"> +#{Message.prompt_message} +</SPAN> +<SPAN CLASS="vpe-text"> +<SPAN CLASS="vpe-text"> +</SPAN> +<INPUT VALUE="#{user.name}"/> + +</SPAN> +<INPUT TYPE="button" VALUE="Say Hello!" STYLE="-moz-user-modify: read-only;"/> + +</FORM> +</DIV> +</TD> +</TR> +</TABLE> +</DIV> + </test> +</tests> \ No newline at end of file Modified: workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/projectProperties.properties =================================================================== --- workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/projectProperties.properties 2009-08-26 17:13:46 UTC (rev 17280) +++ workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/resources/projectProperties.properties 2009-08-26 19:21:00 UTC (rev 17281) @@ -1,3 +1,3 @@ JSFProjectName=JBIDETestProject Apachev6.0=D\:/Java/apache-tomcat-6.0.18 -JBossEap4.3=C\:/jbdevstudioRelease/jboss-eap/jboss-as \ No newline at end of file +JBossEap4.3=C\:/jbdevstudio200ga/jboss-eap/jboss-as \ No newline at end of file Modified: workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/TestUtil.java =================================================================== --- workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/TestUtil.java 2009-08-26 17:13:46 UTC (rev 17280) +++ workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/TestUtil.java 2009-08-26 19:21:00 UTC (rev 17281) @@ -11,7 +11,6 @@ package org.jboss.tools.vpe.ui.bot.test; import junit.framework.Assert; -import org.eclipse.swt.widgets.Display; import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor; import org.jboss.tools.vpe.editor.VpeController; import org.jboss.tools.vpe.editor.VpeEditorPart; @@ -33,11 +32,6 @@ public static VpeController getVpeController(JSPMultiPageEditor part) { VpeEditorPart visualEditor = (VpeEditorPart) part.getVisualEditor(); - while(visualEditor.getController()==null) { - if (!Display.getCurrent().readAndDispatch()) { - Display.getCurrent().sleep(); - } - } return visualEditor.getController(); } Modified: workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/VPEAllTests.java =================================================================== --- workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/VPEAllTests.java 2009-08-26 17:13:46 UTC (rev 17280) +++ workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/VPEAllTests.java 2009-08-26 19:21:00 UTC (rev 17281) @@ -7,13 +7,13 @@ import org.jboss.tools.vpe.ui.bot.test.editor.BlockCommentTest; import org.jboss.tools.vpe.ui.bot.test.editor.ToggleCommentTest; import org.jboss.tools.vpe.ui.bot.test.editor.VerificationOfNameSpacesTest; +import org.jboss.tools.vpe.ui.bot.test.editor.pagedesign.AddSubstitutedELExpressionFolderScopeTest; import org.jboss.tools.vpe.ui.bot.test.editor.preferences.AlwaysHideSelectionBarWithoutPromptTest; import org.jboss.tools.vpe.ui.bot.test.editor.preferences.BorderForUnknownTagsTest; import org.jboss.tools.vpe.ui.bot.test.editor.preferences.ChangeEditorTabForTheFirstOpenPageTest; import org.jboss.tools.vpe.ui.bot.test.editor.preferences.ShowNonVisualTagsTest; import org.jboss.tools.vpe.ui.bot.test.editor.preferences.ShowResourceBundlesUsageasELexpressionsTest; import org.jboss.tools.vpe.ui.bot.test.editor.preferences.ShowSelectionTagBarTest; -import org.jboss.tools.vpe.ui.bot.test.jbide.JBIDE4306Test; import org.jboss.tools.vpe.ui.bot.test.jbide.JBIDE4556Test; import org.jboss.tools.vpe.ui.bot.test.palette.CancelTagLibDefenitionTest; import org.jboss.tools.vpe.ui.bot.test.palette.ImportTagsFromTLDFileTest; @@ -25,15 +25,15 @@ suite.addTestSuite(ImportTagsFromTLDFileTest.class); suite.addTestSuite(ToggleCommentTest.class); suite.addTestSuite(BlockCommentTest.class); - suite.addTestSuite(JBIDE4306Test.class); + suite.addTestSuite(ChangeEditorTabForTheFirstOpenPageTest.class); suite.addTestSuite(JBIDE4556Test.class); - suite.addTestSuite(ChangeEditorTabForTheFirstOpenPageTest.class); suite.addTestSuite(VerificationOfNameSpacesTest.class); suite.addTestSuite(BorderForUnknownTagsTest.class); suite.addTestSuite(ShowResourceBundlesUsageasELexpressionsTest.class); suite.addTestSuite(ShowSelectionTagBarTest.class); suite.addTestSuite(AlwaysHideSelectionBarWithoutPromptTest.class); suite.addTestSuite(ShowNonVisualTagsTest.class); + suite.addTestSuite(AddSubstitutedELExpressionFolderScopeTest.class); return new TestSetup(suite); } } Modified: workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/VPEAutoTestCase.java =================================================================== --- workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/VPEAutoTestCase.java 2009-08-26 17:13:46 UTC (rev 17280) +++ workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/VPEAutoTestCase.java 2009-08-26 19:21:00 UTC (rev 17281) @@ -29,13 +29,14 @@ protected static Properties projectProperties; protected static final String TEST_PAGE = "inputUserName.jsp"; - public static String PROJECT_PROPERTIES = "projectProperties.properties"; + protected static String PROJECT_PROPERTIES = "projectProperties.properties"; /** * Variable defines JBoss EAP 4.3 server location on a file system */ - public static String JBOSS_EAP_HOME; + protected static String JBOSS_EAP_HOME; + protected static String JBT_TEST_PROJECT_NAME; /* (non-Javadoc) * This static block read properties from @@ -55,6 +56,7 @@ fail("Property file " + PROJECT_PROPERTIES + " was not found"); } JBOSS_EAP_HOME = System.getProperty("jbosstools.test.jboss.home",projectProperties.getProperty("JBossEap4.3")); + JBT_TEST_PROJECT_NAME = projectProperties.getProperty("JSFProjectName"); } /** @@ -68,9 +70,9 @@ SWTBot innerBot = bot.viewByTitle(WidgetVariables.PACKAGE_EXPLORER).bot(); SWTBotTree tree = innerBot.tree(); try { - tree.getTreeItem(projectProperties.getProperty("JSFProjectName")); + tree.getTreeItem(JBT_TEST_PROJECT_NAME); } catch (WidgetNotFoundException e) { - createJSFProject(projectProperties.getProperty("JSFProjectName")); + createJSFProject(JBT_TEST_PROJECT_NAME); } } @@ -93,6 +95,7 @@ protected void createJSFProject(String jsfProjectName){ bot.menu("File").menu("New").menu("Other...").click(); + bot.shell("New").activate(); SWTBotTree tree = bot.tree(); waitForJobs(); tree.expandNode("JBoss Tools Web").expandNode("JSF").select("JSF Project"); Modified: workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/BlockCommentTest.java =================================================================== --- workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/BlockCommentTest.java 2009-08-26 17:13:46 UTC (rev 17280) +++ workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/BlockCommentTest.java 2009-08-26 19:21:00 UTC (rev 17281) @@ -3,39 +3,28 @@ import org.eclipse.swt.SWT; import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.Event; -import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotEclipseEditor; -import org.eclipse.swtbot.swt.finder.SWTBot; -import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree; -import org.jboss.tools.ui.bot.test.WidgetVariables; -import org.jboss.tools.vpe.ui.bot.test.VPEAutoTestCase; -public class BlockCommentTest extends VPEAutoTestCase{ +public class BlockCommentTest extends VPEEditorTestCase{ - private static String textEditor; - private static SWTBotEclipseEditor editor; - public void testBlockComment() throws Throwable{ //Test open page - SWTBot innerBot = bot.viewByTitle(WidgetVariables.PACKAGE_EXPLORER).bot(); - SWTBotTree tree = innerBot.tree(); - tree.expandNode(projectProperties.getProperty("JSFProjectName")) - .expandNode("WebContent").expandNode("pages").getNode(TEST_PAGE).doubleClick(); + openPage(); - editor = bot.editorByTitle(TEST_PAGE).toTextEditor(); - textEditor = editor.getText(); + setEditor(bot.editorByTitle(TEST_PAGE).toTextEditor()); + setEditorText(getEditor().getText()); //Test add block comment from Source menu - editor.navigateTo(22,22); + getEditor().navigateTo(22,22); bot.menu("Source").menu("Add Block Comment").click(); waitForJobs(); checkVPE("BlockCommentTestToggle.xml"); //Test remove block comment from Source menu - editor.navigateTo(22,22); + getEditor().navigateTo(22,22); bot.menu("Source").menu("Remove Block Comment").click(); waitForJobs(); checkVPE("CommentTestUntoggle.xml"); @@ -43,68 +32,48 @@ //Test add block comment with CTRL+SHIFT+/ hot keys - editor.navigateTo(22,22); + getEditor().navigateTo(22,22); pressBlockCommentHotKeys(); waitForJobs(); checkVPE("BlockCommentTestToggle.xml"); //Test remove block comment with CTRL+SHIFT+\ hot keys - editor.navigateTo(22,22); + getEditor().navigateTo(22,22); pressUnBlockCommentHotKeys(); waitForJobs(); checkVPE("CommentTestUntoggle.xml"); //Test add block comment lines from Source menu - editor.navigateTo(18,22); + getEditor().navigateTo(18,22); bot.menu("Source").menu("Add Block Comment").click(); waitForJobs(); checkVPE("BlockCommentTestLinesToggle.xml"); //Test remove block comment lines from Source menu - editor.navigateTo(18,22); + getEditor().navigateTo(18,22); bot.menu("Source").menu("Remove Block Comment").click(); waitForJobs(); checkVPE("CommentTestUntoggle.xml"); //Test add block comment lines with CTRL+SHIFT+/ hot keys - editor.navigateTo(18,22); + getEditor().navigateTo(18,22); bot.menu("Source").menu("Add Block Comment").click(); waitForJobs(); checkVPE("BlockCommentTestLinesToggle.xml"); //Test remove block comment lines with CTRL+SHIFT+/ hot keys - editor.navigateTo(18,22); + getEditor().navigateTo(18,22); bot.menu("Source").menu("Remove Block Comment").click(); waitForJobs(); checkVPE("CommentTestUntoggle.xml"); } - - @Override - protected void closeUnuseDialogs() { - } - - @Override - protected boolean isUnuseDialogOpened() { - return false; - } - - private void checkVPE(String testPage) throws Throwable{ - editor.selectLine(9); - if (!"<body id=\"bodyId\">".equals(editor.getTextOnCurrentLine().trim())) { - editor.insertText("<body id=\"bodyId\">"); - } - editor.save(); - waitForJobs(); - performContentTestByIDs(testPage, bot.multiPageEditorByTitle(TEST_PAGE)); - } - private void pressBlockCommentHotKeys(){ bot.getDisplay().syncExec(new Runnable() { public void run() { @@ -169,20 +138,4 @@ }); } - @Override - protected void tearDown() throws Exception { - - //Restore page state before tests - - editor.setFocus(); - bot.menu("Edit").menu("Select All").click(); - bot.menu("Edit").menu("Delete").click(); - editor.setText(textEditor); - editor.save(); - waitForJobs(); - editor.close(); - super.tearDown(); - } - - } Modified: workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/ToggleCommentTest.java =================================================================== --- workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/ToggleCommentTest.java 2009-08-26 17:13:46 UTC (rev 17280) +++ workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/ToggleCommentTest.java 2009-08-26 19:21:00 UTC (rev 17281) @@ -3,32 +3,21 @@ import org.eclipse.swt.SWT; import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.Event; -import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotEclipseEditor; -import org.eclipse.swtbot.swt.finder.SWTBot; -import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree; -import org.jboss.tools.ui.bot.test.WidgetVariables; -import org.jboss.tools.vpe.ui.bot.test.VPEAutoTestCase; -public class ToggleCommentTest extends VPEAutoTestCase{ +public class ToggleCommentTest extends VPEEditorTestCase{ - private static String textEditor; - private static SWTBotEclipseEditor editor; - public void testToggleComment() throws Throwable{ //Test open page - SWTBot innerBot = bot.viewByTitle(WidgetVariables.PACKAGE_EXPLORER).bot(); - SWTBotTree tree = innerBot.tree(); - tree.expandNode(projectProperties.getProperty("JSFProjectName")) - .expandNode("WebContent").expandNode("pages").getNode(TEST_PAGE).doubleClick(); - - editor = bot.editorByTitle(TEST_PAGE).toTextEditor(); - textEditor = editor.getText(); + openPage(); + + setEditor(bot.editorByTitle(TEST_PAGE).toTextEditor()); + setEditorText(getEditor().getText()); //Test toggle comment from Source menu - editor.navigateTo(22,22); + getEditor().navigateTo(22,22); bot.menu("Source").menu("Toggle Comment").click(); waitForJobs(); checkSelectionBar("#comment"); @@ -36,7 +25,7 @@ //Test untoggle comment from Source menu - editor.navigateTo(22,22); + getEditor().navigateTo(22,22); bot.menu("Source").menu("Toggle Comment").click(); waitForJobs(); checkSelectionBar("h:commandButton"); @@ -44,7 +33,7 @@ //Test toggle comment with CTRL+SHIFT+C hot keys - editor.navigateTo(22,22); + getEditor().navigateTo(22,22); pressToggleCommentHotKeys(); waitForJobs(); checkSelectionBar("#comment"); @@ -52,7 +41,7 @@ //Test untoggle comment with CTRL+SHIFT hot keys - editor.navigateTo(22,22); + getEditor().navigateTo(22,22); pressToggleCommentHotKeys(); waitForJobs(); checkSelectionBar("h:commandButton"); @@ -60,16 +49,6 @@ } - private void checkVPE(String testPage) throws Throwable{ - editor.selectLine(9); - if (!"<body id=\"bodyId\">".equals(editor.getTextOnCurrentLine().trim())) { - editor.insertText("<body id=\"bodyId\">"); - } - editor.save(); - waitForJobs(); - performContentTestByIDs(testPage, bot.multiPageEditorByTitle(TEST_PAGE)); - } - private void pressToggleCommentHotKeys(){ bot.getDisplay().syncExec(new Runnable() { public void run() { @@ -102,31 +81,6 @@ }); } - @Override - protected void closeUnuseDialogs() { - - } - - @Override - protected boolean isUnuseDialogOpened() { - return false; - } - - @Override - protected void tearDown() throws Exception { - - //Restore page state before tests - - editor.setFocus(); - bot.menu("Edit").menu("Select All").click(); - bot.menu("Edit").menu("Delete").click(); - editor.setText(textEditor); - editor.save(); - waitForJobs(); - editor.close(); - super.tearDown(); - } - private void checkSelectionBar (String... args){ for (int i = 0; i < args.length; i++) { bot.toolbarButton(args[i]).click(); Added: workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/VPEEditorTestCase.java =================================================================== --- workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/VPEEditorTestCase.java (rev 0) +++ workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/VPEEditorTestCase.java 2009-08-26 19:21:00 UTC (rev 17281) @@ -0,0 +1,81 @@ +package org.jboss.tools.vpe.ui.bot.test.editor; + +import java.io.IOException; + +import org.eclipse.core.runtime.FileLocator; +import org.eclipse.core.runtime.Platform; +import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotEclipseEditor; +import org.eclipse.swtbot.swt.finder.SWTBot; +import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree; +import org.jboss.tools.ui.bot.test.WidgetVariables; +import org.jboss.tools.vpe.ui.bot.test.Activator; +import org.jboss.tools.vpe.ui.bot.test.VPEAutoTestCase; + +public abstract class VPEEditorTestCase extends VPEAutoTestCase{ + + private String editorText; + private SWTBotEclipseEditor editor; + + String getEditorText() { + return editorText; + } + + void setEditorText(String textEditor) { + this.editorText = textEditor; + } + + SWTBotEclipseEditor getEditor() { + return editor; + } + + void setEditor(SWTBotEclipseEditor editor) { + this.editor = editor; + } + + @Override + protected boolean isUnuseDialogOpened() { + return false; + } + + @Override + protected void closeUnuseDialogs() { + } + + @Override + protected String getPathToResources(String testPage) throws IOException { + return FileLocator.toFileURL(Platform.getBundle(Activator.PLUGIN_ID).getEntry("/")).getFile()+"resources/editor/"+testPage; + } + + void openPage(){ + SWTBot innerBot = bot.viewByTitle(WidgetVariables.PACKAGE_EXPLORER).bot(); + SWTBotTree tree = innerBot.tree(); + tree.expandNode(JBT_TEST_PROJECT_NAME) + .expandNode("WebContent").expandNode("pages").getNode(TEST_PAGE).doubleClick(); + } + + void checkVPE(String testPage) throws Throwable{ + editor.selectLine(9); + if (!"<body id=\"bodyId\">".equals(editor.getTextOnCurrentLine().trim())) { + editor.insertText("<body id=\"bodyId\">"); + } + editor.save(); + waitForJobs(); + performContentTestByIDs(testPage, bot.multiPageEditorByTitle(TEST_PAGE)); + } + + @Override + protected void tearDown() throws Exception { + + //Restore page state before tests + + editor.setFocus(); + bot.menu("Edit").menu("Select All").click(); + bot.menu("Edit").menu("Delete").click(); + editor.setText(editorText); + editor.save(); + waitForJobs(); + editor.close(); + super.tearDown(); + } + +} Modified: workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/VerificationOfNameSpacesTest.java =================================================================== --- workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/VerificationOfNameSpacesTest.java 2009-08-26 17:13:46 UTC (rev 17280) +++ workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/VerificationOfNameSpacesTest.java 2009-08-26 19:21:00 UTC (rev 17281) @@ -1,73 +1,37 @@ package org.jboss.tools.vpe.ui.bot.test.editor; -import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotEclipseEditor; -import org.eclipse.swtbot.swt.finder.SWTBot; -import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree; -import org.jboss.tools.ui.bot.test.WidgetVariables; -import org.jboss.tools.vpe.ui.bot.test.VPEAutoTestCase; +public class VerificationOfNameSpacesTest extends VPEEditorTestCase{ -public class VerificationOfNameSpacesTest extends VPEAutoTestCase{ - - private static String textEditor; private static String testText = "<jsp:root\n" + "xmlns:jsp=\"http://java.sun.com/JSP/Page\n" + "xmlns:public=\"http://www.jspcentral.com/tags\"\n" + "version=\"1.2\">\n" + "...\n" + "</jsp:root>"; - private static SWTBotEclipseEditor editor; public void testVerificationOfNameSpaces() throws Throwable{ //Test open page - SWTBot innerBot = bot.viewByTitle(WidgetVariables.PACKAGE_EXPLORER).bot(); - SWTBotTree tree = innerBot.tree(); - tree.expandNode(projectProperties.getProperty("JSFProjectName")) - .expandNode("WebContent").expandNode("pages").getNode(TEST_PAGE).doubleClick(); + openPage(); - editor = bot.editorByTitle(TEST_PAGE).toTextEditor(); - textEditor = editor.getText(); + setEditor(bot.editorByTitle(TEST_PAGE).toTextEditor()); + setEditorText(getEditor().getText()); //Test clear source - editor.setFocus(); + getEditor().setFocus(); bot.menu("Edit").menu("Select All").click(); waitForJobs(); bot.menu("Edit").menu("Delete").click(); //Test insert test text - editor.setText(testText); - editor.save(); + getEditor().setText(testText); + getEditor().save(); waitForJobs(); performContentTestByDocument("VerificationOfNameSpaces.xml", bot.multiPageEditorByTitle(TEST_PAGE)); } - @Override - protected void closeUnuseDialogs() { - - } - - @Override - protected boolean isUnuseDialogOpened() { - return false; - } - - @Override - protected void tearDown() throws Exception { - - //Restore page state before tests - - editor.setFocus(); - bot.menu("Edit").menu("Select All").click(); - bot.menu("Edit").menu("Delete").click(); - editor.setText(textEditor); - editor.save(); - waitForJobs(); - editor.close(); - super.tearDown(); - } - } Added: workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/pagedesign/AddSubstitutedELExpressionFolderScopeTest.java =================================================================== --- workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/pagedesign/AddSubstitutedELExpressionFolderScopeTest.java (rev 0) +++ workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/pagedesign/AddSubstitutedELExpressionFolderScopeTest.java 2009-08-26 19:21:00 UTC (rev 17281) @@ -0,0 +1,169 @@ +package org.jboss.tools.vpe.ui.bot.test.editor.pagedesign; + +import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotEclipseEditor; +import org.eclipse.swtbot.swt.finder.SWTBot; +import org.eclipse.swtbot.swt.finder.widgets.SWTBotTable; +import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree; +import org.jboss.tools.ui.bot.test.WidgetVariables; + +public class AddSubstitutedELExpressionFolderScopeTest extends SubstitutedELTestCase{ + + private static final String TEST_PAGE_FOR_FOLDER = "testPage"; + private static final String TEST_FOLDER = "testFolder"; + + //Do not edit this variable as test will fail + private static final String EL_VALUE = "Any Name"; + + public void testAddSubstitutedELExpressionFolderScope() throws Throwable{ + + //Test open page + openPage(); + setEditor(bot.editorByTitle(TEST_PAGE).toTextEditor()); + setEditorText(getEditor().getText()); + + //Test create new folder + + SWTBot innerBot = bot.viewByTitle(WidgetVariables.PACKAGE_EXPLORER).bot(); + innerBot.tree().expandNode(JBT_TEST_PROJECT_NAME).expandNode("WebContent") + .select(); + + bot.menu("File").menu("New").menu("Folder").click(); + + bot.shell("New Folder").activate(); + bot.textWithLabel("Folder name:").setText(TEST_FOLDER); + bot.button("Finish").click(); + + //Test create page in new folder + + innerBot = bot.viewByTitle(WidgetVariables.PACKAGE_EXPLORER).bot(); + innerBot.tree().expandNode(JBT_TEST_PROJECT_NAME).expandNode("WebContent") + .getNode(TEST_FOLDER).select(); + + bot.menu("File").menu("New").menu("JSP File").click(); + + bot.shell("New File JSP").activate(); + bot.textWithLabel("Name*").setText(TEST_PAGE_FOR_FOLDER); + bot.button("Finish").click(); + waitForJobs(); + SWTBotEclipseEditor editorForTestPage = bot.editorByTitle(TEST_PAGE_FOR_FOLDER+".jsp").toTextEditor(); + editorForTestPage.setText(getEditorText()); + editorForTestPage.save(); + editorForTestPage.close(); + bot.viewByTitle(WidgetVariables.PACKAGE_EXPLORER).setFocus(); + bot.editorByTitle(TEST_PAGE).setFocus(); + + //Test open Page Design Options + + bot.toolbarButtonWithTooltip(PAGE_DESIGN).click(); + bot.shell(PAGE_DESIGN).activate(); + + //Test choose Substituted EL tab + + bot.tabItem(SUBSTITUTED_EL).activate(); + + //Clear EL table + clearELTable(bot.table()); + + //Test add EL with folder scope to list + + bot.button("Add").click(); + bot.shell(ADD_EL).activate(); + bot.textWithLabel("El Name*").setText("user.name"); + bot.textWithLabel("Value").setText(EL_VALUE); + bot.radio("Folder: Any Page at the Same Folder").click(); + bot.button("Finish").click(); + + //Test check table with ELs + + bot.shell(PAGE_DESIGN).activate(); + SWTBotTable table = bot.table(); + String elName = table.cell(0, "El Expression"); + String scope = table.cell(0, "Scope"); + String elValue = table.cell(0, "Value"); + assertEquals("user.name",elName); + assertEquals("Folder",scope); + assertEquals(EL_VALUE, elValue); + + //Test close Design Options + + bot.button("OK").click(); + waitForJobs(); + + //Check page content + + checkVPEForTestPage("AddSubstitutedELExpressionTestPage.xml"); + checkVPEForHelloPage("AddSubstitutedELExpressionHelloPage.xml"); + checkVPEForTestPageFolder("RemoveSubstitutedELExpressionTestPage.xml"); + + //Test check the page in the same folder + + + + //Test open Page Design Options + + bot.toolbarButtonWithTooltip(PAGE_DESIGN).click(); + bot.shell(PAGE_DESIGN).activate(); + + //Test choose Substituted EL tab + + bot.tabItem(SUBSTITUTED_EL).activate(); + + //Delete item + + bot.table().select(0); + bot.button("Remove").click(); + bot.button("OK").click(); + + //Check VPE content + + checkVPEForTestPage("RemoveSubstitutedELExpressionTestPage.xml"); + checkVPEForHelloPage("RemoveSubstitutedELExpressionHelloPage.xml"); + checkVPEForTestPageFolder("RemoveSubstitutedELExpressionTestPage.xml"); + } + + @Override + protected void tearDown() throws Exception { + bot.viewByTitle(WidgetVariables.PACKAGE_EXPLORER).setFocus(); + SWTBot innerBot = bot.viewByTitle(WidgetVariables.PACKAGE_EXPLORER).bot(); + innerBot.tree().expandNode(JBT_TEST_PROJECT_NAME).expandNode("WebContent") + .getNode(TEST_FOLDER).select(); + bot.menu("Edit").menu("Delete").click(); + bot.shell("Confirm Delete").activate(); + bot.button("OK").click(); + waitForJobs(); + super.tearDown(); + } + + private void checkVPEForTestPageFolder(String testPageFolder) throws Throwable{ + + //Open hello page + + SWTBot innerBot = bot.viewByTitle(WidgetVariables.PACKAGE_EXPLORER).bot(); + SWTBotTree tree = innerBot.tree(); + tree.expandNode(JBT_TEST_PROJECT_NAME) + .expandNode("WebContent").expandNode(TEST_FOLDER) + .getNode(TEST_PAGE_FOR_FOLDER+".jsp").doubleClick(); + SWTBotEclipseEditor editor = bot.editorByTitle(TEST_PAGE_FOR_FOLDER+".jsp").toTextEditor(); + String editorText = editor.getText(); + editor.selectLine(9); + if (!"<body id=\"bodyId\">".equals(editor.getTextOnCurrentLine().trim())) { + editor.insertText("<body id=\"bodyId\">"); + } + editor.save(); + waitForJobs(); + + //Check page content + + try { + performContentTestByIDs(testPageFolder, bot.multiPageEditorByTitle(TEST_PAGE_FOR_FOLDER+".jsp")); + } catch (Throwable e) { + throw e; + }finally{ + editor.setText(editorText); + editor.saveAndClose(); + openPage(); + } + + } + +} Added: workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/pagedesign/PageDesignTestCase.java =================================================================== --- workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/pagedesign/PageDesignTestCase.java (rev 0) +++ workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/pagedesign/PageDesignTestCase.java 2009-08-26 19:21:00 UTC (rev 17281) @@ -0,0 +1,53 @@ +package org.jboss.tools.vpe.ui.bot.test.editor.pagedesign; + +import java.io.IOException; + +import org.eclipse.core.runtime.FileLocator; +import org.eclipse.core.runtime.Platform; +import org.eclipse.swtbot.swt.finder.SWTBot; +import org.eclipse.swtbot.swt.finder.exceptions.WidgetNotFoundException; +import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree; +import org.jboss.tools.ui.bot.test.WidgetVariables; +import org.jboss.tools.vpe.ui.bot.test.Activator; +import org.jboss.tools.vpe.ui.bot.test.VPEAutoTestCase; + +public abstract class PageDesignTestCase extends VPEAutoTestCase{ + + final static String PAGE_DESIGN = "Page Design Options"; + + @Override + protected void closeUnuseDialogs() { + try { + bot.shell(PAGE_DESIGN).close(); + } catch (WidgetNotFoundException e) { + } + } + + @Override + protected boolean isUnuseDialogOpened() { + boolean isOpened = false; + try { + bot.shell(PAGE_DESIGN).activate(); + isOpened = true; + } catch (WidgetNotFoundException e) { + } + return isOpened; + } + + void closePage(){ + bot.editorByTitle(TEST_PAGE).close(); + } + + void openPage(){ + SWTBot innerBot = bot.viewByTitle(WidgetVariables.PACKAGE_EXPLORER).bot(); + SWTBotTree tree = innerBot.tree(); + tree.expandNode(JBT_TEST_PROJECT_NAME) + .expandNode("WebContent").expandNode("pages").getNode(TEST_PAGE).doubleClick(); + } + + @Override + protected String getPathToResources(String testPage) throws IOException { + return FileLocator.toFileURL(Platform.getBundle(Activator.PLUGIN_ID).getEntry("/")).getFile()+"resources/pagedesign/"+testPage; + } + +} Added: workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/pagedesign/SubstitutedELTestCase.java =================================================================== --- workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/pagedesign/SubstitutedELTestCase.java (rev 0) +++ workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/pagedesign/SubstitutedELTestCase.java 2009-08-26 19:21:00 UTC (rev 17281) @@ -0,0 +1,129 @@ +package org.jboss.tools.vpe.ui.bot.test.editor.pagedesign; + +import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotEclipseEditor; +import org.eclipse.swtbot.swt.finder.SWTBot; +import org.eclipse.swtbot.swt.finder.exceptions.WidgetNotFoundException; +import org.eclipse.swtbot.swt.finder.widgets.SWTBotTable; +import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree; +import org.jboss.tools.ui.bot.test.WidgetVariables; + +public abstract class SubstitutedELTestCase extends PageDesignTestCase{ + + static final String ADD_EL = "Add EL Reference"; + static final String SUBSTITUTED_EL = "Substituted EL expressions"; + private SWTBotEclipseEditor editor; + private String editorText; + private String textHelloPage; + + + SWTBotEclipseEditor getEditor() { + return editor; + } + + void setEditor(SWTBotEclipseEditor editor) { + this.editor = editor; + } + + String getEditorText() { + return editorText; + } + + void setEditorText(String editorText) { + this.editorText = editorText; + } + + @Override + protected void closeUnuseDialogs() { + try { + bot.shell(ADD_EL).close(); + } catch (WidgetNotFoundException e) { + } + super.closeUnuseDialogs(); + } + + @Override + protected boolean isUnuseDialogOpened() { + boolean isOpened = super.isUnuseDialogOpened(); + try { + bot.shell(ADD_EL).activate(); + isOpened = true; + } catch (WidgetNotFoundException e) { + } + return isOpened; + } + + + void checkVPEForTestPage(String testPage) throws Throwable{ + editor.selectLine(9); + if (!"<body id=\"bodyId\">".equals(editor.getTextOnCurrentLine().trim())) { + editor.insertText("<body id=\"bodyId\">"); + } + editor.save(); + waitForJobs(); + performContentTestByIDs(testPage, bot.multiPageEditorByTitle(TEST_PAGE)); + } + + @Override + protected void setUp() throws Exception { + super.setUp(); + } + + @Override + protected void tearDown() throws Exception { + editor.setText(editorText); + editor.save(); + bot.toolbarButtonWithTooltip(PAGE_DESIGN).click(); + bot.shell(PAGE_DESIGN).activate(); + bot.tabItem(SUBSTITUTED_EL).activate(); + clearELTable(bot.table()); + try { + bot.button("OK").click(); + } catch (WidgetNotFoundException e) { + bot.shell(PAGE_DESIGN).close(); + } + super.tearDown(); + } + + void clearELTable(SWTBotTable table){ + try { + while (true) { + table.select(0); + bot.button("Remove").click(); + } + } catch (IllegalArgumentException e) { + } + catch (WidgetNotFoundException e) { + } + } + + void checkVPEForHelloPage(String testHelloPage) throws Throwable{ + + //Open hello page + + SWTBot innerBot = bot.viewByTitle(WidgetVariables.PACKAGE_EXPLORER).bot(); + SWTBotTree tree = innerBot.tree(); + tree.expandNode(JBT_TEST_PROJECT_NAME) + .expandNode("WebContent").expandNode("pages").getNode("hello.jsp").doubleClick(); + SWTBotEclipseEditor editor = bot.editorByTitle("hello.jsp").toTextEditor(); + textHelloPage = editor.getText(); + editor.selectLine(10); + if (!"<body id=\"bodyId\">".equals(editor.getTextOnCurrentLine().trim())) { + editor.insertText("<body id=\"bodyId\">"); + } + editor.save(); + waitForJobs(); + + //Check page content + + try { + performContentTestByIDs(testHelloPage, bot.multiPageEditorByTitle("hello.jsp")); + } catch (Throwable e) { + throw e; + }finally{ + editor.setText(textHelloPage); + editor.saveAndClose(); + openPage(); + } + } + +} Deleted: workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/ChangeEditorTabForTheFirstOpenPageTest.java =================================================================== --- workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/ChangeEditorTabForTheFirstOpenPageTest.java 2009-08-26 17:13:46 UTC (rev 17280) +++ workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/ChangeEditorTabForTheFirstOpenPageTest.java 2009-08-26 19:21:00 UTC (rev 17281) @@ -1,7 +0,0 @@ -package org.jboss.tools.vpe.ui.bot.test.editor.preferences; - -import org.jboss.tools.vpe.ui.bot.test.jbide.JBIDE4306Test; - -public class ChangeEditorTabForTheFirstOpenPageTest extends JBIDE4306Test{ - -} Copied: workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/ChangeEditorTabForTheFirstOpenPageTest.java (from rev 17213, workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/jbide/JBIDE4306Test.java) =================================================================== --- workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/ChangeEditorTabForTheFirstOpenPageTest.java (rev 0) +++ workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/ChangeEditorTabForTheFirstOpenPageTest.java 2009-08-26 19:21:00 UTC (rev 17281) @@ -0,0 +1,74 @@ +package org.jboss.tools.vpe.ui.bot.test.editor.preferences; + +import org.eclipse.swtbot.swt.finder.SWTBot; +import org.eclipse.swtbot.swt.finder.exceptions.WidgetNotFoundException; +import org.jboss.tools.ui.bot.test.WidgetVariables; + +public class ChangeEditorTabForTheFirstOpenPageTest extends PreferencesTestCase{ + + public void testChangeEditorTabForTheFirstOpenPage(){ + + //Test open page on visual/source tab + + openPage(); + + //Test set default source tab + + bot.toolbarButtonWithTooltip("Preferences").click(); + bot.shell("Preferences (Filtered)").activate(); + bot.comboBoxWithLabel("Select the default active editor's tab\nfor files that haven't been previously\nopened in the VPE:").setSelection("Source"); + bot.button("OK").click(); + + //Create and open new page + + SWTBot innerBot = bot.viewByTitle(WidgetVariables.PACKAGE_EXPLORER).bot(); + + innerBot.tree().expandNode(JBT_TEST_PROJECT_NAME).expandNode("WebContent") + .getNode("pages").select(); + + bot.menu("File").menu("New").menu("JSP File").click(); + bot.shell("New File JSP").activate(); + bot.textWithLabel("Name*").setText("testPage"); + bot.button("Finish").click(); + waitForJobs(); + bot.viewByTitle(WidgetVariables.PACKAGE_EXPLORER).setFocus(); + + //Check if the tab changed + + WidgetNotFoundException exception = null; + try { + bot.toolbarButtonWithTooltip("Refresh").click(); + } catch (WidgetNotFoundException e) { + exception = e; + } + assertNotNull(exception); + bot.editorByTitle("testPage.jsp").close(); + bot.editorByTitle(TEST_PAGE).setFocus(); + + //Test set default visual/source tab + + bot.toolbarButtonWithTooltip("Preferences").click(); + bot.shell("Preferences (Filtered)").activate(); + bot.comboBoxWithLabel("Select the default active editor's tab\nfor files that haven't been previously\nopened in the VPE:").setSelection("Visual/Source"); + bot.button("OK").click(); + bot.editorByTitle(TEST_PAGE).close(); + } + + @Override + protected void tearDown() throws Exception { + + //Delete test page if it has been created + try { + SWTBot innerBot = bot.viewByTitle(WidgetVariables.PACKAGE_EXPLORER).bot(); + innerBot.tree().expandNode(JBT_TEST_PROJECT_NAME).expandNode("WebContent") + .expandNode("pages").getNode("testPage.jsp").select(); + bot.menu("Edit").menu("Delete").click(); + bot.shell("Confirm Delete").activate(); + bot.button("OK").click(); + } catch (WidgetNotFoundException e) { + } + waitForJobs(); + super.tearDown(); + } + +} Modified: workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/PreferencesTestCase.java =================================================================== --- workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/PreferencesTestCase.java 2009-08-26 17:13:46 UTC (rev 17280) +++ workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/editor/preferences/PreferencesTestCase.java 2009-08-26 19:21:00 UTC (rev 17281) @@ -1,12 +1,17 @@ package org.jboss.tools.vpe.ui.bot.test.editor.preferences; +import java.io.IOException; + +import org.eclipse.core.runtime.FileLocator; +import org.eclipse.core.runtime.Platform; import org.eclipse.swtbot.swt.finder.SWTBot; import org.eclipse.swtbot.swt.finder.exceptions.WidgetNotFoundException; import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree; import org.jboss.tools.ui.bot.test.WidgetVariables; +import org.jboss.tools.vpe.ui.bot.test.Activator; import org.jboss.tools.vpe.ui.bot.test.VPEAutoTestCase; -public class PreferencesTestCase extends VPEAutoTestCase{ +public abstract class PreferencesTestCase extends VPEAutoTestCase{ @Override protected void closeUnuseDialogs() { @@ -34,8 +39,13 @@ void openPage(){ SWTBot innerBot = bot.viewByTitle(WidgetVariables.PACKAGE_EXPLORER).bot(); SWTBotTree tree = innerBot.tree(); - tree.expandNode(projectProperties.getProperty("JSFProjectName")) + tree.expandNode(JBT_TEST_PROJECT_NAME) .expandNode("WebContent").expandNode("pages").getNode(TEST_PAGE).doubleClick(); } + @Override + protected String getPathToResources(String testPage) throws IOException { + return FileLocator.toFileURL(Platform.getBundle(Activator.PLUGIN_ID).getEntry("/")).getFile()+"resources/preferences/"+testPage; + } + } Deleted: workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/jbide/JBIDE4306Test.java =================================================================== --- workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/jbide/JBIDE4306Test.java 2009-08-26 17:13:46 UTC (rev 17280) +++ workspace/yzhishko/org.jboss.tools.vpe.ui.bot.test/src/org/jboss/tools/vpe/ui/bot/test/jbide/JBIDE4306Test.java 2009-08-26 19:21:00 UTC (rev 17281) @@ -1,53 +0,0 @@ -package org.jboss.tools.vpe.ui.bot.test.jbide; - -import org.eclipse.swtbot.swt.finder.SWTBot; -import org.eclipse.swtbot.swt.finder.exceptions.WidgetNotFoundException; -import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree; -import org.jboss.tools.ui.bot.test.WidgetVariables; -import org.jboss.tools.vpe.ui.bot.test.editor.preferences.PreferencesTestCase; - -public class JBIDE4306Test extends PreferencesTestCase{ - - public void testJBIDE4306(){ - - //Test open page on visual/source tab - - SWTBot innerBot = bot.viewByTitle(WidgetVariables.PACKAGE_EXPLORER).bot(); - SWTBotTree tree = innerBot.tree(); - tree.expandNode(projectProperties.getProperty("JSFProjectName")) - .expandNode("WebContent").expandNode("pages").getNode(TEST_PAGE).doubleClick(); - - //Test set default source tab - - bot.toolbarButtonWithTooltip("Preferences").click(); - bot.shell("Preferences (Filtered)").activate(); - bot.comboBoxWithLabel("Select the default active editor's tab\nfor files that haven't been previously\nopened in the VPE:").setSelection("Source"); - bot.button("OK").click(); - innerBot = bot.viewByTitle(WidgetVariables.PACKAGE_EXPLORER).bot(); - tree = innerBot.tree(); - bot.viewByTitle(WidgetVariables.PACKAGE_EXPLORER).setFocus(); - tree.expandNode(projectProperties.getProperty("JSFProjectName")) - .expandNode("WebContent").expandNode("pages").getNode("hello.jsp").doubleClick(); - - //Check if the tab changed - - WidgetNotFoundException exception = null; - try { - bot.toolbarButtonWithTooltip("Refresh").click(); - } catch (WidgetNotFoundException e) { - exception = e; - } - assertNotNull(exception); - bot.editorByTitle("hello.jsp").close(); - bot.editorByTitle(TEST_PAGE).setFocus(); - - //Test set default visual/source tab - - bot.toolbarButtonWithTooltip("Preferences").click(); - bot.shell("Preferences (Filtered)").activate(); - bot.comboBoxWithLabel("Select the default active editor's tab\nfor files that haven't been previously\nopened in the VPE:").setSelection("Visual/Source"); - bot.button("OK").click(); - bot.editorByTitle(TEST_PAGE).close(); - } - -}

16 years, 4 months

1
0
0 / 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

jbosstools-commits August 2009