From cc7297c466f9b2d42d859161f04693840d1a2a1a Mon Sep 17 00:00:00 2001 From: Eike Stepper Date: Tue, 12 Jun 2012 10:59:13 +0200 Subject: [380629] Design a default Security model https://bugs.eclipse.org/bugs/show_bug.cgi?id=380629 --- .../icons/full/obj16/ClassCheck.gif | Bin 206 -> 0 bytes .../icons/full/obj16/ClassPermission.gif | Bin 0 -> 206 bytes .../icons/full/obj16/PackageCheck.gif | Bin 207 -> 0 bytes .../icons/full/obj16/PackagePermission.gif | Bin 0 -> 207 bytes .../icons/full/obj16/ResourceCheck.gif | Bin 346 -> 0 bytes .../icons/full/obj16/ResourcePermission.gif | Bin 0 -> 346 bytes .../plugin.properties | 32 ++-- .../cdo/security/provider/CheckItemProvider.java | 171 --------------------- .../security/provider/ClassCheckItemProvider.java | 156 ------------------- .../provider/ClassPermissionItemProvider.java | 156 +++++++++++++++++++ .../provider/PackageCheckItemProvider.java | 148 ------------------ .../provider/PackagePermissionItemProvider.java | 148 ++++++++++++++++++ .../security/provider/PermissionItemProvider.java | 171 +++++++++++++++++++++ .../cdo/security/provider/RealmItemProvider.java | 16 ++ .../provider/ResourceCheckItemProvider.java | 157 ------------------- .../provider/ResourcePermissionItemProvider.java | 159 +++++++++++++++++++ .../cdo/security/provider/RoleItemProvider.java | 16 +- .../SecurityItemProviderAdapterFactory.java | 54 +++---- .../cdo/security/provider/UserItemProvider.java | 16 ++ 19 files changed, 713 insertions(+), 687 deletions(-) delete mode 100644 plugins/org.eclipse.emf.cdo.security.edit/icons/full/obj16/ClassCheck.gif create mode 100644 plugins/org.eclipse.emf.cdo.security.edit/icons/full/obj16/ClassPermission.gif delete mode 100644 plugins/org.eclipse.emf.cdo.security.edit/icons/full/obj16/PackageCheck.gif create mode 100644 plugins/org.eclipse.emf.cdo.security.edit/icons/full/obj16/PackagePermission.gif delete mode 100644 plugins/org.eclipse.emf.cdo.security.edit/icons/full/obj16/ResourceCheck.gif create mode 100644 plugins/org.eclipse.emf.cdo.security.edit/icons/full/obj16/ResourcePermission.gif delete mode 100644 plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/CheckItemProvider.java delete mode 100644 plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/ClassCheckItemProvider.java create mode 100644 plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/ClassPermissionItemProvider.java delete mode 100644 plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/PackageCheckItemProvider.java create mode 100644 plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/PackagePermissionItemProvider.java create mode 100644 plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/PermissionItemProvider.java delete mode 100644 plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/ResourceCheckItemProvider.java create mode 100644 plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/ResourcePermissionItemProvider.java (limited to 'plugins/org.eclipse.emf.cdo.security.edit') diff --git a/plugins/org.eclipse.emf.cdo.security.edit/icons/full/obj16/ClassCheck.gif b/plugins/org.eclipse.emf.cdo.security.edit/icons/full/obj16/ClassCheck.gif deleted file mode 100644 index 2b8da630d8..0000000000 Binary files a/plugins/org.eclipse.emf.cdo.security.edit/icons/full/obj16/ClassCheck.gif and /dev/null differ diff --git a/plugins/org.eclipse.emf.cdo.security.edit/icons/full/obj16/ClassPermission.gif b/plugins/org.eclipse.emf.cdo.security.edit/icons/full/obj16/ClassPermission.gif new file mode 100644 index 0000000000..2b8da630d8 Binary files /dev/null and b/plugins/org.eclipse.emf.cdo.security.edit/icons/full/obj16/ClassPermission.gif differ diff --git a/plugins/org.eclipse.emf.cdo.security.edit/icons/full/obj16/PackageCheck.gif b/plugins/org.eclipse.emf.cdo.security.edit/icons/full/obj16/PackageCheck.gif deleted file mode 100644 index 30c5c10cc4..0000000000 Binary files a/plugins/org.eclipse.emf.cdo.security.edit/icons/full/obj16/PackageCheck.gif and /dev/null differ diff --git a/plugins/org.eclipse.emf.cdo.security.edit/icons/full/obj16/PackagePermission.gif b/plugins/org.eclipse.emf.cdo.security.edit/icons/full/obj16/PackagePermission.gif new file mode 100644 index 0000000000..30c5c10cc4 Binary files /dev/null and b/plugins/org.eclipse.emf.cdo.security.edit/icons/full/obj16/PackagePermission.gif differ diff --git a/plugins/org.eclipse.emf.cdo.security.edit/icons/full/obj16/ResourceCheck.gif b/plugins/org.eclipse.emf.cdo.security.edit/icons/full/obj16/ResourceCheck.gif deleted file mode 100644 index 27c7cbbe48..0000000000 Binary files a/plugins/org.eclipse.emf.cdo.security.edit/icons/full/obj16/ResourceCheck.gif and /dev/null differ diff --git a/plugins/org.eclipse.emf.cdo.security.edit/icons/full/obj16/ResourcePermission.gif b/plugins/org.eclipse.emf.cdo.security.edit/icons/full/obj16/ResourcePermission.gif new file mode 100644 index 0000000000..27c7cbbe48 Binary files /dev/null and b/plugins/org.eclipse.emf.cdo.security.edit/icons/full/obj16/ResourcePermission.gif differ diff --git a/plugins/org.eclipse.emf.cdo.security.edit/plugin.properties b/plugins/org.eclipse.emf.cdo.security.edit/plugin.properties index eff33b4dbf..d1af9e7a5d 100644 --- a/plugins/org.eclipse.emf.cdo.security.edit/plugin.properties +++ b/plugins/org.eclipse.emf.cdo.security.edit/plugin.properties @@ -65,32 +65,24 @@ _UI_User_allGroups_feature = All Groups _UI_User_allRoles_feature = All Roles _UI_User_label_feature = Label _UI_Group_allInheritingGroups_feature = All Inheriting Groups -_UI_Check_type = Check -_UI_ClassCheck_type = Class Check -_UI_PackageCheck_type = Package Check -_UI_ResourceCheck_type = Resource Check -_UI_Role_checks_feature = Checks -_UI_Check_role_feature = Role -_UI_Check_permission_feature = Permission -_UI_ClassCheck_classes_feature = Classes -_UI_PackageCheck_packages_feature = Packages -_UI_ResourceCheck_pattern_feature = Pattern -_UI_Permission_READ_literal = READ -_UI_Permission_WRITE_literal = WRITE _UI_Realm_allUsers_feature = All Users _UI_Realm_allGroups_feature = All Groups _UI_Realm_allRoles_feature = All Roles -_UI_Realm_allChecks_feature = All Checks _UI_User_unassignedRoles_feature = Unassigned Roles -_UI_Realm_defaultPermission_feature = Default Permission -_UI_User_defaultPermissionOverride_feature = Default Permission Override -_UI_User_defaultPermission_feature = Default Permission -_UI_User_allChecks_feature = All Checks -_UI_ClassCheck_applicableClass_feature = Applicable Class -_UI_PackageCheck_applicablePackage_feature = Applicable Package _UI_Realm_defaultAccess_feature = Default Access _UI_User_defaultAccessOverride_feature = Default Access Override _UI_User_defaultAccess_feature = Default Access -_UI_Check_access_feature = Access _UI_Access_READ_literal = READ _UI_Access_WRITE_literal = WRITE +_UI_Permission_type = Permission +_UI_ClassPermission_type = Class Permission +_UI_PackagePermission_type = Package Permission +_UI_ResourcePermission_type = Resource Permission +_UI_Realm_allPermissions_feature = All Permissions +_UI_Role_permissions_feature = Permissions +_UI_User_allPermissions_feature = All Permissions +_UI_Permission_role_feature = Role +_UI_Permission_access_feature = Access +_UI_ClassPermission_applicableClass_feature = Applicable Class +_UI_PackagePermission_applicablePackage_feature = Applicable Package +_UI_ResourcePermission_pattern_feature = Pattern diff --git a/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/CheckItemProvider.java b/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/CheckItemProvider.java deleted file mode 100644 index 902eb8e391..0000000000 --- a/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/CheckItemProvider.java +++ /dev/null @@ -1,171 +0,0 @@ -/** - */ -package org.eclipse.emf.cdo.security.provider; - -import org.eclipse.emf.cdo.security.Check; -import org.eclipse.emf.cdo.security.Access; -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.common.util.ResourceLocator; -import org.eclipse.emf.edit.provider.ComposeableAdapterFactory; -import org.eclipse.emf.edit.provider.IChildCreationExtender; -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.ItemProviderAdapter; -import org.eclipse.emf.edit.provider.ViewerNotification; - -import java.util.Collection; -import java.util.List; - -/** - * This is the item provider adapter for a {@link org.eclipse.emf.cdo.security.Check} object. - * - * - * @generated - */ -public class CheckItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, - IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, - ITableItemLabelProvider, ITableItemColorProvider, ITableItemFontProvider, IItemColorProvider, IItemFontProvider -{ - /** - * This constructs an instance from a factory and a notifier. - * - * - * @generated - */ - public CheckItemProvider(AdapterFactory adapterFactory) - { - super(adapterFactory); - } - - /** - * This returns the property descriptors for the adapted class. - * - * - * @generated - */ - @Override - public List getPropertyDescriptors(Object object) - { - if (itemPropertyDescriptors == null) - { - super.getPropertyDescriptors(object); - - addAccessPropertyDescriptor(object); - } - return itemPropertyDescriptors; - } - - /** - * This adds a property descriptor for the Access feature. - * - * - * @generated - */ - protected void addAccessPropertyDescriptor(Object object) - { - itemPropertyDescriptors.add(createItemPropertyDescriptor( - ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), - getResourceLocator(), - getString("_UI_Check_access_feature"), //$NON-NLS-1$ - getString("_UI_PropertyDescriptor_description", "_UI_Check_access_feature", "_UI_Check_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - SecurityPackage.Literals.CHECK__ACCESS, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, - null)); - } - - /** - * - * - * @generated - */ - @Override - public boolean hasChildren(Object object) - { - return hasChildren(object, true); - } - - /** - * - * - * @generated - */ - @Override - protected boolean shouldComposeCreationImage() - { - return true; - } - - /** - * This returns the label text for the adapted class. - * - * - * @generated - */ - @Override - public String getText(Object object) - { - Access labelValue = ((Check)object).getAccess(); - String label = labelValue == null ? null : labelValue.toString(); - return label == null || label.length() == 0 ? getString("_UI_Check_type") : //$NON-NLS-1$ - getString("_UI_Check_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$ - } - - /** - * This handles model notifications by calling {@link #updateChildren} to update any cached - * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}. - * - * - * @generated - */ - @Override - public void notifyChanged(Notification notification) - { - updateChildren(notification); - - switch (notification.getFeatureID(Check.class)) - { - case SecurityPackage.CHECK__ACCESS: - fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true)); - return; - } - super.notifyChanged(notification); - } - - /** - * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children - * that can be created under this object. - * - * - * @generated - */ - @Override - protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) - { - super.collectNewChildDescriptors(newChildDescriptors, object); - } - - /** - * Return the resource locator for this item provider's resources. - * - * - * @generated - */ - @Override - public ResourceLocator getResourceLocator() - { - return ((IChildCreationExtender)adapterFactory).getResourceLocator(); - } - -} diff --git a/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/ClassCheckItemProvider.java b/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/ClassCheckItemProvider.java deleted file mode 100644 index 01791ad1cb..0000000000 --- a/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/ClassCheckItemProvider.java +++ /dev/null @@ -1,156 +0,0 @@ -/** - */ -package org.eclipse.emf.cdo.security.provider; - -import org.eclipse.emf.cdo.security.Access; -import org.eclipse.emf.cdo.security.ClassCheck; -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.EClass; -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; - -/** - * This is the item provider adapter for a {@link org.eclipse.emf.cdo.security.ClassCheck} object. - * - * - * @generated - */ -public class ClassCheckItemProvider extends CheckItemProvider implements IEditingDomainItemProvider, - IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, - ITableItemLabelProvider, ITableItemColorProvider, ITableItemFontProvider, IItemColorProvider, IItemFontProvider -{ - /** - * This constructs an instance from a factory and a notifier. - * - * - * @generated - */ - public ClassCheckItemProvider(AdapterFactory adapterFactory) - { - super(adapterFactory); - } - - /** - * This returns the property descriptors for the adapted class. - * - * - * @generated - */ - @Override - public List getPropertyDescriptors(Object object) - { - if (itemPropertyDescriptors == null) - { - super.getPropertyDescriptors(object); - - addApplicableClassPropertyDescriptor(object); - } - return itemPropertyDescriptors; - } - - /** - * This adds a property descriptor for the Applicable Class feature. - * - * - * @generated - */ - protected void addApplicableClassPropertyDescriptor(Object object) - { - itemPropertyDescriptors - .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), - getResourceLocator(), - getString("_UI_ClassCheck_applicableClass_feature"), //$NON-NLS-1$ - getString( - "_UI_PropertyDescriptor_description", "_UI_ClassCheck_applicableClass_feature", "_UI_ClassCheck_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - SecurityPackage.Literals.CLASS_CHECK__APPLICABLE_CLASS, true, false, true, null, null, null)); - } - - /** - * This returns ClassCheck.gif. - * - * - * @generated - */ - @Override - public Object getImage(Object object) - { - return overlayImage(object, getResourceLocator().getImage("full/obj16/ClassCheck")); //$NON-NLS-1$ - } - - /** - * - * - * @generated - */ - @Override - protected boolean shouldComposeCreationImage() - { - return true; - } - - /** - * This returns the label text for the adapted class. - * - * - * @generated NOT - */ - @Override - public String getText(Object object) - { - Access labelValue = ((ClassCheck)object).getAccess(); - EClass applicableClass = ((ClassCheck)object).getApplicableClass(); - String label = labelValue == null ? null : labelValue.toString(); - - if (applicableClass != null) - { - label += " " + applicableClass.getName(); - } - - return label == null || label.length() == 0 ? getString("_UI_ClassCheck_type") : //$NON-NLS-1$ - label; - } - - /** - * This handles model notifications by calling {@link #updateChildren} to update any cached - * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}. - * - * - * @generated - */ - @Override - public void notifyChanged(Notification notification) - { - updateChildren(notification); - super.notifyChanged(notification); - } - - /** - * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children - * that can be created under this object. - * - * - * @generated - */ - @Override - protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) - { - super.collectNewChildDescriptors(newChildDescriptors, object); - } - -} 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 new file mode 100644 index 0000000000..5e43cf1e75 --- /dev/null +++ b/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/ClassPermissionItemProvider.java @@ -0,0 +1,156 @@ +/** + */ +package org.eclipse.emf.cdo.security.provider; + +import org.eclipse.emf.cdo.security.Access; +import org.eclipse.emf.cdo.security.ClassPermission; +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.EClass; +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; + +/** + * This is the item provider adapter for a {@link org.eclipse.emf.cdo.security.ClassPermission} object. + * + * + * @generated + */ +public class ClassPermissionItemProvider extends PermissionItemProvider implements IEditingDomainItemProvider, + IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, + ITableItemLabelProvider, ITableItemColorProvider, ITableItemFontProvider, IItemColorProvider, IItemFontProvider +{ + /** + * This constructs an instance from a factory and a notifier. + * + * + * @generated + */ + public ClassPermissionItemProvider(AdapterFactory adapterFactory) + { + super(adapterFactory); + } + + /** + * This returns the property descriptors for the adapted class. + * + * + * @generated + */ + @Override + public List getPropertyDescriptors(Object object) + { + if (itemPropertyDescriptors == null) + { + super.getPropertyDescriptors(object); + + addApplicableClassPropertyDescriptor(object); + } + return itemPropertyDescriptors; + } + + /** + * This adds a property descriptor for the Applicable Class feature. + * + * + * @generated + */ + protected void addApplicableClassPropertyDescriptor(Object object) + { + itemPropertyDescriptors + .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), + getResourceLocator(), + getString("_UI_ClassPermission_applicableClass_feature"), //$NON-NLS-1$ + getString( + "_UI_PropertyDescriptor_description", "_UI_ClassPermission_applicableClass_feature", "_UI_ClassPermission_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + SecurityPackage.Literals.CLASS_PERMISSION__APPLICABLE_CLASS, true, false, true, null, null, null)); + } + + /** + * This returns ClassPermission.gif. + * + * + * @generated + */ + @Override + public Object getImage(Object object) + { + return overlayImage(object, getResourceLocator().getImage("full/obj16/ClassPermission")); //$NON-NLS-1$ + } + + /** + * + * + * @generated + */ + @Override + protected boolean shouldComposeCreationImage() + { + return true; + } + + /** + * This returns the label text for the adapted class. + * + * + * @generated NOT + */ + @Override + public String getText(Object object) + { + Access labelValue = ((ClassPermission)object).getAccess(); + EClass applicableClass = ((ClassPermission)object).getApplicableClass(); + String label = labelValue == null ? null : labelValue.toString(); + + if (applicableClass != null) + { + label += " " + applicableClass.getName(); + } + + return label == null || label.length() == 0 ? getString("_UI_ClassPermission_type") : //$NON-NLS-1$ + label; + } + + /** + * This handles model notifications by calling {@link #updateChildren} to update any cached + * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}. + * + * + * @generated + */ + @Override + public void notifyChanged(Notification notification) + { + updateChildren(notification); + super.notifyChanged(notification); + } + + /** + * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children + * that can be created under this object. + * + * + * @generated + */ + @Override + protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) + { + super.collectNewChildDescriptors(newChildDescriptors, object); + } + +} diff --git a/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/PackageCheckItemProvider.java b/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/PackageCheckItemProvider.java deleted file mode 100644 index 8fa3740e86..0000000000 --- a/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/PackageCheckItemProvider.java +++ /dev/null @@ -1,148 +0,0 @@ -/** - */ -package org.eclipse.emf.cdo.security.provider; - -import org.eclipse.emf.cdo.security.PackageCheck; -import org.eclipse.emf.cdo.security.Access; -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; - -/** - * This is the item provider adapter for a {@link org.eclipse.emf.cdo.security.PackageCheck} object. - * - * - * @generated - */ -public class PackageCheckItemProvider extends CheckItemProvider implements IEditingDomainItemProvider, - IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, - ITableItemLabelProvider, ITableItemColorProvider, ITableItemFontProvider, IItemColorProvider, IItemFontProvider -{ - /** - * This constructs an instance from a factory and a notifier. - * - * - * @generated - */ - public PackageCheckItemProvider(AdapterFactory adapterFactory) - { - super(adapterFactory); - } - - /** - * This returns the property descriptors for the adapted class. - * - * - * @generated - */ - @Override - public List getPropertyDescriptors(Object object) - { - if (itemPropertyDescriptors == null) - { - super.getPropertyDescriptors(object); - - addApplicablePackagePropertyDescriptor(object); - } - return itemPropertyDescriptors; - } - - /** - * This adds a property descriptor for the Applicable Package feature. - * - * - * @generated - */ - protected void addApplicablePackagePropertyDescriptor(Object object) - { - itemPropertyDescriptors - .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), - getResourceLocator(), - getString("_UI_PackageCheck_applicablePackage_feature"), //$NON-NLS-1$ - getString( - "_UI_PropertyDescriptor_description", "_UI_PackageCheck_applicablePackage_feature", "_UI_PackageCheck_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - SecurityPackage.Literals.PACKAGE_CHECK__APPLICABLE_PACKAGE, true, false, true, null, null, null)); - } - - /** - * This returns PackageCheck.gif. - * - * - * @generated - */ - @Override - public Object getImage(Object object) - { - return overlayImage(object, getResourceLocator().getImage("full/obj16/PackageCheck")); //$NON-NLS-1$ - } - - /** - * - * - * @generated - */ - @Override - protected boolean shouldComposeCreationImage() - { - return true; - } - - /** - * This returns the label text for the adapted class. - * - * - * @generated - */ - @Override - public String getText(Object object) - { - Access labelValue = ((PackageCheck)object).getAccess(); - String label = labelValue == null ? null : labelValue.toString(); - return label == null || label.length() == 0 ? getString("_UI_PackageCheck_type") : //$NON-NLS-1$ - getString("_UI_PackageCheck_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$ - } - - /** - * This handles model notifications by calling {@link #updateChildren} to update any cached - * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}. - * - * - * @generated - */ - @Override - public void notifyChanged(Notification notification) - { - updateChildren(notification); - super.notifyChanged(notification); - } - - /** - * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children - * that can be created under this object. - * - * - * @generated - */ - @Override - protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) - { - super.collectNewChildDescriptors(newChildDescriptors, object); - } - -} 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 new file mode 100644 index 0000000000..98b1126a61 --- /dev/null +++ b/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/PackagePermissionItemProvider.java @@ -0,0 +1,148 @@ +/** + */ +package org.eclipse.emf.cdo.security.provider; + +import org.eclipse.emf.cdo.security.PackagePermission; +import org.eclipse.emf.cdo.security.Access; +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; + +/** + * This is the item provider adapter for a {@link org.eclipse.emf.cdo.security.PackagePermission} object. + * + * + * @generated + */ +public class PackagePermissionItemProvider extends PermissionItemProvider implements IEditingDomainItemProvider, + IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, + ITableItemLabelProvider, ITableItemColorProvider, ITableItemFontProvider, IItemColorProvider, IItemFontProvider +{ + /** + * This constructs an instance from a factory and a notifier. + * + * + * @generated + */ + public PackagePermissionItemProvider(AdapterFactory adapterFactory) + { + super(adapterFactory); + } + + /** + * This returns the property descriptors for the adapted class. + * + * + * @generated + */ + @Override + public List getPropertyDescriptors(Object object) + { + if (itemPropertyDescriptors == null) + { + super.getPropertyDescriptors(object); + + addApplicablePackagePropertyDescriptor(object); + } + return itemPropertyDescriptors; + } + + /** + * This adds a property descriptor for the Applicable Package feature. + * + * + * @generated + */ + protected void addApplicablePackagePropertyDescriptor(Object object) + { + itemPropertyDescriptors + .add(createItemPropertyDescriptor(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), + getResourceLocator(), + getString("_UI_PackagePermission_applicablePackage_feature"), //$NON-NLS-1$ + getString( + "_UI_PropertyDescriptor_description", "_UI_PackagePermission_applicablePackage_feature", "_UI_PackagePermission_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + SecurityPackage.Literals.PACKAGE_PERMISSION__APPLICABLE_PACKAGE, true, false, true, null, null, null)); + } + + /** + * This returns PackagePermission.gif. + * + * + * @generated + */ + @Override + public Object getImage(Object object) + { + return overlayImage(object, getResourceLocator().getImage("full/obj16/PackagePermission")); //$NON-NLS-1$ + } + + /** + * + * + * @generated + */ + @Override + protected boolean shouldComposeCreationImage() + { + return true; + } + + /** + * This returns the label text for the adapted class. + * + * + * @generated + */ + @Override + public String getText(Object object) + { + Access labelValue = ((PackagePermission)object).getAccess(); + String label = labelValue == null ? null : labelValue.toString(); + return label == null || label.length() == 0 ? getString("_UI_PackagePermission_type") : //$NON-NLS-1$ + getString("_UI_PackagePermission_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$ + } + + /** + * This handles model notifications by calling {@link #updateChildren} to update any cached + * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}. + * + * + * @generated + */ + @Override + public void notifyChanged(Notification notification) + { + updateChildren(notification); + super.notifyChanged(notification); + } + + /** + * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children + * that can be created under this object. + * + * + * @generated + */ + @Override + protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) + { + super.collectNewChildDescriptors(newChildDescriptors, object); + } + +} 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 new file mode 100644 index 0000000000..9ce0d8c817 --- /dev/null +++ b/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/PermissionItemProvider.java @@ -0,0 +1,171 @@ +/** + */ +package org.eclipse.emf.cdo.security.provider; + +import org.eclipse.emf.cdo.security.Permission; +import org.eclipse.emf.cdo.security.Access; +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.common.util.ResourceLocator; +import org.eclipse.emf.edit.provider.ComposeableAdapterFactory; +import org.eclipse.emf.edit.provider.IChildCreationExtender; +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.ItemProviderAdapter; +import org.eclipse.emf.edit.provider.ViewerNotification; + +import java.util.Collection; +import java.util.List; + +/** + * This is the item provider adapter for a {@link org.eclipse.emf.cdo.security.Permission} object. + * + * + * @generated + */ +public class PermissionItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider, + IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, + ITableItemLabelProvider, ITableItemColorProvider, ITableItemFontProvider, IItemColorProvider, IItemFontProvider +{ + /** + * This constructs an instance from a factory and a notifier. + * + * + * @generated + */ + public PermissionItemProvider(AdapterFactory adapterFactory) + { + super(adapterFactory); + } + + /** + * This returns the property descriptors for the adapted class. + * + * + * @generated + */ + @Override + public List getPropertyDescriptors(Object object) + { + if (itemPropertyDescriptors == null) + { + super.getPropertyDescriptors(object); + + addAccessPropertyDescriptor(object); + } + return itemPropertyDescriptors; + } + + /** + * This adds a property descriptor for the Access feature. + * + * + * @generated + */ + protected void addAccessPropertyDescriptor(Object object) + { + itemPropertyDescriptors.add(createItemPropertyDescriptor( + ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), + getResourceLocator(), + getString("_UI_Permission_access_feature"), //$NON-NLS-1$ + getString("_UI_PropertyDescriptor_description", "_UI_Permission_access_feature", "_UI_Permission_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + SecurityPackage.Literals.PERMISSION__ACCESS, true, false, false, ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, + null, null)); + } + + /** + * + * + * @generated + */ + @Override + public boolean hasChildren(Object object) + { + return hasChildren(object, true); + } + + /** + * + * + * @generated + */ + @Override + protected boolean shouldComposeCreationImage() + { + return true; + } + + /** + * This returns the label text for the adapted class. + * + * + * @generated + */ + @Override + public String getText(Object object) + { + 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$ + getString("_UI_Permission_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$ + } + + /** + * This handles model notifications by calling {@link #updateChildren} to update any cached + * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}. + * + * + * @generated + */ + @Override + public void notifyChanged(Notification notification) + { + updateChildren(notification); + + switch (notification.getFeatureID(Permission.class)) + { + case SecurityPackage.PERMISSION__ACCESS: + fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true)); + return; + } + super.notifyChanged(notification); + } + + /** + * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children + * that can be created under this object. + * + * + * @generated + */ + @Override + protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) + { + super.collectNewChildDescriptors(newChildDescriptors, object); + } + + /** + * Return the resource locator for this item provider's resources. + * + * + * @generated + */ + @Override + public ResourceLocator getResourceLocator() + { + return ((IChildCreationExtender)adapterFactory).getResourceLocator(); + } + +} 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 27d728c955..c13be5943c 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 @@ -69,12 +69,28 @@ public class RealmItemProvider extends SecurityElementItemProvider implements IE { super.getPropertyDescriptors(object); + addAllPermissionsPropertyDescriptor(object); addNamePropertyDescriptor(object); addDefaultAccessPropertyDescriptor(object); } return itemPropertyDescriptors; } + /** + * This adds a property descriptor for the All Permissions feature. + * + * + * @generated + */ + protected void addAllPermissionsPropertyDescriptor(Object object) + { + itemPropertyDescriptors.add(createItemPropertyDescriptor( + ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), + getString("_UI_Realm_allPermissions_feature"), //$NON-NLS-1$ + getString("_UI_PropertyDescriptor_description", "_UI_Realm_allPermissions_feature", "_UI_Realm_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + SecurityPackage.Literals.REALM__ALL_PERMISSIONS, false, false, false, null, null, null)); + } + /** * This adds a property descriptor for the Name feature. * diff --git a/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/ResourceCheckItemProvider.java b/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/ResourceCheckItemProvider.java deleted file mode 100644 index 89b371b20f..0000000000 --- a/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/ResourceCheckItemProvider.java +++ /dev/null @@ -1,157 +0,0 @@ -/** - */ -package org.eclipse.emf.cdo.security.provider; - -import org.eclipse.emf.cdo.security.Access; -import org.eclipse.emf.cdo.security.ResourceCheck; -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; - -import java.util.Collection; -import java.util.List; - -/** - * This is the item provider adapter for a {@link org.eclipse.emf.cdo.security.ResourceCheck} object. - * - * - * @generated - */ -public class ResourceCheckItemProvider extends CheckItemProvider implements IEditingDomainItemProvider, - IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, - ITableItemLabelProvider, ITableItemColorProvider, ITableItemFontProvider, IItemColorProvider, IItemFontProvider -{ - /** - * This constructs an instance from a factory and a notifier. - * - * - * @generated - */ - public ResourceCheckItemProvider(AdapterFactory adapterFactory) - { - super(adapterFactory); - } - - /** - * This returns the property descriptors for the adapted class. - * - * - * @generated - */ - @Override - public List getPropertyDescriptors(Object object) - { - if (itemPropertyDescriptors == null) - { - super.getPropertyDescriptors(object); - - addPatternPropertyDescriptor(object); - } - return itemPropertyDescriptors; - } - - /** - * This adds a property descriptor for the Pattern feature. - * - * - * @generated - */ - protected void addPatternPropertyDescriptor(Object object) - { - itemPropertyDescriptors.add(createItemPropertyDescriptor( - ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), - getResourceLocator(), - getString("_UI_ResourceCheck_pattern_feature"), //$NON-NLS-1$ - getString("_UI_PropertyDescriptor_description", "_UI_ResourceCheck_pattern_feature", "_UI_ResourceCheck_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ - SecurityPackage.Literals.RESOURCE_CHECK__PATTERN, true, false, false, - ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); - } - - /** - * This returns ResourceCheck.gif. - * - * - * @generated - */ - @Override - public Object getImage(Object object) - { - return overlayImage(object, getResourceLocator().getImage("full/obj16/ResourceCheck")); //$NON-NLS-1$ - } - - /** - * - * - * @generated - */ - @Override - protected boolean shouldComposeCreationImage() - { - return true; - } - - /** - * This returns the label text for the adapted class. - * - * - * @generated - */ - @Override - public String getText(Object object) - { - Access labelValue = ((ResourceCheck)object).getAccess(); - String label = labelValue == null ? null : labelValue.toString(); - return label == null || label.length() == 0 ? getString("_UI_ResourceCheck_type") : //$NON-NLS-1$ - getString("_UI_ResourceCheck_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$ - } - - /** - * This handles model notifications by calling {@link #updateChildren} to update any cached - * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}. - * - * - * @generated - */ - @Override - public void notifyChanged(Notification notification) - { - updateChildren(notification); - - switch (notification.getFeatureID(ResourceCheck.class)) - { - case SecurityPackage.RESOURCE_CHECK__PATTERN: - fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true)); - return; - } - super.notifyChanged(notification); - } - - /** - * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children - * that can be created under this object. - * - * - * @generated - */ - @Override - protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) - { - super.collectNewChildDescriptors(newChildDescriptors, object); - } - -} 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 new file mode 100644 index 0000000000..15383a360c --- /dev/null +++ b/plugins/org.eclipse.emf.cdo.security.edit/src/org/eclipse/emf/cdo/security/provider/ResourcePermissionItemProvider.java @@ -0,0 +1,159 @@ +/** + */ +package org.eclipse.emf.cdo.security.provider; + +import org.eclipse.emf.cdo.security.Access; +import org.eclipse.emf.cdo.security.ResourcePermission; +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; + +import java.util.Collection; +import java.util.List; + +/** + * This is the item provider adapter for a {@link org.eclipse.emf.cdo.security.ResourcePermission} object. + * + * + * @generated + */ +public class ResourcePermissionItemProvider extends PermissionItemProvider implements IEditingDomainItemProvider, + IStructuredItemContentProvider, ITreeItemContentProvider, IItemLabelProvider, IItemPropertySource, + ITableItemLabelProvider, ITableItemColorProvider, ITableItemFontProvider, IItemColorProvider, IItemFontProvider +{ + /** + * This constructs an instance from a factory and a notifier. + * + * + * @generated + */ + public ResourcePermissionItemProvider(AdapterFactory adapterFactory) + { + super(adapterFactory); + } + + /** + * This returns the property descriptors for the adapted class. + * + * + * @generated + */ + @Override + public List getPropertyDescriptors(Object object) + { + if (itemPropertyDescriptors == null) + { + super.getPropertyDescriptors(object); + + addPatternPropertyDescriptor(object); + } + return itemPropertyDescriptors; + } + + /** + * This adds a property descriptor for the Pattern feature. + * + * + * @generated + */ + 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", "_UI_ResourcePermission_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + SecurityPackage.Literals.RESOURCE_PERMISSION__PATTERN, true, false, false, + ItemPropertyDescriptor.GENERIC_VALUE_IMAGE, null, null)); + } + + /** + * This returns ResourcePermission.gif. + * + * + * @generated + */ + @Override + public Object getImage(Object object) + { + return overlayImage(object, getResourceLocator().getImage("full/obj16/ResourcePermission")); //$NON-NLS-1$ + } + + /** + * + * + * @generated + */ + @Override + protected boolean shouldComposeCreationImage() + { + return true; + } + + /** + * This returns the label text for the adapted class. + * + * + * @generated + */ + @Override + public String getText(Object object) + { + Access labelValue = ((ResourcePermission)object).getAccess(); + String label = labelValue == null ? null : labelValue.toString(); + return label == null || label.length() == 0 ? getString("_UI_ResourcePermission_type") : //$NON-NLS-1$ + getString("_UI_ResourcePermission_type") + " " + label; //$NON-NLS-1$ //$NON-NLS-2$ + } + + /** + * This handles model notifications by calling {@link #updateChildren} to update any cached + * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}. + * + * + * @generated + */ + @Override + public void notifyChanged(Notification notification) + { + updateChildren(notification); + + switch (notification.getFeatureID(ResourcePermission.class)) + { + case SecurityPackage.RESOURCE_PERMISSION__PATTERN: + fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true)); + return; + } + super.notifyChanged(notification); + } + + /** + * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children + * that can be created under this object. + * + * + * @generated + */ + @Override + protected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) + { + super.collectNewChildDescriptors(newChildDescriptors, object); + } + +} 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 fc456262b5..30bd474a99 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 @@ -119,7 +119,7 @@ public class RoleItemProvider extends SecurityItemItemProvider implements IEditi if (childrenFeatures == null) { super.getChildrenFeatures(object); - childrenFeatures.add(SecurityPackage.Literals.ROLE__CHECKS); + childrenFeatures.add(SecurityPackage.Literals.ROLE__PERMISSIONS); } return childrenFeatures; } @@ -192,7 +192,7 @@ public class RoleItemProvider extends SecurityItemItemProvider implements IEditi case SecurityPackage.ROLE__ID: fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true)); return; - case SecurityPackage.ROLE__CHECKS: + case SecurityPackage.ROLE__PERMISSIONS: fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false)); return; } @@ -211,14 +211,14 @@ public class RoleItemProvider extends SecurityItemItemProvider implements IEditi { super.collectNewChildDescriptors(newChildDescriptors, object); - newChildDescriptors.add(createChildParameter(SecurityPackage.Literals.ROLE__CHECKS, - SecurityFactory.eINSTANCE.createClassCheck())); + newChildDescriptors.add(createChildParameter(SecurityPackage.Literals.ROLE__PERMISSIONS, + SecurityFactory.eINSTANCE.createClassPermission())); - newChildDescriptors.add(createChildParameter(SecurityPackage.Literals.ROLE__CHECKS, - SecurityFactory.eINSTANCE.createPackageCheck())); + newChildDescriptors.add(createChildParameter(SecurityPackage.Literals.ROLE__PERMISSIONS, + SecurityFactory.eINSTANCE.createPackagePermission())); - newChildDescriptors.add(createChildParameter(SecurityPackage.Literals.ROLE__CHECKS, - SecurityFactory.eINSTANCE.createResourceCheck())); + newChildDescriptors.add(createChildParameter(SecurityPackage.Literals.ROLE__PERMISSIONS, + SecurityFactory.eINSTANCE.createResourcePermission())); } } 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 e48f472ca7..73ff95d240 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 @@ -257,78 +257,78 @@ public class SecurityItemProviderAdapterFactory extends SecurityAdapterFactory i } /** - * This keeps track of the one adapter used for all {@link org.eclipse.emf.cdo.security.ClassCheck} instances. + * This keeps track of the one adapter used for all {@link org.eclipse.emf.cdo.security.ClassPermission} instances. * * * @generated */ - protected ClassCheckItemProvider classCheckItemProvider; + protected ClassPermissionItemProvider classPermissionItemProvider; /** - * This creates an adapter for a {@link org.eclipse.emf.cdo.security.ClassCheck}. + * This creates an adapter for a {@link org.eclipse.emf.cdo.security.ClassPermission}. * * * @generated */ @Override - public Adapter createClassCheckAdapter() + public Adapter createClassPermissionAdapter() { - if (classCheckItemProvider == null) + if (classPermissionItemProvider == null) { - classCheckItemProvider = new ClassCheckItemProvider(this); + classPermissionItemProvider = new ClassPermissionItemProvider(this); } - return classCheckItemProvider; + return classPermissionItemProvider; } /** - * This keeps track of the one adapter used for all {@link org.eclipse.emf.cdo.security.PackageCheck} instances. + * This keeps track of the one adapter used for all {@link org.eclipse.emf.cdo.security.PackagePermission} instances. * * * @generated */ - protected PackageCheckItemProvider packageCheckItemProvider; + protected PackagePermissionItemProvider packagePermissionItemProvider; /** - * This creates an adapter for a {@link org.eclipse.emf.cdo.security.PackageCheck}. + * This creates an adapter for a {@link org.eclipse.emf.cdo.security.PackagePermission}. * * * @generated */ @Override - public Adapter createPackageCheckAdapter() + public Adapter createPackagePermissionAdapter() { - if (packageCheckItemProvider == null) + if (packagePermissionItemProvider == null) { - packageCheckItemProvider = new PackageCheckItemProvider(this); + packagePermissionItemProvider = new PackagePermissionItemProvider(this); } - return packageCheckItemProvider; + return packagePermissionItemProvider; } /** - * This keeps track of the one adapter used for all {@link org.eclipse.emf.cdo.security.ResourceCheck} instances. + * This keeps track of the one adapter used for all {@link org.eclipse.emf.cdo.security.ResourcePermission} instances. * * * @generated */ - protected ResourceCheckItemProvider resourceCheckItemProvider; + protected ResourcePermissionItemProvider resourcePermissionItemProvider; /** - * This creates an adapter for a {@link org.eclipse.emf.cdo.security.ResourceCheck}. + * This creates an adapter for a {@link org.eclipse.emf.cdo.security.ResourcePermission}. * * * @generated */ @Override - public Adapter createResourceCheckAdapter() + public Adapter createResourcePermissionAdapter() { - if (resourceCheckItemProvider == null) + if (resourcePermissionItemProvider == null) { - resourceCheckItemProvider = new ResourceCheckItemProvider(this); + resourcePermissionItemProvider = new ResourcePermissionItemProvider(this); } - return resourceCheckItemProvider; + return resourcePermissionItemProvider; } /** @@ -484,12 +484,12 @@ public class SecurityItemProviderAdapterFactory extends SecurityAdapterFactory i userItemProvider.dispose(); if (userPasswordItemProvider != null) userPasswordItemProvider.dispose(); - if (classCheckItemProvider != null) - classCheckItemProvider.dispose(); - if (packageCheckItemProvider != null) - packageCheckItemProvider.dispose(); - if (resourceCheckItemProvider != null) - resourceCheckItemProvider.dispose(); + if (classPermissionItemProvider != null) + classPermissionItemProvider.dispose(); + if (packagePermissionItemProvider != null) + packagePermissionItemProvider.dispose(); + if (resourcePermissionItemProvider != null) + resourcePermissionItemProvider.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 f52a72ab16..395e00c3fc 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 @@ -77,6 +77,7 @@ public class UserItemProvider extends AssigneeItemProvider implements IEditingDo addDefaultAccessOverridePropertyDescriptor(object); addDefaultAccessPropertyDescriptor(object); addLockedPropertyDescriptor(object); + addAllPermissionsPropertyDescriptor(object); } return itemPropertyDescriptors; } @@ -215,6 +216,21 @@ public class UserItemProvider extends AssigneeItemProvider implements IEditingDo null)); } + /** + * This adds a property descriptor for the All Permissions feature. + * + * + * @generated + */ + protected void addAllPermissionsPropertyDescriptor(Object object) + { + itemPropertyDescriptors.add(createItemPropertyDescriptor( + ((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(), getResourceLocator(), + getString("_UI_User_allPermissions_feature"), //$NON-NLS-1$ + getString("_UI_PropertyDescriptor_description", "_UI_User_allPermissions_feature", "_UI_User_type"), //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ + SecurityPackage.Literals.USER__ALL_PERMISSIONS, false, false, false, null, null, null)); + } + /** * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or -- cgit v1.2.1