diff options
| author | Eike Stepper | 2013-09-19 18:29:47 +0000 |
|---|---|---|
| committer | Eike Stepper | 2013-09-19 18:29:47 +0000 |
| commit | af9ce07ac1e7e452c0cb7b2d11a20b30caae5367 (patch) | |
| tree | 8e30d8339c51dc73028a848695996efec3d8cce0 | |
| parent | 47a001205811c0f1b35cb6ae4051ad1702fb0bee (diff) | |
| download | cdo-af9ce07ac1e7e452c0cb7b2d11a20b30caae5367.tar.gz cdo-af9ce07ac1e7e452c0cb7b2d11a20b30caae5367.tar.xz cdo-af9ce07ac1e7e452c0cb7b2d11a20b30caae5367.zip | |
[417473] Provide an expressions model
https://bugs.eclipse.org/bugs/show_bug.cgi?id=417473
2 files changed, 8 insertions, 8 deletions
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 43fe692af2..c0e33fd3bd 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 @@ -194,22 +194,19 @@ public class ExpressionFilterItemProvider extends ObjectFilterItemProvider imple ExpressionsFactory.eINSTANCE.createStringValue())); newChildDescriptors.add(createChildParameter(SecurityPackage.Literals.EXPRESSION_FILTER__EXPRESSION, - ExpressionsFactory.eINSTANCE.createListValue())); - - newChildDescriptors.add(createChildParameter(SecurityPackage.Literals.EXPRESSION_FILTER__EXPRESSION, ExpressionsFactory.eINSTANCE.createFunctionInvocation())); newChildDescriptors.add(createChildParameter(SecurityPackage.Literals.EXPRESSION_FILTER__EXPRESSION, ExpressionsFactory.eINSTANCE.createMemberInvocation())); newChildDescriptors.add(createChildParameter(SecurityPackage.Literals.EXPRESSION_FILTER__EXPRESSION, - ExpressionsFactory.eINSTANCE.createMemberAccess())); + ExpressionsFactory.eINSTANCE.createStaticAccess())); newChildDescriptors.add(createChildParameter(SecurityPackage.Literals.EXPRESSION_FILTER__EXPRESSION, - ExpressionsFactory.eINSTANCE.createContextAccess())); + ExpressionsFactory.eINSTANCE.createMemberAccess())); newChildDescriptors.add(createChildParameter(SecurityPackage.Literals.EXPRESSION_FILTER__EXPRESSION, - ExpressionsFactory.eINSTANCE.createThis())); + ExpressionsFactory.eINSTANCE.createContextAccess())); newChildDescriptors.add(createChildParameter(SecurityPackage.Literals.EXPRESSION_FILTER__EXPRESSION, ExpressionsFactory.eINSTANCE.createContainedObject())); @@ -219,6 +216,9 @@ public class ExpressionFilterItemProvider extends ObjectFilterItemProvider imple newChildDescriptors.add(createChildParameter(SecurityPackage.Literals.EXPRESSION_FILTER__EXPRESSION, ExpressionsFactory.eINSTANCE.createLinkedExpression())); + + newChildDescriptors.add(createChildParameter(SecurityPackage.Literals.EXPRESSION_FILTER__EXPRESSION, + ExpressionsFactory.eINSTANCE.createListConstruction())); } } diff --git a/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/impl/ObjectFilterImpl.java b/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/impl/ObjectFilterImpl.java index 4b9a3176be..f186168522 100644 --- a/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/impl/ObjectFilterImpl.java +++ b/plugins/org.eclipse.emf.cdo.security/src/org/eclipse/emf/cdo/security/impl/ObjectFilterImpl.java @@ -53,8 +53,8 @@ public abstract class ObjectFilterImpl extends PermissionFilterImpl implements O } @Override - protected boolean filter(CDORevision revision, CDORevisionProvider revisionProvider, CDOBranchPoint securityContext, int level) - throws Exception + protected boolean filter(CDORevision revision, CDORevisionProvider revisionProvider, CDOBranchPoint securityContext, + int level) throws Exception { CDOView view = getView(revisionProvider); CDOID id = revision.getID(); |