diff options
Diffstat (limited to 'plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo')
27 files changed, 71 insertions, 392 deletions
diff --git a/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/AndFilterItemProvider.java b/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/AndFilterItemProvider.java index 4bed20229f..b37de79b61 100644 --- a/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/AndFilterItemProvider.java +++ b/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/AndFilterItemProvider.java @@ -14,17 +14,7 @@ import org.eclipse.emf.cdo.security.PermissionFilter; import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.Notification; -import org.eclipse.emf.edit.provider.IEditingDomainItemProvider; -import org.eclipse.emf.edit.provider.IItemColorProvider; -import org.eclipse.emf.edit.provider.IItemFontProvider; -import org.eclipse.emf.edit.provider.IItemLabelProvider; import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; -import org.eclipse.emf.edit.provider.IItemPropertySource; -import org.eclipse.emf.edit.provider.IStructuredItemContentProvider; -import org.eclipse.emf.edit.provider.ITableItemColorProvider; -import org.eclipse.emf.edit.provider.ITableItemFontProvider; -import org.eclipse.emf.edit.provider.ITableItemLabelProvider; -import org.eclipse.emf.edit.provider.ITreeItemContentProvider; import java.util.Collection; import java.util.List; @@ -36,9 +26,7 @@ import java.util.List; * <!-- end-user-doc --> * @generated */ -public class AndFilterItemProvider extends CombinedFilterItemProvider implements IEditingDomainItemProvider, -IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, -ITableItemLabelProvider, ITableItemColorProvider, ITableItemFontProvider, IItemColorProvider, IItemFontProvider +public class AndFilterItemProvider extends CombinedFilterItemProvider { /** * This constructs an instance from a factory and a notifier. diff --git a/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/AssigneeItemProvider.java b/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/AssigneeItemProvider.java index 0513763f87..0c114d20fb 100644 --- a/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/AssigneeItemProvider.java +++ b/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/AssigneeItemProvider.java @@ -16,17 +16,7 @@ import org.eclipse.emf.cdo.security.SecurityPackage; import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.edit.provider.ComposeableAdapterFactory; -import org.eclipse.emf.edit.provider.IEditingDomainItemProvider; -import org.eclipse.emf.edit.provider.IItemColorProvider; -import org.eclipse.emf.edit.provider.IItemFontProvider; -import org.eclipse.emf.edit.provider.IItemLabelProvider; import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; -import org.eclipse.emf.edit.provider.IItemPropertySource; -import org.eclipse.emf.edit.provider.IStructuredItemContentProvider; -import org.eclipse.emf.edit.provider.ITableItemColorProvider; -import org.eclipse.emf.edit.provider.ITableItemFontProvider; -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.ViewerNotification; @@ -39,9 +29,7 @@ import java.util.List; * <!-- end-user-doc --> * @generated */ -public class AssigneeItemProvider extends SecurityItemItemProvider implements IEditingDomainItemProvider, -IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, -ITableItemLabelProvider, ITableItemColorProvider, ITableItemFontProvider, IItemColorProvider, IItemFontProvider +public class AssigneeItemProvider extends SecurityItemItemProvider { /** * This constructs an instance from a factory and a notifier. @@ -125,8 +113,7 @@ ITableItemLabelProvider, ITableItemColorProvider, ITableItemFontProvider, IItemC public String getText(Object object) { String label = ((Assignee)object).getId(); - return label == null || label.length() == 0 ? getString("_UI_Assignee_type") //$NON-NLS-1$ - : + return label == null || label.length() == 0 ? getString("_UI_Assignee_type") : //$NON-NLS-1$ getString("_UI_Assignee_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$ } diff --git a/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/ClassFilterItemProvider.java b/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/ClassFilterItemProvider.java index 824ab74e06..7e8be262be 100644 --- a/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/ClassFilterItemProvider.java +++ b/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/ClassFilterItemProvider.java @@ -17,17 +17,7 @@ import org.eclipse.emf.cdo.security.SecurityPackage; import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.edit.provider.ComposeableAdapterFactory; -import org.eclipse.emf.edit.provider.IEditingDomainItemProvider; -import org.eclipse.emf.edit.provider.IItemColorProvider; -import org.eclipse.emf.edit.provider.IItemFontProvider; -import org.eclipse.emf.edit.provider.IItemLabelProvider; import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; -import org.eclipse.emf.edit.provider.IItemPropertySource; -import org.eclipse.emf.edit.provider.IStructuredItemContentProvider; -import org.eclipse.emf.edit.provider.ITableItemColorProvider; -import org.eclipse.emf.edit.provider.ITableItemFontProvider; -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.ViewerNotification; @@ -41,9 +31,7 @@ import java.util.List; * <!-- end-user-doc --> * @generated */ -public class ClassFilterItemProvider extends PermissionFilterItemProvider implements IEditingDomainItemProvider, -IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, -ITableItemLabelProvider, ITableItemColorProvider, ITableItemFontProvider, IItemColorProvider, IItemFontProvider +public class ClassFilterItemProvider extends PermissionFilterItemProvider { /** * This constructs an instance from a factory and a notifier. @@ -86,7 +74,7 @@ ITableItemLabelProvider, ITableItemColorProvider, ITableItemFontProvider, IItemC itemPropertyDescriptors .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_ClassFilter_applicableClass_feature"), //$NON-NLS-1$ - getString("_UI_PropertyDescriptor_description", "_UI_ClassFilter_applicableClass_feature", //$NON-NLS-1$ //$NON-NLS-2$ + getString("_UI_PropertyDescriptor_description", "_UI_ClassFilter_applicableClass_feature", //$NON-NLS-1$//$NON-NLS-2$ "_UI_ClassFilter_type"), //$NON-NLS-1$ SecurityPackage.Literals.CLASS_FILTER__APPLICABLE_CLASS, true, false, true, null, null, null)); } diff --git a/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/ClassPermissionItemProvider.java b/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/ClassPermissionItemProvider.java index a10ef1be17..1602acc3b0 100644 --- a/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/ClassPermissionItemProvider.java +++ b/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/ClassPermissionItemProvider.java @@ -21,17 +21,7 @@ import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.ecore.EClass; import org.eclipse.emf.ecore.EClassifier; import org.eclipse.emf.edit.provider.ComposeableAdapterFactory; -import org.eclipse.emf.edit.provider.IEditingDomainItemProvider; -import org.eclipse.emf.edit.provider.IItemColorProvider; -import org.eclipse.emf.edit.provider.IItemFontProvider; -import org.eclipse.emf.edit.provider.IItemLabelProvider; import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; -import org.eclipse.emf.edit.provider.IItemPropertySource; -import org.eclipse.emf.edit.provider.IStructuredItemContentProvider; -import org.eclipse.emf.edit.provider.ITableItemColorProvider; -import org.eclipse.emf.edit.provider.ITableItemFontProvider; -import org.eclipse.emf.edit.provider.ITableItemLabelProvider; -import org.eclipse.emf.edit.provider.ITreeItemContentProvider; import org.eclipse.emf.edit.provider.ItemPropertyDescriptor; import java.util.ArrayList; @@ -47,9 +37,7 @@ import java.util.List; * @generated */ @Deprecated -public class ClassPermissionItemProvider extends PermissionItemProvider implements IEditingDomainItemProvider, -IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, -ITableItemLabelProvider, ITableItemColorProvider, ITableItemFontProvider, IItemColorProvider, IItemFontProvider +public class ClassPermissionItemProvider extends PermissionItemProvider { /** * This constructs an instance from a factory and a notifier. @@ -182,8 +170,7 @@ ITableItemLabelProvider, ITableItemColorProvider, ITableItemFontProvider, IItemC } return label == null || label.length() == 0 ? getString("_UI_ClassPermission_type") //$NON-NLS-1$ - : - label; + : label; } /** diff --git a/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/CombinedFilterItemProvider.java b/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/CombinedFilterItemProvider.java index 0f501e507a..2bb71a91ec 100644 --- a/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/CombinedFilterItemProvider.java +++ b/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/CombinedFilterItemProvider.java @@ -18,17 +18,7 @@ import org.eclipse.emf.cdo.security.SecurityPackage; import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.ecore.EStructuralFeature; -import org.eclipse.emf.edit.provider.IEditingDomainItemProvider; -import org.eclipse.emf.edit.provider.IItemColorProvider; -import org.eclipse.emf.edit.provider.IItemFontProvider; -import org.eclipse.emf.edit.provider.IItemLabelProvider; import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; -import org.eclipse.emf.edit.provider.IItemPropertySource; -import org.eclipse.emf.edit.provider.IStructuredItemContentProvider; -import org.eclipse.emf.edit.provider.ITableItemColorProvider; -import org.eclipse.emf.edit.provider.ITableItemFontProvider; -import org.eclipse.emf.edit.provider.ITableItemLabelProvider; -import org.eclipse.emf.edit.provider.ITreeItemContentProvider; import org.eclipse.emf.edit.provider.ViewerNotification; import java.util.Collection; @@ -41,9 +31,7 @@ import java.util.List; * <!-- end-user-doc --> * @generated */ -public class CombinedFilterItemProvider extends PermissionFilterItemProvider implements IEditingDomainItemProvider, -IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, -ITableItemLabelProvider, ITableItemColorProvider, ITableItemFontProvider, IItemColorProvider, IItemFontProvider +public class CombinedFilterItemProvider extends PermissionFilterItemProvider { /** * This constructs an instance from a factory and a notifier. diff --git a/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/DirectoryItemProvider.java b/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/DirectoryItemProvider.java index 4a540a261b..fe14a1b224 100644 --- a/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/DirectoryItemProvider.java +++ b/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/DirectoryItemProvider.java @@ -18,17 +18,7 @@ import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.ecore.EStructuralFeature; import org.eclipse.emf.edit.provider.ComposeableAdapterFactory; -import org.eclipse.emf.edit.provider.IEditingDomainItemProvider; -import org.eclipse.emf.edit.provider.IItemColorProvider; -import org.eclipse.emf.edit.provider.IItemFontProvider; -import org.eclipse.emf.edit.provider.IItemLabelProvider; import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; -import org.eclipse.emf.edit.provider.IItemPropertySource; -import org.eclipse.emf.edit.provider.IStructuredItemContentProvider; -import org.eclipse.emf.edit.provider.ITableItemColorProvider; -import org.eclipse.emf.edit.provider.ITableItemFontProvider; -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.ViewerNotification; @@ -41,9 +31,7 @@ import java.util.List; * <!-- end-user-doc --> * @generated */ -public class DirectoryItemProvider extends SecurityItemItemProvider implements IEditingDomainItemProvider, -IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, -ITableItemLabelProvider, ITableItemColorProvider, ITableItemFontProvider, IItemColorProvider, IItemFontProvider +public class DirectoryItemProvider extends SecurityItemItemProvider { /** * This constructs an instance from a factory and a notifier. @@ -157,8 +145,7 @@ ITableItemLabelProvider, ITableItemColorProvider, ITableItemFontProvider, IItemC { String label = ((Directory)object).getName(); return label == null || label.length() == 0 ? getString("_UI_Directory_type") //$NON-NLS-1$ - : - label; + : label; } /** diff --git a/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/ExpressionFilterItemProvider.java b/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/ExpressionFilterItemProvider.java index e3dbff882c..3b7c2d63e3 100644 --- a/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/ExpressionFilterItemProvider.java +++ b/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/ExpressionFilterItemProvider.java @@ -18,17 +18,7 @@ import org.eclipse.emf.cdo.security.SecurityPackage; import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.ecore.EStructuralFeature; -import org.eclipse.emf.edit.provider.IEditingDomainItemProvider; -import org.eclipse.emf.edit.provider.IItemColorProvider; -import org.eclipse.emf.edit.provider.IItemFontProvider; -import org.eclipse.emf.edit.provider.IItemLabelProvider; import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; -import org.eclipse.emf.edit.provider.IItemPropertySource; -import org.eclipse.emf.edit.provider.IStructuredItemContentProvider; -import org.eclipse.emf.edit.provider.ITableItemColorProvider; -import org.eclipse.emf.edit.provider.ITableItemFontProvider; -import org.eclipse.emf.edit.provider.ITableItemLabelProvider; -import org.eclipse.emf.edit.provider.ITreeItemContentProvider; import org.eclipse.emf.edit.provider.ViewerNotification; import java.util.Collection; @@ -41,9 +31,7 @@ import java.util.List; * <!-- end-user-doc --> * @generated */ -public class ExpressionFilterItemProvider extends ObjectFilterItemProvider implements IEditingDomainItemProvider, -IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, -ITableItemLabelProvider, ITableItemColorProvider, ITableItemFontProvider, IItemColorProvider, IItemFontProvider +public class ExpressionFilterItemProvider extends ObjectFilterItemProvider { /** * This constructs an instance from a factory and a notifier. diff --git a/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/FilterPermissionItemProvider.java b/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/FilterPermissionItemProvider.java index 6954f2dcb9..d971683f0b 100644 --- a/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/FilterPermissionItemProvider.java +++ b/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/FilterPermissionItemProvider.java @@ -20,17 +20,7 @@ import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.common.util.EList; import org.eclipse.emf.ecore.EStructuralFeature; -import org.eclipse.emf.edit.provider.IEditingDomainItemProvider; -import org.eclipse.emf.edit.provider.IItemColorProvider; -import org.eclipse.emf.edit.provider.IItemFontProvider; -import org.eclipse.emf.edit.provider.IItemLabelProvider; import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; -import org.eclipse.emf.edit.provider.IItemPropertySource; -import org.eclipse.emf.edit.provider.IStructuredItemContentProvider; -import org.eclipse.emf.edit.provider.ITableItemColorProvider; -import org.eclipse.emf.edit.provider.ITableItemFontProvider; -import org.eclipse.emf.edit.provider.ITableItemLabelProvider; -import org.eclipse.emf.edit.provider.ITreeItemContentProvider; import org.eclipse.emf.edit.provider.ViewerNotification; import java.util.Collection; @@ -44,9 +34,7 @@ import java.util.List; * <!-- end-user-doc --> * @generated */ -public class FilterPermissionItemProvider extends PermissionItemProvider implements IEditingDomainItemProvider, -IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, -ITableItemLabelProvider, ITableItemColorProvider, ITableItemFontProvider, IItemColorProvider, IItemFontProvider +public class FilterPermissionItemProvider extends PermissionItemProvider { /** * This constructs an instance from a factory and a notifier. diff --git a/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/GroupItemProvider.java b/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/GroupItemProvider.java index 9c66d80305..e354f35f47 100644 --- a/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/GroupItemProvider.java +++ b/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/GroupItemProvider.java @@ -16,17 +16,7 @@ import org.eclipse.emf.cdo.security.SecurityPackage; import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.edit.provider.ComposeableAdapterFactory; -import org.eclipse.emf.edit.provider.IEditingDomainItemProvider; -import org.eclipse.emf.edit.provider.IItemColorProvider; -import org.eclipse.emf.edit.provider.IItemFontProvider; -import org.eclipse.emf.edit.provider.IItemLabelProvider; import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; -import org.eclipse.emf.edit.provider.IItemPropertySource; -import org.eclipse.emf.edit.provider.IStructuredItemContentProvider; -import org.eclipse.emf.edit.provider.ITableItemColorProvider; -import org.eclipse.emf.edit.provider.ITableItemFontProvider; -import org.eclipse.emf.edit.provider.ITableItemLabelProvider; -import org.eclipse.emf.edit.provider.ITreeItemContentProvider; import java.util.Collection; import java.util.List; @@ -37,9 +27,7 @@ import java.util.List; * <!-- end-user-doc --> * @generated */ -public class GroupItemProvider extends AssigneeItemProvider implements IEditingDomainItemProvider, -IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, -ITableItemLabelProvider, ITableItemColorProvider, ITableItemFontProvider, IItemColorProvider, IItemFontProvider +public class GroupItemProvider extends AssigneeItemProvider { /** * This constructs an instance from a factory and a notifier. @@ -151,8 +139,7 @@ ITableItemLabelProvider, ITableItemColorProvider, ITableItemFontProvider, IItemC { String label = ((Group)object).getId(); return label == null || label.length() == 0 ? getString("_UI_Group_type") //$NON-NLS-1$ - : - label; + : label; } /** diff --git a/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/LinkedFilterItemProvider.java b/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/LinkedFilterItemProvider.java index e54b0bb2d8..d5e7972092 100644 --- a/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/LinkedFilterItemProvider.java +++ b/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/LinkedFilterItemProvider.java @@ -16,17 +16,7 @@ import org.eclipse.emf.cdo.security.SecurityPackage; import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.edit.provider.ComposeableAdapterFactory; -import org.eclipse.emf.edit.provider.IEditingDomainItemProvider; -import org.eclipse.emf.edit.provider.IItemColorProvider; -import org.eclipse.emf.edit.provider.IItemFontProvider; -import org.eclipse.emf.edit.provider.IItemLabelProvider; import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; -import org.eclipse.emf.edit.provider.IItemPropertySource; -import org.eclipse.emf.edit.provider.IStructuredItemContentProvider; -import org.eclipse.emf.edit.provider.ITableItemColorProvider; -import org.eclipse.emf.edit.provider.ITableItemFontProvider; -import org.eclipse.emf.edit.provider.ITableItemLabelProvider; -import org.eclipse.emf.edit.provider.ITreeItemContentProvider; import java.util.Collection; import java.util.List; @@ -38,9 +28,7 @@ import java.util.List; * <!-- end-user-doc --> * @generated */ -public class LinkedFilterItemProvider extends PermissionFilterItemProvider implements IEditingDomainItemProvider, -IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, -ITableItemLabelProvider, ITableItemColorProvider, ITableItemFontProvider, IItemColorProvider, IItemFontProvider +public class LinkedFilterItemProvider extends PermissionFilterItemProvider { /** * This constructs an instance from a factory and a notifier. diff --git a/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/NotFilterItemProvider.java b/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/NotFilterItemProvider.java index 321f6a2d1a..3c01802677 100644 --- a/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/NotFilterItemProvider.java +++ b/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/NotFilterItemProvider.java @@ -14,17 +14,7 @@ import org.eclipse.emf.cdo.security.PermissionFilter; import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.Notification; -import org.eclipse.emf.edit.provider.IEditingDomainItemProvider; -import org.eclipse.emf.edit.provider.IItemColorProvider; -import org.eclipse.emf.edit.provider.IItemFontProvider; -import org.eclipse.emf.edit.provider.IItemLabelProvider; import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; -import org.eclipse.emf.edit.provider.IItemPropertySource; -import org.eclipse.emf.edit.provider.IStructuredItemContentProvider; -import org.eclipse.emf.edit.provider.ITableItemColorProvider; -import org.eclipse.emf.edit.provider.ITableItemFontProvider; -import org.eclipse.emf.edit.provider.ITableItemLabelProvider; -import org.eclipse.emf.edit.provider.ITreeItemContentProvider; import java.util.Collection; import java.util.List; @@ -36,9 +26,7 @@ import java.util.List; * <!-- end-user-doc --> * @generated */ -public class NotFilterItemProvider extends CombinedFilterItemProvider implements IEditingDomainItemProvider, -IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, -ITableItemLabelProvider, ITableItemColorProvider, ITableItemFontProvider, IItemColorProvider, IItemFontProvider +public class NotFilterItemProvider extends CombinedFilterItemProvider { /** * This constructs an instance from a factory and a notifier. diff --git a/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/ObjectFilterItemProvider.java b/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/ObjectFilterItemProvider.java index 7c89a71b77..88290787c3 100644 --- a/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/ObjectFilterItemProvider.java +++ b/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/ObjectFilterItemProvider.java @@ -14,17 +14,7 @@ import org.eclipse.emf.cdo.security.PermissionFilter; import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.Notification; -import org.eclipse.emf.edit.provider.IEditingDomainItemProvider; -import org.eclipse.emf.edit.provider.IItemColorProvider; -import org.eclipse.emf.edit.provider.IItemFontProvider; -import org.eclipse.emf.edit.provider.IItemLabelProvider; import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; -import org.eclipse.emf.edit.provider.IItemPropertySource; -import org.eclipse.emf.edit.provider.IStructuredItemContentProvider; -import org.eclipse.emf.edit.provider.ITableItemColorProvider; -import org.eclipse.emf.edit.provider.ITableItemFontProvider; -import org.eclipse.emf.edit.provider.ITableItemLabelProvider; -import org.eclipse.emf.edit.provider.ITreeItemContentProvider; import java.util.Collection; import java.util.List; @@ -36,9 +26,7 @@ import java.util.List; * <!-- end-user-doc --> * @generated */ -public class ObjectFilterItemProvider extends PermissionFilterItemProvider implements IEditingDomainItemProvider, -IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, -ITableItemLabelProvider, ITableItemColorProvider, ITableItemFontProvider, IItemColorProvider, IItemFontProvider +public class ObjectFilterItemProvider extends PermissionFilterItemProvider { /** * This constructs an instance from a factory and a notifier. diff --git a/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/ObjectPermissionItemProvider.java b/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/ObjectPermissionItemProvider.java index 7d32f06d1f..fbc632ed94 100644 --- a/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/ObjectPermissionItemProvider.java +++ b/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/ObjectPermissionItemProvider.java @@ -15,17 +15,7 @@ import org.eclipse.emf.cdo.security.ObjectPermission; import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.Notification; -import org.eclipse.emf.edit.provider.IEditingDomainItemProvider; -import org.eclipse.emf.edit.provider.IItemColorProvider; -import org.eclipse.emf.edit.provider.IItemFontProvider; -import org.eclipse.emf.edit.provider.IItemLabelProvider; import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; -import org.eclipse.emf.edit.provider.IItemPropertySource; -import org.eclipse.emf.edit.provider.IStructuredItemContentProvider; -import org.eclipse.emf.edit.provider.ITableItemColorProvider; -import org.eclipse.emf.edit.provider.ITableItemFontProvider; -import org.eclipse.emf.edit.provider.ITableItemLabelProvider; -import org.eclipse.emf.edit.provider.ITreeItemContentProvider; import java.util.Collection; import java.util.List; @@ -38,9 +28,7 @@ import java.util.List; * @generated */ @Deprecated -public class ObjectPermissionItemProvider extends PermissionItemProvider implements IEditingDomainItemProvider, -IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, -ITableItemLabelProvider, ITableItemColorProvider, ITableItemFontProvider, IItemColorProvider, IItemFontProvider +public class ObjectPermissionItemProvider extends PermissionItemProvider { /** * This constructs an instance from a factory and a notifier. @@ -92,8 +80,7 @@ ITableItemLabelProvider, ITableItemColorProvider, ITableItemFontProvider, IItemC { Access labelValue = ((ObjectPermission)object).getAccess(); String label = labelValue == null ? null : labelValue.toString(); - return label == null || label.length() == 0 ? getString("_UI_ObjectPermission_type") //$NON-NLS-1$ - : + return label == null || label.length() == 0 ? getString("_UI_ObjectPermission_type") : //$NON-NLS-1$ getString("_UI_ObjectPermission_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$ } diff --git a/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/OrFilterItemProvider.java b/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/OrFilterItemProvider.java index 58dc647940..26eb79d3c3 100644 --- a/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/OrFilterItemProvider.java +++ b/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/OrFilterItemProvider.java @@ -14,17 +14,7 @@ import org.eclipse.emf.cdo.security.PermissionFilter; import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.Notification; -import org.eclipse.emf.edit.provider.IEditingDomainItemProvider; -import org.eclipse.emf.edit.provider.IItemColorProvider; -import org.eclipse.emf.edit.provider.IItemFontProvider; -import org.eclipse.emf.edit.provider.IItemLabelProvider; import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; -import org.eclipse.emf.edit.provider.IItemPropertySource; -import org.eclipse.emf.edit.provider.IStructuredItemContentProvider; -import org.eclipse.emf.edit.provider.ITableItemColorProvider; -import org.eclipse.emf.edit.provider.ITableItemFontProvider; -import org.eclipse.emf.edit.provider.ITableItemLabelProvider; -import org.eclipse.emf.edit.provider.ITreeItemContentProvider; import java.util.Collection; import java.util.List; @@ -36,9 +26,7 @@ import java.util.List; * <!-- end-user-doc --> * @generated */ -public class OrFilterItemProvider extends CombinedFilterItemProvider implements IEditingDomainItemProvider, -IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, -ITableItemLabelProvider, ITableItemColorProvider, ITableItemFontProvider, IItemColorProvider, IItemFontProvider +public class OrFilterItemProvider extends CombinedFilterItemProvider { /** * This constructs an instance from a factory and a notifier. diff --git a/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/PackageFilterItemProvider.java b/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/PackageFilterItemProvider.java index 64e9237fcd..38abfc69c6 100644 --- a/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/PackageFilterItemProvider.java +++ b/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/PackageFilterItemProvider.java @@ -16,17 +16,7 @@ import org.eclipse.emf.cdo.security.SecurityPackage; import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.edit.provider.ComposeableAdapterFactory; -import org.eclipse.emf.edit.provider.IEditingDomainItemProvider; -import org.eclipse.emf.edit.provider.IItemColorProvider; -import org.eclipse.emf.edit.provider.IItemFontProvider; -import org.eclipse.emf.edit.provider.IItemLabelProvider; import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; -import org.eclipse.emf.edit.provider.IItemPropertySource; -import org.eclipse.emf.edit.provider.IStructuredItemContentProvider; -import org.eclipse.emf.edit.provider.ITableItemColorProvider; -import org.eclipse.emf.edit.provider.ITableItemFontProvider; -import org.eclipse.emf.edit.provider.ITableItemLabelProvider; -import org.eclipse.emf.edit.provider.ITreeItemContentProvider; import java.util.Collection; import java.util.List; @@ -38,9 +28,7 @@ import java.util.List; * <!-- end-user-doc --> * @generated */ -public class PackageFilterItemProvider extends PermissionFilterItemProvider implements IEditingDomainItemProvider, -IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, -ITableItemLabelProvider, ITableItemColorProvider, ITableItemFontProvider, IItemColorProvider, IItemFontProvider +public class PackageFilterItemProvider extends PermissionFilterItemProvider { /** * This constructs an instance from a factory and a notifier. @@ -80,9 +68,9 @@ ITableItemLabelProvider, ITableItemColorProvider, ITableItemFontProvider, IItemC protected void addApplicablePackagePropertyDescriptor(Object object) { itemPropertyDescriptors - .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), - getResourceLocator(), getString("_UI_PackageFilter_applicablePackage_feature"), //$NON-NLS-1$ - getString("_UI_PropertyDescriptor_description", "_UI_PackageFilter_applicablePackage_feature", //$NON-NLS-1$ //$NON-NLS-2$ + .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), + getResourceLocator(), getString("_UI_PackageFilter_applicablePackage_feature"), //$NON-NLS-1$ + getString("_UI_PropertyDescriptor_description", "_UI_PackageFilter_applicablePackage_feature", //$NON-NLS-1$//$NON-NLS-2$ "_UI_PackageFilter_type"), //$NON-NLS-1$ SecurityPackage.Literals.PACKAGE_FILTER__APPLICABLE_PACKAGE, true, false, true, null, null, null)); } diff --git a/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/PackagePermissionItemProvider.java b/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/PackagePermissionItemProvider.java index a5e5207315..c427d8352e 100644 --- a/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/PackagePermissionItemProvider.java +++ b/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/PackagePermissionItemProvider.java @@ -20,17 +20,7 @@ import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.ecore.EPackage; import org.eclipse.emf.edit.provider.ComposeableAdapterFactory; -import org.eclipse.emf.edit.provider.IEditingDomainItemProvider; -import org.eclipse.emf.edit.provider.IItemColorProvider; -import org.eclipse.emf.edit.provider.IItemFontProvider; -import org.eclipse.emf.edit.provider.IItemLabelProvider; import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; -import org.eclipse.emf.edit.provider.IItemPropertySource; -import org.eclipse.emf.edit.provider.IStructuredItemContentProvider; -import org.eclipse.emf.edit.provider.ITableItemColorProvider; -import org.eclipse.emf.edit.provider.ITableItemFontProvider; -import org.eclipse.emf.edit.provider.ITableItemLabelProvider; -import org.eclipse.emf.edit.provider.ITreeItemContentProvider; import org.eclipse.emf.edit.provider.ItemPropertyDescriptor; import java.util.ArrayList; @@ -46,9 +36,7 @@ import java.util.List; * @generated */ @Deprecated -public class PackagePermissionItemProvider extends PermissionItemProvider implements IEditingDomainItemProvider, -IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, -ITableItemLabelProvider, ITableItemColorProvider, ITableItemFontProvider, IItemColorProvider, IItemFontProvider +public class PackagePermissionItemProvider extends PermissionItemProvider { /** * This constructs an instance from a factory and a notifier. diff --git a/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/PermissionFilterItemProvider.java b/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/PermissionFilterItemProvider.java index be0354ab80..ce077e216c 100644 --- a/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/PermissionFilterItemProvider.java +++ b/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/PermissionFilterItemProvider.java @@ -40,8 +40,8 @@ import java.util.List; * @generated */ public class PermissionFilterItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, -IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, -ITableItemLabelProvider, ITableItemColorProvider, ITableItemFontProvider, IItemColorProvider, IItemFontProvider + IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, + ITableItemLabelProvider, ITableItemColorProvider, ITableItemFontProvider, IItemColorProvider, IItemFontProvider { /** * This constructs an instance from a factory and a notifier. diff --git a/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/PermissionItemProvider.java b/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/PermissionItemProvider.java index 006e351cb1..c605abb753 100644 --- a/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/PermissionItemProvider.java +++ b/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/PermissionItemProvider.java @@ -44,8 +44,8 @@ import java.util.List; * @generated */ public class PermissionItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, -IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, -ITableItemLabelProvider, ITableItemColorProvider, ITableItemFontProvider, IItemColorProvider, IItemFontProvider + IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, + ITableItemLabelProvider, ITableItemColorProvider, ITableItemFontProvider, IItemColorProvider, IItemFontProvider { /** * This constructs an instance from a factory and a notifier. @@ -125,8 +125,7 @@ ITableItemLabelProvider, ITableItemColorProvider, ITableItemFontProvider, IItemC { Access labelValue = ((Permission)object).getAccess(); String label = labelValue == null ? null : labelValue.toString(); - return label == null || label.length() == 0 ? getString("_UI_Permission_type") //$NON-NLS-1$ - : + return label == null || label.length() == 0 ? getString("_UI_Permission_type") : //$NON-NLS-1$ getString("_UI_Permission_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$ } diff --git a/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/RealmItemProvider.java b/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/RealmItemProvider.java index 29f8122c56..89fd3c0507 100644 --- a/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/RealmItemProvider.java +++ b/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/RealmItemProvider.java @@ -18,17 +18,7 @@ import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.ecore.EStructuralFeature; import org.eclipse.emf.edit.provider.ComposeableAdapterFactory; -import org.eclipse.emf.edit.provider.IEditingDomainItemProvider; -import org.eclipse.emf.edit.provider.IItemColorProvider; -import org.eclipse.emf.edit.provider.IItemFontProvider; -import org.eclipse.emf.edit.provider.IItemLabelProvider; import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; -import org.eclipse.emf.edit.provider.IItemPropertySource; -import org.eclipse.emf.edit.provider.IStructuredItemContentProvider; -import org.eclipse.emf.edit.provider.ITableItemColorProvider; -import org.eclipse.emf.edit.provider.ITableItemFontProvider; -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.ViewerNotification; @@ -41,9 +31,7 @@ import java.util.List; * <!-- end-user-doc --> * @generated */ -public class RealmItemProvider extends SecurityElementItemProvider implements IEditingDomainItemProvider, -IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, -ITableItemLabelProvider, ITableItemColorProvider, ITableItemFontProvider, IItemColorProvider, IItemFontProvider +public class RealmItemProvider extends SecurityElementItemProvider { /** * This constructs an instance from a factory and a notifier. @@ -154,7 +142,7 @@ ITableItemLabelProvider, ITableItemColorProvider, ITableItemFontProvider, IItemC itemPropertyDescriptors .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_Realm_defaultGroupDirectory_feature"), //$NON-NLS-1$ - getString("_UI_PropertyDescriptor_description", "_UI_Realm_defaultGroupDirectory_feature", //$NON-NLS-1$ //$NON-NLS-2$ + getString("_UI_PropertyDescriptor_description", "_UI_Realm_defaultGroupDirectory_feature", //$NON-NLS-1$//$NON-NLS-2$ "_UI_Realm_type"), //$NON-NLS-1$ SecurityPackage.Literals.REALM__DEFAULT_GROUP_DIRECTORY, true, false, true, null, null, null)); } @@ -242,8 +230,7 @@ ITableItemLabelProvider, ITableItemColorProvider, ITableItemFontProvider, IItemC { String label = ((Realm)object).getName(); return label == null || label.length() == 0 ? getString("_UI_Realm_type") //$NON-NLS-1$ - : - label; + : label; } /** diff --git a/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/ResourceFilterItemProvider.java b/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/ResourceFilterItemProvider.java index a7d24e7f39..349076bb2a 100644 --- a/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/ResourceFilterItemProvider.java +++ b/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/ResourceFilterItemProvider.java @@ -17,17 +17,7 @@ import org.eclipse.emf.cdo.security.SecurityPackage; import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.edit.provider.ComposeableAdapterFactory; -import org.eclipse.emf.edit.provider.IEditingDomainItemProvider; -import org.eclipse.emf.edit.provider.IItemColorProvider; -import org.eclipse.emf.edit.provider.IItemFontProvider; -import org.eclipse.emf.edit.provider.IItemLabelProvider; import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; -import org.eclipse.emf.edit.provider.IItemPropertySource; -import org.eclipse.emf.edit.provider.IStructuredItemContentProvider; -import org.eclipse.emf.edit.provider.ITableItemColorProvider; -import org.eclipse.emf.edit.provider.ITableItemFontProvider; -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.ViewerNotification; @@ -41,9 +31,7 @@ import java.util.List; * <!-- end-user-doc --> * @generated */ -public class ResourceFilterItemProvider extends PermissionFilterItemProvider implements IEditingDomainItemProvider, -IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, -ITableItemLabelProvider, ITableItemColorProvider, ITableItemFontProvider, IItemColorProvider, IItemFontProvider +public class ResourceFilterItemProvider extends PermissionFilterItemProvider { /** * This constructs an instance from a factory and a notifier. @@ -93,7 +81,7 @@ ITableItemLabelProvider, ITableItemColorProvider, ITableItemFontProvider, IItemC itemPropertyDescriptors .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_ResourceFilter_path_feature"), //$NON-NLS-1$ - getString("_UI_PropertyDescriptor_description", "_UI_ResourceFilter_path_feature", //$NON-NLS-1$ //$NON-NLS-2$ + getString("_UI_PropertyDescriptor_description", "_UI_ResourceFilter_path_feature", //$NON-NLS-1$//$NON-NLS-2$ "_UI_ResourceFilter_type"), //$NON-NLS-1$ SecurityPackage.Literals.RESOURCE_FILTER__PATH, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); @@ -108,9 +96,9 @@ ITableItemLabelProvider, ITableItemColorProvider, ITableItemFontProvider, IItemC protected void addPatternStylePropertyDescriptor(Object object) { itemPropertyDescriptors - .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), - getResourceLocator(), getString("_UI_ResourceFilter_patternStyle_feature"), //$NON-NLS-1$ - getString("_UI_PropertyDescriptor_description", "_UI_ResourceFilter_patternStyle_feature", //$NON-NLS-1$ //$NON-NLS-2$ + .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), + getResourceLocator(), getString("_UI_ResourceFilter_patternStyle_feature"), //$NON-NLS-1$ + getString("_UI_PropertyDescriptor_description", "_UI_ResourceFilter_patternStyle_feature", //$NON-NLS-1$//$NON-NLS-2$ "_UI_ResourceFilter_type"), //$NON-NLS-1$ SecurityPackage.Literals.RESOURCE_FILTER__PATTERN_STYLE, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); @@ -125,9 +113,9 @@ ITableItemLabelProvider, ITableItemColorProvider, ITableItemFontProvider, IItemC protected void addFoldersPropertyDescriptor(Object object) { itemPropertyDescriptors - .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), - getResourceLocator(), getString("_UI_ResourceFilter_folders_feature"), //$NON-NLS-1$ - getString("_UI_PropertyDescriptor_description", "_UI_ResourceFilter_folders_feature", //$NON-NLS-1$ //$NON-NLS-2$ + .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), + getResourceLocator(), getString("_UI_ResourceFilter_folders_feature"), //$NON-NLS-1$ + getString("_UI_PropertyDescriptor_description", "_UI_ResourceFilter_folders_feature", //$NON-NLS-1$//$NON-NLS-2$ "_UI_ResourceFilter_type"), //$NON-NLS-1$ SecurityPackage.Literals.RESOURCE_FILTER__FOLDERS, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null)); @@ -142,9 +130,9 @@ ITableItemLabelProvider, ITableItemColorProvider, ITableItemFontProvider, IItemC protected void addModelResourcesPropertyDescriptor(Object object) { itemPropertyDescriptors - .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), - getResourceLocator(), getString("_UI_ResourceFilter_modelResources_feature"), //$NON-NLS-1$ - getString("_UI_PropertyDescriptor_description", "_UI_ResourceFilter_modelResources_feature", //$NON-NLS-1$ //$NON-NLS-2$ + .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), + getResourceLocator(), getString("_UI_ResourceFilter_modelResources_feature"), //$NON-NLS-1$ + getString("_UI_PropertyDescriptor_description", "_UI_ResourceFilter_modelResources_feature", //$NON-NLS-1$//$NON-NLS-2$ "_UI_ResourceFilter_type"), //$NON-NLS-1$ SecurityPackage.Literals.RESOURCE_FILTER__MODEL_RESOURCES, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null)); @@ -159,9 +147,9 @@ ITableItemLabelProvider, ITableItemColorProvider, ITableItemFontProvider, IItemC protected void addModelObjectsPropertyDescriptor(Object object) { itemPropertyDescriptors - .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), - getResourceLocator(), getString("_UI_ResourceFilter_modelObjects_feature"), //$NON-NLS-1$ - getString("_UI_PropertyDescriptor_description", "_UI_ResourceFilter_modelObjects_feature", //$NON-NLS-1$ //$NON-NLS-2$ + .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), + getResourceLocator(), getString("_UI_ResourceFilter_modelObjects_feature"), //$NON-NLS-1$ + getString("_UI_PropertyDescriptor_description", "_UI_ResourceFilter_modelObjects_feature", //$NON-NLS-1$//$NON-NLS-2$ "_UI_ResourceFilter_type"), //$NON-NLS-1$ SecurityPackage.Literals.RESOURCE_FILTER__MODEL_OBJECTS, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null)); @@ -176,9 +164,9 @@ ITableItemLabelProvider, ITableItemColorProvider, ITableItemFontProvider, IItemC protected void addIncludeParentsPropertyDescriptor(Object object) { itemPropertyDescriptors - .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), - getResourceLocator(), getString("_UI_ResourceFilter_includeParents_feature"), //$NON-NLS-1$ - getString("_UI_PropertyDescriptor_description", "_UI_ResourceFilter_includeParents_feature", //$NON-NLS-1$ //$NON-NLS-2$ + .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), + getResourceLocator(), getString("_UI_ResourceFilter_includeParents_feature"), //$NON-NLS-1$ + getString("_UI_PropertyDescriptor_description", "_UI_ResourceFilter_includeParents_feature", //$NON-NLS-1$//$NON-NLS-2$ "_UI_ResourceFilter_type"), //$NON-NLS-1$ SecurityPackage.Literals.RESOURCE_FILTER__INCLUDE_PARENTS, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null)); @@ -195,7 +183,7 @@ ITableItemLabelProvider, ITableItemColorProvider, ITableItemFontProvider, IItemC itemPropertyDescriptors .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), getString("_UI_ResourceFilter_includeRoot_feature"), //$NON-NLS-1$ - getString("_UI_PropertyDescriptor_description", "_UI_ResourceFilter_includeRoot_feature", //$NON-NLS-1$ //$NON-NLS-2$ + getString("_UI_PropertyDescriptor_description", "_UI_ResourceFilter_includeRoot_feature", //$NON-NLS-1$//$NON-NLS-2$ "_UI_ResourceFilter_type"), //$NON-NLS-1$ SecurityPackage.Literals.RESOURCE_FILTER__INCLUDE_ROOT, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null)); @@ -210,9 +198,9 @@ ITableItemLabelProvider, ITableItemColorProvider, ITableItemFontProvider, IItemC protected void addTextResourcesPropertyDescriptor(Object object) { itemPropertyDescriptors - .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), - getResourceLocator(), getString("_UI_ResourceFilter_textResources_feature"), //$NON-NLS-1$ - getString("_UI_PropertyDescriptor_description", "_UI_ResourceFilter_textResources_feature", //$NON-NLS-1$ //$NON-NLS-2$ + .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), + getResourceLocator(), getString("_UI_ResourceFilter_textResources_feature"), //$NON-NLS-1$ + getString("_UI_PropertyDescriptor_description", "_UI_ResourceFilter_textResources_feature", //$NON-NLS-1$//$NON-NLS-2$ "_UI_ResourceFilter_type"), //$NON-NLS-1$ SecurityPackage.Literals.RESOURCE_FILTER__TEXT_RESOURCES, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null)); @@ -227,9 +215,9 @@ ITableItemLabelProvider, ITableItemColorProvider, ITableItemFontProvider, IItemC protected void addBinaryResourcesPropertyDescriptor(Object object) { itemPropertyDescriptors - .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), - getResourceLocator(), getString("_UI_ResourceFilter_binaryResources_feature"), //$NON-NLS-1$ - getString("_UI_PropertyDescriptor_description", "_UI_ResourceFilter_binaryResources_feature", //$NON-NLS-1$ //$NON-NLS-2$ + .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), + getResourceLocator(), getString("_UI_ResourceFilter_binaryResources_feature"), //$NON-NLS-1$ + getString("_UI_PropertyDescriptor_description", "_UI_ResourceFilter_binaryResources_feature", //$NON-NLS-1$//$NON-NLS-2$ "_UI_ResourceFilter_type"), //$NON-NLS-1$ SecurityPackage.Literals.RESOURCE_FILTER__BINARY_RESOURCES, true, false, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null, null)); diff --git a/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/ResourcePermissionItemProvider.java b/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/ResourcePermissionItemProvider.java index b6e9cc7321..1abd470199 100644 --- a/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/ResourcePermissionItemProvider.java +++ b/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/ResourcePermissionItemProvider.java @@ -17,17 +17,7 @@ import org.eclipse.emf.cdo.security.SecurityPackage; import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.edit.provider.ComposeableAdapterFactory; -import org.eclipse.emf.edit.provider.IEditingDomainItemProvider; -import org.eclipse.emf.edit.provider.IItemColorProvider; -import org.eclipse.emf.edit.provider.IItemFontProvider; -import org.eclipse.emf.edit.provider.IItemLabelProvider; import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; -import org.eclipse.emf.edit.provider.IItemPropertySource; -import org.eclipse.emf.edit.provider.IStructuredItemContentProvider; -import org.eclipse.emf.edit.provider.ITableItemColorProvider; -import org.eclipse.emf.edit.provider.ITableItemFontProvider; -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.ViewerNotification; @@ -41,9 +31,7 @@ import java.util.List; * @generated */ @Deprecated -public class ResourcePermissionItemProvider extends PermissionItemProvider implements IEditingDomainItemProvider, -IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, -ITableItemLabelProvider, ITableItemColorProvider, ITableItemFontProvider, IItemColorProvider, IItemFontProvider +public class ResourcePermissionItemProvider extends PermissionItemProvider { /** * This constructs an instance from a factory and a notifier. @@ -83,9 +71,9 @@ ITableItemLabelProvider, ITableItemColorProvider, ITableItemFontProvider, IItemC protected void addPatternPropertyDescriptor(Object object) { itemPropertyDescriptors - .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), - getResourceLocator(), getString("_UI_ResourcePermission_pattern_feature"), //$NON-NLS-1$ - getString("_UI_PropertyDescriptor_description", "_UI_ResourcePermission_pattern_feature", //$NON-NLS-1$ //$NON-NLS-2$ + .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), + getResourceLocator(), getString("_UI_ResourcePermission_pattern_feature"), //$NON-NLS-1$ + getString("_UI_PropertyDescriptor_description", "_UI_ResourcePermission_pattern_feature", //$NON-NLS-1$//$NON-NLS-2$ "_UI_ResourcePermission_type"), //$NON-NLS-1$ SecurityPackage.Literals.RESOURCE_PERMISSION__PATTERN, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); diff --git a/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/RoleItemProvider.java b/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/RoleItemProvider.java index f902ebce84..7baa635430 100644 --- a/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/RoleItemProvider.java +++ b/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/RoleItemProvider.java @@ -19,17 +19,7 @@ import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.ecore.EStructuralFeature; import org.eclipse.emf.edit.command.CommandParameter; import org.eclipse.emf.edit.provider.ComposeableAdapterFactory; -import org.eclipse.emf.edit.provider.IEditingDomainItemProvider; -import org.eclipse.emf.edit.provider.IItemColorProvider; -import org.eclipse.emf.edit.provider.IItemFontProvider; -import org.eclipse.emf.edit.provider.IItemLabelProvider; import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; -import org.eclipse.emf.edit.provider.IItemPropertySource; -import org.eclipse.emf.edit.provider.IStructuredItemContentProvider; -import org.eclipse.emf.edit.provider.ITableItemColorProvider; -import org.eclipse.emf.edit.provider.ITableItemFontProvider; -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.ViewerNotification; @@ -43,9 +33,7 @@ import java.util.List; * <!-- end-user-doc --> * @generated */ -public class RoleItemProvider extends SecurityItemItemProvider implements IEditingDomainItemProvider, -IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, -ITableItemLabelProvider, ITableItemColorProvider, ITableItemFontProvider, IItemColorProvider, IItemFontProvider +public class RoleItemProvider extends SecurityItemItemProvider { /** * This constructs an instance from a factory and a notifier. @@ -174,8 +162,7 @@ ITableItemLabelProvider, ITableItemColorProvider, ITableItemFontProvider, IItemC { String label = ((Role)object).getId(); return label == null || label.length() == 0 ? getString("_UI_Role_type") //$NON-NLS-1$ - : - label; + : label; } /** diff --git a/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/SecurityElementItemProvider.java b/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/SecurityElementItemProvider.java index aa6b6c4cb1..f7679ef11a 100644 --- a/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/SecurityElementItemProvider.java +++ b/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/SecurityElementItemProvider.java @@ -14,17 +14,7 @@ import org.eclipse.emf.cdo.etypes.provider.ModelElementItemProvider; import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.Notification; -import org.eclipse.emf.edit.provider.IEditingDomainItemProvider; -import org.eclipse.emf.edit.provider.IItemColorProvider; -import org.eclipse.emf.edit.provider.IItemFontProvider; -import org.eclipse.emf.edit.provider.IItemLabelProvider; import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; -import org.eclipse.emf.edit.provider.IItemPropertySource; -import org.eclipse.emf.edit.provider.IStructuredItemContentProvider; -import org.eclipse.emf.edit.provider.ITableItemColorProvider; -import org.eclipse.emf.edit.provider.ITableItemFontProvider; -import org.eclipse.emf.edit.provider.ITableItemLabelProvider; -import org.eclipse.emf.edit.provider.ITreeItemContentProvider; import java.util.Collection; import java.util.List; @@ -35,9 +25,7 @@ import java.util.List; * <!-- end-user-doc --> * @generated */ -public class SecurityElementItemProvider extends ModelElementItemProvider implements IEditingDomainItemProvider, -IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, -ITableItemLabelProvider, ITableItemColorProvider, ITableItemFontProvider, IItemColorProvider, IItemFontProvider +public class SecurityElementItemProvider extends ModelElementItemProvider { /** * This constructs an instance from a factory and a notifier. diff --git a/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/SecurityItemItemProvider.java b/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/SecurityItemItemProvider.java index b170caf4c6..72ad81a7c2 100644 --- a/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/SecurityItemItemProvider.java +++ b/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/SecurityItemItemProvider.java @@ -12,17 +12,7 @@ package org.eclipse.emf.cdo.security.provider; import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.Notification; -import org.eclipse.emf.edit.provider.IEditingDomainItemProvider; -import org.eclipse.emf.edit.provider.IItemColorProvider; -import org.eclipse.emf.edit.provider.IItemFontProvider; -import org.eclipse.emf.edit.provider.IItemLabelProvider; import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; -import org.eclipse.emf.edit.provider.IItemPropertySource; -import org.eclipse.emf.edit.provider.IStructuredItemContentProvider; -import org.eclipse.emf.edit.provider.ITableItemColorProvider; -import org.eclipse.emf.edit.provider.ITableItemFontProvider; -import org.eclipse.emf.edit.provider.ITableItemLabelProvider; -import org.eclipse.emf.edit.provider.ITreeItemContentProvider; import java.util.Collection; import java.util.List; @@ -33,9 +23,7 @@ import java.util.List; * <!-- end-user-doc --> * @generated */ -public class SecurityItemItemProvider extends SecurityElementItemProvider implements IEditingDomainItemProvider, -IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, -ITableItemLabelProvider, ITableItemColorProvider, ITableItemFontProvider, IItemColorProvider, IItemFontProvider +public class SecurityItemItemProvider extends SecurityElementItemProvider { /** * This constructs an instance from a factory and a notifier. diff --git a/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/SecurityItemProviderAdapterFactory.java b/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/SecurityItemProviderAdapterFactory.java index 3a8ae78fd7..70b9e67853 100644 --- a/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/SecurityItemProviderAdapterFactory.java +++ b/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/SecurityItemProviderAdapterFactory.java @@ -636,7 +636,7 @@ public class SecurityItemProviderAdapterFactory extends SecurityAdapterFactory if (isFactoryForType(type)) { Object adapter = super.adapt(object, type); - if (!(type instanceof Class<?>) || ((Class<?>)type).isInstance(adapter)) + if (!(type instanceof Class<?>) || (((Class<?>)type).isInstance(adapter))) { return adapter; } @@ -714,7 +714,7 @@ public class SecurityItemProviderAdapterFactory extends SecurityAdapterFactory } /** - * This disposes all of the item providers created by this factory. + * This disposes all of the item providers created by this factory. * <!-- begin-user-doc --> * <!-- end-user-doc --> * @generated @@ -722,77 +722,41 @@ public class SecurityItemProviderAdapterFactory extends SecurityAdapterFactory public void dispose() { if (realmItemProvider != null) - { realmItemProvider.dispose(); - } if (directoryItemProvider != null) - { directoryItemProvider.dispose(); - } if (roleItemProvider != null) - { roleItemProvider.dispose(); - } if (groupItemProvider != null) - { groupItemProvider.dispose(); - } if (userItemProvider != null) - { userItemProvider.dispose(); - } if (userPasswordItemProvider != null) - { userPasswordItemProvider.dispose(); - } if (classPermissionItemProvider != null) - { classPermissionItemProvider.dispose(); - } if (packagePermissionItemProvider != null) - { packagePermissionItemProvider.dispose(); - } if (resourcePermissionItemProvider != null) - { resourcePermissionItemProvider.dispose(); - } if (filterPermissionItemProvider != null) - { filterPermissionItemProvider.dispose(); - } if (linkedFilterItemProvider != null) - { linkedFilterItemProvider.dispose(); - } if (packageFilterItemProvider != null) - { packageFilterItemProvider.dispose(); - } if (classFilterItemProvider != null) - { classFilterItemProvider.dispose(); - } if (resourceFilterItemProvider != null) - { resourceFilterItemProvider.dispose(); - } if (expressionFilterItemProvider != null) - { expressionFilterItemProvider.dispose(); - } if (notFilterItemProvider != null) - { notFilterItemProvider.dispose(); - } if (andFilterItemProvider != null) - { andFilterItemProvider.dispose(); - } if (orFilterItemProvider != null) - { orFilterItemProvider.dispose(); - } } } diff --git a/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/UserItemProvider.java b/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/UserItemProvider.java index 01addbd61e..08bb811695 100644 --- a/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/UserItemProvider.java +++ b/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/UserItemProvider.java @@ -18,17 +18,7 @@ import org.eclipse.emf.common.notify.AdapterFactory; import org.eclipse.emf.common.notify.Notification; import org.eclipse.emf.ecore.EStructuralFeature; import org.eclipse.emf.edit.provider.ComposeableAdapterFactory; -import org.eclipse.emf.edit.provider.IEditingDomainItemProvider; -import org.eclipse.emf.edit.provider.IItemColorProvider; -import org.eclipse.emf.edit.provider.IItemFontProvider; -import org.eclipse.emf.edit.provider.IItemLabelProvider; import org.eclipse.emf.edit.provider.IItemPropertyDescriptor; -import org.eclipse.emf.edit.provider.IItemPropertySource; -import org.eclipse.emf.edit.provider.IStructuredItemContentProvider; -import org.eclipse.emf.edit.provider.ITableItemColorProvider; -import org.eclipse.emf.edit.provider.ITableItemFontProvider; -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.ViewerNotification; @@ -41,9 +31,7 @@ import java.util.List; * <!-- end-user-doc --> * @generated */ -public class UserItemProvider extends AssigneeItemProvider implements IEditingDomainItemProvider, -IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, -ITableItemLabelProvider, ITableItemColorProvider, ITableItemFontProvider, IItemColorProvider, IItemFontProvider +public class UserItemProvider extends AssigneeItemProvider { /** * This constructs an instance from a factory and a notifier. @@ -305,8 +293,7 @@ ITableItemLabelProvider, ITableItemColorProvider, ITableItemFontProvider, IItemC { String label = ((User)object).getId(); return label == null || label.length() == 0 ? getString("_UI_User_type") //$NON-NLS-1$ - : - label; + : label; } /** diff --git a/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/UserPasswordItemProvider.java b/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/UserPasswordItemProvider.java index 8db5709f76..15b6123796 100644 --- a/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/UserPasswordItemProvider.java +++ b/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/UserPasswordItemProvider.java @@ -41,8 +41,8 @@ import java.util.List; * @generated */ public class UserPasswordItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, -IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, -ITableItemLabelProvider, ITableItemColorProvider, ITableItemFontProvider, IItemColorProvider, IItemFontProvider + IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, + ITableItemLabelProvider, ITableItemColorProvider, ITableItemFontProvider, IItemColorProvider, IItemFontProvider { /** * This constructs an instance from a factory and a notifier. |