Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenoit Maggi2018-06-18 11:32:41 +0000
committerBenoit Maggi2018-06-18 11:32:41 +0000
commit8d36439e606bd1e7fbe2a81cf1a8ea93bd8fb378 (patch)
tree92cf800d16d1d82a172b4bde67f174b75969e64d /plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src
parent004543b17ed36046bc094f671e63c486d2fc0589 (diff)
downloadorg.eclipse.papyrus-8d36439e606bd1e7fbe2a81cf1a8ea93bd8fb378.tar.gz
org.eclipse.papyrus-8d36439e606bd1e7fbe2a81cf1a8ea93bd8fb378.tar.xz
org.eclipse.papyrus-8d36439e606bd1e7fbe2a81cf1a8ea93bd8fb378.zip
Bug 536003 - Remove incubation in All Papyrus Core Projects
- remove incubation from description - remove duplicate groupid/version in pom.xml - remove useless cast Change-Id: If1617e9660a0b03ac0af65c08592ab4125c2f891 Signed-off-by: Benoit Maggi <benoit.maggi@cea.fr>
Diffstat (limited to 'plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src')
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/adapter/GMFMultiDiagramAdapterFactory.java10
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/databinding/custom/AbstractCustomStyleListValueCommand.java2
2 files changed, 5 insertions, 7 deletions
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/adapter/GMFMultiDiagramAdapterFactory.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/adapter/GMFMultiDiagramAdapterFactory.java
index b436cc693ec..d13f8e9b021 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/adapter/GMFMultiDiagramAdapterFactory.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/adapter/GMFMultiDiagramAdapterFactory.java
@@ -29,21 +29,21 @@ public class GMFMultiDiagramAdapterFactory implements IAdapterFactory {
IEditorPart nestedEditor = ((IMultiDiagramEditor) adaptableObject).getActiveEditor();
// The nestedEditor may or may not handle these cases.
- if (nestedEditor != null && nestedEditor instanceof IAdaptable) {
+ if (nestedEditor instanceof IAdaptable) {
if (adapterType == IDiagramGraphicalViewer.class) {
- return ((IAdaptable) nestedEditor).getAdapter(IDiagramGraphicalViewer.class);
+ return nestedEditor.getAdapter(IDiagramGraphicalViewer.class);
}
if (adapterType == Diagram.class) {
- return ((IAdaptable) nestedEditor).getAdapter(Diagram.class);
+ return nestedEditor.getAdapter(Diagram.class);
}
if (adapterType == DiagramEditPart.class) {
- return ((IAdaptable) nestedEditor).getAdapter(DiagramEditPart.class);
+ return nestedEditor.getAdapter(DiagramEditPart.class);
}
if (adapterType == IDiagramWorkbenchPart.class) {
- return ((IAdaptable) nestedEditor).getAdapter(IDiagramWorkbenchPart.class);
+ return nestedEditor.getAdapter(IDiagramWorkbenchPart.class);
}
}
}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/databinding/custom/AbstractCustomStyleListValueCommand.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/databinding/custom/AbstractCustomStyleListValueCommand.java
index 10b3216b133..992d03eb392 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/databinding/custom/AbstractCustomStyleListValueCommand.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/databinding/custom/AbstractCustomStyleListValueCommand.java
@@ -81,8 +81,6 @@ public abstract class AbstractCustomStyleListValueCommand extends AbstractComman
}
command = createCommand();
-
- // return true;
return command.canExecute();
}

Back to the top