Bug 463290 - Papyrus diagram shall be expanded with new visual graphical

notation
update build.xml and java execution in classpath

Change-Id: Ib9ae03edf42e8de29bfa5615429137e4f8a4a343

4 files changed, 19 insertions, 23 deletions

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/build.properties b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/build.properties
index 9e7dafc38b0..11396e8fa01 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/build.properties
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/build.properties
@@ -1,19 +1,17 @@
-# Copyright (c) 2015 CEA LIST.

-#  

-# All rights reserved. This program and the accompanying materials

-# are made available under the terms of the Eclipse Public License v1.0

-# which accompanies this distribution, and is available at

-# http://www.eclipse.org/legal/epl-v10.html

-#  

-# Contributors:

-# 	CEA LIST - Initial API and implementation

-# 

-

-bin.includes = .,\

-               model/,\

-               META-INF/,\

-               plugin.xml,\

-               plugin.properties

-jars.compile.order = .

-source.. = src-gen/

-output.. = bin/

+#
+#Mon Sep 12 09:29:38 CEST 2011
+bin.includes = .options,\
+               META-INF/,\
+               plugin.properties,\
+               about.html,\
+               .,\
+               plugin.xml,\
+               schema/,\
+               icons/,\
+               model/
+output..=bin/
+jars.compile.order=.
+src.includes = about.html
+source.. = src/,\
+           src-gen/
+bin..=bin/
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/expansion/ExpandEditPartProvider.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/expansion/ExpandEditPartProvider.java
index c17989eccba..27d4c746ef5 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/expansion/ExpandEditPartProvider.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.common/src/org/eclipse/papyrus/infra/gmfdiag/common/expansion/ExpandEditPartProvider.java
@@ -169,7 +169,6 @@ public class ExpandEditPartProvider extends AbstractEditPartProvider {
 	 * @return a constructor (<tt>null</tt> if none could be found).
 	 */
 	private Constructor getCreationConstructor(Class editpartClass) {
-		Assert.isNotNull(editpartClass);
 
 		if (editpartClass != null) {
 			Constructor[] consts = editpartClass.getConstructors();
@@ -185,7 +184,6 @@ public class ExpandEditPartProvider extends AbstractEditPartProvider {
 	private IGraphicalEditPart createNewGraphicEditPart(Class editpartClass, Object[] constructorParams) {
 		try {
 			Constructor constructor = getCreationConstructor(editpartClass);
-			Assert.isNotNull(constructor);
 
 			return (constructor == null)? null : (IGraphicalEditPart) constructor.newInstance(constructorParams);
 		} 
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.expansion.edit/.classpath b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.expansion.edit/.classpath
index a0c6dd9cee8..ed2bc1287f0 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.expansion.edit/.classpath
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.expansion.edit/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <classpath>

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

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

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

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

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

 </classpath>

diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.expansion.editor/.classpath b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.expansion.editor/.classpath
index a0c6dd9cee8..ed2bc1287f0 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.expansion.editor/.classpath
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.expansion.editor/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <classpath>

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

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

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

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

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

 </classpath>