Refactored the generated code to handle visualID as a String instead of

an int and refactoed the API to comply.

Change-Id: Ie459e27d5c80dd18743aeac9e2d745b2f95a4fe0

4 files changed, 14 insertions, 14 deletions

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.dnd/.classpath b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.dnd/.classpath
index 2d1a4302f04..098194ca4b7 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.dnd/.classpath
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.dnd/.classpath
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<classpath>

-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>

-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>

-	<classpathentry kind="src" path="src"/>

-	<classpathentry kind="output" path="bin"/>

-</classpath>

+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.dnd/.settings/org.eclipse.jdt.core.prefs b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.dnd/.settings/org.eclipse.jdt.core.prefs
index 4759947300a..9ca8e68231b 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.dnd/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.dnd/.settings/org.eclipse.jdt.core.prefs
@@ -1,10 +1,10 @@
 eclipse.preferences.version=1

 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled

-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5

-org.eclipse.jdt.core.compiler.compliance=1.5

+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7

+org.eclipse.jdt.core.compiler.compliance=1.7

 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error

 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error

-org.eclipse.jdt.core.compiler.source=1.5

+org.eclipse.jdt.core.compiler.source=1.7

 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false

 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16

 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.dnd/META-INF/MANIFEST.MF b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.dnd/META-INF/MANIFEST.MF
index 779bf405e50..95532bc1560 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.dnd/META-INF/MANIFEST.MF
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.dnd/META-INF/MANIFEST.MF
@@ -18,10 +18,10 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="1.2.0",

  org.eclipse.papyrus.infra.gmfdiag.common;bundle-version="1.2.0"

 Bundle-Vendor: Eclipse Modeling Project

+Bundle-RequiredExecutionEnvironment: JavaSE-1.7

 Bundle-ActivationPolicy: lazy

 Bundle-Version: 1.2.0.qualifier

 Bundle-Name: UML Drag and Drop

 Bundle-Activator: org.eclipse.papyrus.uml.diagram.dnd.Activator

 Bundle-ManifestVersion: 2

 Bundle-SymbolicName: org.eclipse.papyrus.uml.diagram.dnd;singleton:=true

-Bundle-RequiredExecutionEnvironment: J2SE-1.5

diff --git a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.dnd/src/org/eclipse/papyrus/uml/diagram/dnd/strategy/MoveInnerClassDropStrategy.java b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.dnd/src/org/eclipse/papyrus/uml/diagram/dnd/strategy/MoveInnerClassDropStrategy.java
index c0fcb71ff5f..4c57f7cbafb 100644
--- a/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.dnd/src/org/eclipse/papyrus/uml/diagram/dnd/strategy/MoveInnerClassDropStrategy.java
+++ b/plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.dnd/src/org/eclipse/papyrus/uml/diagram/dnd/strategy/MoveInnerClassDropStrategy.java
@@ -111,7 +111,7 @@ public class MoveInnerClassDropStrategy extends MoveDropStrategy {
 

 		for (EObject eObject : getSourceEObjects(dropRequest)) {

 			if (eObject instanceof org.eclipse.uml2.uml.Class) {

-				viewDescriptors.add(new CreateViewRequest.ViewDescriptor(new EObjectAdapter(eObject), Node.class, Integer.toString(NestedClassForClassEditPart.VISUAL_ID), ((IGraphicalEditPart) targetEditPart).getDiagramPreferencesHint()));

+				viewDescriptors.add(new CreateViewRequest.ViewDescriptor(new EObjectAdapter(eObject), Node.class, NestedClassForClassEditPart.VISUAL_ID, ((IGraphicalEditPart) targetEditPart).getDiagramPreferencesHint()));

 			}

 		}

 		if (viewDescriptors.isEmpty()) {

@@ -163,7 +163,7 @@ public class MoveInnerClassDropStrategy extends MoveDropStrategy {
 			EditPart primaryEditPart = getPrimaryEditPart(targetEditPart);

 			View primaryView = ((IGraphicalEditPart) targetEditPart).getPrimaryView();

 			

-			int nestedClassSemanticHint = -1;

+			String nestedClassSemanticHint = null;

 			switch (UMLVisualIDRegistry.getVisualID(primaryView)) {

 			case ClassEditPart.VISUAL_ID:

 				nestedClassSemanticHint = ClassNestedClassifierCompartmentEditPart.VISUAL_ID;

@@ -185,7 +185,7 @@ public class MoveInnerClassDropStrategy extends MoveDropStrategy {
 				break;

 			}

 

-			if (nestedClassSemanticHint != -1) {

+			if (nestedClassSemanticHint != null) {

 				String type = UMLVisualIDRegistry.getType(nestedClassSemanticHint);

 				EditPart target = ((IGraphicalEditPart) primaryEditPart).getChildBySemanticHint(type);

 				if (target != null) {