Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2015-09-11 09:23:25 +0000
committerEike Stepper2015-09-11 09:23:25 +0000
commitf825a7616abd157df6f28baf927c08948488c1f0 (patch)
tree4c5683edd19c111194c72f6f77a19cc33ae6d460 /plugins/org.eclipse.emf.cdo.security.ui
parentac65e976777121e250d8eda56449d7253e93930e (diff)
downloadcdo-f825a7616abd157df6f28baf927c08948488c1f0.tar.gz
cdo-f825a7616abd157df6f28baf927c08948488c1f0.tar.xz
cdo-f825a7616abd157df6f28baf927c08948488c1f0.zip
[Releng] Ignore version range lower bound problems
Diffstat (limited to 'plugins/org.eclipse.emf.cdo.security.ui')
-rw-r--r--plugins/org.eclipse.emf.cdo.security.ui/.project68
-rw-r--r--plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/internal/ui/editor/TableSection.java89
2 files changed, 81 insertions, 76 deletions
diff --git a/plugins/org.eclipse.emf.cdo.security.ui/.project b/plugins/org.eclipse.emf.cdo.security.ui/.project
index 729eafa44c..2adcb4f901 100644
--- a/plugins/org.eclipse.emf.cdo.security.ui/.project
+++ b/plugins/org.eclipse.emf.cdo.security.ui/.project
@@ -4,36 +4,40 @@
<comment></comment>
<projects>
</projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.oomph.version.VersionBuilder</name>
- <arguments>
- <dictionary>
- <key>release.path</key>
- <value>/org.eclipse.emf.cdo.releng.release/release.xml</value>
- </dictionary>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- <nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
- <nature>org.eclipse.oomph.version.VersionNature</nature>
- </natures>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.ManifestBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.oomph.version.VersionBuilder</name>
+ <arguments>
+ <dictionary>
+ <key>ignore.lower.bound.dependency.ranges</key>
+ <value>true</value>
+ </dictionary>
+ <dictionary>
+ <key>release.path</key>
+ <value>/org.eclipse.emf.cdo.releng.release/release.xml</value>
+ </dictionary>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.pde.PluginNature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
+ <nature>org.eclipse.oomph.version.VersionNature</nature>
+ </natures>
</projectDescription>
diff --git a/plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/internal/ui/editor/TableSection.java b/plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/internal/ui/editor/TableSection.java
index b17aa20c74..51b3cf9421 100644
--- a/plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/internal/ui/editor/TableSection.java
+++ b/plugins/org.eclipse.emf.cdo.security.ui/src/org/eclipse/emf/cdo/security/internal/ui/editor/TableSection.java
@@ -186,6 +186,7 @@ public abstract class TableSection<T extends EObject> extends AbstractSectionPar
globalAction.install(viewer);
}
+ @SuppressWarnings("unchecked")
protected IAction createAddNewAction()
{
Command dummy = createCreateNewCommand();
@@ -237,7 +238,7 @@ public abstract class TableSection<T extends EObject> extends AbstractSectionPar
Command dummy = createDeleteCommand(EcoreUtil.create(elementEClass));
return new SelectionListenerAction<EObject>(dummy.getLabel(), SharedIcons.getDescriptor("etool16/delete.gif")) //$NON-NLS-1$
- {
+ {
@Override
public void run()
{
@@ -259,7 +260,7 @@ public abstract class TableSection<T extends EObject> extends AbstractSectionPar
{
return EObject.class;
}
- };
+ };
}
protected Command createDeleteCommand(EObject toDelete)
@@ -291,59 +292,59 @@ public abstract class TableSection<T extends EObject> extends AbstractSectionPar
{
viewer.addDropSupport(DND.DROP_LINK | DND.DROP_MOVE | DND.DROP_COPY,
new Transfer[] { LocalSelectionTransfer.getTransfer() }, new ViewerDropAdapter(viewer)
- {
- {
- // We don't want it to look like you can insert new elements, only drop onto existing elements
- setFeedbackEnabled(false);
- }
-
- @Override
- public boolean validateDrop(Object target, int operation, TransferData transferType)
- {
- boolean result = false;
-
- if (target instanceof EObject && LocalSelectionTransfer.getTransfer().isSupportedType(transferType))
{
- EObject objectToDrop = getObjectToDrop(transferType);
- if (objectToDrop != null)
{
- result = getDropReference((EObject)target, objectToDrop) != null;
+ // We don't want it to look like you can insert new elements, only drop onto existing elements
+ setFeedbackEnabled(false);
+ }
+
+ @Override
+ public boolean validateDrop(Object target, int operation, TransferData transferType)
+ {
+ boolean result = false;
- if (result && (getCurrentEvent().operations | DND.DROP_COPY) != 0)
+ if (target instanceof EObject && LocalSelectionTransfer.getTransfer().isSupportedType(transferType))
{
- overrideOperation(DND.DROP_COPY);
+ EObject objectToDrop = getObjectToDrop(transferType);
+ if (objectToDrop != null)
+ {
+ result = getDropReference((EObject)target, objectToDrop) != null;
+
+ if (result && (getCurrentEvent().operations | DND.DROP_COPY) != 0)
+ {
+ overrideOperation(DND.DROP_COPY);
+ }
+ }
}
- }
- }
- return result;
- }
+ return result;
+ }
- @Override
- public boolean performDrop(Object data)
- {
- IStructuredSelection selection = (IStructuredSelection)data;
- EObject objectToDrop = UIUtil.getElement(selection, EObject.class);
- EObject target = (EObject)getCurrentTarget();
+ @Override
+ public boolean performDrop(Object data)
+ {
+ IStructuredSelection selection = (IStructuredSelection)data;
+ EObject objectToDrop = UIUtil.getElement(selection, EObject.class);
+ EObject target = (EObject)getCurrentTarget();
- Command command = AddCommand.create(getEditingDomain(), target, getDropReference(target, objectToDrop),
- selection.toList());
+ Command command = AddCommand.create(getEditingDomain(), target, getDropReference(target, objectToDrop),
+ selection.toList());
- boolean result = execute(command);
- if (result)
- {
- viewer.getControl().setFocus();
- viewer.setSelection(new StructuredSelection(target));
- }
+ boolean result = execute(command);
+ if (result)
+ {
+ viewer.getControl().setFocus();
+ viewer.setSelection(new StructuredSelection(target));
+ }
- return result;
- }
+ return result;
+ }
- private EObject getObjectToDrop(TransferData transferType)
- {
- return UIUtil.getElement(LocalSelectionTransfer.getTransfer().getSelection(), EObject.class);
- }
- });
+ private EObject getObjectToDrop(TransferData transferType)
+ {
+ return UIUtil.getElement(LocalSelectionTransfer.getTransfer().getSelection(), EObject.class);
+ }
+ });
}
protected EReference getDropReference(EObject target, EObject objectToDrop)

Back to the top