Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorcletavernie2011-12-08 10:15:44 -0500
committercletavernie2011-12-08 10:15:44 -0500
commit164d1a0c11747f223e5dab8a275eefdd41489c52 (patch)
tree40cdd767f34590937667c90df3b15c5d04c84bcb
parentdba7d45df525d9b4fc3e518b221c674c5dddea57 (diff)
downloadorg.eclipse.papyrus-164d1a0c11747f223e5dab8a275eefdd41489c52.tar.gz
org.eclipse.papyrus-164d1a0c11747f223e5dab8a275eefdd41489c52.tar.xz
org.eclipse.papyrus-164d1a0c11747f223e5dab8a275eefdd41489c52.zip
Sandbox import.
-rw-r--r--sandbox/org.eclipse.papyrus.constraints.customization/META-INF/MANIFEST.MF4
-rw-r--r--sandbox/org.eclipse.papyrus.constraints.customization/plugin.xml2
-rw-r--r--sandbox/org.eclipse.papyrus.constraints/META-INF/MANIFEST.MF4
-rw-r--r--sandbox/org.eclipse.papyrus.constraints/src/org/eclipse/papyrus/constraints/Activator.java2
-rw-r--r--sandbox/org.eclipse.papyrus.emf.editor/META-INF/MANIFEST.MF7
-rw-r--r--sandbox/org.eclipse.papyrus.emf.editor/src/org/eclipse/papyrus/emf/editor/part/PapyrusEditor.java12
-rw-r--r--sandbox/org.eclipse.papyrus.emf.embeddededitor/META-INF/MANIFEST.MF9
-rw-r--r--sandbox/org.eclipse.papyrus.emf.embeddededitor/src/org/eclipse/papyrus/emf/embeddededitor/Activator.java2
-rw-r--r--sandbox/org.eclipse.papyrus.emf.embeddededitor/src/org/eclipse/papyrus/emf/embeddededitor/SandboxDialog.java8
-rw-r--r--sandbox/org.eclipse.papyrus.emf.embeddededitor/src/org/eclipse/papyrus/emf/embeddededitor/editor/EmbeddedEditor.java12
-rw-r--r--sandbox/org.eclipse.papyrus.emf.embeddededitor/src/org/eclipse/papyrus/emf/embeddededitor/providers/ModiscoLabelProvider.java2
-rw-r--r--sandbox/org.eclipse.papyrus.infra.emf/.classpath7
-rw-r--r--sandbox/org.eclipse.papyrus.infra.emf/.project28
-rw-r--r--sandbox/org.eclipse.papyrus.infra.emf/.settings/org.eclipse.jdt.core.prefs8
-rw-r--r--sandbox/org.eclipse.papyrus.infra.emf/META-INF/MANIFEST.MF17
-rw-r--r--sandbox/org.eclipse.papyrus.infra.emf/build.properties4
-rw-r--r--sandbox/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/Activator.java54
-rw-r--r--sandbox/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/providers/EMFContentProvider.java38
-rw-r--r--sandbox/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/providers/EMFLabelProvider.java7
-rw-r--r--sandbox/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/utils/EMFHelper.java377
-rw-r--r--sandbox/org.eclipse.papyrus.newchild.customization/META-INF/MANIFEST.MF4
-rw-r--r--sandbox/org.eclipse.papyrus.newchild.customization/plugin.xml5
-rw-r--r--sandbox/org.eclipse.papyrus.newchild/META-INF/MANIFEST.MF10
-rw-r--r--sandbox/org.eclipse.papyrus.newchild/Model/NewChild.ecore6
-rw-r--r--sandbox/org.eclipse.papyrus.newchild/Model/NewChild.genmodel2
-rw-r--r--sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/MenuAction.java4
-rw-r--r--sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/NewchildConfiguration.java1
-rw-r--r--sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/impl/MenuActionImpl.java4
-rw-r--r--sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/impl/NewchildConfigurationImpl.java1
-rw-r--r--sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/impl/NewchildPackageImpl.java2
-rw-r--r--sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/ncpolicy/NewEMFChildMenu.java1
-rw-r--r--sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/ncpolicy/impl/NcpolicyPackageImpl.java2
-rw-r--r--sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/ncpolicy/impl/NewChildPolicyImpl.java1
-rw-r--r--sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/ncpolicy/impl/NewEMFChildMenuImpl.java8
-rw-r--r--sandbox/org.eclipse.papyrus.newchild/src/org/eclipse/papyrus/newchild/Activator.java2
-rw-r--r--sandbox/org.eclipse.papyrus.newchild/src/org/eclipse/papyrus/newchild/action/ExtendedTypeAction.java14
-rw-r--r--sandbox/org.eclipse.papyrus.newchild/src/org/eclipse/papyrus/newchild/menu/FillerFactory.java2
-rw-r--r--sandbox/org.eclipse.papyrus.properties.marte/META-INF/MANIFEST.MF4
-rw-r--r--sandbox/org.eclipse.papyrus.properties.marte/plugin.xml5
39 files changed, 613 insertions, 69 deletions
diff --git a/sandbox/org.eclipse.papyrus.constraints.customization/META-INF/MANIFEST.MF b/sandbox/org.eclipse.papyrus.constraints.customization/META-INF/MANIFEST.MF
index 499f4bed161..72d3c98e650 100644
--- a/sandbox/org.eclipse.papyrus.constraints.customization/META-INF/MANIFEST.MF
+++ b/sandbox/org.eclipse.papyrus.constraints.customization/META-INF/MANIFEST.MF
@@ -7,7 +7,7 @@ Bundle-Activator: org.eclipse.papyrus.constraints.customization.Activator
Bundle-Vendor: Eclipse Modeling Project
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
- org.eclipse.papyrus.properties;bundle-version="0.9.0",
- org.eclipse.papyrus.newchild;bundle-version="0.9.0"
+ org.eclipse.papyrus.newchild;bundle-version="0.9.0",
+ org.eclipse.papyrus.views.properties;bundle-version="0.9.0"
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-ActivationPolicy: lazy
diff --git a/sandbox/org.eclipse.papyrus.constraints.customization/plugin.xml b/sandbox/org.eclipse.papyrus.constraints.customization/plugin.xml
index ff72b6f48e6..c88fa82767d 100644
--- a/sandbox/org.eclipse.papyrus.constraints.customization/plugin.xml
+++ b/sandbox/org.eclipse.papyrus.constraints.customization/plugin.xml
@@ -2,7 +2,7 @@
<?eclipse version="3.4"?>
<plugin>
<extension
- point="org.eclipse.papyrus.properties.context">
+ point="org.eclipse.papyrus.views.properties.context">
<context
contextModel="Model/Constraints.ctx"
loadDefault="true">
diff --git a/sandbox/org.eclipse.papyrus.constraints/META-INF/MANIFEST.MF b/sandbox/org.eclipse.papyrus.constraints/META-INF/MANIFEST.MF
index aedada5ded3..cf4015e124e 100644
--- a/sandbox/org.eclipse.papyrus.constraints/META-INF/MANIFEST.MF
+++ b/sandbox/org.eclipse.papyrus.constraints/META-INF/MANIFEST.MF
@@ -18,10 +18,10 @@ Export-Package: org.eclipse.papyrus.constraints,
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.emf.ecore;visibility:=reexport,
org.eclipse.ui;bundle-version="3.7.0",
- org.eclipse.papyrus.log;bundle-version="0.8.0",
org.eclipse.emf.facet.infra.query;bundle-version="0.1.0",
org.eclipse.emf.facet.infra.query.core;bundle-version="0.1.0",
org.eclipse.emf.facet.infra.common.core;bundle-version="0.1.0",
- org.eclipse.emf.facet.infra.browser.custom.core;bundle-version="0.1.0"
+ org.eclipse.emf.facet.infra.browser.custom.core;bundle-version="0.1.0",
+ org.eclipse.papyrus.infra.core.log;bundle-version="0.9.0"
Bundle-ActivationPolicy: lazy
Eclipse-BuddyPolicy: dependent
diff --git a/sandbox/org.eclipse.papyrus.constraints/src/org/eclipse/papyrus/constraints/Activator.java b/sandbox/org.eclipse.papyrus.constraints/src/org/eclipse/papyrus/constraints/Activator.java
index e00845a50bb..d45e0e6688c 100644
--- a/sandbox/org.eclipse.papyrus.constraints/src/org/eclipse/papyrus/constraints/Activator.java
+++ b/sandbox/org.eclipse.papyrus.constraints/src/org/eclipse/papyrus/constraints/Activator.java
@@ -11,7 +11,7 @@
*****************************************************************************/
package org.eclipse.papyrus.constraints;
-import org.eclipse.papyrus.log.LogHelper;
+import org.eclipse.papyrus.infra.core.log.LogHelper;
import org.eclipse.ui.plugin.AbstractUIPlugin;
import org.osgi.framework.BundleContext;
diff --git a/sandbox/org.eclipse.papyrus.emf.editor/META-INF/MANIFEST.MF b/sandbox/org.eclipse.papyrus.emf.editor/META-INF/MANIFEST.MF
index 0ada7f93992..f2e0a2e5d97 100644
--- a/sandbox/org.eclipse.papyrus.emf.editor/META-INF/MANIFEST.MF
+++ b/sandbox/org.eclipse.papyrus.emf.editor/META-INF/MANIFEST.MF
@@ -11,12 +11,13 @@ Require-Bundle: org.eclipse.ui,
org.eclipse.emf.ecore.editor;bundle-version="2.7.0",
org.eclipse.core.resources;bundle-version="3.7.100",
org.eclipse.ui.views.properties.tabbed;bundle-version="3.5.200",
- org.eclipse.papyrus.properties;bundle-version="0.9.0",
org.eclipse.papyrus.newchild;bundle-version="0.9.0",
- org.eclipse.papyrus.widgets;bundle-version="0.9.0",
org.eclipse.emf.facet.infra.browser.custom;bundle-version="0.1.0",
org.eclipse.emf.facet.infra.browser;bundle-version="0.1.0",
org.eclipse.emf.facet.infra.browser.custom.core;bundle-version="0.1.0",
- org.eclipse.emf.facet.infra.browser.uicore;bundle-version="0.1.0"
+ org.eclipse.emf.facet.infra.browser.uicore;bundle-version="0.1.0",
+ org.eclipse.papyrus.views.properties;bundle-version="0.9.0",
+ org.eclipse.papyrus.infra.widgets;bundle-version="0.9.0",
+ org.eclipse.emf.transaction;bundle-version="1.4.0"
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-ActivationPolicy: lazy
diff --git a/sandbox/org.eclipse.papyrus.emf.editor/src/org/eclipse/papyrus/emf/editor/part/PapyrusEditor.java b/sandbox/org.eclipse.papyrus.emf.editor/src/org/eclipse/papyrus/emf/editor/part/PapyrusEditor.java
index 199f9968d85..1f408c3c11f 100644
--- a/sandbox/org.eclipse.papyrus.emf.editor/src/org/eclipse/papyrus/emf/editor/part/PapyrusEditor.java
+++ b/sandbox/org.eclipse.papyrus.emf.editor/src/org/eclipse/papyrus/emf/editor/part/PapyrusEditor.java
@@ -31,12 +31,12 @@ import org.eclipse.jface.viewers.ViewerFilter;
import org.eclipse.papyrus.emf.editor.Activator;
import org.eclipse.papyrus.emf.editor.actions.MoDiscoDropAdapter;
import org.eclipse.papyrus.emf.editor.providers.CustomizableContentProvider;
-import org.eclipse.papyrus.properties.widgets.layout.GridData;
-import org.eclipse.papyrus.properties.widgets.layout.PropertiesLayout;
-import org.eclipse.papyrus.widgets.editors.AbstractEditor;
-import org.eclipse.papyrus.widgets.editors.ICommitListener;
-import org.eclipse.papyrus.widgets.editors.StringEditor;
-import org.eclipse.papyrus.widgets.providers.PatternViewerFilter;
+import org.eclipse.papyrus.infra.widgets.editors.AbstractEditor;
+import org.eclipse.papyrus.infra.widgets.editors.ICommitListener;
+import org.eclipse.papyrus.infra.widgets.editors.StringEditor;
+import org.eclipse.papyrus.infra.widgets.providers.PatternViewerFilter;
+import org.eclipse.papyrus.views.properties.widgets.layout.GridData;
+import org.eclipse.papyrus.views.properties.widgets.layout.PropertiesLayout;
import org.eclipse.swt.SWT;
import org.eclipse.swt.dnd.DND;
import org.eclipse.swt.dnd.Transfer;
diff --git a/sandbox/org.eclipse.papyrus.emf.embeddededitor/META-INF/MANIFEST.MF b/sandbox/org.eclipse.papyrus.emf.embeddededitor/META-INF/MANIFEST.MF
index 4c1023acaa8..a39400ae5a6 100644
--- a/sandbox/org.eclipse.papyrus.emf.embeddededitor/META-INF/MANIFEST.MF
+++ b/sandbox/org.eclipse.papyrus.emf.embeddededitor/META-INF/MANIFEST.MF
@@ -13,15 +13,16 @@ Require-Bundle: org.eclipse.ui,
org.eclipse.emf.edit;bundle-version="2.7.0",
org.eclipse.emf.ecore.editor;bundle-version="2.7.0",
org.eclipse.ui.views.properties.tabbed;bundle-version="3.5.200",
- org.eclipse.papyrus.properties;bundle-version="0.9.0",
- org.eclipse.papyrus.widgets;bundle-version="0.9.0",
+ org.eclipse.papyrus.views.properties;bundle-version="0.9.0",
+ org.eclipse.papyrus.infra.widgets;bundle-version="0.9.0",
org.eclipse.emf.facet.infra.browser.custom;bundle-version="0.1.0",
org.eclipse.emf.facet.infra.browser.custom.core;bundle-version="0.1.0",
org.eclipse.emf.facet.infra.browser;bundle-version="0.1.0",
org.eclipse.emf.facet.infra.browser.uicore;bundle-version="0.1.0",
- org.eclipse.papyrus.log;bundle-version="0.8.0",
+ org.eclipse.papyrus.infra.core.log;bundle-version="0.8.0",
org.eclipse.papyrus.newchild;bundle-version="0.9.0",
- org.eclipse.papyrus.properties.model;bundle-version="0.9.0"
+ org.eclipse.papyrus.views.properties.model;bundle-version="0.9.0",
+ org.eclipse.emf.transaction;bundle-version="1.4.0"
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-ActivationPolicy: lazy
Export-Package: org.eclipse.papyrus.emf.embeddededitor,
diff --git a/sandbox/org.eclipse.papyrus.emf.embeddededitor/src/org/eclipse/papyrus/emf/embeddededitor/Activator.java b/sandbox/org.eclipse.papyrus.emf.embeddededitor/src/org/eclipse/papyrus/emf/embeddededitor/Activator.java
index 0571a75c083..32b95f22820 100644
--- a/sandbox/org.eclipse.papyrus.emf.embeddededitor/src/org/eclipse/papyrus/emf/embeddededitor/Activator.java
+++ b/sandbox/org.eclipse.papyrus.emf.embeddededitor/src/org/eclipse/papyrus/emf/embeddededitor/Activator.java
@@ -18,7 +18,7 @@ import org.eclipse.core.runtime.Status;
import org.eclipse.emf.facet.infra.browser.custom.MetamodelView;
import org.eclipse.emf.facet.infra.browser.custom.core.CustomizationsCatalog;
import org.eclipse.emf.facet.infra.browser.uicore.CustomizationManager;
-import org.eclipse.papyrus.log.LogHelper;
+import org.eclipse.papyrus.infra.core.log.LogHelper;
import org.eclipse.ui.plugin.AbstractUIPlugin;
import org.osgi.framework.BundleContext;
diff --git a/sandbox/org.eclipse.papyrus.emf.embeddededitor/src/org/eclipse/papyrus/emf/embeddededitor/SandboxDialog.java b/sandbox/org.eclipse.papyrus.emf.embeddededitor/src/org/eclipse/papyrus/emf/embeddededitor/SandboxDialog.java
index fe44cade0d8..3809fdbec72 100644
--- a/sandbox/org.eclipse.papyrus.emf.embeddededitor/src/org/eclipse/papyrus/emf/embeddededitor/SandboxDialog.java
+++ b/sandbox/org.eclipse.papyrus.emf.embeddededitor/src/org/eclipse/papyrus/emf/embeddededitor/SandboxDialog.java
@@ -33,10 +33,10 @@ import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.ISelectionChangedListener;
import org.eclipse.jface.viewers.SelectionChangedEvent;
import org.eclipse.papyrus.emf.embeddededitor.editor.EmbeddedEditor;
-import org.eclipse.papyrus.properties.contexts.View;
-import org.eclipse.papyrus.properties.runtime.ConfigurationManager;
-import org.eclipse.papyrus.properties.runtime.EmbeddedDisplayEngine;
-import org.eclipse.papyrus.widgets.Activator;
+import org.eclipse.papyrus.infra.widgets.Activator;
+import org.eclipse.papyrus.views.properties.contexts.View;
+import org.eclipse.papyrus.views.properties.runtime.ConfigurationManager;
+import org.eclipse.papyrus.views.properties.runtime.EmbeddedDisplayEngine;
import org.eclipse.swt.SWT;
import org.eclipse.swt.custom.SashForm;
import org.eclipse.swt.custom.ScrolledComposite;
diff --git a/sandbox/org.eclipse.papyrus.emf.embeddededitor/src/org/eclipse/papyrus/emf/embeddededitor/editor/EmbeddedEditor.java b/sandbox/org.eclipse.papyrus.emf.embeddededitor/src/org/eclipse/papyrus/emf/embeddededitor/editor/EmbeddedEditor.java
index f8210686357..cb8e2116b16 100644
--- a/sandbox/org.eclipse.papyrus.emf.embeddededitor/src/org/eclipse/papyrus/emf/embeddededitor/editor/EmbeddedEditor.java
+++ b/sandbox/org.eclipse.papyrus.emf.embeddededitor/src/org/eclipse/papyrus/emf/embeddededitor/editor/EmbeddedEditor.java
@@ -50,13 +50,13 @@ import org.eclipse.jface.viewers.ViewerFilter;
import org.eclipse.papyrus.emf.embeddededitor.Activator;
import org.eclipse.papyrus.emf.embeddededitor.providers.CustomizableContentProvider;
import org.eclipse.papyrus.emf.embeddededitor.providers.EditingDomainProviderAdapter;
+import org.eclipse.papyrus.infra.widgets.editors.AbstractEditor;
+import org.eclipse.papyrus.infra.widgets.editors.ICommitListener;
+import org.eclipse.papyrus.infra.widgets.editors.StringEditor;
+import org.eclipse.papyrus.infra.widgets.providers.PatternViewerFilter;
import org.eclipse.papyrus.newchild.util.EMFHelper;
-import org.eclipse.papyrus.properties.widgets.layout.GridData;
-import org.eclipse.papyrus.properties.widgets.layout.PropertiesLayout;
-import org.eclipse.papyrus.widgets.editors.AbstractEditor;
-import org.eclipse.papyrus.widgets.editors.ICommitListener;
-import org.eclipse.papyrus.widgets.editors.StringEditor;
-import org.eclipse.papyrus.widgets.providers.PatternViewerFilter;
+import org.eclipse.papyrus.views.properties.widgets.layout.GridData;
+import org.eclipse.papyrus.views.properties.widgets.layout.PropertiesLayout;
import org.eclipse.swt.SWT;
import org.eclipse.swt.dnd.DND;
import org.eclipse.swt.dnd.Transfer;
diff --git a/sandbox/org.eclipse.papyrus.emf.embeddededitor/src/org/eclipse/papyrus/emf/embeddededitor/providers/ModiscoLabelProvider.java b/sandbox/org.eclipse.papyrus.emf.embeddededitor/src/org/eclipse/papyrus/emf/embeddededitor/providers/ModiscoLabelProvider.java
index 682875a4d58..970eed676b4 100644
--- a/sandbox/org.eclipse.papyrus.emf.embeddededitor/src/org/eclipse/papyrus/emf/embeddededitor/providers/ModiscoLabelProvider.java
+++ b/sandbox/org.eclipse.papyrus.emf.embeddededitor/src/org/eclipse/papyrus/emf/embeddededitor/providers/ModiscoLabelProvider.java
@@ -13,7 +13,7 @@ package org.eclipse.papyrus.emf.embeddededitor.providers;
import org.eclipse.core.runtime.IAdaptable;
import org.eclipse.emf.ecore.EObject;
-import org.eclipse.papyrus.properties.providers.EMFObjectLabelProvider;
+import org.eclipse.papyrus.views.properties.providers.EMFObjectLabelProvider;
public class ModiscoLabelProvider extends EMFObjectLabelProvider {
diff --git a/sandbox/org.eclipse.papyrus.infra.emf/.classpath b/sandbox/org.eclipse.papyrus.infra.emf/.classpath
new file mode 100644
index 00000000000..2d1a4302f04
--- /dev/null
+++ b/sandbox/org.eclipse.papyrus.infra.emf/.classpath
@@ -0,0 +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>
diff --git a/sandbox/org.eclipse.papyrus.infra.emf/.project b/sandbox/org.eclipse.papyrus.infra.emf/.project
new file mode 100644
index 00000000000..2e261c7b71c
--- /dev/null
+++ b/sandbox/org.eclipse.papyrus.infra.emf/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.eclipse.papyrus.infra.emf</name>
+ <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.SchemaBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.pde.PluginNature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
+</projectDescription>
diff --git a/sandbox/org.eclipse.papyrus.infra.emf/.settings/org.eclipse.jdt.core.prefs b/sandbox/org.eclipse.papyrus.infra.emf/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 00000000000..5a8be5f6faa
--- /dev/null
+++ b/sandbox/org.eclipse.papyrus.infra.emf/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,8 @@
+#Thu Dec 08 10:09:13 CET 2011
+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.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.5
diff --git a/sandbox/org.eclipse.papyrus.infra.emf/META-INF/MANIFEST.MF b/sandbox/org.eclipse.papyrus.infra.emf/META-INF/MANIFEST.MF
new file mode 100644
index 00000000000..fdc35ee2580
--- /dev/null
+++ b/sandbox/org.eclipse.papyrus.infra.emf/META-INF/MANIFEST.MF
@@ -0,0 +1,17 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: EMF Tools
+Bundle-SymbolicName: org.eclipse.papyrus.infra.emf
+Bundle-Version: 0.9.0.qualifier
+Bundle-Activator: org.eclipse.papyrus.infra.emf.Activator
+Bundle-Vendor: Eclipse Modeling Project
+Require-Bundle: org.eclipse.ui,
+ org.eclipse.core.runtime,
+ org.eclipse.emf.ecore;bundle-version="2.7.0",
+ org.eclipse.emf.edit;bundle-version="2.7.1",
+ org.eclipse.papyrus.infra.core.log;bundle-version="0.9.0"
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-ActivationPolicy: lazy
+Export-Package: org.eclipse.papyrus.infra.emf,
+ org.eclipse.papyrus.infra.emf.providers,
+ org.eclipse.papyrus.infra.emf.utils
diff --git a/sandbox/org.eclipse.papyrus.infra.emf/build.properties b/sandbox/org.eclipse.papyrus.infra.emf/build.properties
new file mode 100644
index 00000000000..41eb6ade2b4
--- /dev/null
+++ b/sandbox/org.eclipse.papyrus.infra.emf/build.properties
@@ -0,0 +1,4 @@
+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+ .
diff --git a/sandbox/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/Activator.java b/sandbox/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/Activator.java
new file mode 100644
index 00000000000..57e05d40e7a
--- /dev/null
+++ b/sandbox/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/Activator.java
@@ -0,0 +1,54 @@
+package org.eclipse.papyrus.infra.emf;
+
+import org.eclipse.papyrus.infra.core.log.LogHelper;
+import org.eclipse.ui.plugin.AbstractUIPlugin;
+import org.osgi.framework.BundleContext;
+
+/**
+ * The activator class controls the plug-in life cycle
+ */
+public class Activator extends AbstractUIPlugin {
+
+ // The plug-in ID
+ public static final String PLUGIN_ID = "org.eclipse.papyrus.infra.emf"; //$NON-NLS-1$
+
+ // The shared instance
+ private static Activator plugin;
+
+ public static LogHelper log;
+
+ /**
+ * The constructor
+ */
+ public Activator() {
+ }
+
+ /*
+ * (non-Javadoc)
+ * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
+ */
+ public void start(BundleContext context) throws Exception {
+ super.start(context);
+ plugin = this;
+ log = new LogHelper(this);
+ }
+
+ /*
+ * (non-Javadoc)
+ * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
+ */
+ public void stop(BundleContext context) throws Exception {
+ plugin = null;
+ super.stop(context);
+ }
+
+ /**
+ * Returns the shared instance
+ *
+ * @return the shared instance
+ */
+ public static Activator getDefault() {
+ return plugin;
+ }
+
+}
diff --git a/sandbox/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/providers/EMFContentProvider.java b/sandbox/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/providers/EMFContentProvider.java
new file mode 100644
index 00000000000..f710522687d
--- /dev/null
+++ b/sandbox/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/providers/EMFContentProvider.java
@@ -0,0 +1,38 @@
+package org.eclipse.papyrus.infra.emf.providers;
+
+import org.eclipse.jface.viewers.ITreeContentProvider;
+import org.eclipse.jface.viewers.Viewer;
+
+public class EMFContentProvider implements ITreeContentProvider {
+
+ public void dispose() {
+ // TODO Auto-generated method stub
+
+ }
+
+ public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
+ // TODO Auto-generated method stub
+
+ }
+
+ public Object[] getElements(Object inputElement) {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public Object[] getChildren(Object parentElement) {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public Object getParent(Object element) {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ public boolean hasChildren(Object element) {
+ // TODO Auto-generated method stub
+ return false;
+ }
+
+}
diff --git a/sandbox/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/providers/EMFLabelProvider.java b/sandbox/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/providers/EMFLabelProvider.java
new file mode 100644
index 00000000000..6da4d0a25d8
--- /dev/null
+++ b/sandbox/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/providers/EMFLabelProvider.java
@@ -0,0 +1,7 @@
+package org.eclipse.papyrus.infra.emf.providers;
+
+import org.eclipse.jface.viewers.LabelProvider;
+
+public class EMFLabelProvider extends LabelProvider {
+
+}
diff --git a/sandbox/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/utils/EMFHelper.java b/sandbox/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/utils/EMFHelper.java
new file mode 100644
index 00000000000..f33928e13cc
--- /dev/null
+++ b/sandbox/org.eclipse.papyrus.infra.emf/src/org/eclipse/papyrus/infra/emf/utils/EMFHelper.java
@@ -0,0 +1,377 @@
+/*****************************************************************************
+ * Copyright (c) 2010 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:
+ * Camille Letavernier (CEA LIST) camille.letavernier@cea.fr - Initial API and implementation
+ *****************************************************************************/
+package org.eclipse.papyrus.infra.emf.utils;
+
+import java.io.IOException;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EClassifier;
+import org.eclipse.emf.ecore.EEnum;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.ecore.EcorePackage;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.resource.ResourceSet;
+import org.eclipse.emf.ecore.resource.URIConverter;
+import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
+import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.papyrus.infra.emf.Activator;
+
+/**
+ * A Helper class for manipulating EMF Objects
+ *
+ * @author Camille Letavernier
+ */
+public class EMFHelper {
+
+ /**
+ * Returns the EClass corresponding to the given nsUri and className
+ *
+ * @param nsUri
+ * The NSURI of the EClass' EPackage
+ * @param className
+ * The EClass' name
+ * @return
+ * The EClass instance, or null if the EClass couldn't be found
+ */
+ public static EClass getEClass(String nsUri, String className) {
+ EPackage ePackage = EPackage.Registry.INSTANCE.getEPackage(nsUri);
+ if(ePackage == null) {
+ Activator.log.warn("Cannot find an EPackage matching the nsURI " + nsUri); //$NON-NLS-1$
+ return null;
+ }
+ return getEClass(ePackage, className);
+ }
+
+ /**
+ * Return the EClass corresponding to the given EPackage and className
+ *
+ * @param metamodel
+ * The EClass' EPackage
+ * @param className
+ * The EClass' name
+ * @return
+ * The EClass instance, or null if the EClass couldn't be found
+ */
+ public static EClass getEClass(EPackage metamodel, String className) {
+ EClassifier classifier = metamodel.getEClassifier(className);
+ if(classifier == null) {
+ Activator.log.warn("Classifier " + className + " not found in metamodel " + metamodel.getName() + " (" + metamodel.getNsURI() + ")"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+ }
+ if(classifier instanceof EClass) {
+ return (EClass)classifier;
+ } else {
+ Activator.log.warn("Classifier " + className + " in " + metamodel.getName() + " (" + metamodel.getNsURI() + ") is not an EClass"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+ }
+
+ return null;
+ }
+
+ /**
+ * Tests if an Object is an instance of the given EClass
+ *
+ * @param element
+ * The EObject to test
+ * @param className
+ * The name of the EClass
+ * @param metamodel
+ * The EPackage owning the EClass
+ * @return
+ * True if the EObject is an instance of the EClass, or of one of the EClass' subtypes
+ */
+ public static boolean isInstance(EObject element, String className, EPackage metamodel) {
+
+ EClassifier theClass = metamodel.getEClassifier(className);
+
+ if(theClass == null) {
+ Activator.log.warn("Class " + className + " not found in Metamodel : " + metamodel.getName() + " (" + metamodel.getNsURI() + ")"); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
+ return false;
+ }
+
+ return theClass.isInstance(element);
+ }
+
+ /**
+ * Tests if the given eClass is a Subclass of fromClass
+ *
+ * @param eClass
+ * @param fromClass
+ * @return
+ * true if eClass is a subclass of fromClass
+ */
+ public static boolean isSubclass(EClass eClass, EClass fromClass) {
+ //Everything is an EObject
+ if(eClass != null && fromClass == EcorePackage.eINSTANCE.getEObject()) {
+ return true;
+ }
+
+ if(eClass == fromClass) {
+ return true;
+ }
+
+ List<EClass> superTypes = eClass.getEAllSuperTypes();
+ if(superTypes.contains(fromClass)) {
+ return true;
+ }
+
+ return false;
+ }
+
+ /**
+ * Returns the EObject corresponding to the input object
+ * Tests if the input is an EObject, or if it is Adaptable
+ * to an EObject
+ *
+ * @param source
+ * @return An EObject corresponding to the input source, or null
+ * if the EObject could not be resolved
+ */
+ public static EObject getEObject(Object source) {
+ if(source instanceof EObject) {
+ return (EObject)source;
+ } else if(source instanceof IAdaptable) {
+ return (EObject)((IAdaptable)source).getAdapter(EObject.class);
+ }
+
+ return null;
+ }
+
+ /**
+ * Return the eClass' qualified name. The qualified name is obtained by the concatenation
+ * of its package hierarchy with the class name, separated by the given separator
+ *
+ * @param eClass
+ * @param separator
+ * The separator used between each package name
+ * @return
+ * The EClass' qualified name
+ */
+ public static String getQualifiedName(EClass eClass, String separator) {
+ return getQualifiedName(eClass.getEPackage(), separator) + separator + eClass.getName();
+ }
+
+ /**
+ * Return the ePackage's qualified name. The qualified name is obtained by the concatenation
+ * of its superPackage hierarchy with the ePackage name, separated by the given separator
+ *
+ * @param ePackage
+ * @param separator
+ * The separator used between each package name
+ * @return
+ * The EPackage's qualified name
+ */
+ public static String getQualifiedName(EPackage ePackage, String separator) {
+ if(ePackage.getESuperPackage() == null) {
+ return ePackage.getName();
+ }
+ return getQualifiedName(ePackage.getESuperPackage(), separator) + separator + ePackage.getName();
+ }
+
+
+ /**
+ * Loads and returns the first EObject at the given URI.
+ * The EObject is loaded in the given resourceSet.
+ *
+ * @param resourceSet
+ * The ResourceSet in which the model will be loaded
+ * @param uri
+ * The URI describing the location of the model to load
+ * @return
+ * The first EObject located at the given URI
+ * @throws IOException
+ *
+ */
+ public static EObject loadEMFModel(ResourceSet resourceSet, URI uri) throws IOException {
+ if(resourceSet == null) {
+ resourceSet = new ResourceSetImpl();
+ }
+ try {
+ Resource resource = resourceSet.getResource(uri, true);
+ if(resource != null) {
+ if(!resource.getContents().isEmpty()) {
+ return resource.getContents().get(0);
+ }
+ }
+ } catch (Exception ex) {
+ IOException exception = new IOException(ex.toString());
+ exception.initCause(ex);
+ throw exception;
+ }
+
+ return null;
+ }
+
+ /**
+ * Return the root package containing the given package, or the package
+ * itself if it is already the root
+ *
+ * @param ePackage
+ * @return
+ * The Root package
+ */
+ public static EPackage getRootPackage(EPackage ePackage) {
+ if(ePackage == null) {
+ return null;
+ }
+
+ if(ePackage.getESuperPackage() == null) {
+ return ePackage;
+ }
+ return getRootPackage(ePackage.getESuperPackage());
+ }
+
+
+ /**
+ * Return the list of EClasses that are subtypes
+ * of the given EClass
+ *
+ * @param type
+ * @param concreteClassesOnly
+ * If true, only Concrete EClasses will be returned. Abstract and Interface EClasses will be filtered
+ * @return
+ * The list of EClasses implementing or extending the given EClass
+ */
+ public static List<EClass> getSubclassesOf(EClass type, boolean concreteClassesOnly) {
+ List<EClass> result = new LinkedList<EClass>();
+ if(!concreteClassesOnly || (!type.isAbstract() && !type.isInterface())) {
+ result.add(type);
+ }
+
+ EPackage ePackage = getRootPackage(type.getEPackage());
+ getSubclassesOf(type, ePackage, result, concreteClassesOnly);
+ return result;
+ }
+
+ private static void getSubclassesOf(EClass type, EPackage fromPackage, List<EClass> result, boolean concreteClassesOnly) {
+ for(EClassifier classifier : fromPackage.getEClassifiers()) {
+ if(classifier instanceof EClass) {
+ EClass eClass = (EClass)classifier;
+ if(eClass.getEAllSuperTypes().contains(type)) {
+ if(!concreteClassesOnly || (!eClass.isAbstract() && !eClass.isInterface())) {
+ result.add(eClass);
+ }
+ }
+ }
+ }
+
+ for(EPackage subPackage : fromPackage.getESubpackages()) {
+ getSubclassesOf(type, subPackage, result, concreteClassesOnly);
+ }
+ }
+
+ /**
+ * Tests if an EObject is read only
+ * Delegates to the EObject's editing domain if it can be found
+ *
+ * @param eObject
+ * @return
+ * True if the EObject is read only
+ */
+ public static boolean isReadOnly(EObject eObject) {
+ EditingDomain domain = AdapterFactoryEditingDomain.getEditingDomainFor(eObject);
+ return isReadOnly(eObject, domain);
+ }
+
+ /**
+ * Tests if an EObject is read only
+ * Delegates to the given editing domain if it isn't null
+ *
+ * @param eObject
+ * @param domain
+ * @return
+ * True if the EObject is read only
+ */
+ public static boolean isReadOnly(EObject eObject, EditingDomain domain) {
+ return isReadOnly(eObject.eResource(), domain);
+ }
+
+ /**
+ * Tests if the Resource is read only
+ * Delegates to the given editing domain if it isn't null
+ *
+ * @param resource
+ * @param domain
+ * @return
+ * True if the Resource is read only
+ */
+ public static boolean isReadOnly(Resource resource, EditingDomain domain) {
+ if(domain instanceof AdapterFactoryEditingDomain) {
+ return ((AdapterFactoryEditingDomain)domain).isReadOnly(resource);
+ }
+
+ if(resource == null) {
+ return false;
+ }
+
+ ResourceSet resourceSet = resource.getResourceSet();
+
+ if(resourceSet == null) {
+ return false;
+ }
+
+ Map<String, ?> attributes = resourceSet.getURIConverter().getAttributes(resource.getURI(), null);
+ Boolean readOnly = (Boolean)attributes.get(URIConverter.ATTRIBUTE_READ_ONLY);
+
+ return readOnly == null ? false : readOnly;
+ }
+
+ /**
+ * Tests if the given EStructuralFeature is required (ie. should always
+ * have a value)
+ *
+ * A feature is required if at least of one the following conditions if
+ * true :
+ *
+ * - It has a defaultValue
+ * - Its lowerBound is at least 1
+ * - It is an enumeration (Enumerations always have a default value)
+ * - It is a Java primitive type, and is not marked as Unsettable
+ *
+ * @param feature
+ * the feature to test
+ * @return
+ * true if the feature is required, false otherwise
+ */
+ public static boolean isRequired(EStructuralFeature feature) {
+ //EEnums are always required, as an EEnum always has a default value
+ if(feature.getEType() instanceof EEnum) {
+ return true;
+ }
+
+ //At least one value means it is required
+ if(feature.getLowerBound() >= 1) {
+ return true;
+ }
+
+ //Java primitive types cannot have a null value
+ //if the feature is not specifically marked as unsettable, then it is required
+ if(feature.getEType().getInstanceClass().isPrimitive() && !feature.isUnsettable()) {
+ return true;
+ }
+
+ //If there is a default value, there is always a value
+ if(feature.getDefaultValueLiteral() != null) {
+ return true;
+ }
+
+ return false; //The property if not required
+ }
+
+
+}
diff --git a/sandbox/org.eclipse.papyrus.newchild.customization/META-INF/MANIFEST.MF b/sandbox/org.eclipse.papyrus.newchild.customization/META-INF/MANIFEST.MF
index 0f481824c7e..a56c75f6647 100644
--- a/sandbox/org.eclipse.papyrus.newchild.customization/META-INF/MANIFEST.MF
+++ b/sandbox/org.eclipse.papyrus.newchild.customization/META-INF/MANIFEST.MF
@@ -9,7 +9,7 @@ Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
org.eclipse.papyrus.newchild;bundle-version="0.9.0",
org.eclipse.emf.facet.infra.browser.custom.core;bundle-version="0.1.0",
- org.eclipse.papyrus.properties;bundle-version="0.9.0",
- org.eclipse.papyrus.constraints.customization;bundle-version="0.9.0"
+ org.eclipse.papyrus.constraints.customization;bundle-version="0.9.0",
+ org.eclipse.papyrus.views.properties;bundle-version="0.9.0"
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-ActivationPolicy: lazy
diff --git a/sandbox/org.eclipse.papyrus.newchild.customization/plugin.xml b/sandbox/org.eclipse.papyrus.newchild.customization/plugin.xml
index 01c14b4925b..5e11749af52 100644
--- a/sandbox/org.eclipse.papyrus.newchild.customization/plugin.xml
+++ b/sandbox/org.eclipse.papyrus.newchild.customization/plugin.xml
@@ -9,10 +9,9 @@
</browserCustomization>
</extension>
<extension
- point="org.eclipse.papyrus.properties.context">
+ point="org.eclipse.papyrus.views.properties.context">
<context
- contextModel="Model/NewChild.ctx"
- loadDefault="true">
+ contextModel="Model/NewChild.ctx">
</context>
</extension>
diff --git a/sandbox/org.eclipse.papyrus.newchild/META-INF/MANIFEST.MF b/sandbox/org.eclipse.papyrus.newchild/META-INF/MANIFEST.MF
index 49142a2959a..fee6eea2870 100644
--- a/sandbox/org.eclipse.papyrus.newchild/META-INF/MANIFEST.MF
+++ b/sandbox/org.eclipse.papyrus.newchild/META-INF/MANIFEST.MF
@@ -15,14 +15,14 @@ Export-Package: org.eclipse.papyrus.newchild,
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.emf.ecore;visibility:=reexport,
org.eclipse.emf.ecore.xmi;visibility:=reexport,
- org.eclipse.papyrus.core.queries.configuration;visibility:=reexport,
- org.eclipse.papyrus.extendedtypes;visibility:=reexport,
org.eclipse.emf.facet.infra.query;visibility:=reexport,
org.eclipse.uml2.uml;visibility:=reexport,
org.eclipse.ui;bundle-version="3.7.0",
- org.eclipse.papyrus.log;bundle-version="0.8.0",
org.eclipse.emf.edit.ui;bundle-version="2.7.0",
org.eclipse.papyrus.constraints;bundle-version="0.9.0",
- org.eclipse.papyrus.core;bundle-version="0.8.0",
- org.eclipse.papyrus.service.edit;bundle-version="0.8.1"
+ org.eclipse.papyrus.infra.queries.core.configuration;bundle-version="0.9.0",
+ org.eclipse.papyrus.infra.extendedtypes;bundle-version="0.9.0",
+ org.eclipse.papyrus.infra.core.log;bundle-version="0.9.0",
+ org.eclipse.papyrus.infra.core;bundle-version="0.9.0",
+ org.eclipse.papyrus.infra.services.edit;bundle-version="0.9.0"
Bundle-ActivationPolicy: lazy
diff --git a/sandbox/org.eclipse.papyrus.newchild/Model/NewChild.ecore b/sandbox/org.eclipse.papyrus.newchild/Model/NewChild.ecore
index d1fc2faad09..447b925effd 100644
--- a/sandbox/org.eclipse.papyrus.newchild/Model/NewChild.ecore
+++ b/sandbox/org.eclipse.papyrus.newchild/Model/NewChild.ecore
@@ -10,7 +10,7 @@
<eStructuralFeatures xsi:type="ecore:EReference" name="newChildPolicies" upperBound="-1"
eType="#//ncpolicy/NewChildPolicySet" containment="true"/>
</eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="MenuRoot" eSuperTypes="#//MenuContainer ../../org.eclipse.papyrus.constraints/Model/Constraints.ecore#//DisplayUnit">
+ <eClassifiers xsi:type="ecore:EClass" name="MenuRoot" eSuperTypes="#//MenuContainer platform:/plugin/org.eclipse.papyrus.constraints/Model/Constraints.ecore#//DisplayUnit">
<eStructuralFeatures xsi:type="ecore:EReference" name="groups" upperBound="-1"
eType="#//MenuGroup" containment="true"/>
<eStructuralFeatures xsi:type="ecore:EAttribute" name="name" lowerBound="1" eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
@@ -28,7 +28,7 @@
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="MenuAction" eSuperTypes="#//MenuItem">
<eStructuralFeatures xsi:type="ecore:EReference" name="elementType" lowerBound="1"
- eType="ecore:EClass platform:/plugin/org.eclipse.papyrus.extendedtypes/model/ExtendedTypes.ecore#//ExtendedElementTypeConfiguration"/>
+ eType="ecore:EClass platform:/plugin/org.eclipse.papyrus.infra.extendedtypes/model/ExtendedTypes.ecore#//ExtendedElementTypeConfiguration"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="Separator" eSuperTypes="#//MenuItem"/>
<eClassifiers xsi:type="ecore:EClass" name="MenuGroup" eSuperTypes="#//MenuContainer">
@@ -64,7 +64,7 @@
<eStructuralFeatures xsi:type="ecore:EReference" name="groups" upperBound="-1"
eType="#//MenuGroup" containment="true"/>
</eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="NewChildPolicySet" eSuperTypes="../../org.eclipse.papyrus.constraints/Model/Constraints.ecore#//DisplayUnit">
+ <eClassifiers xsi:type="ecore:EClass" name="NewChildPolicySet" eSuperTypes="platform:/plugin/org.eclipse.papyrus.constraints/Model/Constraints.ecore#//DisplayUnit">
<eStructuralFeatures xsi:type="ecore:EAttribute" name="name" lowerBound="1"
eType="ecore:EDataType platform:/plugin/org.eclipse.emf.ecore/model/Ecore.ecore#//EString"/>
<eStructuralFeatures xsi:type="ecore:EReference" name="policies" upperBound="-1"
diff --git a/sandbox/org.eclipse.papyrus.newchild/Model/NewChild.genmodel b/sandbox/org.eclipse.papyrus.newchild/Model/NewChild.genmodel
index 3ba12bb6949..8ab95dc141e 100644
--- a/sandbox/org.eclipse.papyrus.newchild/Model/NewChild.genmodel
+++ b/sandbox/org.eclipse.papyrus.newchild/Model/NewChild.genmodel
@@ -5,7 +5,7 @@
editDirectory="/org.eclipse.papyrus.newchild.edit/src-gen" editorDirectory="/org.eclipse.papyrus.newchild.editor/src-gen"
modelPluginID="org.eclipse.papyrus.newchild" modelName="NewChild" testsDirectory="/org.eclipse.papyrus.newchild.tests/src-gen"
importerID="org.eclipse.emf.importer.ecore" complianceLevel="5.0" copyrightFields="false"
- usedGenPackages="platform:/plugin/org.eclipse.papyrus.core.queries.configuration/model/Configuration.genmodel#//configuration ../../org.eclipse.papyrus.constraints/Model/Constraints.genmodel#//constraints platform:/plugin/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore platform:/plugin/org.eclipse.papyrus.extendedtypes/model/ExtendedTypes.genmodel#//extendedtypes platform:/plugin/org.eclipse.emf.facet.infra.query/model/query.genmodel#//query platform:/plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml">
+ usedGenPackages="platform:/plugin/org.eclipse.papyrus.infra.queries.core.configuration/model/Configuration.genmodel#//configuration platform:/plugin/org.eclipse.papyrus.constraints/Model/Constraints.genmodel#//constraints platform:/plugin/org.eclipse.emf.ecore/model/Ecore.genmodel#//ecore platform:/plugin/org.eclipse.papyrus.infra.extendedtypes/model/ExtendedTypes.genmodel#//extendedtypes platform:/plugin/org.eclipse.emf.facet.infra.query/model/query.genmodel#//query platform:/plugin/org.eclipse.uml2.uml/model/UML.genmodel#//uml">
<foreignModel>NewChild.ecore</foreignModel>
<genPackages prefix="Newchild" basePackage="org.eclipse.papyrus" resource="XML"
disposableProviderFactory="true" ecorePackage="NewChild.ecore#/">
diff --git a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/MenuAction.java b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/MenuAction.java
index e8f8de03c31..45506ac3d95 100644
--- a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/MenuAction.java
+++ b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/MenuAction.java
@@ -6,9 +6,7 @@
*/
package org.eclipse.papyrus.newchild;
-import org.eclipse.papyrus.extendedtypes.ExtendedElementTypeConfiguration;
-
-import org.eclipse.papyrus.newchild.ncpolicy.CreateIn;
+import org.eclipse.papyrus.infra.extendedtypes.ExtendedElementTypeConfiguration;
/**
* <!-- begin-user-doc -->
diff --git a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/NewchildConfiguration.java b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/NewchildConfiguration.java
index 3221b11ae7e..a68783266b7 100644
--- a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/NewchildConfiguration.java
+++ b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/NewchildConfiguration.java
@@ -9,6 +9,7 @@ package org.eclipse.papyrus.newchild;
import org.eclipse.emf.common.util.EList;
import org.eclipse.emf.ecore.EObject;
+
import org.eclipse.papyrus.newchild.ncpolicy.NewChildPolicySet;
/**
diff --git a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/impl/MenuActionImpl.java b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/impl/MenuActionImpl.java
index 6aee3f15c17..e28f082fa17 100644
--- a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/impl/MenuActionImpl.java
+++ b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/impl/MenuActionImpl.java
@@ -13,13 +13,11 @@ import org.eclipse.emf.ecore.InternalEObject;
import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.papyrus.extendedtypes.ExtendedElementTypeConfiguration;
+import org.eclipse.papyrus.infra.extendedtypes.ExtendedElementTypeConfiguration;
import org.eclipse.papyrus.newchild.MenuAction;
import org.eclipse.papyrus.newchild.NewchildPackage;
-import org.eclipse.papyrus.newchild.ncpolicy.CreateIn;
-
/**
* <!-- begin-user-doc -->
* An implementation of the model object '<em><b>Menu Action</b></em>'.
diff --git a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/impl/NewchildConfigurationImpl.java b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/impl/NewchildConfigurationImpl.java
index a197aa92bf9..8caa4e04d7e 100644
--- a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/impl/NewchildConfigurationImpl.java
+++ b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/impl/NewchildConfigurationImpl.java
@@ -25,6 +25,7 @@ import org.eclipse.emf.ecore.util.InternalEList;
import org.eclipse.papyrus.newchild.MenuRoot;
import org.eclipse.papyrus.newchild.NewchildConfiguration;
import org.eclipse.papyrus.newchild.NewchildPackage;
+
import org.eclipse.papyrus.newchild.ncpolicy.NewChildPolicySet;
/**
diff --git a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/impl/NewchildPackageImpl.java b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/impl/NewchildPackageImpl.java
index 9b028ff3e6c..461160ca1e8 100644
--- a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/impl/NewchildPackageImpl.java
+++ b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/impl/NewchildPackageImpl.java
@@ -17,7 +17,7 @@ import org.eclipse.emf.ecore.impl.EPackageImpl;
import org.eclipse.papyrus.constraints.ConstraintsPackage;
-import org.eclipse.papyrus.extendedtypes.ExtendedtypesPackage;
+import org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage;
import org.eclipse.papyrus.newchild.CustomFiller;
import org.eclipse.papyrus.newchild.Menu;
diff --git a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/ncpolicy/NewEMFChildMenu.java b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/ncpolicy/NewEMFChildMenu.java
index ecd5020b6dd..22ec5d470ae 100644
--- a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/ncpolicy/NewEMFChildMenu.java
+++ b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/ncpolicy/NewEMFChildMenu.java
@@ -7,6 +7,7 @@
package org.eclipse.papyrus.newchild.ncpolicy;
import org.eclipse.emf.common.util.EList;
+
import org.eclipse.papyrus.newchild.Menu;
import org.eclipse.papyrus.newchild.MenuGroup;
diff --git a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/ncpolicy/impl/NcpolicyPackageImpl.java b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/ncpolicy/impl/NcpolicyPackageImpl.java
index ea13793eb46..85a6785777a 100644
--- a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/ncpolicy/impl/NcpolicyPackageImpl.java
+++ b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/ncpolicy/impl/NcpolicyPackageImpl.java
@@ -17,7 +17,7 @@ import org.eclipse.emf.ecore.impl.EPackageImpl;
import org.eclipse.papyrus.constraints.ConstraintsPackage;
-import org.eclipse.papyrus.extendedtypes.ExtendedtypesPackage;
+import org.eclipse.papyrus.infra.extendedtypes.ExtendedtypesPackage;
import org.eclipse.papyrus.newchild.NewchildPackage;
diff --git a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/ncpolicy/impl/NewChildPolicyImpl.java b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/ncpolicy/impl/NewChildPolicyImpl.java
index 9056aeb9461..e279384f8ea 100644
--- a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/ncpolicy/impl/NewChildPolicyImpl.java
+++ b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/ncpolicy/impl/NewChildPolicyImpl.java
@@ -9,6 +9,7 @@ package org.eclipse.papyrus.newchild.ncpolicy.impl;
import java.util.Collection;
import org.eclipse.emf.common.notify.Notification;
+
import org.eclipse.emf.common.util.EList;
import org.eclipse.emf.ecore.EClass;
diff --git a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/ncpolicy/impl/NewEMFChildMenuImpl.java b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/ncpolicy/impl/NewEMFChildMenuImpl.java
index 9dce97f7be1..ebb4a8f2d2b 100644
--- a/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/ncpolicy/impl/NewEMFChildMenuImpl.java
+++ b/sandbox/org.eclipse.papyrus.newchild/src-gen/org/eclipse/papyrus/newchild/ncpolicy/impl/NewEMFChildMenuImpl.java
@@ -7,18 +7,22 @@
package org.eclipse.papyrus.newchild.ncpolicy.impl;
import java.util.Collection;
-import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.common.notify.NotificationChain;
+
import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.InternalEObject;
+
import org.eclipse.emf.ecore.impl.ENotificationImpl;
import org.eclipse.emf.ecore.util.EObjectContainmentEList;
import org.eclipse.emf.ecore.util.InternalEList;
+
import org.eclipse.papyrus.newchild.MenuGroup;
+
import org.eclipse.papyrus.newchild.impl.MenuImpl;
import org.eclipse.papyrus.newchild.ncpolicy.CreateIn;
diff --git a/sandbox/org.eclipse.papyrus.newchild/src/org/eclipse/papyrus/newchild/Activator.java b/sandbox/org.eclipse.papyrus.newchild/src/org/eclipse/papyrus/newchild/Activator.java
index 7597fde8701..6d82a9b636c 100644
--- a/sandbox/org.eclipse.papyrus.newchild/src/org/eclipse/papyrus/newchild/Activator.java
+++ b/sandbox/org.eclipse.papyrus.newchild/src/org/eclipse/papyrus/newchild/Activator.java
@@ -11,7 +11,7 @@
*****************************************************************************/
package org.eclipse.papyrus.newchild;
-import org.eclipse.papyrus.log.LogHelper;
+import org.eclipse.papyrus.infra.core.log.LogHelper;
import org.eclipse.ui.plugin.AbstractUIPlugin;
import org.osgi.framework.BundleContext;
diff --git a/sandbox/org.eclipse.papyrus.newchild/src/org/eclipse/papyrus/newchild/action/ExtendedTypeAction.java b/sandbox/org.eclipse.papyrus.newchild/src/org/eclipse/papyrus/newchild/action/ExtendedTypeAction.java
index 2e039e1f669..ef2c70576d5 100644
--- a/sandbox/org.eclipse.papyrus.newchild/src/org/eclipse/papyrus/newchild/action/ExtendedTypeAction.java
+++ b/sandbox/org.eclipse.papyrus.newchild/src/org/eclipse/papyrus/newchild/action/ExtendedTypeAction.java
@@ -20,13 +20,13 @@ import org.eclipse.gmf.runtime.emf.type.core.IElementType;
import org.eclipse.gmf.runtime.emf.type.core.requests.CreateElementRequest;
import org.eclipse.jface.action.Action;
import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.papyrus.core.utils.GMFtoEMFCommandWrapper;
-import org.eclipse.papyrus.extendedtypes.ExtendedEditHelperAdvice;
-import org.eclipse.papyrus.extendedtypes.ExtendedElementTypeConfiguration;
-import org.eclipse.papyrus.extendedtypes.ExtendedSemanticTypeDescriptor;
-import org.eclipse.papyrus.extendedtypes.types.ExtendedHintedTypeFactory;
-import org.eclipse.papyrus.service.edit.service.ElementEditServiceUtils;
-import org.eclipse.papyrus.service.edit.service.IElementEditService;
+import org.eclipse.papyrus.commands.wrappers.GMFtoEMFCommandWrapper;
+import org.eclipse.papyrus.infra.extendedtypes.ExtendedEditHelperAdvice;
+import org.eclipse.papyrus.infra.extendedtypes.ExtendedElementTypeConfiguration;
+import org.eclipse.papyrus.infra.extendedtypes.ExtendedSemanticTypeDescriptor;
+import org.eclipse.papyrus.infra.extendedtypes.types.ExtendedHintedTypeFactory;
+import org.eclipse.papyrus.infra.services.edit.service.ElementEditServiceUtils;
+import org.eclipse.papyrus.infra.services.edit.service.IElementEditService;
public class ExtendedTypeAction extends Action {
diff --git a/sandbox/org.eclipse.papyrus.newchild/src/org/eclipse/papyrus/newchild/menu/FillerFactory.java b/sandbox/org.eclipse.papyrus.newchild/src/org/eclipse/papyrus/newchild/menu/FillerFactory.java
index 3d17df0c8c1..426c57ecd75 100644
--- a/sandbox/org.eclipse.papyrus.newchild/src/org/eclipse/papyrus/newchild/menu/FillerFactory.java
+++ b/sandbox/org.eclipse.papyrus.newchild/src/org/eclipse/papyrus/newchild/menu/FillerFactory.java
@@ -11,7 +11,7 @@
*****************************************************************************/
package org.eclipse.papyrus.newchild.menu;
-import org.eclipse.papyrus.extendedtypes.Activator;
+import org.eclipse.papyrus.newchild.Activator;
import org.eclipse.papyrus.newchild.CustomFiller;
import org.eclipse.papyrus.newchild.Menu;
import org.eclipse.papyrus.newchild.MenuAction;
diff --git a/sandbox/org.eclipse.papyrus.properties.marte/META-INF/MANIFEST.MF b/sandbox/org.eclipse.papyrus.properties.marte/META-INF/MANIFEST.MF
index 77d7d82354c..b2673a04699 100644
--- a/sandbox/org.eclipse.papyrus.properties.marte/META-INF/MANIFEST.MF
+++ b/sandbox/org.eclipse.papyrus.properties.marte/META-INF/MANIFEST.MF
@@ -7,7 +7,7 @@ Bundle-Activator: org.eclipse.papyrus.properties.marte.Activator
Bundle-Vendor: Eclipse Modeling Project
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
- org.eclipse.papyrus.properties;bundle-version="0.9.0",
- org.eclipse.papyrus.properties.uml;bundle-version="0.9.0"
+ org.eclipse.papyrus.views.properties;bundle-version="0.9.0",
+ org.eclipse.papyrus.uml.properties;bundle-version="0.9.0"
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-ActivationPolicy: lazy
diff --git a/sandbox/org.eclipse.papyrus.properties.marte/plugin.xml b/sandbox/org.eclipse.papyrus.properties.marte/plugin.xml
index 472f1c7d6f5..5dac8fffe01 100644
--- a/sandbox/org.eclipse.papyrus.properties.marte/plugin.xml
+++ b/sandbox/org.eclipse.papyrus.properties.marte/plugin.xml
@@ -2,10 +2,9 @@
<?eclipse version="3.4"?>
<plugin>
<extension
- point="org.eclipse.papyrus.properties.context">
+ point="org.eclipse.papyrus.views.properties.context">
<context
- contextModel="model/MARTE.ctx"
- loadDefault="true">
+ contextModel="model/MARTE.ctx">
</context>
</extension>

Back to the top