diff options
27 files changed, 439 insertions, 162 deletions
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/OverviewComponentsSection.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/OverviewComponentsSection.java index c7f5016eb..4ef59aad6 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/OverviewComponentsSection.java +++ b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/src/org/eclipse/jst/jsf/facesconfig/ui/section/OverviewComponentsSection.java @@ -93,13 +93,13 @@ public class OverviewComponentsSection extends AbstractOverviewSection { TableColumn typecol = new TableColumn(table, SWT.LEFT); tablelayout.addColumnData(new ColumnWeightData(1, true)); typecol - .setText(EditorMessages.OverviewPage_ComponentsSection_table_typecol); + .setText(EditorMessages.OverviewPage_ComponentsSection_table_namecol); typecol.setResizable(true); TableColumn namecol = new TableColumn(table, SWT.LEFT); tablelayout.addColumnData(new ColumnWeightData(1, true)); namecol - .setText(EditorMessages.OverviewPage_ComponentsSection_table_namecol); + .setText(EditorMessages.OverviewPage_ComponentsSection_table_typecol); namecol.setResizable(true); return table; diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/edit/provider/ActionListenerTypeItemProvider.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/edit/provider/ActionListenerTypeItemProvider.java index db9605f4f..f27e6fdd0 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/edit/provider/ActionListenerTypeItemProvider.java +++ b/jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/edit/provider/ActionListenerTypeItemProvider.java @@ -136,13 +136,12 @@ public class ActionListenerTypeItemProvider extends ItemProviderAdapter * This returns the label text for the adapted class. * <!-- begin-user-doc * --> <!-- end-user-doc --> - * @generated + * @generated NOT */ public String getText(Object object) { - String label = ((ActionListenerType)object).getId(); - return label == null || label.length() == 0 ? - getString("_UI_ActionListenerType_type") : - getString("_UI_ActionListenerType_type") + " " + label; + String label = ((ActionListenerType) object).getTextContent(); + return label == null || label.length() == 0 ? getString("_UI_ActionListenerType_type") + : label; } /** diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/edit/provider/ApplicationFactoryTypeItemProvider.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/edit/provider/ApplicationFactoryTypeItemProvider.java index 8ae61e0e6..f2da63054 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/edit/provider/ApplicationFactoryTypeItemProvider.java +++ b/jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/edit/provider/ApplicationFactoryTypeItemProvider.java @@ -136,13 +136,12 @@ implements * This returns the label text for the adapted class. * <!-- begin-user-doc * --> <!-- end-user-doc --> - * @generated + * @generated NOT */ public String getText(Object object) { - String label = ((ApplicationFactoryType)object).getId(); - return label == null || label.length() == 0 ? - getString("_UI_ApplicationFactoryType_type") : - getString("_UI_ApplicationFactoryType_type") + " " + label; + String label = ((ApplicationFactoryType) object).getTextContent(); + return label == null || label.length() == 0 ? getString("_UI_ApplicationFactoryType_type") + : label; } /** diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/edit/provider/ComponentTypeItemProvider.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/edit/provider/ComponentTypeItemProvider.java index 96baac37a..c823f2e50 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/edit/provider/ComponentTypeItemProvider.java +++ b/jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/edit/provider/ComponentTypeItemProvider.java @@ -30,6 +30,7 @@ import org.eclipse.emf.edit.provider.ItemProviderAdapter; import org.eclipse.emf.edit.provider.ViewerNotification; import org.eclipse.jst.jsf.facesconfig.FacesConfigPlugin; import org.eclipse.jst.jsf.facesconfig.emf.ComponentType; +import org.eclipse.jst.jsf.facesconfig.emf.DisplayNameType; import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigFactory; import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigPackage; @@ -176,16 +177,16 @@ public class ComponentTypeItemProvider extends ItemProviderAdapter implements /** * This returns the label text for the adapted class. <!-- begin-user-doc * --> <!-- end-user-doc --> - * + * @generated NOT * */ public String getText(Object object) { String label = null; - // if (((ComponentType) object).getDisplayName() != null - // && ((ComponentType) object).getDisplayName().size() > 0) { - // label = ((DisplayNameType) ((ComponentType) object) - // .getDisplayName().get(0)).getTextContent(); - // } + if (((ComponentType) object).getDisplayName() != null + && ((ComponentType) object).getDisplayName().size() > 0) { + label = ((DisplayNameType) ((ComponentType) object) + .getDisplayName().get(0)).getTextContent(); + } if (label == null || label.length() == 0) { if (((ComponentType) object).getComponentClass() != null) { @@ -195,7 +196,8 @@ public class ComponentTypeItemProvider extends ItemProviderAdapter implements } return label == null || label.length() == 0 ? getString("_UI_ComponentType_type") //$NON-NLS-1$ - : getString("_UI_ComponentType_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$ + : label; +// : getString("_UI_ComponentType_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$ } /** @@ -307,13 +309,12 @@ public class ComponentTypeItemProvider extends ItemProviderAdapter implements * @see org.eclipse.emf.edit.provider.ITableItemLabelProvider#getColumnText(java.lang.Object, int) */ public String getColumnText(Object object, int columnIndex) { - ComponentType component = (ComponentType) object; switch (columnIndex) { + case 0: return getText(object); case 1: - return component.getComponentClass() == null ? "" : component //$NON-NLS-1$ - .getComponentClass().getTextContent(); + return getString("_UI_ComponentType_type"); //$NON-NLS-1$ } return null; } diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/edit/provider/ConverterTypeItemProvider.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/edit/provider/ConverterTypeItemProvider.java index 3b495ea39..1ad9ab6c9 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/edit/provider/ConverterTypeItemProvider.java +++ b/jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/edit/provider/ConverterTypeItemProvider.java @@ -30,6 +30,7 @@ import org.eclipse.emf.edit.provider.ItemProviderAdapter; import org.eclipse.emf.edit.provider.ViewerNotification; import org.eclipse.jst.jsf.facesconfig.FacesConfigPlugin; import org.eclipse.jst.jsf.facesconfig.emf.ConverterType; +import org.eclipse.jst.jsf.facesconfig.emf.DisplayNameType; import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigFactory; import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigPackage; @@ -142,17 +143,37 @@ public class ConverterTypeItemProvider extends ItemProviderAdapter implements return overlayImage(object, getResourceLocator().getImage("full/obj16/ConverterType")); } - /** - * This returns the label text for the adapted class. - * <!-- begin-user-doc + /** + * This returns the label text for the adapted class. <!-- begin-user-doc * --> <!-- end-user-doc --> - * @generated + * + * @generated NOT */ public String getText(Object object) { - String label = ((ConverterType)object).getId(); - return label == null || label.length() == 0 ? - getString("_UI_ConverterType_type") : - getString("_UI_ConverterType_type") + " " + label; + String label = null; + + if (((ConverterType) object).getDisplayName() != null + && ((ConverterType) object).getDisplayName().size() > 0) { + label = ((DisplayNameType) ((ConverterType) object) + .getDisplayName().get(0)).getTextContent(); + } + + if (label == null && ((ConverterType) object).getConverterId() != null) { + label = ((ConverterType) object).getConverterId().getTextContent(); + } + + if (label == null || label.length() == 0) { + if (((ConverterType) object).getConverterClass() != null) + label = ((ConverterType) object).getConverterClass() + .getTextContent(); + } + if (label == null || label.length() ==0) { + label = ((ConverterType) object).getId(); + } + + return label == null || label.length() == 0 ? getString("_UI_ConverterType_type") + : label; +// : getString("_UI_ConverterType_type") + " " + label; } /** @@ -263,13 +284,12 @@ public class ConverterTypeItemProvider extends ItemProviderAdapter implements * @see org.eclipse.emf.edit.provider.ITableItemLabelProvider#getColumnText(java.lang.Object, int) */ public String getColumnText(Object object, int columnIndex) { - ConverterType converter = (ConverterType) object; switch (columnIndex) { + case 0: return getText(object); case 1: - return converter.getConverterClass() == null ? "" : converter //$NON-NLS-1$ - .getConverterClass().getTextContent(); + return getString("_UI_ConverterType_type"); //$NON-NLS-1$ } return null; } diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/edit/provider/DefaultRenderKitIdTypeItemProvider.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/edit/provider/DefaultRenderKitIdTypeItemProvider.java index 0116f9692..82efd15c3 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/edit/provider/DefaultRenderKitIdTypeItemProvider.java +++ b/jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/edit/provider/DefaultRenderKitIdTypeItemProvider.java @@ -134,13 +134,12 @@ public class DefaultRenderKitIdTypeItemProvider extends ItemProviderAdapter * This returns the label text for the adapted class. * <!-- begin-user-doc * --> <!-- end-user-doc --> - * @generated + * @generated NOT */ public String getText(Object object) { - String label = ((DefaultRenderKitIdType)object).getId(); - return label == null || label.length() == 0 ? - getString("_UI_DefaultRenderKitIdType_type") : - getString("_UI_DefaultRenderKitIdType_type") + " " + label; + String label = ((DefaultRenderKitIdType) object).getTextContent(); + return label == null || label.length() == 0 ? getString("_UI_DefaultRenderKitIdType_type") + : label; } /** diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/edit/provider/ExceptionHandlerFactoryTypeItemProvider.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/edit/provider/ExceptionHandlerFactoryTypeItemProvider.java index d9deefd08..654f40f33 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/edit/provider/ExceptionHandlerFactoryTypeItemProvider.java +++ b/jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/edit/provider/ExceptionHandlerFactoryTypeItemProvider.java @@ -23,6 +23,7 @@ import org.eclipse.emf.edit.provider.IEditingDomainItemProvider; import org.eclipse.emf.edit.provider.IItemLabelProvider; import org.eclipse.emf.edit.provider.IItemPropertySource; import org.eclipse.emf.edit.provider.IStructuredItemContentProvider; +import org.eclipse.emf.edit.provider.ITableItemLabelProvider; import org.eclipse.emf.edit.provider.ITreeItemContentProvider; import org.eclipse.emf.edit.provider.ItemPropertyDescriptor; import org.eclipse.emf.edit.provider.ItemProviderAdapter; @@ -34,6 +35,7 @@ import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigPackage; /** * This is the item provider adapter for a {@link org.eclipse.jst.jsf.facesconfig.emf.ExceptionHandlerFactoryType} object. * <!-- begin-user-doc --> + * @extends ITableItemLabelProvider * <!-- end-user-doc --> * @generated */ @@ -45,7 +47,8 @@ public class ExceptionHandlerFactoryTypeItemProvider IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, - IItemPropertySource { + IItemPropertySource, + ITableItemLabelProvider{ /** * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -140,13 +143,12 @@ public class ExceptionHandlerFactoryTypeItemProvider * This returns the label text for the adapted class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @generated + * @generated NOT */ public String getText(Object object) { - String label = ((ExceptionHandlerFactoryType)object).getId(); - return label == null || label.length() == 0 ? - getString("_UI_ExceptionHandlerFactoryType_type") : - getString("_UI_ExceptionHandlerFactoryType_type") + " " + label; + String label = ((ExceptionHandlerFactoryType) object).getTextContent(); + return label == null || label.length() == 0 ? getString("_UI_ExceptionHandlerFactoryType_type") + : label; } /** @@ -188,5 +190,27 @@ public class ExceptionHandlerFactoryTypeItemProvider public ResourceLocator getResourceLocator() { return FacesConfigPlugin.INSTANCE; } + /* (non-Javadoc) + * @see org.eclipse.emf.edit.provider.ITableItemLabelProvider#getColumnImage(java.lang.Object, int) + */ + public Object getColumnImage(Object object, int columnIndex) { + // TODO Auto-generated method stub + if(columnIndex ==0) + return getImage(object); + return null; + } + /* (non-Javadoc) + * @see org.eclipse.emf.edit.provider.ITableItemLabelProvider#getColumnText(java.lang.Object, int) + */ + public String getColumnText(Object object, int columnIndex) { + switch (columnIndex) { + + case 0: + return getText(object); + case 1: + return getString("_UI_ExceptionHandlerFactoryType_type"); //$NON-NLS-1$ + } + return null; + } } diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/edit/provider/ExternalContextFactoryTypeItemProvider.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/edit/provider/ExternalContextFactoryTypeItemProvider.java index 165548f99..6e2d0e391 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/edit/provider/ExternalContextFactoryTypeItemProvider.java +++ b/jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/edit/provider/ExternalContextFactoryTypeItemProvider.java @@ -23,6 +23,7 @@ import org.eclipse.emf.edit.provider.IEditingDomainItemProvider; import org.eclipse.emf.edit.provider.IItemLabelProvider; import org.eclipse.emf.edit.provider.IItemPropertySource; import org.eclipse.emf.edit.provider.IStructuredItemContentProvider; +import org.eclipse.emf.edit.provider.ITableItemLabelProvider; import org.eclipse.emf.edit.provider.ITreeItemContentProvider; import org.eclipse.emf.edit.provider.ItemPropertyDescriptor; import org.eclipse.emf.edit.provider.ItemProviderAdapter; @@ -34,6 +35,7 @@ import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigPackage; /** * This is the item provider adapter for a {@link org.eclipse.jst.jsf.facesconfig.emf.ExternalContextFactoryType} object. * <!-- begin-user-doc --> + * @extends ITableItemLabelProvider * <!-- end-user-doc --> * @generated */ @@ -45,7 +47,8 @@ public class ExternalContextFactoryTypeItemProvider IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, - IItemPropertySource { + IItemPropertySource, + ITableItemLabelProvider{ /** * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -140,13 +143,12 @@ public class ExternalContextFactoryTypeItemProvider * This returns the label text for the adapted class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @generated + * @generated NOT */ public String getText(Object object) { - String label = ((ExternalContextFactoryType)object).getId(); - return label == null || label.length() == 0 ? - getString("_UI_ExternalContextFactoryType_type") : - getString("_UI_ExternalContextFactoryType_type") + " " + label; + String label = ((ExternalContextFactoryType) object).getTextContent(); + return label == null || label.length() == 0 ? getString("_UI_ExternalContextFactoryType_type") + : label; } /** @@ -188,5 +190,29 @@ public class ExternalContextFactoryTypeItemProvider public ResourceLocator getResourceLocator() { return FacesConfigPlugin.INSTANCE; } + + /* (non-Javadoc) + * @see org.eclipse.emf.edit.provider.ITableItemLabelProvider#getColumnImage(java.lang.Object, int) + */ + public Object getColumnImage(Object object, int columnIndex) { + // TODO Auto-generated method stub + if(columnIndex ==0) + return getImage(object); + return null; + } + + /* (non-Javadoc) + * @see org.eclipse.emf.edit.provider.ITableItemLabelProvider#getColumnText(java.lang.Object, int) + */ + public String getColumnText(Object object, int columnIndex) { + switch (columnIndex) { + + case 0: + return getText(object); + case 1: + return getString("_UI_ExternalContextFactoryType_type"); //$NON-NLS-1$ + } + return null; + } } diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/edit/provider/FacesContextFactoryTypeItemProvider.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/edit/provider/FacesContextFactoryTypeItemProvider.java index 661b762fa..2fe6e237d 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/edit/provider/FacesContextFactoryTypeItemProvider.java +++ b/jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/edit/provider/FacesContextFactoryTypeItemProvider.java @@ -134,13 +134,12 @@ public class FacesContextFactoryTypeItemProvider extends ItemProviderAdapter * This returns the label text for the adapted class. * <!-- begin-user-doc * --> <!-- end-user-doc --> - * @generated + * @generated NOT */ public String getText(Object object) { - String label = ((FacesContextFactoryType)object).getId(); - return label == null || label.length() == 0 ? - getString("_UI_FacesContextFactoryType_type") : - getString("_UI_FacesContextFactoryType_type") + " " + label; + String label = ((FacesContextFactoryType) object).getTextContent(); + return label == null || label.length() == 0 ? getString("_UI_FacesContextFactoryType_type") + : label; } /** diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/edit/provider/LifecycleExtensionTypeItemProvider.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/edit/provider/LifecycleExtensionTypeItemProvider.java index d52066981..fa06c3947 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/edit/provider/LifecycleExtensionTypeItemProvider.java +++ b/jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/edit/provider/LifecycleExtensionTypeItemProvider.java @@ -21,12 +21,14 @@ import org.eclipse.emf.edit.provider.IEditingDomainItemProvider; import org.eclipse.emf.edit.provider.IItemLabelProvider; import org.eclipse.emf.edit.provider.IItemPropertySource; import org.eclipse.emf.edit.provider.IStructuredItemContentProvider; +import org.eclipse.emf.edit.provider.ITableItemLabelProvider; import org.eclipse.emf.edit.provider.ITreeItemContentProvider; import org.eclipse.jst.jsf.facesconfig.emf.LifecycleExtensionType; /** * This is the item provider adapter for a {@link org.eclipse.jst.jsf.facesconfig.emf.LifecycleExtensionType} object. * <!-- begin-user-doc --> + * @extends ITableItemLabelProvider * <!-- end-user-doc --> * @generated */ @@ -38,7 +40,8 @@ public class LifecycleExtensionTypeItemProvider IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, - IItemPropertySource { + IItemPropertySource, + ITableItemLabelProvider{ /** * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -86,13 +89,12 @@ public class LifecycleExtensionTypeItemProvider * This returns the label text for the adapted class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @generated + * @generated NOT */ - public String getText(Object object) { - String label = ((LifecycleExtensionType)object).getId(); - return label == null || label.length() == 0 ? - getString("_UI_LifecycleExtensionType_type") : - getString("_UI_LifecycleExtensionType_type") + " " + label; + public String getText(Object object) { + String label = ((LifecycleExtensionType) object).getTextContent(); + return label == null || label.length() == 0 ? getString("_UI_LifecycleExtensionType_type") + : label; } /** @@ -117,5 +119,27 @@ public class LifecycleExtensionTypeItemProvider protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) { super.collectNewChildDescriptors(newChildDescriptors, object); } + /* (non-Javadoc) + * @see org.eclipse.emf.edit.provider.ITableItemLabelProvider#getColumnImage(java.lang.Object, int) + */ + public Object getColumnImage(Object object, int columnIndex) { + // TODO Auto-generated method stub + if(columnIndex ==0) + return getImage(object); + return null; + } + /* (non-Javadoc) + * @see org.eclipse.emf.edit.provider.ITableItemLabelProvider#getColumnText(java.lang.Object, int) + */ + public String getColumnText(Object object, int columnIndex) { + switch (columnIndex) { + + case 0: + return getText(object); + case 1: + return getString("_UI_LifecycleExtensionType_type"); //$NON-NLS-1$ + } + return null; + } } diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/edit/provider/LifecycleFactoryTypeItemProvider.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/edit/provider/LifecycleFactoryTypeItemProvider.java index 89ee6526e..58fbeca04 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/edit/provider/LifecycleFactoryTypeItemProvider.java +++ b/jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/edit/provider/LifecycleFactoryTypeItemProvider.java @@ -134,13 +134,12 @@ public class LifecycleFactoryTypeItemProvider extends ItemProviderAdapter * This returns the label text for the adapted class. * <!-- begin-user-doc * --> <!-- end-user-doc --> - * @generated + * @generated NOT */ public String getText(Object object) { - String label = ((LifecycleFactoryType)object).getId(); - return label == null || label.length() == 0 ? - getString("_UI_LifecycleFactoryType_type") : - getString("_UI_LifecycleFactoryType_type") + " " + label; + String label = ((LifecycleFactoryType) object).getTextContent(); + return label == null || label.length() == 0 ? getString("_UI_LifecycleFactoryType_type") + : label; } /** diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/edit/provider/LocaleConfigTypeItemProvider.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/edit/provider/LocaleConfigTypeItemProvider.java index e8e3dfe91..adc2f0e88 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/edit/provider/LocaleConfigTypeItemProvider.java +++ b/jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/edit/provider/LocaleConfigTypeItemProvider.java @@ -33,6 +33,7 @@ import org.eclipse.jst.jsf.facesconfig.FacesConfigPlugin; import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigFactory; import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigPackage; import org.eclipse.jst.jsf.facesconfig.emf.LocaleConfigType; +import org.eclipse.jst.jsf.facesconfig.emf.SupportedLocaleType; /** * This is the item provider adapter for a {@link org.eclipse.jst.jsf.facesconfig.emf.LocaleConfigType} object. @@ -147,10 +148,29 @@ public class LocaleConfigTypeItemProvider * @generated NOT */ public String getText(Object object) { - String label = ((LocaleConfigType)object).getId(); + String label = null; + + final StringBuffer buf = new StringBuffer(); + final LocaleConfigType l = (LocaleConfigType)object; + + if (l.getDefaultLocale() != null) + buf.append(l.getDefaultLocale().getTextContent()); + + for (final Object locObj : l.getSupportedLocale()) { + final SupportedLocaleType loc = (SupportedLocaleType)locObj; + if (loc.getTextContent() != null) { + if (buf.toString() != null) { + buf.append(','); + } + buf.append(loc.getTextContent()); + } + } + label = buf.toString(); + return label == null || label.length() == 0 ? - getString("_UI_LocaleConfigType_type") : //$NON-NLS-1$ - getString("_UI_LocaleConfigType_type") + " " + label; //$NON-NLS-1$//$NON-NLS-2$ + getString("_UI_LocaleConfigType_type") //$NON-NLS-1$ + : label; + } /** diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/edit/provider/MessageBundleTypeItemProvider.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/edit/provider/MessageBundleTypeItemProvider.java index 27094b87c..56d4ce023 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/edit/provider/MessageBundleTypeItemProvider.java +++ b/jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/edit/provider/MessageBundleTypeItemProvider.java @@ -134,13 +134,12 @@ public class MessageBundleTypeItemProvider extends ItemProviderAdapter * This returns the label text for the adapted class. * <!-- begin-user-doc * --> <!-- end-user-doc --> - * @generated + * @generated NOT */ public String getText(Object object) { - String label = ((MessageBundleType)object).getId(); - return label == null || label.length() == 0 ? - getString("_UI_MessageBundleType_type") : - getString("_UI_MessageBundleType_type") + " " + label; + String label = ((MessageBundleType) object).getTextContent(); + return label == null || label.length() == 0 ? getString("_UI_MessageBundleType_type") + : label; } /** diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/edit/provider/NavigationHandlerTypeItemProvider.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/edit/provider/NavigationHandlerTypeItemProvider.java index 6d5fa2ce8..c61240b76 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/edit/provider/NavigationHandlerTypeItemProvider.java +++ b/jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/edit/provider/NavigationHandlerTypeItemProvider.java @@ -134,13 +134,12 @@ public class NavigationHandlerTypeItemProvider extends ItemProviderAdapter * This returns the label text for the adapted class. * <!-- begin-user-doc * --> <!-- end-user-doc --> - * @generated + * @generated NOT */ public String getText(Object object) { - String label = ((NavigationHandlerType)object).getId(); - return label == null || label.length() == 0 ? - getString("_UI_NavigationHandlerType_type") : - getString("_UI_NavigationHandlerType_type") + " " + label; + String label = ((NavigationHandlerType) object).getTextContent(); + return label == null || label.length() == 0 ? getString("_UI_NavigationHandlerType_type") + : label; } /** diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/edit/provider/PartialViewContextFactoryTypeItemProvider.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/edit/provider/PartialViewContextFactoryTypeItemProvider.java index 8288f7eab..228d21418 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/edit/provider/PartialViewContextFactoryTypeItemProvider.java +++ b/jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/edit/provider/PartialViewContextFactoryTypeItemProvider.java @@ -23,6 +23,7 @@ import org.eclipse.emf.edit.provider.IEditingDomainItemProvider; import org.eclipse.emf.edit.provider.IItemLabelProvider; import org.eclipse.emf.edit.provider.IItemPropertySource; import org.eclipse.emf.edit.provider.IStructuredItemContentProvider; +import org.eclipse.emf.edit.provider.ITableItemLabelProvider; import org.eclipse.emf.edit.provider.ITreeItemContentProvider; import org.eclipse.emf.edit.provider.ItemPropertyDescriptor; import org.eclipse.emf.edit.provider.ItemProviderAdapter; @@ -34,6 +35,7 @@ import org.eclipse.jst.jsf.facesconfig.emf.PartialViewContextFactoryType; /** * This is the item provider adapter for a {@link org.eclipse.jst.jsf.facesconfig.emf.PartialViewContextFactoryType} object. * <!-- begin-user-doc --> + * @extends ITableItemLabelProvider * <!-- end-user-doc --> * @generated */ @@ -45,7 +47,8 @@ public class PartialViewContextFactoryTypeItemProvider IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, - IItemPropertySource { + IItemPropertySource, + ITableItemLabelProvider{ /** * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -140,13 +143,12 @@ public class PartialViewContextFactoryTypeItemProvider * This returns the label text for the adapted class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @generated + * @generated NOT */ public String getText(Object object) { - String label = ((PartialViewContextFactoryType)object).getId(); - return label == null || label.length() == 0 ? - getString("_UI_PartialViewContextFactoryType_type") : - getString("_UI_PartialViewContextFactoryType_type") + " " + label; + String label = ((PartialViewContextFactoryType) object).getTextContent(); + return label == null || label.length() == 0 ? getString("_UI_PartialViewContextFactoryType_type") + : label; } /** @@ -188,5 +190,27 @@ public class PartialViewContextFactoryTypeItemProvider public ResourceLocator getResourceLocator() { return FacesConfigPlugin.INSTANCE; } + /* (non-Javadoc) + * @see org.eclipse.emf.edit.provider.ITableItemLabelProvider#getColumnImage(java.lang.Object, int) + */ + public Object getColumnImage(Object object, int columnIndex) { + // TODO Auto-generated method stub + if(columnIndex ==0) + return getImage(object); + return null; + } + /* (non-Javadoc) + * @see org.eclipse.emf.edit.provider.ITableItemLabelProvider#getColumnText(java.lang.Object, int) + */ + public String getColumnText(Object object, int columnIndex) { + switch (columnIndex) { + + case 0: + return getText(object); + case 1: + return getString("_UI_PartialViewContextFactoryType_type"); //$NON-NLS-1$ + } + return null; + } } diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/edit/provider/PhaseListenerTypeItemProvider.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/edit/provider/PhaseListenerTypeItemProvider.java index 40d51df0d..9eec94185 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/edit/provider/PhaseListenerTypeItemProvider.java +++ b/jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/edit/provider/PhaseListenerTypeItemProvider.java @@ -134,13 +134,12 @@ public class PhaseListenerTypeItemProvider extends ItemProviderAdapter * This returns the label text for the adapted class. * <!-- begin-user-doc * --> <!-- end-user-doc --> - * @generated + * @generated NOT */ public String getText(Object object) { - String label = ((PhaseListenerType)object).getId(); - return label == null || label.length() == 0 ? - getString("_UI_PhaseListenerType_type") : - getString("_UI_PhaseListenerType_type") + " " + label; + String label = ((PhaseListenerType) object).getTextContent(); + return label == null || label.length() == 0 ? getString("_UI_PhaseListenerType_type") + : label; } /** diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/edit/provider/PropertyResolverTypeItemProvider.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/edit/provider/PropertyResolverTypeItemProvider.java index 0559dcd76..e26873da4 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/edit/provider/PropertyResolverTypeItemProvider.java +++ b/jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/edit/provider/PropertyResolverTypeItemProvider.java @@ -134,13 +134,12 @@ public class PropertyResolverTypeItemProvider extends ItemProviderAdapter * This returns the label text for the adapted class. * <!-- begin-user-doc * --> <!-- end-user-doc --> - * @generated + * @generated NOT */ public String getText(Object object) { - String label = ((PropertyResolverType)object).getId(); - return label == null || label.length() == 0 ? - getString("_UI_PropertyResolverType_type") : - getString("_UI_PropertyResolverType_type") + " " + label; + String label = ((PropertyResolverType) object).getTextContent(); + return label == null || label.length() == 0 ? getString("_UI_PropertyResolverType_type") + : label; } /** diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/edit/provider/RenderKitFactoryTypeItemProvider.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/edit/provider/RenderKitFactoryTypeItemProvider.java index e85d89edb..804431ad8 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/edit/provider/RenderKitFactoryTypeItemProvider.java +++ b/jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/edit/provider/RenderKitFactoryTypeItemProvider.java @@ -134,13 +134,12 @@ public class RenderKitFactoryTypeItemProvider extends ItemProviderAdapter * This returns the label text for the adapted class. * <!-- begin-user-doc * --> <!-- end-user-doc --> - * @generated + * @generated NOT */ public String getText(Object object) { - String label = ((RenderKitFactoryType)object).getId(); - return label == null || label.length() == 0 ? - getString("_UI_RenderKitFactoryType_type") : - getString("_UI_RenderKitFactoryType_type") + " " + label; + String label = ((RenderKitFactoryType) object).getTextContent(); + return label == null || label.length() == 0 ? getString("_UI_RenderKitFactoryType_type") + : label; } /** diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/edit/provider/RenderKitTypeItemProvider.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/edit/provider/RenderKitTypeItemProvider.java index 286126414..560e7a1de 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/edit/provider/RenderKitTypeItemProvider.java +++ b/jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/edit/provider/RenderKitTypeItemProvider.java @@ -29,6 +29,7 @@ import org.eclipse.emf.edit.provider.ItemPropertyDescriptor; import org.eclipse.emf.edit.provider.ItemProviderAdapter; import org.eclipse.emf.edit.provider.ViewerNotification; import org.eclipse.jst.jsf.facesconfig.FacesConfigPlugin; +import org.eclipse.jst.jsf.facesconfig.emf.DisplayNameType; import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigFactory; import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigPackage; import org.eclipse.jst.jsf.facesconfig.emf.RenderKitType; @@ -141,17 +142,40 @@ public class RenderKitTypeItemProvider extends ItemProviderAdapter implements return overlayImage(object, getResourceLocator().getImage("full/obj16/RenderKitType")); } - /** - * This returns the label text for the adapted class. - * <!-- begin-user-doc + /** + * This returns the label text for the adapted class. <!-- begin-user-doc * --> <!-- end-user-doc --> - * @generated + * + * @generated NOT */ public String getText(Object object) { - String label = ((RenderKitType)object).getId(); - return label == null || label.length() == 0 ? - getString("_UI_RenderKitType_type") : - getString("_UI_RenderKitType_type") + " " + label; + + String label = null; + + if (((RenderKitType) object).getDisplayName() != null + && ((RenderKitType) object).getDisplayName().size() > 0) { + label = ((DisplayNameType) ((RenderKitType) object) + .getDisplayName().get(0)).getTextContent(); + } + + if ((label == null || label.length() == 0) && ((RenderKitType) object).getRenderKitId() != null + && ((RenderKitType) object).getRenderKitId().getTextContent() != null) { + label = ((RenderKitType) object).getRenderKitId().getTextContent(); + } + + if (label == null || label.length() == 0) { + if (((RenderKitType) object).getRenderKitClass() != null) + label = ((RenderKitType) object).getRenderKitClass() + .getTextContent(); + } + + if (label == null || label.length() == 0) { + label = ((RenderKitType) object).getId(); + } + + return label == null || label.length() == 0 ? getString("_UI_RenderKitType_type") + : label; +// : getString("_UI_RenderKitType_type") + " " + label; } /** @@ -257,13 +281,21 @@ public class RenderKitTypeItemProvider extends ItemProviderAdapter implements * @see org.eclipse.emf.edit.provider.ITableItemLabelProvider#getColumnText(java.lang.Object, int) */ public String getColumnText(Object object, int columnIndex) { - RenderKitType renderkit = (RenderKitType) object; +// RenderKitType renderkit = (RenderKitType) object; +// switch (columnIndex) { +// case 0: +// return getText(object); +// case 1: +// return renderkit.getRenderKitClass() == null ? "" : renderkit //$NON-NLS-1$ +// .getRenderKitClass().getTextContent(); +// } +// return null; +// RenderKitType renderkit = (RenderKitType) object; switch (columnIndex) { case 0: return getText(object); case 1: - return renderkit.getRenderKitClass() == null ? "" : renderkit //$NON-NLS-1$ - .getRenderKitClass().getTextContent(); + return getString("_UI_RenderKitType_type"); //$NON-NLS-1$ } return null; } diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/edit/provider/ResourceHandlerTypeItemProvider.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/edit/provider/ResourceHandlerTypeItemProvider.java index e1c0dfbf8..0324d2101 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/edit/provider/ResourceHandlerTypeItemProvider.java +++ b/jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/edit/provider/ResourceHandlerTypeItemProvider.java @@ -23,6 +23,7 @@ import org.eclipse.emf.edit.provider.IEditingDomainItemProvider; import org.eclipse.emf.edit.provider.IItemLabelProvider; import org.eclipse.emf.edit.provider.IItemPropertySource; import org.eclipse.emf.edit.provider.IStructuredItemContentProvider; +import org.eclipse.emf.edit.provider.ITableItemLabelProvider; import org.eclipse.emf.edit.provider.ITreeItemContentProvider; import org.eclipse.emf.edit.provider.ItemPropertyDescriptor; import org.eclipse.emf.edit.provider.ItemProviderAdapter; @@ -34,6 +35,7 @@ import org.eclipse.jst.jsf.facesconfig.emf.ResourceHandlerType; /** * This is the item provider adapter for a {@link org.eclipse.jst.jsf.facesconfig.emf.ResourceHandlerType} object. * <!-- begin-user-doc --> + * @extends ITableItemLabelProvider * <!-- end-user-doc --> * @generated */ @@ -45,7 +47,8 @@ public class ResourceHandlerTypeItemProvider IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, - IItemPropertySource { + IItemPropertySource, + ITableItemLabelProvider{ /** * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -140,13 +143,12 @@ public class ResourceHandlerTypeItemProvider * This returns the label text for the adapted class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @generated + * @generated NOT */ public String getText(Object object) { - String label = ((ResourceHandlerType)object).getId(); - return label == null || label.length() == 0 ? - getString("_UI_ResourceHandlerType_type") : - getString("_UI_ResourceHandlerType_type") + " " + label; + String label = ((ResourceHandlerType) object).getTextContent(); + return label == null || label.length() == 0 ? getString("_UI_ResourceHandlerType_type") + : label; } /** @@ -188,5 +190,27 @@ public class ResourceHandlerTypeItemProvider public ResourceLocator getResourceLocator() { return FacesConfigPlugin.INSTANCE; } + /* (non-Javadoc) + * @see org.eclipse.emf.edit.provider.ITableItemLabelProvider#getColumnImage(java.lang.Object, int) + */ + public Object getColumnImage(Object object, int columnIndex) { + // TODO Auto-generated method stub + if(columnIndex ==0) + return getImage(object); + return null; + } + /* (non-Javadoc) + * @see org.eclipse.emf.edit.provider.ITableItemLabelProvider#getColumnText(java.lang.Object, int) + */ + public String getColumnText(Object object, int columnIndex) { + switch (columnIndex) { + + case 0: + return getText(object); + case 1: + return getString("_UI_ResourceHandlerType_type"); //$NON-NLS-1$ + } + return null; + } } diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/edit/provider/StateManagerTypeItemProvider.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/edit/provider/StateManagerTypeItemProvider.java index ca50a836d..2e9cd5b47 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/edit/provider/StateManagerTypeItemProvider.java +++ b/jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/edit/provider/StateManagerTypeItemProvider.java @@ -134,13 +134,12 @@ public class StateManagerTypeItemProvider extends ItemProviderAdapter implements * This returns the label text for the adapted class. * <!-- begin-user-doc * --> <!-- end-user-doc --> - * @generated + * @generated NOT */ public String getText(Object object) { - String label = ((StateManagerType)object).getId(); - return label == null || label.length() == 0 ? - getString("_UI_StateManagerType_type") : - getString("_UI_StateManagerType_type") + " " + label; + String label = ((StateManagerType) object).getTextContent(); + return label == null || label.length() == 0 ? getString("_UI_StateManagerType_type") + : label; } /** diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/edit/provider/TagHandlerDelegateFactoryTypeItemProvider.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/edit/provider/TagHandlerDelegateFactoryTypeItemProvider.java index bdde5cc20..c13c9e765 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/edit/provider/TagHandlerDelegateFactoryTypeItemProvider.java +++ b/jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/edit/provider/TagHandlerDelegateFactoryTypeItemProvider.java @@ -23,6 +23,7 @@ import org.eclipse.emf.edit.provider.IEditingDomainItemProvider; import org.eclipse.emf.edit.provider.IItemLabelProvider; import org.eclipse.emf.edit.provider.IItemPropertySource; import org.eclipse.emf.edit.provider.IStructuredItemContentProvider; +import org.eclipse.emf.edit.provider.ITableItemLabelProvider; import org.eclipse.emf.edit.provider.ITreeItemContentProvider; import org.eclipse.emf.edit.provider.ItemPropertyDescriptor; import org.eclipse.emf.edit.provider.ItemProviderAdapter; @@ -34,6 +35,7 @@ import org.eclipse.jst.jsf.facesconfig.emf.TagHandlerDelegateFactoryType; /** * This is the item provider adapter for a {@link org.eclipse.jst.jsf.facesconfig.emf.TagHandlerDelegateFactoryType} object. * <!-- begin-user-doc --> + * @extends ITableItemLabelProvider * <!-- end-user-doc --> * @generated */ @@ -45,7 +47,8 @@ public class TagHandlerDelegateFactoryTypeItemProvider IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, - IItemPropertySource { + IItemPropertySource, + ITableItemLabelProvider{ /** * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -140,13 +143,12 @@ public class TagHandlerDelegateFactoryTypeItemProvider * This returns the label text for the adapted class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @generated + * @generated NOT */ public String getText(Object object) { - String label = ((TagHandlerDelegateFactoryType)object).getId(); - return label == null || label.length() == 0 ? - getString("_UI_TagHandlerDelegateFactoryType_type") : - getString("_UI_TagHandlerDelegateFactoryType_type") + " " + label; + String label = ((TagHandlerDelegateFactoryType) object).getTextContent(); + return label == null || label.length() == 0 ? getString("_UI_TagHandlerDelegateFactoryType_type") + : label; } /** @@ -189,4 +191,27 @@ public class TagHandlerDelegateFactoryTypeItemProvider return FacesConfigPlugin.INSTANCE; } + /* (non-Javadoc) + * @see org.eclipse.emf.edit.provider.ITableItemLabelProvider#getColumnImage(java.lang.Object, int) + */ + public Object getColumnImage(Object object, int columnIndex) { + // TODO Auto-generated method stub + if(columnIndex ==0) + return getImage(object); + return null; + } + + /* (non-Javadoc) + * @see org.eclipse.emf.edit.provider.ITableItemLabelProvider#getColumnText(java.lang.Object, int) + */ + public String getColumnText(Object object, int columnIndex) { + switch (columnIndex) { + + case 0: + return getText(object); + case 1: + return getString("_UI_TagHandlerDelegateFactoryType_type"); //$NON-NLS-1$ + } + return null; + } } diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/edit/provider/ValidatorTypeItemProvider.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/edit/provider/ValidatorTypeItemProvider.java index fc49619a1..59cbdc79f 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/edit/provider/ValidatorTypeItemProvider.java +++ b/jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/edit/provider/ValidatorTypeItemProvider.java @@ -29,6 +29,7 @@ import org.eclipse.emf.edit.provider.ItemPropertyDescriptor; import org.eclipse.emf.edit.provider.ItemProviderAdapter; import org.eclipse.emf.edit.provider.ViewerNotification; import org.eclipse.jst.jsf.facesconfig.FacesConfigPlugin; +import org.eclipse.jst.jsf.facesconfig.emf.DisplayNameType; import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigFactory; import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigPackage; import org.eclipse.jst.jsf.facesconfig.emf.ValidatorType; @@ -141,17 +142,37 @@ public class ValidatorTypeItemProvider extends ItemProviderAdapter implements return overlayImage(object, getResourceLocator().getImage("full/obj16/ValidatorType")); } - /** - * This returns the label text for the adapted class. - * <!-- begin-user-doc + /** + * This returns the label text for the adapted class. <!-- begin-user-doc * --> <!-- end-user-doc --> - * @generated + * + * @generated NOT */ public String getText(Object object) { - String label = ((ValidatorType)object).getId(); - return label == null || label.length() == 0 ? - getString("_UI_ValidatorType_type") : - getString("_UI_ValidatorType_type") + " " + label; + String label = null; + + if (((ValidatorType) object).getDisplayName() != null + && ((ValidatorType) object).getDisplayName().size() > 0) { + label = ((DisplayNameType) ((ValidatorType) object) + .getDisplayName().get(0)).getTextContent(); + } + + if ((label == null || label.length() == 0) && ((ValidatorType) object).getValidatorId() != null + && ((ValidatorType) object).getValidatorId().getTextContent() != null) { + label = ((ValidatorType) object).getValidatorId().getTextContent(); + } + + if (label == null || label.length() == 0) { + if (((ValidatorType) object).getValidatorClass() != null) + label = ((ValidatorType) object).getValidatorClass() + .getTextContent(); + } + if (label == null || label.length() == 0) { + label = ((ValidatorType) object).getId(); + } + return label == null || label.length() == 0 ? getString("_UI_ValidatorType_type") + : label; +// : getString("_UI_ValidatorType_type") + " " + label; } /** @@ -257,13 +278,12 @@ public class ValidatorTypeItemProvider extends ItemProviderAdapter implements * @see org.eclipse.emf.edit.provider.ITableItemLabelProvider#getColumnText(java.lang.Object, int) */ public String getColumnText(Object object, int columnIndex) { - ValidatorType validator = (ValidatorType) object; switch (columnIndex) { + case 0: return getText(object); case 1: - return validator.getValidatorClass() == null ? "" : validator //$NON-NLS-1$ - .getValidatorClass().getTextContent(); + return getString("_UI_ValidatorType_type"); //$NON-NLS-1$ } return null; } diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/edit/provider/VariableResolverTypeItemProvider.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/edit/provider/VariableResolverTypeItemProvider.java index a3988cda7..38b626023 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/edit/provider/VariableResolverTypeItemProvider.java +++ b/jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/edit/provider/VariableResolverTypeItemProvider.java @@ -134,13 +134,12 @@ public class VariableResolverTypeItemProvider extends ItemProviderAdapter * This returns the label text for the adapted class. * <!-- begin-user-doc * --> <!-- end-user-doc --> - * @generated + * @generated NOT */ public String getText(Object object) { - String label = ((VariableResolverType)object).getId(); - return label == null || label.length() == 0 ? - getString("_UI_VariableResolverType_type") : - getString("_UI_VariableResolverType_type") + " " + label; + String label = ((VariableResolverType) object).getTextContent(); + return label == null || label.length() == 0 ? getString("_UI_VariableResolverType_type") + : label; } /** diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/edit/provider/ViewDeclarationLanguageFactoryTypeItemProvider.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/edit/provider/ViewDeclarationLanguageFactoryTypeItemProvider.java index 08f2ffcb0..7e2b6d8d1 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/edit/provider/ViewDeclarationLanguageFactoryTypeItemProvider.java +++ b/jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/edit/provider/ViewDeclarationLanguageFactoryTypeItemProvider.java @@ -23,6 +23,7 @@ import org.eclipse.emf.edit.provider.IEditingDomainItemProvider; import org.eclipse.emf.edit.provider.IItemLabelProvider; import org.eclipse.emf.edit.provider.IItemPropertySource; import org.eclipse.emf.edit.provider.IStructuredItemContentProvider; +import org.eclipse.emf.edit.provider.ITableItemLabelProvider; import org.eclipse.emf.edit.provider.ITreeItemContentProvider; import org.eclipse.emf.edit.provider.ItemPropertyDescriptor; import org.eclipse.emf.edit.provider.ItemProviderAdapter; @@ -34,6 +35,7 @@ import org.eclipse.jst.jsf.facesconfig.emf.ViewDeclarationLanguageFactoryType; /** * This is the item provider adapter for a {@link org.eclipse.jst.jsf.facesconfig.emf.ViewDeclarationLanguageFactoryType} object. * <!-- begin-user-doc --> + * @extends ITableItemLabelProvider * <!-- end-user-doc --> * @generated */ @@ -45,7 +47,8 @@ public class ViewDeclarationLanguageFactoryTypeItemProvider IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, - IItemPropertySource { + IItemPropertySource, + ITableItemLabelProvider{ /** * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -140,13 +143,12 @@ public class ViewDeclarationLanguageFactoryTypeItemProvider * This returns the label text for the adapted class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @generated + * @generated NOT */ public String getText(Object object) { - String label = ((ViewDeclarationLanguageFactoryType)object).getId(); - return label == null || label.length() == 0 ? - getString("_UI_ViewDeclarationLanguageFactoryType_type") : - getString("_UI_ViewDeclarationLanguageFactoryType_type") + " " + label; + String label = ((ViewDeclarationLanguageFactoryType) object).getTextContent(); + return label == null || label.length() == 0 ? getString("_UI_ViewDeclarationLanguageFactoryType_type") + : label; } /** @@ -189,4 +191,27 @@ public class ViewDeclarationLanguageFactoryTypeItemProvider return FacesConfigPlugin.INSTANCE; } + /* (non-Javadoc) + * @see org.eclipse.emf.edit.provider.ITableItemLabelProvider#getColumnImage(java.lang.Object, int) + */ + public Object getColumnImage(Object object, int columnIndex) { + // TODO Auto-generated method stub + if(columnIndex ==0) + return getImage(object); + return null; + } + + /* (non-Javadoc) + * @see org.eclipse.emf.edit.provider.ITableItemLabelProvider#getColumnText(java.lang.Object, int) + */ + public String getColumnText(Object object, int columnIndex) { + switch (columnIndex) { + + case 0: + return getText(object); + case 1: + return getString("_UI_ViewDeclarationLanguageFactoryType_type"); //$NON-NLS-1$ + } + return null; + } } diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/edit/provider/ViewHandlerTypeItemProvider.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/edit/provider/ViewHandlerTypeItemProvider.java index 514a9b465..8cd0a0dde 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/edit/provider/ViewHandlerTypeItemProvider.java +++ b/jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/edit/provider/ViewHandlerTypeItemProvider.java @@ -134,13 +134,12 @@ public class ViewHandlerTypeItemProvider extends ItemProviderAdapter implements * This returns the label text for the adapted class. * <!-- begin-user-doc * --> <!-- end-user-doc --> - * @generated + * @generated NOT */ public String getText(Object object) { - String label = ((ViewHandlerType)object).getId(); - return label == null || label.length() == 0 ? - getString("_UI_ViewHandlerType_type") : - getString("_UI_ViewHandlerType_type") + " " + label; + String label = ((ViewHandlerType) object).getTextContent(); + return label == null || label.length() == 0 ? getString("_UI_ViewHandlerType_type") + : label; } /** diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/edit/provider/VisitContextFactoryTypeItemProvider.java b/jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/edit/provider/VisitContextFactoryTypeItemProvider.java index d032a00d5..a2acdb490 100644 --- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/edit/provider/VisitContextFactoryTypeItemProvider.java +++ b/jsf/plugins/org.eclipse.jst.jsf.facesconfig/facesconfig/org/eclipse/jst/jsf/facesconfig/edit/provider/VisitContextFactoryTypeItemProvider.java @@ -23,6 +23,7 @@ import org.eclipse.emf.edit.provider.IEditingDomainItemProvider; import org.eclipse.emf.edit.provider.IItemLabelProvider; import org.eclipse.emf.edit.provider.IItemPropertySource; import org.eclipse.emf.edit.provider.IStructuredItemContentProvider; +import org.eclipse.emf.edit.provider.ITableItemLabelProvider; import org.eclipse.emf.edit.provider.ITreeItemContentProvider; import org.eclipse.emf.edit.provider.ItemPropertyDescriptor; import org.eclipse.emf.edit.provider.ItemProviderAdapter; @@ -34,6 +35,7 @@ import org.eclipse.jst.jsf.facesconfig.emf.VisitContextFactoryType; /** * This is the item provider adapter for a {@link org.eclipse.jst.jsf.facesconfig.emf.VisitContextFactoryType} object. * <!-- begin-user-doc --> + * @extends ITableItemLabelProvider * <!-- end-user-doc --> * @generated */ @@ -45,7 +47,8 @@ public class VisitContextFactoryTypeItemProvider IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, - IItemPropertySource { + IItemPropertySource, + ITableItemLabelProvider{ /** * <!-- begin-user-doc --> * <!-- end-user-doc --> @@ -140,13 +143,12 @@ public class VisitContextFactoryTypeItemProvider * This returns the label text for the adapted class. * <!-- begin-user-doc --> * <!-- end-user-doc --> - * @generated + * @generated NOT */ public String getText(Object object) { - String label = ((VisitContextFactoryType)object).getId(); - return label == null || label.length() == 0 ? - getString("_UI_VisitContextFactoryType_type") : - getString("_UI_VisitContextFactoryType_type") + " " + label; + String label = ((VisitContextFactoryType) object).getTextContent(); + return label == null || label.length() == 0 ? getString("_UI_VisitContextFactoryType_type") + : label; } /** @@ -189,4 +191,27 @@ public class VisitContextFactoryTypeItemProvider return FacesConfigPlugin.INSTANCE; } + /* (non-Javadoc) + * @see org.eclipse.emf.edit.provider.ITableItemLabelProvider#getColumnImage(java.lang.Object, int) + */ + public Object getColumnImage(Object object, int columnIndex) { + // TODO Auto-generated method stub + if(columnIndex ==0) + return getImage(object); + return null; + } + + /* (non-Javadoc) + * @see org.eclipse.emf.edit.provider.ITableItemLabelProvider#getColumnText(java.lang.Object, int) + */ + public String getColumnText(Object object, int columnIndex) { + switch (columnIndex) { + + case 0: + return getText(object); + case 1: + return getString("_UI_VisitContextFactoryType_type"); //$NON-NLS-1$ + } + return null; + } } |