NEW - bug 369499: [SysML] Update to UML2.4 (4.0.x)

https://bugs.eclipse.org/bugs/show_bug.cgi?id=369499

3 files changed, 16 insertions, 16 deletions

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/META-INF/MANIFEST.MF b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/META-INF/MANIFEST.MF
index 7610b9bd1f2..ae45b1e4a4d 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/META-INF/MANIFEST.MF
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/META-INF/MANIFEST.MF
@@ -10,7 +10,6 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.papyrus.uml.diagram.common;bundle-version="0.9.0",

  org.eclipse.papyrus.editor;bundle-version="0.9.0",

  org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="0.9.0",

- org.eclipse.papyrus.sysml.edit;bundle-version="0.9.0",

  org.eclipse.papyrus.extensionpoints.editors;bundle-version="0.9.0",

  org.eclipse.papyrus.infra.services.edit;bundle-version="0.9.0",

  org.eclipse.papyrus.uml.service.types;bundle-version="0.9.0",

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/build.properties b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/build.properties
index 8c11925997b..8c12d368676 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/build.properties
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/build.properties
@@ -2,6 +2,7 @@
 #Mon Sep 12 09:30:14 CEST 2011

 bin.includes=META-INF/,.,icons/,plugin.xml,about.html,plugin.properties

 output..=bin/

-src.includes=META-INF/,.,icons/,plugin.xml,about.html,plugin.properties

+src.includes = icons/,\

+               about.html

 source..=src/,src-gen/,src-common-uml/,src-common-sysml/,src-common-gmf/

 bin..=bin/

diff --git a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src/org/eclipse/papyrus/sysml/diagram/common/Activator.java b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src/org/eclipse/papyrus/sysml/diagram/common/Activator.java
index 8c716f6af4a..43099bfbb22 100644
--- a/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src/org/eclipse/papyrus/sysml/diagram/common/Activator.java
+++ b/plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/src/org/eclipse/papyrus/sysml/diagram/common/Activator.java
@@ -18,15 +18,15 @@ import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.jface.resource.ImageDescriptor;

 import org.eclipse.jface.viewers.ILabelProvider;

 import org.eclipse.papyrus.infra.core.log.LogHelper;

-import org.eclipse.papyrus.sysml.activities.provider.ActivitiesItemProviderAdapterFactory;

-import org.eclipse.papyrus.sysml.allocations.provider.AllocationsItemProviderAdapterFactory;

-import org.eclipse.papyrus.sysml.blocks.provider.BlocksItemProviderAdapterFactory;

-import org.eclipse.papyrus.sysml.constraints.provider.ConstraintsItemProviderAdapterFactory;

-import org.eclipse.papyrus.sysml.modelelements.provider.ModelelementsItemProviderAdapterFactory;

+//import org.eclipse.papyrus.sysml.activities.provider.ActivitiesItemProviderAdapterFactory;

+//import org.eclipse.papyrus.sysml.allocations.provider.AllocationsItemProviderAdapterFactory;

+//import org.eclipse.papyrus.sysml.blocks.provider.BlocksItemProviderAdapterFactory;

+//import org.eclipse.papyrus.sysml.constraints.provider.ConstraintsItemProviderAdapterFactory;

+//import org.eclipse.papyrus.sysml.modelelements.provider.ModelelementsItemProviderAdapterFactory;

 import org.eclipse.papyrus.sysml.portandflows.FlowDirection;

 import org.eclipse.papyrus.sysml.portandflows.FlowPort;

-import org.eclipse.papyrus.sysml.portandflows.provider.PortandflowsItemProviderAdapterFactory;

-import org.eclipse.papyrus.sysml.requirements.provider.RequirementsItemProviderAdapterFactory;

+//import org.eclipse.papyrus.sysml.portandflows.provider.PortandflowsItemProviderAdapterFactory;

+//import org.eclipse.papyrus.sysml.requirements.provider.RequirementsItemProviderAdapterFactory;

 import org.eclipse.papyrus.uml.tools.providers.UMLLabelProvider;

 import org.eclipse.swt.graphics.Image;

 import org.eclipse.ui.plugin.AbstractUIPlugin;

@@ -264,13 +264,13 @@ public class Activator extends AbstractUIPlugin {
 		ArrayList<AdapterFactory> factories = new ArrayList<AdapterFactory>();

 

 		// Add SysML adapters

-		factories.add(new ActivitiesItemProviderAdapterFactory());

-		factories.add(new AllocationsItemProviderAdapterFactory());

-		factories.add(new BlocksItemProviderAdapterFactory());

-		factories.add(new ConstraintsItemProviderAdapterFactory());

-		factories.add(new ModelelementsItemProviderAdapterFactory());

-		factories.add(new PortandflowsItemProviderAdapterFactory());

-		factories.add(new RequirementsItemProviderAdapterFactory());

+//		factories.add(new ActivitiesItemProviderAdapterFactory());

+//		factories.add(new AllocationsItemProviderAdapterFactory());

+//		factories.add(new BlocksItemProviderAdapterFactory());

+//		factories.add(new ConstraintsItemProviderAdapterFactory());

+//		factories.add(new ModelelementsItemProviderAdapterFactory());

+//		factories.add(new PortandflowsItemProviderAdapterFactory());

+//		factories.add(new RequirementsItemProviderAdapterFactory());

 		// Add UML adapter   

 		factories.add(new UMLItemProviderAdapterFactory());