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. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * This is the item provider adapter for a + * {@link org.jboss.tools.smooks.model.javabean12.WiringType} object. <!-- + * begin-user-doc --> <!-- end-user-doc --> + * * @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. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * This constructs an instance from a factory and a notifier. <!-- + * begin-user-doc --> <!-- end-user-doc --> + * * @generated */ public WiringTypeItemProvider(AdapterFactory adapterFactory) { @@ -54,9 +44,9 @@ } /** - * This returns the property descriptors for the adapted class. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * This returns the property descriptors for the adapted class. <!-- + * begin-user-doc --> <!-- end-user-doc --> + * * @generated */ public List getPropertyDescriptors(Object object) { @@ -73,165 +63,125 @@ } /** - * This adds a property descriptor for the Bean Id Ref feature. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * This adds a property descriptor for the Bean Id Ref feature. <!-- + * begin-user-doc --> <!-- end-user-doc --> + * * @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. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * This adds a property descriptor for the Property feature. <!-- + * begin-user-doc --> <!-- end-user-doc --> + * * @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. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * This adds a property descriptor for the Setter Method feature. <!-- + * begin-user-doc --> <!-- end-user-doc --> + * * @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. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * This adds a property descriptor for the Wire On Element feature. <!-- + * begin-user-doc --> <!-- end-user-doc --> + * * @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. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * This adds a property descriptor for the Wire On Element NS feature. <!-- + * begin-user-doc --> <!-- end-user-doc --> + * * @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. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * This returns WiringType.gif. <!-- begin-user-doc --> <!-- end-user-doc + * --> + * * @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. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * This returns the label text for the adapted class. <!-- begin-user-doc + * --> <!-- end-user-doc --> + * * @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}. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * 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}. <!-- begin-user-doc --> <!-- + * end-user-doc --> + * * @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. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s + * describing the children that can be created under this object. <!-- + * begin-user-doc --> <!-- end-user-doc --> + * * @generated */ protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) { @@ -239,9 +189,9 @@ } /** - * Return the resource locator for this item provider's resources. - * <!-- begin-user-doc --> - * <!-- end-user-doc --> + * Return the resource locator for this item provider's resources. <!-- + * begin-user-doc --> <!-- end-user-doc --> + * * @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; }