Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorcletavernie2011-11-04 09:19:35 +0000
committercletavernie2011-11-04 09:19:35 +0000
commit70956b5e77e1008a5c66d5b80452584b396cc0b5 (patch)
tree792842a1114eac24396a7111f06890bd286aae91 /plugins/infra
parent4115d32312593180c6702f4b891b20d6324f8b7b (diff)
downloadorg.eclipse.papyrus-70956b5e77e1008a5c66d5b80452584b396cc0b5.tar.gz
org.eclipse.papyrus-70956b5e77e1008a5c66d5b80452584b396cc0b5.tar.xz
org.eclipse.papyrus-70956b5e77e1008a5c66d5b80452584b396cc0b5.zip
362162: [Architecture - Refactoring] The plug-ins should be renamed to match their layer's qualified name
https://bugs.eclipse.org/bugs/show_bug.cgi?id=362162
Diffstat (limited to 'plugins/infra')
-rw-r--r--plugins/infra/core/org.eclipse.papyrus.infra.core.adaptor.emf/.project2
-rw-r--r--plugins/infra/core/org.eclipse.papyrus.infra.core.adaptor.emf/META-INF/MANIFEST.MF5
-rw-r--r--plugins/infra/core/org.eclipse.papyrus.infra.core.adaptor.emf/src/org/eclipse/papyrus/core/adaptor/emf/Activator.java6
-rw-r--r--plugins/infra/core/org.eclipse.papyrus.infra.core.adaptor.gmf/.project2
-rw-r--r--plugins/infra/core/org.eclipse.papyrus.infra.core.adaptor.gmf/META-INF/MANIFEST.MF5
-rw-r--r--plugins/infra/core/org.eclipse.papyrus.infra.core.adaptor.gmf/src/org/eclipse/papyrus/core/adaptor/gmf/Activator.java16
-rw-r--r--plugins/infra/core/org.eclipse.papyrus.infra.core.log/.project2
-rw-r--r--plugins/infra/core/org.eclipse.papyrus.infra.core.log/META-INF/MANIFEST.MF2
-rw-r--r--plugins/infra/core/org.eclipse.papyrus.infra.core.log/src/org/eclipse/papyrus/log/internal/Activator.java4
-rw-r--r--plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/.project2
-rw-r--r--plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/META-INF/MANIFEST.MF4
-rw-r--r--plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/.project2
-rw-r--r--plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/META-INF/MANIFEST.MF8
-rw-r--r--plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/Activator.java4
-rw-r--r--plugins/infra/core/org.eclipse.papyrus.infra.core/.project2
-rw-r--r--plugins/infra/core/org.eclipse.papyrus.infra.core/META-INF/MANIFEST.MF10
-rw-r--r--plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/core/Activator.java6
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/.project2
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/META-INF/MANIFEST.MF4
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/src/org/eclipse/papyrus/commands/Activator.java6
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.navigation/.project2
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.navigation/META-INF/MANIFEST.MF18
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.navigation/src/org/eclipse/papyrus/navigation/Activator.java6
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.outline/.project2
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.outline/META-INF/MANIFEST.MF4
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.outline/src/org/eclipse/papyrus/outline/internal/Activator.java7
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/.project2
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/META-INF/MANIFEST.MF4
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/preferences/Activator.java7
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/.project2
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/META-INF/MANIFEST.MF11
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/properties/notation/Activator.java2
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.widgets/.project2
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.widgets/META-INF/MANIFEST.MF6
-rw-r--r--plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.widgets/src/org/eclipse/papyrus/widgets/gmf/Activator.java4
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.export/.project2
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.export/META-INF/MANIFEST.MF6
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/.project2
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/META-INF/MANIFEST.MF13
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/src/org/eclipse/papyrus/extendedtypes/emf/Activator.java6
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.extendedtypes/.project2
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.extendedtypes/META-INF/MANIFEST.MF10
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/extendedtypes/Activator.java6
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.onefile/.project2
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.onefile/META-INF/MANIFEST.MF6
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.onefile/src/org/eclipse/papyrus/onefile/Activator.java6
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.ui.resources/.project2
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.ui.resources/META-INF/MANIFEST.MF8
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.ui.resources/src/org/eclipse/papyrus/ui/resources/Activator.java6
-rw-r--r--plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/.project2
-rw-r--r--plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/META-INF/MANIFEST.MF5
-rw-r--r--plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/.project2
-rw-r--r--plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/META-INF/MANIFEST.MF3
-rw-r--r--plugins/infra/queries/org.eclipse.papyrus.infra.queries.core/.project2
-rw-r--r--plugins/infra/queries/org.eclipse.papyrus.infra.queries.core/META-INF/MANIFEST.MF12
-rw-r--r--plugins/infra/queries/org.eclipse.papyrus.infra.queries.core/src/org/eclipse/papyrus/core/queries/Activator.java16
-rw-r--r--plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.history/.project2
-rw-r--r--plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.history/META-INF/MANIFEST.MF5
-rw-r--r--plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/.project2
-rw-r--r--plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/META-INF/MANIFEST.MF12
-rw-r--r--plugins/infra/services/org.eclipse.papyrus.infra.services.decoration/.project2
-rw-r--r--plugins/infra/services/org.eclipse.papyrus.infra.services.decoration/META-INF/MANIFEST.MF4
-rw-r--r--plugins/infra/services/org.eclipse.papyrus.infra.services.decoration/src/org/eclipse/papyrus/decoration/Activator.java10
-rw-r--r--plugins/infra/services/org.eclipse.papyrus.infra.services.edit/.project2
-rw-r--r--plugins/infra/services/org.eclipse.papyrus.infra.services.edit/META-INF/MANIFEST.MF8
-rw-r--r--plugins/infra/services/org.eclipse.papyrus.infra.services.edit/src/org/eclipse/papyrus/service/edit/Activator.java6
-rw-r--r--plugins/infra/services/org.eclipse.papyrus.infra.services.markerlistener/.project2
-rw-r--r--plugins/infra/services/org.eclipse.papyrus.infra.services.markerlistener/META-INF/MANIFEST.MF5
-rw-r--r--plugins/infra/services/org.eclipse.papyrus.infra.services.markerlistener/src/org/eclipse/papyrus/markerlistener/Activator.java6
-rw-r--r--plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.preferences/.project2
-rw-r--r--plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.preferences/META-INF/MANIFEST.MF9
-rw-r--r--plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.preferences/src/org/eclipse/papyrus/core/resourceloading/preferences/CorePlugin.java6
-rw-r--r--plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/.project2
-rw-r--r--plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/META-INF/MANIFEST.MF9
-rw-r--r--plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/core/resourceloading/Activator.java4
-rw-r--r--plugins/infra/services/org.eclipse.papyrus.infra.services.validation/.project56
-rw-r--r--plugins/infra/services/org.eclipse.papyrus.infra.services.validation/META-INF/MANIFEST.MF10
-rw-r--r--plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/validation/Activator.java10
-rw-r--r--plugins/infra/table/org.eclipse.papyrus.infra.table.common/.project2
-rw-r--r--plugins/infra/table/org.eclipse.papyrus.infra.table.common/META-INF/MANIFEST.MF14
-rw-r--r--plugins/infra/table/org.eclipse.papyrus.infra.table.common/src/org/eclipse/papyrus/table/common/Activator.java4
-rw-r--r--plugins/infra/table/org.eclipse.papyrus.infra.table.instance/.project2
-rw-r--r--plugins/infra/table/org.eclipse.papyrus.infra.table.instance/META-INF/MANIFEST.MF3
-rw-r--r--plugins/infra/table/org.eclipse.papyrus.infra.table.instance/src/org/eclipse/papyrus/table/instance/Activator.java4
-rw-r--r--plugins/infra/table/org.eclipse.papyrus.infra.table.menu/.project2
-rw-r--r--plugins/infra/table/org.eclipse.papyrus.infra.table.menu/META-INF/MANIFEST.MF8
-rw-r--r--plugins/infra/table/org.eclipse.papyrus.infra.table.menu/src/org/eclipse/papyrus/table/menu/Activator.java6
-rw-r--r--plugins/infra/table/org.eclipse.papyrus.infra.table.modelexplorer/.project2
-rw-r--r--plugins/infra/table/org.eclipse.papyrus.infra.table.modelexplorer/META-INF/MANIFEST.MF5
-rw-r--r--plugins/infra/table/org.eclipse.papyrus.infra.table.modelexplorer/src/org/eclipse/papyrus/table/modelexplorer/Activator.java4
-rw-r--r--plugins/infra/table/org.eclipse.papyrus.infra.table.properties/.project2
-rw-r--r--plugins/infra/table/org.eclipse.papyrus.infra.table.properties/META-INF/MANIFEST.MF9
-rw-r--r--plugins/infra/table/org.eclipse.papyrus.infra.table.properties/src/org/eclipse/papyrus/properties/table/Activator.java6
-rw-r--r--plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/.project56
-rw-r--r--plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/META-INF/MANIFEST.MF4
-rw-r--r--plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/ui/toolbox/Activator.java10
-rw-r--r--plugins/infra/widget/org.eclipse.papyrus.infra.widgets/.project2
-rw-r--r--plugins/infra/widget/org.eclipse.papyrus.infra.widgets/META-INF/MANIFEST.MF6
-rw-r--r--plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/widgets/Activator.java2
-rw-r--r--plugins/infra/xtext/org.eclipse.papyrus.infra.xtext.widgets/.project2
-rw-r--r--plugins/infra/xtext/org.eclipse.papyrus.infra.xtext.widgets/META-INF/MANIFEST.MF6
-rw-r--r--plugins/infra/xtext/org.eclipse.papyrus.infra.xtext.widgets/src/org/eclipse/papyrus/widgets/xtext/Activator.java4
102 files changed, 327 insertions, 304 deletions
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.adaptor.emf/.project b/plugins/infra/core/org.eclipse.papyrus.infra.core.adaptor.emf/.project
index aaa4ac1f908..9594b67e4ed 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.adaptor.emf/.project
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.adaptor.emf/.project
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>org.eclipse.papyrus.core.adaptor.emf</name>
+ <name>org.eclipse.papyrus.infra.core.adaptor.emf</name>
<comment></comment>
<projects>
</projects>
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.adaptor.emf/META-INF/MANIFEST.MF b/plugins/infra/core/org.eclipse.papyrus.infra.core.adaptor.emf/META-INF/MANIFEST.MF
index fada431d5fb..95a9de41e6e 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.adaptor.emf/META-INF/MANIFEST.MF
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.adaptor.emf/META-INF/MANIFEST.MF
@@ -1,5 +1,5 @@
Manifest-Version: 1.0
-Require-Bundle: org.eclipse.papyrus.core;bundle-version="0.9.0"
+Require-Bundle: org.eclipse.papyrus.infra.core;bundle-version="0.9.0"
Export-Package: org.eclipse.papyrus.core.adaptor.emf
Bundle-Vendor: %providerName
Bundle-ActivationPolicy: lazy
@@ -8,7 +8,6 @@ Bundle-Localization: plugin
Bundle-Name: %pluginName
Bundle-ManifestVersion: 2
Bundle-Activator: org.eclipse.papyrus.core.adaptor.emf.Activator
-Bundle-SymbolicName: org.eclipse.papyrus.core.adaptor.emf;singleton:=t
- rue
+Bundle-SymbolicName: org.eclipse.papyrus.infra.core.adaptor.emf;singleton:=true
Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.adaptor.emf/src/org/eclipse/papyrus/core/adaptor/emf/Activator.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.adaptor.emf/src/org/eclipse/papyrus/core/adaptor/emf/Activator.java
index 73b351dbab1..e40eedda638 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.adaptor.emf/src/org/eclipse/papyrus/core/adaptor/emf/Activator.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.adaptor.emf/src/org/eclipse/papyrus/core/adaptor/emf/Activator.java
@@ -1,7 +1,7 @@
/*****************************************************************************
* Copyright (c) 2008 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
@@ -22,7 +22,7 @@ import org.osgi.framework.BundleContext;
public class Activator extends AbstractUIPlugin {
// The plug-in ID
- public static final String PLUGIN_ID = "org.eclipse.papyrus.diagram.emftree";
+ public static final String PLUGIN_ID = "org.eclipse.papyrus.infra.core.adaptor.emf";
// The shared instance
private static Activator plugin;
@@ -38,6 +38,7 @@ public class Activator extends AbstractUIPlugin {
*
* @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
*/
+ @Override
public void start(BundleContext context) throws Exception {
super.start(context);
plugin = this;
@@ -48,6 +49,7 @@ public class Activator extends AbstractUIPlugin {
*
* @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
*/
+ @Override
public void stop(BundleContext context) throws Exception {
plugin = null;
super.stop(context);
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.adaptor.gmf/.project b/plugins/infra/core/org.eclipse.papyrus.infra.core.adaptor.gmf/.project
index a1a1ef35d42..dd07a398bb9 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.adaptor.gmf/.project
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.adaptor.gmf/.project
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>org.eclipse.papyrus.core.adaptor.gmf</name>
+ <name>org.eclipse.papyrus.infra.core.adaptor.gmf</name>
<comment></comment>
<projects>
</projects>
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.adaptor.gmf/META-INF/MANIFEST.MF b/plugins/infra/core/org.eclipse.papyrus.infra.core.adaptor.gmf/META-INF/MANIFEST.MF
index 36ff059b36f..da0af266390 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.adaptor.gmf/META-INF/MANIFEST.MF
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.adaptor.gmf/META-INF/MANIFEST.MF
@@ -7,12 +7,11 @@ Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Require-Bundle: org.eclipse.emf.edit.ui;bundle-version="2.5.0",
org.eclipse.emf.ecore.edit;bundle-version="2.5.0",
- org.eclipse.papyrus.core;bundle-version="0.9.0",
+ org.eclipse.papyrus.infra.core;bundle-version="0.9.0",
org.eclipse.gmf.runtime.diagram.ui.resources.editor;bundle-version="1.2.0"
Bundle-Vendor: %providerName
Bundle-Version: 0.9.0.qualifier
Bundle-ManifestVersion: 2
Bundle-Activator: org.eclipse.papyrus.core.adaptor.gmf.Activator
-Bundle-SymbolicName: org.eclipse.papyrus.core.adaptor.gmf;singleton:=t
- rue
+Bundle-SymbolicName: org.eclipse.papyrus.infra.core.adaptor.gmf;singleton:=true
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.adaptor.gmf/src/org/eclipse/papyrus/core/adaptor/gmf/Activator.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.adaptor.gmf/src/org/eclipse/papyrus/core/adaptor/gmf/Activator.java
index 711abe42610..7d72f2f1fa6 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.adaptor.gmf/src/org/eclipse/papyrus/core/adaptor/gmf/Activator.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.adaptor.gmf/src/org/eclipse/papyrus/core/adaptor/gmf/Activator.java
@@ -1,7 +1,7 @@
/*****************************************************************************
* Copyright (c) 2008 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
@@ -43,7 +43,7 @@ public class Activator extends AbstractUIPlugin {
/**
* @generated
*/
- public static final String ID = "org.eclipse.papyrus.gmf.multipages"; //$NON-NLS-1$
+ public static final String ID = "org.eclipse.papyrus.infra.core.adaptor.gmf"; //$NON-NLS-1$
/**
* @generated
@@ -65,18 +65,19 @@ public class Activator extends AbstractUIPlugin {
*/
public Activator() {
}
-
- /** Logging helper */
- public static LogHelper log;
+
+ /** Logging helper */
+ public static LogHelper log;
/**
* @generated
*/
+ @Override
public void start(BundleContext context) throws Exception {
super.start(context);
instance = this;
// register the login helper
- log = new LogHelper(this);
+ log = new LogHelper(this);
PreferencesHint.registerPreferenceStore(DIAGRAM_PREFERENCES_HINT, getPreferenceStore());
adapterFactory = createAdapterFactory();
}
@@ -84,6 +85,7 @@ public class Activator extends AbstractUIPlugin {
/**
* @generated
*/
+ @Override
public void stop(BundleContext context) throws Exception {
adapterFactory.dispose();
adapterFactory = null;
@@ -173,7 +175,7 @@ public class Activator extends AbstractUIPlugin {
final IPath p = new Path(path);
if(p.isAbsolute() && p.segmentCount() > 1) {
return AbstractUIPlugin.imageDescriptorFromPlugin(p.segment(0), p.removeFirstSegments(1).makeAbsolute()
- .toString());
+ .toString());
} else {
return getBundledImageDescriptor(p.makeAbsolute().toString());
}
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.log/.project b/plugins/infra/core/org.eclipse.papyrus.infra.core.log/.project
index 36deae1cccb..7968d5c7fbf 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.log/.project
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.log/.project
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>org.eclipse.papyrus.log</name>
+ <name>org.eclipse.papyrus.infra.log</name>
<comment></comment>
<projects>
</projects>
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.log/META-INF/MANIFEST.MF b/plugins/infra/core/org.eclipse.papyrus.infra.core.log/META-INF/MANIFEST.MF
index 37d3ff461be..1136e9943ea 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.log/META-INF/MANIFEST.MF
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.log/META-INF/MANIFEST.MF
@@ -8,6 +8,6 @@ Bundle-Localization: plugin
Bundle-Name: %pluginName
Bundle-Activator: org.eclipse.papyrus.log.internal.Activator
Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.log
+Bundle-SymbolicName: org.eclipse.papyrus.infra.log
Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.log/src/org/eclipse/papyrus/log/internal/Activator.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.log/src/org/eclipse/papyrus/log/internal/Activator.java
index fecc0d47e3e..e40f9fbc22d 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.log/src/org/eclipse/papyrus/log/internal/Activator.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.log/src/org/eclipse/papyrus/log/internal/Activator.java
@@ -19,7 +19,7 @@ import org.osgi.framework.BundleContext;
public class Activator extends Plugin {
// The plug-in ID
- public static final String PLUGIN_ID = "org.eclipse.papyrus.log";
+ public static final String PLUGIN_ID = "org.eclipse.papyrus.infra.log";
// The shared instance
private static Activator plugin;
@@ -35,6 +35,7 @@ public class Activator extends Plugin {
*
* @see org.eclipse.core.runtime.Plugins#start(org.osgi.framework.BundleContext)
*/
+ @Override
public void start(BundleContext context) throws Exception {
super.start(context);
plugin = this;
@@ -45,6 +46,7 @@ public class Activator extends Plugin {
*
* @see org.eclipse.core.runtime.Plugin#stop(org.osgi.framework.BundleContext)
*/
+ @Override
public void stop(BundleContext context) throws Exception {
plugin = null;
super.stop(context);
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/.project b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/.project
index 5c2ab4a43c7..ebd7fbdba7e 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/.project
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/.project
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>org.eclipse.papyrus.sasheditor.di</name>
+ <name>org.eclipse.papyrus.infra.sasheditor.di</name>
<comment></comment>
<projects>
</projects>
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/META-INF/MANIFEST.MF b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/META-INF/MANIFEST.MF
index ac6310e4606..be0aa23f171 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/META-INF/MANIFEST.MF
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor.di/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
Manifest-Version: 1.0
Require-Bundle: org.eclipse.swt;bundle-version="3.5.0";visibility:=reexport,
- org.eclipse.papyrus.sasheditor;bundle-version:="0.9.0";visibility:=reexport,
+ org.eclipse.papyrus.infra.sasheditor;bundle-version="0.9.0";visibility:=reexport,
org.eclipse.ui;bundle-version="3.6.0",
org.eclipse.core.runtime;bundle-version="3.6.0",
org.eclipse.emf.ecore;visibility:=reexport,
@@ -21,6 +21,6 @@ Bundle-Version: 0.9.0.qualifier
Bundle-Localization: plugin
Bundle-Name: %pluginName
Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.sasheditor.di;singleton:=true
+Bundle-SymbolicName: org.eclipse.papyrus.infra.sasheditor.di;singleton:=true
Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/.project b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/.project
index ee4fd880c8a..e063ebdd0ba 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/.project
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/.project
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>org.eclipse.papyrus.sasheditor</name>
+ <name>org.eclipse.papyrus.infra.sasheditor</name>
<comment></comment>
<projects>
</projects>
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/META-INF/MANIFEST.MF b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/META-INF/MANIFEST.MF
index 9bc12288cef..04009b4604d 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/META-INF/MANIFEST.MF
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/META-INF/MANIFEST.MF
@@ -13,12 +13,12 @@ Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Require-Bundle: org.eclipse.ui,
org.eclipse.gef,
- org.junit;bundle-version:="4.8.1";resolution:=optional,
- org.eclipse.papyrus.log;bundle-version="0.9.0";visibility:=reexport,
- org.eclipse.core.runtime;bundle-version:="3.7.0"
+ org.junit;bundle-version="4.8.1";resolution:=optional,
+ org.eclipse.papyrus.infra.log;bundle-version="0.9.0";visibility:=reexport,
+ org.eclipse.core.runtime;bundle-version="3.7.0"
Bundle-Vendor: %providerName
Bundle-Version: 0.9.0.qualifier
Bundle-ManifestVersion: 2
Bundle-Activator: org.eclipse.papyrus.sasheditor.Activator
-Bundle-SymbolicName: org.eclipse.papyrus.sasheditor;singleton:=true
+Bundle-SymbolicName: org.eclipse.papyrus.infra.sasheditor;singleton:=true
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/Activator.java b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/Activator.java
index 080fb0096bf..5ef671afa0a 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/Activator.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core.sasheditor/src/org/eclipse/papyrus/sasheditor/Activator.java
@@ -1,7 +1,7 @@
/*****************************************************************************
* Copyright (c) 2008 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
@@ -23,7 +23,7 @@ import org.osgi.framework.BundleContext;
public class Activator extends AbstractUIPlugin {
/** Plugin ID */
- public static final String PLUGIN_ID = "org.eclipse.papyrus.sasheditor";
+ public static final String PLUGIN_ID = "org.eclipse.papyrus.infra.sasheditor";
/** shared instance of the plugin */
private static Activator plugin;
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/.project b/plugins/infra/core/org.eclipse.papyrus.infra.core/.project
index 9c5fd1135cb..5aff7adb53d 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/.project
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/.project
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>org.eclipse.papyrus.core</name>
+ <name>org.eclipse.papyrus.infra.core</name>
<comment></comment>
<projects>
</projects>
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/META-INF/MANIFEST.MF b/plugins/infra/core/org.eclipse.papyrus.infra.core/META-INF/MANIFEST.MF
index 24eb2b2e474..f119db8a1f4 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/META-INF/MANIFEST.MF
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/META-INF/MANIFEST.MF
@@ -1,10 +1,10 @@
Manifest-Version: 1.0
-Require-Bundle: org.eclipse.papyrus.sasheditor;bundle-version:="0.9.0";visibility:=reexport,
- org.eclipse.papyrus.sasheditor.di;bundle-version="0.9.0";visibility:=reexport,
+Require-Bundle: org.eclipse.papyrus.infra.sasheditor;bundle-version="0.9.0";visibility:=reexport,
+ org.eclipse.papyrus.infra.sasheditor.di;bundle-version="0.9.0";visibility:=reexport,
org.eclipse.ui.ide;bundle-version="3.4.0";visibility:=reexport,
org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.1.0";visibility:=reexport,
org.eclipse.emf.edit.ui;bundle-version="2.6.0";visibility:=reexport,
- org.eclipse.papyrus.commands;bundle-version="0.9.0";visibility:=reexport
+ org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="0.9.0";visibility:=reexport
Export-Package: org.eclipse.papyrus.core,
org.eclipse.papyrus.core.contentoutline,
org.eclipse.papyrus.core.editor,
@@ -15,7 +15,7 @@ Export-Package: org.eclipse.papyrus.core,
org.eclipse.papyrus.core.lifecycleevents,
org.eclipse.papyrus.core.listenerservice,
org.eclipse.papyrus.core.modelsetquery,
- org.eclipse.papyrus.core.modelsetquery.impl;x-friends:="org.eclipse.papyrus.resourceloading.umlprofile",
+ org.eclipse.papyrus.core.modelsetquery.impl;x-friends:="org.eclipse.papyrus.uml.resourceloading.profile",
org.eclipse.papyrus.core.multidiagram.actionbarcontributor,
org.eclipse.papyrus.core.services,
org.eclipse.papyrus.core.ui,
@@ -31,6 +31,6 @@ Bundle-Localization: plugin
Bundle-Name: %pluginName
Bundle-ManifestVersion: 2
Bundle-Activator: org.eclipse.papyrus.core.Activator
-Bundle-SymbolicName: org.eclipse.papyrus.core;singleton:=true
+Bundle-SymbolicName: org.eclipse.papyrus.infra.core;singleton:=true
Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/core/Activator.java b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/core/Activator.java
index 3307889fdc3..d09a7a69e83 100644
--- a/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/core/Activator.java
+++ b/plugins/infra/core/org.eclipse.papyrus.infra.core/src/org/eclipse/papyrus/core/Activator.java
@@ -1,7 +1,7 @@
/*****************************************************************************
* Copyright (c) 2008 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
@@ -23,7 +23,7 @@ import org.osgi.framework.BundleContext;
public class Activator extends AbstractUIPlugin {
// The plug-in ID
- public static final String PLUGIN_ID = "org.eclipse.papyrus.core";
+ public static final String PLUGIN_ID = "org.eclipse.papyrus.infra.core";
// The shared instance
private static Activator plugin;
@@ -44,6 +44,7 @@ public class Activator extends AbstractUIPlugin {
* org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext
* )
*/
+ @Override
public void start(BundleContext context) throws Exception {
super.start(context);
plugin = this;
@@ -58,6 +59,7 @@ public class Activator extends AbstractUIPlugin {
* org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext
* )
*/
+ @Override
public void stop(BundleContext context) throws Exception {
plugin = null;
log = null;
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/.project b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/.project
index 8e03a7a93a8..7eaedb9bed9 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/.project
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/.project
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>org.eclipse.papyrus.commands</name>
+ <name>org.eclipse.papyrus.infra.gmfdiag.commands</name>
<comment></comment>
<projects>
</projects>
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/META-INF/MANIFEST.MF
index 57a1db4368f..e68f0fc9381 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/META-INF/MANIFEST.MF
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Export-Package: org.eclipse.papyrus.commands,
org.eclipse.papyrus.commands.wrappers
Require-Bundle: org.eclipse.ui.workbench,
- org.eclipse.papyrus.log;bundle-version:="0.9.0",
+ org.eclipse.papyrus.infra.log;bundle-version="0.9.0",
org.eclipse.gmf.runtime.common.core,
org.eclipse.emf.common,
org.eclipse.gef,
@@ -13,6 +13,6 @@ Bundle-Version: 0.9.0.qualifier
Bundle-Name: %pluginName
Bundle-Activator: org.eclipse.papyrus.commands.Activator
Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.commands;singleton:=true
+Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.commands;singleton:=true
Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/src/org/eclipse/papyrus/commands/Activator.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/src/org/eclipse/papyrus/commands/Activator.java
index 89aac5d8c7a..1de726d6b83 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/src/org/eclipse/papyrus/commands/Activator.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.commands/src/org/eclipse/papyrus/commands/Activator.java
@@ -1,7 +1,7 @@
/*****************************************************************************
* Copyright (c) 2011 Atos.
*
- *
+ *
* 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
@@ -23,7 +23,7 @@ import org.osgi.framework.BundleContext;
public class Activator extends AbstractUIPlugin {
// The plug-in ID
- public static final String PLUGIN_ID = "org.eclipse.papyrus.commands"; //$NON-NLS-1$
+ public static final String PLUGIN_ID = "org.eclipse.papyrus.infra.gmfdiag.commands"; //$NON-NLS-1$
// The shared instance
private static Activator plugin;
@@ -42,6 +42,7 @@ public class Activator extends AbstractUIPlugin {
*
* @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
*/
+ @Override
public void start(BundleContext context) throws Exception {
super.start(context);
plugin = this;
@@ -54,6 +55,7 @@ public class Activator extends AbstractUIPlugin {
*
* @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
*/
+ @Override
public void stop(BundleContext context) throws Exception {
plugin = null;
log = null;
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.navigation/.project b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.navigation/.project
index 9e5180418f0..ae030e4c71b 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.navigation/.project
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.navigation/.project
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>org.eclipse.papyrus.navigation</name>
+ <name>org.eclipse.papyrus.infra.gmfdiag.navigation</name>
<comment></comment>
<projects>
</projects>
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.navigation/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.navigation/META-INF/MANIFEST.MF
index 6ddf6acea67..ffc9452e9b4 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.navigation/META-INF/MANIFEST.MF
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.navigation/META-INF/MANIFEST.MF
@@ -2,16 +2,16 @@ Manifest-Version: 1.0
Export-Package: org.eclipse.papyrus.navigation,
org.eclipse.papyrus.navigation.decorator,
org.eclipse.papyrus.navigation.preference
-Require-Bundle: org.eclipse.papyrus.core;bundle-version:="0.9.0";visibility:=reexport,
- org.eclipse.papyrus.commands;bundle-version="0.9.0",
- org.eclipse.papyrus.preferences;bundle-version="0.9.0",
- org.eclipse.papyrus.core.adaptor.gmf;bundle-version="0.9.0",
- org.eclipse.papyrus.ui.toolbox;bundle-version="0.9.0",
- org.eclipse.core.expressions;bundle-version:="3.4.300",
- org.eclipse.papyrus.views.modelexplorer;bundle-version:="0.9.0",
+Require-Bundle: org.eclipse.papyrus.infra.core;bundle-version="0.9.0";visibility:=reexport,
+ org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="0.9.0",
+ org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="0.9.0",
+ org.eclipse.papyrus.infra.core.adaptor.gmf;bundle-version="0.9.0",
+ org.eclipse.papyrus.infra.widgets.toolbox;bundle-version="0.9.0",
+ org.eclipse.core.expressions;bundle-version="3.4.300",
+ org.eclipse.papyrus.views.modelexplorer;bundle-version="0.9.0",
org.eclipse.ui.navigator;bundle-version="3.5.100",
org.eclipse.emf.facet.infra.browser.uicore;bundle-version="0.1.0",
- org.eclipse.papyrus.ui.perspectiveconfiguration;bundle-version="0.9.0"
+ org.eclipse.papyrus.editor.perspectiveconfiguration;bundle-version="0.9.0"
Bundle-Vendor: %providerName
Bundle-ActivationPolicy: lazy
Bundle-Version: 0.9.0.qualifier
@@ -19,6 +19,6 @@ Bundle-Localization: plugin
Bundle-Name: %pluginName
Bundle-Activator: org.eclipse.papyrus.navigation.Activator
Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.navigation;singleton:=true
+Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.navigation;singleton:=true
Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.navigation/src/org/eclipse/papyrus/navigation/Activator.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.navigation/src/org/eclipse/papyrus/navigation/Activator.java
index 08a476750a8..042ac1696d4 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.navigation/src/org/eclipse/papyrus/navigation/Activator.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.navigation/src/org/eclipse/papyrus/navigation/Activator.java
@@ -1,7 +1,7 @@
/*****************************************************************************
* 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
@@ -22,7 +22,7 @@ import org.osgi.framework.BundleContext;
public class Activator extends AbstractUIPlugin {
// The plug-in ID
- public static final String PLUGIN_ID = "org.eclipse.papyrus.navigation"; //$NON-NLS-1$
+ public static final String PLUGIN_ID = "org.eclipse.papyrus.infra.gmfdiag.navigation"; //$NON-NLS-1$
// The shared instance
private static Activator plugin;
@@ -39,6 +39,7 @@ public class Activator extends AbstractUIPlugin {
* @see
* org.eclipse.core.runtime.Plugins#start(org.osgi.framework.BundleContext)
*/
+ @Override
public void start(BundleContext context) throws Exception {
super.start(context);
plugin = this;
@@ -52,6 +53,7 @@ public class Activator extends AbstractUIPlugin {
* @see
* org.eclipse.core.runtime.Plugin#stop(org.osgi.framework.BundleContext)
*/
+ @Override
public void stop(BundleContext context) throws Exception {
plugin = null;
super.stop(context);
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.outline/.project b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.outline/.project
index a96d0f5d7e8..f47f80c973c 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.outline/.project
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.outline/.project
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>org.eclipse.papyrus.outline</name>
+ <name>org.eclipse.papyrus.infra.gmfdiag.outline</name>
<comment></comment>
<projects>
</projects>
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.outline/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.outline/META-INF/MANIFEST.MF
index e0d801c0c5b..568bc25c009 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.outline/META-INF/MANIFEST.MF
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.outline/META-INF/MANIFEST.MF
@@ -1,5 +1,5 @@
Manifest-Version: 1.0
-Require-Bundle: org.eclipse.papyrus.core;bundle-version="0.9.0",
+Require-Bundle: org.eclipse.papyrus.infra.core;bundle-version="0.9.0",
org.eclipse.uml2.uml.editor;bundle-version="2.2.0",
org.eclipse.gmf.runtime.diagram.ui.render;bundle-version="1.2.0"
Export-Package: org.eclipse.papyrus.outline,
@@ -12,6 +12,6 @@ Bundle-Localization: plugin
Bundle-Name: %pluginName
Bundle-ManifestVersion: 2
Bundle-Activator: org.eclipse.papyrus.outline.internal.Activator
-Bundle-SymbolicName: org.eclipse.papyrus.outline;singleton:=true
+Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.outline;singleton:=true
Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.outline/src/org/eclipse/papyrus/outline/internal/Activator.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.outline/src/org/eclipse/papyrus/outline/internal/Activator.java
index bc356cce566..420f2f9dcc6 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.outline/src/org/eclipse/papyrus/outline/internal/Activator.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.outline/src/org/eclipse/papyrus/outline/internal/Activator.java
@@ -27,7 +27,7 @@ import org.osgi.framework.BundleContext;
public class Activator extends AbstractUIPlugin {
// The plug-in ID
- public static final String PLUGIN_ID = "org.eclipse.papyrus.outline";
+ public static final String PLUGIN_ID = "org.eclipse.papyrus.infra.gmfdiag.outline";
// The shared instance
private static Activator plugin;
@@ -43,6 +43,7 @@ public class Activator extends AbstractUIPlugin {
*
* @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
*/
+ @Override
public void start(BundleContext context) throws Exception {
super.start(context);
plugin = this;
@@ -53,6 +54,7 @@ public class Activator extends AbstractUIPlugin {
*
* @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
*/
+ @Override
public void stop(BundleContext context) throws Exception {
plugin = null;
super.stop(context);
@@ -78,8 +80,9 @@ public class Activator extends AbstractUIPlugin {
IPath path = new Path(pathString);
URL uri = FileLocator.find(Activator.plugin.getBundle(), path, null);
- if(uri == null)
+ if(uri == null) {
return null;
+ }
return ImageDescriptor.createFromURL(uri);
}
}
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/.project b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/.project
index deb7f5cdffd..e5424473c0d 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/.project
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/.project
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>org.eclipse.papyrus.preferences</name>
+ <name>org.eclipse.papyrus.infra.gmfdiag.preferences</name>
<comment></comment>
<projects>
</projects>
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/META-INF/MANIFEST.MF
index 37a81ecc553..83314ae82f3 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/META-INF/MANIFEST.MF
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
Manifest-Version: 1.0
Require-Bundle: org.eclipse.gmf.runtime.diagram.ui.properties,
- org.eclipse.papyrus.log;bundle-version="0.9.0"
+ org.eclipse.papyrus.infra.log;bundle-version="0.9.0"
Export-Package: org.eclipse.papyrus.preferences,
org.eclipse.papyrus.preferences.initializer,
org.eclipse.papyrus.preferences.jface.preference;x-internal:=true,
@@ -18,6 +18,6 @@ Bundle-Name: %pluginName
Bundle-Localization: plugin
Bundle-ManifestVersion: 2
Bundle-Activator: org.eclipse.papyrus.preferences.Activator
-Bundle-SymbolicName: org.eclipse.papyrus.preferences;singleton:=true
+Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.preferences;singleton:=true
Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/preferences/Activator.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/preferences/Activator.java
index e12333d90cf..7f1d11533bb 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/preferences/Activator.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.preferences/src/org/eclipse/papyrus/preferences/Activator.java
@@ -1,6 +1,6 @@
/****************************************************************************
* Copyright (c) 2008 Atos Origin.
- *
+ *
* 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
@@ -27,7 +27,7 @@ import org.osgi.framework.BundleContext;
public class Activator extends AbstractUIPlugin {
// The plug-in ID
- public static final String PLUGIN_ID = "org.eclipse.papyrus.preferences"; //$NON-NLS-1$
+ public static final String PLUGIN_ID = "org.eclipse.papyrus.infra.gmfdiag.preferences"; //$NON-NLS-1$
// The shared instance
private static Activator plugin;
@@ -51,6 +51,7 @@ public class Activator extends AbstractUIPlugin {
*
* @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
*/
+ @Override
public void start(BundleContext context) throws Exception {
super.start(context);
plugin = this;
@@ -58,6 +59,7 @@ public class Activator extends AbstractUIPlugin {
log = new LogHelper(plugin);
}
+ @Override
public IPreferenceStore getPreferenceStore() {
// Create the preference store lazily.
if(papyrusPreferenceStore == null) {
@@ -72,6 +74,7 @@ public class Activator extends AbstractUIPlugin {
*
* @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
*/
+ @Override
public void stop(BundleContext context) throws Exception {
plugin = null;
log = null;
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/.project b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/.project
index f20aa0ea0e6..406b60555a6 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/.project
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/.project
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>org.eclipse.papyrus.properties.notation</name>
+ <name>org.eclipse.papyrus.infra.gmfdiag.properties</name>
<comment></comment>
<projects>
</projects>
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/META-INF/MANIFEST.MF
index 81b71e8a006..04f460e3f3b 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/META-INF/MANIFEST.MF
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/META-INF/MANIFEST.MF
@@ -3,25 +3,24 @@ Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
org.eclipse.papyrus.views.properties;bundle-version="0.9.0",
org.eclipse.papyrus.views.properties.model;bundle-version="0.9.0",
- org.eclipse.gmf.runtime.notation;bundle-version:="1.4.1",
+ org.eclipse.gmf.runtime.notation;bundle-version="1.4.1",
org.eclipse.gef;bundle-version="3.7.0",
org.eclipse.emf.edit;bundle-version="2.7.0",
- org.eclipse.papyrus.widgets;bundle-version:="0.9.0",
+ org.eclipse.papyrus.infra.widgets;bundle-version="0.9.0",
org.eclipse.core.databinding;bundle-version="1.4.0",
org.eclipse.emf.databinding;bundle-version="1.2.0",
org.eclipse.core.databinding.property;bundle-version="1.4.0",
org.eclipse.core.databinding.beans;bundle-version="1.2.100",
org.eclipse.papyrus.uml.properties;bundle-version="0.9.0",
- org.eclipse.papyrus.log;bundle-version:="0.9.0",
+ org.eclipse.papyrus.infra.log;bundle-version="0.9.0",
org.eclipse.emf.edit.ui;bundle-version="2.7.0",
- org.eclipse.papyrus.core;bundle-version="0.9.0"
+ org.eclipse.papyrus.infra.core;bundle-version="0.9.0"
Bundle-Vendor: %Bundle-Vendor
Bundle-ActivationPolicy: lazy
Bundle-Version: 0.9.0.qualifier
Bundle-Name: %Bundle-Name
Bundle-ManifestVersion: 2
Bundle-Activator: org.eclipse.papyrus.properties.notation.Activator
-Bundle-SymbolicName: org.eclipse.papyrus.properties.notation;singleton
- :=true
+Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.properties;singleton:=true
Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/properties/notation/Activator.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/properties/notation/Activator.java
index 3d60e383d7a..d86a22e5a8e 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/properties/notation/Activator.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.properties/src/org/eclipse/papyrus/properties/notation/Activator.java
@@ -23,7 +23,7 @@ public class Activator extends AbstractUIPlugin {
/**
* The plug-in ID
*/
- public static final String PLUGIN_ID = "org.eclipse.papyrus.properties.notation"; //$NON-NLS-1$
+ public static final String PLUGIN_ID = "org.eclipse.papyrus.infra.gmfdiag.properties"; //$NON-NLS-1$
// The shared instance
private static Activator plugin;
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.widgets/.project b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.widgets/.project
index 7fd416f0d38..37940b6f3ec 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.widgets/.project
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.widgets/.project
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>org.eclipse.papyrus.widgets.gmf</name>
+ <name>org.eclipse.papyrus.infra.gmfdiag.widgets</name>
<comment></comment>
<projects>
</projects>
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.widgets/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.widgets/META-INF/MANIFEST.MF
index 37d3fac289b..172060866d0 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.widgets/META-INF/MANIFEST.MF
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.widgets/META-INF/MANIFEST.MF
@@ -1,10 +1,10 @@
Manifest-Version: 1.0
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
- org.eclipse.papyrus.widgets;bundle-version="0.9.0",
+ org.eclipse.papyrus.infra.widgets;bundle-version="0.9.0",
org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.5.0",
org.eclipse.gmf.runtime.diagram.ui.properties;bundle-version="1.4.2",
- org.eclipse.core.databinding;bundle-version:="1.4.0",
+ org.eclipse.core.databinding;bundle-version="1.4.0",
org.eclipse.jface.databinding;bundle-version="1.5.0",
org.eclipse.core.databinding.property;bundle-version="1.4.0",
org.eclipse.papyrus.views.properties;bundle-version="0.9.0"
@@ -14,6 +14,6 @@ Bundle-Version: 0.9.0.qualifier
Bundle-Name: %Bundle-Name
Bundle-ManifestVersion: 2
Bundle-Activator: org.eclipse.papyrus.widgets.gmf.Activator
-Bundle-SymbolicName: org.eclipse.papyrus.widgets.gmf;singleton:=true
+Bundle-SymbolicName: org.eclipse.papyrus.infra.gmfdiag.widgets;singleton:=true
Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.widgets/src/org/eclipse/papyrus/widgets/gmf/Activator.java b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.widgets/src/org/eclipse/papyrus/widgets/gmf/Activator.java
index 980e6955834..19db1a0f44b 100644
--- a/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.widgets/src/org/eclipse/papyrus/widgets/gmf/Activator.java
+++ b/plugins/infra/gmfdiag/org.eclipse.papyrus.infra.gmfdiag.widgets/src/org/eclipse/papyrus/widgets/gmf/Activator.java
@@ -1,6 +1,6 @@
/*****************************************************************************
* Copyright (c) 2011 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
@@ -22,7 +22,7 @@ import org.osgi.framework.BundleContext;
public class Activator extends AbstractUIPlugin {
// The plug-in ID
- public static final String PLUGIN_ID = "org.eclipse.papyrus.widgets.gmf"; //$NON-NLS-1$
+ public static final String PLUGIN_ID = "org.eclipse.papyrus.infra.gmfdiag.widgets"; //$NON-NLS-1$
// The shared instance
private static Activator plugin;
diff --git a/plugins/infra/org.eclipse.papyrus.infra.export/.project b/plugins/infra/org.eclipse.papyrus.infra.export/.project
index b839fc41ae7..9e5f3639957 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.export/.project
+++ b/plugins/infra/org.eclipse.papyrus.infra.export/.project
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>org.eclipse.papyrus.export</name>
+ <name>org.eclipse.papyrus.infra.export</name>
<comment></comment>
<projects>
</projects>
diff --git a/plugins/infra/org.eclipse.papyrus.infra.export/META-INF/MANIFEST.MF b/plugins/infra/org.eclipse.papyrus.infra.export/META-INF/MANIFEST.MF
index c94401fbef8..d9570b0f97d 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.export/META-INF/MANIFEST.MF
+++ b/plugins/infra/org.eclipse.papyrus.infra.export/META-INF/MANIFEST.MF
@@ -4,9 +4,9 @@ Require-Bundle: org.eclipse.ui.ide;bundle-version="3.7.0",
org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.5.0",
org.eclipse.core.expressions;bundle-version="3.4.300",
org.eclipse.papyrus.views.properties.tabbedproperties.core;bundle-version="0.9.0",
- org.eclipse.emf.common.ui;bundle-version:="2.7.0",
+ org.eclipse.emf.common.ui;bundle-version="2.7.0",
org.eclipse.papyrus.views.modelexplorer;bundle-version="0.9.0",
- org.eclipse.papyrus.onefile;bundle-version="0.9.0"
+ org.eclipse.papyrus.infra.onefile;bundle-version="0.9.0"
Export-Package: org.eclipse.papyrus.export
Bundle-Vendor: %providerName
Bundle-ActivationPolicy: lazy
@@ -14,6 +14,6 @@ Bundle-Version: 0.9.0.qualifier
Bundle-Name: %pluginName
Bundle-ManifestVersion: 2
Bundle-Activator: org.eclipse.papyrus.export.internal.Activator
-Bundle-SymbolicName: org.eclipse.papyrus.export;singleton:=true
+Bundle-SymbolicName: org.eclipse.papyrus.infra.export;singleton:=true
Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/.project b/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/.project
index ffeb794c58d..4f76a49a8c6 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/.project
+++ b/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/.project
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>org.eclipse.papyrus.extendedtypes.emf</name>
+ <name>org.eclipse.papyrus.infra.extendedtypes.emf</name>
<comment></comment>
<projects>
</projects>
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/META-INF/MANIFEST.MF b/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/META-INF/MANIFEST.MF
index 3ba96b62fd2..231669c17d7 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/META-INF/MANIFEST.MF
+++ b/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/META-INF/MANIFEST.MF
@@ -12,18 +12,17 @@ Bundle-RequiredExecutionEnvironment: J2SE-1.5
Require-Bundle: org.eclipse.core.runtime;bundle-version="3.7.0",
org.eclipse.emf.ecore;bundle-version="2.7.0";visibility:=reexport,
org.eclipse.emf.ecore.xmi;bundle-version="2.6.0";visibility:=reexport,
- org.eclipse.papyrus.core.queries.configuration;bundle-version:="0.9.0";visibility:=reexport,
- org.eclipse.papyrus.extendedtypes;bundle-version="0.9.0";visibility:=reexport,
+ org.eclipse.papyrus.infra.queries.core.configuration;bundle-version="0.9.0";visibility:=reexport,
+ org.eclipse.papyrus.infra.extendedtypes;bundle-version="0.9.0";visibility:=reexport,
org.eclipse.emf.facet.infra.query;bundle-version="0.1.0";visibility:=reexport,
org.eclipse.uml2.uml;bundle-version="3.2.0";visibility:=reexport,
- org.eclipse.papyrus.log;bundle-version:="0.9.0",
+ org.eclipse.papyrus.infra.log;bundle-version="0.9.0",
org.eclipse.ui;bundle-version="3.7.0",
- org.eclipse.papyrus.service.edit;bundle-version="0.9.0",
- org.eclipse.papyrus.core.queries;bundle-version="0.9.0"
+ org.eclipse.papyrus.infra.services.edit;bundle-version="0.9.0",
+ org.eclipse.papyrus.infra.queries.core;bundle-version="0.9.0"
Bundle-Vendor: %providerName
Bundle-Version: 0.9.0.qualifier
Bundle-ManifestVersion: 2
Bundle-Activator: org.eclipse.papyrus.extendedtypes.emf.Activator
-Bundle-SymbolicName: org.eclipse.papyrus.extendedtypes.emf;singleton:=
- true
+Bundle-SymbolicName: org.eclipse.papyrus.infra.extendedtypes.emf;singleton:=true
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/src/org/eclipse/papyrus/extendedtypes/emf/Activator.java b/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/src/org/eclipse/papyrus/extendedtypes/emf/Activator.java
index 63f7414b782..a540803106b 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/src/org/eclipse/papyrus/extendedtypes/emf/Activator.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/src/org/eclipse/papyrus/extendedtypes/emf/Activator.java
@@ -10,11 +10,11 @@ import org.osgi.framework.BundleContext;
public class Activator extends AbstractUIPlugin {
// The plug-in ID
- public static final String PLUGIN_ID = "org.eclipse.papyrus.extendedtypes.emf"; //$NON-NLS-1$
+ public static final String PLUGIN_ID = "org.eclipse.papyrus.infra.extendedtypes.emf"; //$NON-NLS-1$
// The shared instance
private static Activator plugin;
-
+
/** Logging helper */
public static LogHelper log;
@@ -28,6 +28,7 @@ public class Activator extends AbstractUIPlugin {
* (non-Javadoc)
* @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
*/
+ @Override
public void start(BundleContext context) throws Exception {
super.start(context);
plugin = this;
@@ -38,6 +39,7 @@ public class Activator extends AbstractUIPlugin {
* (non-Javadoc)
* @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
*/
+ @Override
public void stop(BundleContext context) throws Exception {
log = null;
plugin = null;
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/.project b/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/.project
index fbff794fb15..e9351f0b98e 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/.project
+++ b/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/.project
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>org.eclipse.papyrus.extendedtypes</name>
+ <name>org.eclipse.papyrus.infra.extendedtypes</name>
<comment></comment>
<projects>
</projects>
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/META-INF/MANIFEST.MF b/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/META-INF/MANIFEST.MF
index 04d7e874f03..d26f3603668 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/META-INF/MANIFEST.MF
+++ b/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/META-INF/MANIFEST.MF
@@ -14,17 +14,17 @@ Bundle-RequiredExecutionEnvironment: J2SE-1.5
Require-Bundle: org.eclipse.core.runtime;bundle-version="3.7.0",
org.eclipse.emf.ecore;bundle-version="2.7.0";visibility:=reexport,
org.eclipse.emf.ecore.xmi;bundle-version="2.6.0";visibility:=reexport,
- org.eclipse.papyrus.core.queries.configuration;bundle-version:="0.9.0";visibility:=reexport,
+ org.eclipse.papyrus.infra.queries.core.configuration;bundle-version="0.9.0";visibility:=reexport,
org.eclipse.emf.facet.infra.query;bundle-version="0.1.0";visibility:=reexport,
org.eclipse.uml2.uml;bundle-version="3.2.0";visibility:=reexport,
org.eclipse.ui;bundle-version="3.7.0",
- org.eclipse.gmf.runtime.emf.type.core;bundle-version:="1.4.0";visibility:=reexport,
- org.eclipse.papyrus.log;bundle-version="0.9.0",
- org.eclipse.papyrus.core.queries;bundle-version="0.9.0",
+ org.eclipse.gmf.runtime.emf.type.core;bundle-version="1.4.0";visibility:=reexport,
+ org.eclipse.papyrus.infra.log;bundle-version="0.9.0",
+ org.eclipse.papyrus.infra.queries.core;bundle-version="0.9.0",
org.eclipse.gmf.runtime.common.ui.services;bundle-version="1.3.0"
Bundle-Vendor: %providerName
Bundle-Version: 0.9.0.qualifier
Bundle-ManifestVersion: 2
Bundle-Activator: org.eclipse.papyrus.extendedtypes.Activator
-Bundle-SymbolicName: org.eclipse.papyrus.extendedtypes;singleton:=true
+Bundle-SymbolicName: org.eclipse.papyrus.infra.extendedtypes;singleton:=true
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/extendedtypes/Activator.java b/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/extendedtypes/Activator.java
index 4a4eacf8f18..b82465c8e8d 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/extendedtypes/Activator.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.extendedtypes/src/org/eclipse/papyrus/extendedtypes/Activator.java
@@ -10,11 +10,11 @@ import org.osgi.framework.BundleContext;
public class Activator extends AbstractUIPlugin {
// The plug-in ID
- public static final String PLUGIN_ID = "org.eclipse.papyrus.extendedtypes"; //$NON-NLS-1$
+ public static final String PLUGIN_ID = "org.eclipse.papyrus.infra.extendedtypes"; //$NON-NLS-1$
// The shared instance
private static Activator plugin;
-
+
/** Logging helper */
public static LogHelper log;
@@ -28,6 +28,7 @@ public class Activator extends AbstractUIPlugin {
* (non-Javadoc)
* @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
*/
+ @Override
public void start(BundleContext context) throws Exception {
super.start(context);
plugin = this;
@@ -38,6 +39,7 @@ public class Activator extends AbstractUIPlugin {
* (non-Javadoc)
* @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
*/
+ @Override
public void stop(BundleContext context) throws Exception {
log = null;
plugin = null;
diff --git a/plugins/infra/org.eclipse.papyrus.infra.onefile/.project b/plugins/infra/org.eclipse.papyrus.infra.onefile/.project
index cbc0ec4ed8e..3ab9eb83cfd 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.onefile/.project
+++ b/plugins/infra/org.eclipse.papyrus.infra.onefile/.project
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>org.eclipse.papyrus.onefile</name>
+ <name>org.eclipse.papyrus.infra.onefile</name>
<comment></comment>
<projects>
</projects>
diff --git a/plugins/infra/org.eclipse.papyrus.infra.onefile/META-INF/MANIFEST.MF b/plugins/infra/org.eclipse.papyrus.infra.onefile/META-INF/MANIFEST.MF
index 68e0384aa3d..d5fbd68f1cd 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.onefile/META-INF/MANIFEST.MF
+++ b/plugins/infra/org.eclipse.papyrus.infra.onefile/META-INF/MANIFEST.MF
@@ -1,9 +1,9 @@
Manifest-Version: 1.0
-Require-Bundle: org.eclipse.papyrus.core;bundle-version="0.9.0",
+Require-Bundle: org.eclipse.papyrus.infra.core;bundle-version="0.9.0",
org.eclipse.ui.navigator,
org.eclipse.team.ui,
org.eclipse.ui.navigator.resources,
- org.eclipse.papyrus.ui.resources;bundle-version="0.9.0"
+ org.eclipse.papyrus.infra.ui.resources;bundle-version="0.9.0"
Export-Package: org.eclipse.papyrus.onefile.model,
org.eclipse.papyrus.onefile.utils
Bundle-Vendor: %providerName
@@ -12,6 +12,6 @@ Bundle-Version: 0.9.0.qualifier
Bundle-Name: %pluginName
Bundle-ManifestVersion: 2
Bundle-Activator: org.eclipse.papyrus.onefile.Activator
-Bundle-SymbolicName: org.eclipse.papyrus.onefile;singleton:=true
+Bundle-SymbolicName: org.eclipse.papyrus.infra.onefile;singleton:=true
Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/plugins/infra/org.eclipse.papyrus.infra.onefile/src/org/eclipse/papyrus/onefile/Activator.java b/plugins/infra/org.eclipse.papyrus.infra.onefile/src/org/eclipse/papyrus/onefile/Activator.java
index ecdacc05fbd..8794e7bf4ec 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.onefile/src/org/eclipse/papyrus/onefile/Activator.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.onefile/src/org/eclipse/papyrus/onefile/Activator.java
@@ -1,6 +1,6 @@
/*****************************************************************************
* Copyright (c) 2011 Atos Origin Integration.
- *
+ *
* 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
@@ -20,7 +20,7 @@ import org.osgi.framework.BundleContext;
public class Activator extends AbstractUIPlugin {
// The plug-in ID
- public static final String PLUGIN_ID = "org.eclipse.papyrus.onefile"; //$NON-NLS-1$
+ public static final String PLUGIN_ID = "org.eclipse.papyrus.infra.onefile"; //$NON-NLS-1$
// The shared instance
private static Activator plugin;
@@ -38,6 +38,7 @@ public class Activator extends AbstractUIPlugin {
* org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext
* )
*/
+ @Override
public void start(BundleContext context) throws Exception {
super.start(context);
plugin = this;
@@ -50,6 +51,7 @@ public class Activator extends AbstractUIPlugin {
* org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext
* )
*/
+ @Override
public void stop(BundleContext context) throws Exception {
plugin = null;
super.stop(context);
diff --git a/plugins/infra/org.eclipse.papyrus.infra.ui.resources/.project b/plugins/infra/org.eclipse.papyrus.infra.ui.resources/.project
index 72f62f5283f..05ae6afc904 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.ui.resources/.project
+++ b/plugins/infra/org.eclipse.papyrus.infra.ui.resources/.project
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>org.eclipse.papyrus.ui.resources</name>
+ <name>org.eclipse.papyrus.infra.ui.resources</name>
<comment></comment>
<projects>
</projects>
diff --git a/plugins/infra/org.eclipse.papyrus.infra.ui.resources/META-INF/MANIFEST.MF b/plugins/infra/org.eclipse.papyrus.infra.ui.resources/META-INF/MANIFEST.MF
index 19b27b08e03..01e7c79878c 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.ui.resources/META-INF/MANIFEST.MF
+++ b/plugins/infra/org.eclipse.papyrus.infra.ui.resources/META-INF/MANIFEST.MF
@@ -1,16 +1,16 @@
Manifest-Version: 1.0
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
- org.eclipse.papyrus.core;bundle-version="0.9.0";visibility:=reexport,
+ org.eclipse.papyrus.infra.core;bundle-version="0.9.0";visibility:=reexport,
org.eclipse.ltk.core.refactoring;bundle-version="3.5.200",
- org.eclipse.papyrus.controlmode;bundle-version="0.9.0",
- org.eclipse.papyrus.controlmode.history;bundle-version="0.9.0"
+ org.eclipse.papyrus.infra.services.controlmode;bundle-version="0.9.0",
+ org.eclipse.papyrus.infra.services.controlmode.history;bundle-version="0.9.0"
Bundle-Vendor: %providerName
Bundle-ActivationPolicy: lazy
Bundle-Version: 0.9.0.qualifier
Bundle-Name: %pluginName
Bundle-ManifestVersion: 2
Bundle-Activator: org.eclipse.papyrus.ui.resources.Activator
-Bundle-SymbolicName: org.eclipse.papyrus.ui.resources;singleton:=true
+Bundle-SymbolicName: org.eclipse.papyrus.infra.ui.resources;singleton:=true
Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/plugins/infra/org.eclipse.papyrus.infra.ui.resources/src/org/eclipse/papyrus/ui/resources/Activator.java b/plugins/infra/org.eclipse.papyrus.infra.ui.resources/src/org/eclipse/papyrus/ui/resources/Activator.java
index 705c2d89351..f153c3ee1ce 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.ui.resources/src/org/eclipse/papyrus/ui/resources/Activator.java
+++ b/plugins/infra/org.eclipse.papyrus.infra.ui.resources/src/org/eclipse/papyrus/ui/resources/Activator.java
@@ -1,7 +1,7 @@
/*****************************************************************************
* Copyright (c) 2010 Atos Origin.
*
- *
+ *
* 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
@@ -23,7 +23,7 @@ import org.osgi.framework.BundleContext;
public class Activator extends AbstractUIPlugin {
// The plug-in ID
- public static final String PLUGIN_ID = "org.eclipse.papyrus.ui.resources"; //$NON-NLS-1$
+ public static final String PLUGIN_ID = "org.eclipse.papyrus.infra.ui.resources"; //$NON-NLS-1$
// The shared instance
private static Activator plugin;
@@ -42,6 +42,7 @@ public class Activator extends AbstractUIPlugin {
*
* @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
*/
+ @Override
public void start(BundleContext context) throws Exception {
super.start(context);
plugin = this;
@@ -53,6 +54,7 @@ public class Activator extends AbstractUIPlugin {
*
* @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
*/
+ @Override
public void stop(BundleContext context) throws Exception {
plugin = null;
super.stop(context);
diff --git a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/.project b/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/.project
index 1321a8d778e..d784407f2ea 100644
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/.project
+++ b/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/.project
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>org.eclipse.papyrus.core.queries.configuration.edit</name>
+ <name>org.eclipse.papyrus.infra.queries.core.configuration.edit</name>
<comment></comment>
<projects>
</projects>
diff --git a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/META-INF/MANIFEST.MF b/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/META-INF/MANIFEST.MF
index f77e02fc0c0..cefeaba3e6e 100644
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/META-INF/MANIFEST.MF
+++ b/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration.edit/META-INF/MANIFEST.MF
@@ -7,7 +7,7 @@ Bundle-Name: %pluginName
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.papyrus.core.queries.configuration;bundle-version="0.9.0";visibility:=reexport,
+ org.eclipse.papyrus.infra.queries.core.configuration;bundle-version="0.9.0";visibility:=reexport,
org.eclipse.emf.edit;visibility:=reexport,
org.eclipse.emf.ecore;visibility:=reexport,
org.eclipse.emf.ecore.edit;visibility:=reexport,
@@ -20,6 +20,5 @@ Bundle-Version: 0.9.0.qualifier
Bundle-ManifestVersion: 2
Bundle-Activator: org.eclipse.papyrus.core.queries.configuration.provi
der.ConfigurationEditPlugin$Implementation
-Bundle-SymbolicName: org.eclipse.papyrus.core.queries.configuration.ed
- it;singleton:=true
+Bundle-SymbolicName: org.eclipse.papyrus.infra.queries.core.configuration.edit;singleton:=true
diff --git a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/.project b/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/.project
index 047781ecf83..19b48341fa2 100644
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/.project
+++ b/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/.project
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>org.eclipse.papyrus.core.queries.configuration</name>
+ <name>org.eclipse.papyrus.infra.queries.core.configuration</name>
<comment></comment>
<projects>
</projects>
diff --git a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/META-INF/MANIFEST.MF b/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/META-INF/MANIFEST.MF
index 99b8932ee55..59231e7d4c0 100644
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/META-INF/MANIFEST.MF
+++ b/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core.configuration/META-INF/MANIFEST.MF
@@ -18,6 +18,5 @@ Bundle-Version: 0.9.0.qualifier
Bundle-ManifestVersion: 2
Bundle-Activator: org.eclipse.papyrus.core.queries.configuration.plugi
n.Activator$Implementation
-Bundle-SymbolicName: org.eclipse.papyrus.core.queries.configuration;si
- ngleton:=true
+Bundle-SymbolicName: org.eclipse.papyrus.infra.queries.core.configuration;singleton:=true
diff --git a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core/.project b/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core/.project
index 97e578f6c98..35970c3736b 100644
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core/.project
+++ b/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core/.project
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>org.eclipse.papyrus.core.queries</name>
+ <name>org.eclipse.papyrus.infra.queries.core</name>
<comment></comment>
<projects>
</projects>
diff --git a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core/META-INF/MANIFEST.MF b/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core/META-INF/MANIFEST.MF
index 0be113a56da..be55002da54 100644
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core/META-INF/MANIFEST.MF
+++ b/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core/META-INF/MANIFEST.MF
@@ -1,12 +1,12 @@
Manifest-Version: 1.0
Require-Bundle: org.eclipse.ui;bundle-version="3.7.0",
org.eclipse.core.runtime;bundle-version="3.7.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.papyrus.log;bundle-version="0.9.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.papyrus.infra.log;bundle-version="0.9.0",
org.eclipse.core.databinding;bundle-version="1.3.100",
- org.eclipse.papyrus.core.queries.configuration;bundle-version="0.9.0"
+ org.eclipse.papyrus.infra.queries.core.configuration;bundle-version="0.9.0"
Export-Package: org.eclipse.papyrus.core.queries,
org.eclipse.papyrus.core.queries.converter,
org.eclipse.papyrus.core.queries.modisco
@@ -17,6 +17,6 @@ Bundle-Localization: plugin
Bundle-Name: %pluginName
Bundle-ManifestVersion: 2
Bundle-Activator: org.eclipse.papyrus.core.queries.Activator
-Bundle-SymbolicName: org.eclipse.papyrus.core.queries;singleton:=true
+Bundle-SymbolicName: org.eclipse.papyrus.infra.queries.core;singleton:=true
Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core/src/org/eclipse/papyrus/core/queries/Activator.java b/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core/src/org/eclipse/papyrus/core/queries/Activator.java
index 3e9a8494608..bd2a6a5ae24 100644
--- a/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core/src/org/eclipse/papyrus/core/queries/Activator.java
+++ b/plugins/infra/queries/org.eclipse.papyrus.infra.queries.core/src/org/eclipse/papyrus/core/queries/Activator.java
@@ -1,6 +1,6 @@
/*****************************************************************************
* 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
@@ -21,14 +21,14 @@ import org.osgi.framework.BundleContext;
public class Activator extends AbstractUIPlugin {
/** The plug-in ID */
- public static final String PLUGIN_ID = "org.eclipse.papyrus.core.queries"; //$NON-NLS-1$
+ public static final String PLUGIN_ID = "org.eclipse.papyrus.infra.queries.core"; //$NON-NLS-1$
/** The shared instance */
private static Activator plugin;
-
- /** Logging helper */
- public static LogHelper log;
-
+
+ /** Logging helper */
+ public static LogHelper log;
+
/**
* The constructor
*/
@@ -42,9 +42,9 @@ public class Activator extends AbstractUIPlugin {
public void start(BundleContext context) throws Exception {
super.start(context);
plugin = this;
-
+
// register the login helper
- log = new LogHelper(plugin);
+ log = new LogHelper(plugin);
}
/**
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.history/.project b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.history/.project
index 77427e88881..93291d8661b 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.history/.project
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.history/.project
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>org.eclipse.papyrus.controlmode.history</name>
+ <name>org.eclipse.papyrus.infra.services.controlmode.history</name>
<comment></comment>
<projects>
</projects>
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.history/META-INF/MANIFEST.MF b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.history/META-INF/MANIFEST.MF
index ede1d96face..8af3fdaf9d1 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.history/META-INF/MANIFEST.MF
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode.history/META-INF/MANIFEST.MF
@@ -6,7 +6,7 @@ Export-Package: org.eclipse.papyrus.controlmode.history,
org.eclipse.papyrus.controlmode.mm.history.util
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.emf.ecore;visibility:=reexport,
- org.eclipse.papyrus.core;bundle-version="0.9.0"
+ org.eclipse.papyrus.infra.core;bundle-version="0.9.0"
Bundle-Vendor: %providerName
Bundle-ActivationPolicy: lazy
Bundle-ClassPath: .
@@ -14,7 +14,6 @@ Bundle-Version: 0.9.0.qualifier
Bundle-Name: %pluginName
Bundle-Localization: plugin
Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.eclipse.papyrus.controlmode.history;singleton
- :=true
+Bundle-SymbolicName: org.eclipse.papyrus.infra.services.controlmode.history;singleton:=true
Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/.project b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/.project
index 6d80e215183..389c8dc2a8f 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/.project
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/.project
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>org.eclipse.papyrus.controlmode</name>
+ <name>org.eclipse.papyrus.infra.services.controlmode</name>
<comment></comment>
<projects>
</projects>
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/META-INF/MANIFEST.MF b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/META-INF/MANIFEST.MF
index 593838a8e11..69a95f3fe03 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/META-INF/MANIFEST.MF
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.controlmode/META-INF/MANIFEST.MF
@@ -5,11 +5,11 @@ Require-Bundle: org.eclipse.ui,
org.eclipse.gmf.runtime.notation,
org.eclipse.ui.navigator,
org.eclipse.papyrus.views.modelexplorer;bundle-version="0.9.0",
- org.eclipse.papyrus.core;bundle-version="0.9.0",
- org.eclipse.papyrus.controlmode.history;bundle-version="0.9.0",
- org.eclipse.papyrus.ui.toolbox;bundle-version:="0.9.0",
- org.eclipse.papyrus.core.resourceloading;bundle-version:="0.9.0",
- org.eclipse.papyrus.core.resourceloading.preferences;bundle-version:="0.9.0"
+ org.eclipse.papyrus.infra.core;bundle-version="0.9.0",
+ org.eclipse.papyrus.infra.services.controlmode.history;bundle-version="0.9.0",
+ org.eclipse.papyrus.infra.widgets.toolbox;bundle-version="0.9.0",
+ org.eclipse.papyrus.infra.services.resourceloading;bundle-version="0.9.0",
+ org.eclipse.papyrus.infra.services.resourceloading.preferences;bundle-version="0.9.0"
Export-Package: org.eclipse.papyrus.controlmode,
org.eclipse.papyrus.controlmode.action,
org.eclipse.papyrus.controlmode.commands,
@@ -20,6 +20,6 @@ Bundle-Version: 0.9.0.qualifier
Bundle-Name: %pluginName
Bundle-ManifestVersion: 2
Bundle-Activator: org.eclipse.papyrus.controlmode.ControlModePlugin
-Bundle-SymbolicName: org.eclipse.papyrus.controlmode;singleton:=true
+Bundle-SymbolicName: org.eclipse.papyrus.infra.services.controlmode;singleton:=true
Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.decoration/.project b/plugins/infra/services/org.eclipse.papyrus.infra.services.decoration/.project
index 22ae84f3524..2c3c2fd73ed 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.decoration/.project
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.decoration/.project
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>org.eclipse.papyrus.decoration</name>
+ <name>org.eclipse.papyrus.infra.services.decoration</name>
<comment></comment>
<projects>
</projects>
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.decoration/META-INF/MANIFEST.MF b/plugins/infra/services/org.eclipse.papyrus.infra.services.decoration/META-INF/MANIFEST.MF
index 7ae9dd5215a..3285fc2e8fa 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.decoration/META-INF/MANIFEST.MF
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.decoration/META-INF/MANIFEST.MF
@@ -7,12 +7,12 @@ Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
- org.eclipse.papyrus.core;bundle-version="0.9.0"
+ org.eclipse.papyrus.infra.core;bundle-version="0.9.0"
Bundle-Vendor: %providerName
Bundle-Version: 0.9.0.qualifier
Bundle-ManifestVersion: 2
Bundle-Activator: org.eclipse.papyrus.decoration.Activator
-Bundle-SymbolicName: org.eclipse.papyrus.decoration;singleton:=true
+Bundle-SymbolicName: org.eclipse.papyrus.infra.services.decoration;singleton:=true
Import-Package: org.apache.commons.lang;version="2.4.0",
org.eclipse.core.resources,
org.eclipse.emf.facet.infra.browser.uicore.internal.model,
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.decoration/src/org/eclipse/papyrus/decoration/Activator.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.decoration/src/org/eclipse/papyrus/decoration/Activator.java
index 5e1e5d5da01..c14cb6718f4 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.decoration/src/org/eclipse/papyrus/decoration/Activator.java
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.decoration/src/org/eclipse/papyrus/decoration/Activator.java
@@ -1,14 +1,14 @@
/*****************************************************************************
* Copyright (c) 2011 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:
- * Amine EL KOUHEN (CEA LIST/LIFL) - Amine.Elkouhen@cea.fr
+ * Amine EL KOUHEN (CEA LIST/LIFL) - Amine.Elkouhen@cea.fr
*****************************************************************************/
package org.eclipse.papyrus.decoration;
@@ -25,7 +25,7 @@ public class Activator extends AbstractUIPlugin {
// The plug-in ID
/** The Constant PLUGIN_ID. */
- public static final String PLUGIN_ID = "org.eclipse.papyrus.decoration"; //$NON-NLS-1$
+ public static final String PLUGIN_ID = "org.eclipse.papyrus.infra.services.decoration"; //$NON-NLS-1$
// The Hierarchical Markers ID
/** The HIERARCHICA l_ markers. */
@@ -50,7 +50,7 @@ public class Activator extends AbstractUIPlugin {
* @param context
* @throws Exception
*/
-
+
@Override
public void start(BundleContext context) throws Exception {
super.start(context);
@@ -65,7 +65,7 @@ public class Activator extends AbstractUIPlugin {
* @param context
* @throws Exception
*/
-
+
@Override
public void stop(BundleContext context) throws Exception {
plugin = null;
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/.project b/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/.project
index d109a612a29..09ac34ecca3 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/.project
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/.project
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>org.eclipse.papyrus.service.edit</name>
+ <name>org.eclipse.papyrus.infra.services.edit</name>
<comment></comment>
<projects>
</projects>
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/META-INF/MANIFEST.MF b/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/META-INF/MANIFEST.MF
index bf81256971c..3c9c64815e7 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/META-INF/MANIFEST.MF
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/META-INF/MANIFEST.MF
@@ -1,10 +1,10 @@
Manifest-Version: 1.0
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
- org.eclipse.papyrus.core;bundle-version="0.9.0";visibility:=reexport,
+ org.eclipse.papyrus.infra.core;bundle-version="0.9.0";visibility:=reexport,
org.eclipse.emf;bundle-version="2.6.0",
- org.eclipse.gmf.runtime.emf.type.core;bundle-version:="1.4.0",
- org.eclipse.papyrus.log;bundle-version="0.9.0"
+ org.eclipse.gmf.runtime.emf.type.core;bundle-version="1.4.0",
+ org.eclipse.papyrus.infra.log;bundle-version="0.9.0"
Export-Package: org.eclipse.papyrus.service.edit,
org.eclipse.papyrus.service.edit.commands,
org.eclipse.papyrus.service.edit.messages,
@@ -17,6 +17,6 @@ Bundle-Name: %pluginName
Bundle-Localization: plugin
Bundle-ManifestVersion: 2
Bundle-Activator: org.eclipse.papyrus.service.edit.Activator
-Bundle-SymbolicName: org.eclipse.papyrus.service.edit;singleton:=true
+Bundle-SymbolicName: org.eclipse.papyrus.infra.services.edit;singleton:=true
Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/src/org/eclipse/papyrus/service/edit/Activator.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/src/org/eclipse/papyrus/service/edit/Activator.java
index ded8b534cbf..7519f8f2bd8 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/src/org/eclipse/papyrus/service/edit/Activator.java
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.edit/src/org/eclipse/papyrus/service/edit/Activator.java
@@ -1,7 +1,7 @@
/*****************************************************************************
* 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
@@ -24,7 +24,7 @@ import org.osgi.framework.BundleContext;
public class Activator extends AbstractUIPlugin {
/** Plug-in ID */
- public static final String PLUGIN_ID = "org.eclipse.papyrus.service.edit"; //$NON-NLS-1$
+ public static final String PLUGIN_ID = "org.eclipse.papyrus.infra.services.edit"; //$NON-NLS-1$
/** Shared instance */
private static Activator plugin;
@@ -41,6 +41,7 @@ public class Activator extends AbstractUIPlugin {
*
* @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
*/
+ @Override
public void start(BundleContext context) throws Exception {
super.start(context);
plugin = this;
@@ -52,6 +53,7 @@ public class Activator extends AbstractUIPlugin {
*
* @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
*/
+ @Override
public void stop(BundleContext context) throws Exception {
plugin = null;
super.stop(context);
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.markerlistener/.project b/plugins/infra/services/org.eclipse.papyrus.infra.services.markerlistener/.project
index 37dd4e044e1..4e785f6966a 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.markerlistener/.project
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.markerlistener/.project
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>org.eclipse.papyrus.markerlistener</name>
+ <name>org.eclipse.papyrus.infra.services.markerlistener</name>
<comment></comment>
<projects>
</projects>
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.markerlistener/META-INF/MANIFEST.MF b/plugins/infra/services/org.eclipse.papyrus.infra.services.markerlistener/META-INF/MANIFEST.MF
index 5e3baba7e99..734382b52f6 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.markerlistener/META-INF/MANIFEST.MF
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.markerlistener/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
- org.eclipse.papyrus.core;bundle-version="0.9.0"
+ org.eclipse.papyrus.infra.core;bundle-version="0.9.0"
Export-Package: org.eclipse.papyrus.markerlistener
Bundle-Vendor: %providerName
Bundle-ActivationPolicy: lazy
@@ -9,8 +9,7 @@ Bundle-Version: 0.9.0.qualifier
Bundle-Name: %pluginName
Bundle-ManifestVersion: 2
Bundle-Activator: org.eclipse.papyrus.markerlistener.Activator
-Bundle-SymbolicName: org.eclipse.papyrus.markerlistener;singleton:=tru
- e
+Bundle-SymbolicName: org.eclipse.papyrus.infra.services.markerlistener;singleton:=true
Import-Package: org.eclipse.papyrus.decoration,
org.eclipse.papyrus.diagram.common.util
Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.markerlistener/src/org/eclipse/papyrus/markerlistener/Activator.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.markerlistener/src/org/eclipse/papyrus/markerlistener/Activator.java
index 104c5c60940..a2cd67779b0 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.markerlistener/src/org/eclipse/papyrus/markerlistener/Activator.java
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.markerlistener/src/org/eclipse/papyrus/markerlistener/Activator.java
@@ -1,14 +1,14 @@
/*****************************************************************************
* Copyright (c) 2011 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:
- * Amine EL KOUHEN (CEA LIST/LIFL) - Amine.Elkouhen@cea.fr
+ * Amine EL KOUHEN (CEA LIST/LIFL) - Amine.Elkouhen@cea.fr
*****************************************************************************/
package org.eclipse.papyrus.markerlistener;
@@ -24,7 +24,7 @@ public class Activator extends AbstractUIPlugin {
// The plug-in ID
/** The Constant PLUGIN_ID. */
- public static final String PLUGIN_ID = "org.eclipse.papyrus.markerlistener"; //$NON-NLS-1$
+ public static final String PLUGIN_ID = "org.eclipse.papyrus.infra.services.markerlistener"; //$NON-NLS-1$
// The shared instance
/** The plugin. */
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.preferences/.project b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.preferences/.project
index 23a248cabf9..575eb62beef 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.preferences/.project
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.preferences/.project
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>org.eclipse.papyrus.core.resourceloading.preferences</name>
+ <name>org.eclipse.papyrus.infra.services.resourceloading.preferences</name>
<comment></comment>
<projects>
</projects>
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.preferences/META-INF/MANIFEST.MF b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.preferences/META-INF/MANIFEST.MF
index 59bfad89a72..a044b95acd8 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.preferences/META-INF/MANIFEST.MF
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.preferences/META-INF/MANIFEST.MF
@@ -2,9 +2,9 @@ Manifest-Version: 1.0
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.jface,
org.eclipse.ui,
- org.eclipse.papyrus.preferences;bundle-version="0.9.0",
- org.eclipse.papyrus.core;bundle-version="0.9.0",
- org.eclipse.papyrus.core.resourceloading;bundle-version="0.9.0"
+ org.eclipse.papyrus.infra.gmfdiag.preferences;bundle-version="0.9.0",
+ org.eclipse.papyrus.infra.core;bundle-version="0.9.0",
+ org.eclipse.papyrus.infra.services.resourceloading;bundle-version="0.9.0"
Export-Package: org.eclipse.papyrus.core.resourceloading.preferences
Bundle-Vendor: %providerName
Bundle-ActivationPolicy: lazy
@@ -14,7 +14,6 @@ Bundle-Localization: plugin
Bundle-ManifestVersion: 2
Bundle-Activator: org.eclipse.papyrus.core.resourceloading.preferences
.CorePlugin
-Bundle-SymbolicName: org.eclipse.papyrus.core.resourceloading.preferen
- ces;singleton:=true
+Bundle-SymbolicName: org.eclipse.papyrus.infra.services.resourceloading.preferences;singleton:=true
Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.preferences/src/org/eclipse/papyrus/core/resourceloading/preferences/CorePlugin.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.preferences/src/org/eclipse/papyrus/core/resourceloading/preferences/CorePlugin.java
index a8211b449fa..f0a6b08563b 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.preferences/src/org/eclipse/papyrus/core/resourceloading/preferences/CorePlugin.java
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading.preferences/src/org/eclipse/papyrus/core/resourceloading/preferences/CorePlugin.java
@@ -1,7 +1,7 @@
/*****************************************************************************
* Copyright (c) 2010 Atos Origin.
*
- *
+ *
* 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
@@ -22,7 +22,7 @@ import org.osgi.framework.BundleContext;
public class CorePlugin extends AbstractUIPlugin {
// The plug-in ID
- public static final String PLUGIN_ID = "org.eclipse.papyrus.core.resourceloading.preferences"; //$NON-NLS-1$
+ public static final String PLUGIN_ID = "org.eclipse.papyrus.infra.services.resourceloading.preferences"; //$NON-NLS-1$
// The shared instance
private static CorePlugin plugin;
@@ -38,6 +38,7 @@ public class CorePlugin extends AbstractUIPlugin {
*
* @see org.eclipse.core.runtime.Plugins#start(org.osgi.framework.BundleContext)
*/
+ @Override
public void start(BundleContext context) throws Exception {
super.start(context);
plugin = this;
@@ -48,6 +49,7 @@ public class CorePlugin extends AbstractUIPlugin {
*
* @see org.eclipse.core.runtime.Plugin#stop(org.osgi.framework.BundleContext)
*/
+ @Override
public void stop(BundleContext context) throws Exception {
plugin = null;
super.stop(context);
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/.project b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/.project
index a1311ef215d..f89148e28bc 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/.project
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/.project
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>org.eclipse.papyrus.core.resourceloading</name>
+ <name>org.eclipse.papyrus.infra.services.resourceloading</name>
<comment></comment>
<projects>
</projects>
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/META-INF/MANIFEST.MF b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/META-INF/MANIFEST.MF
index f90bf1d5a9f..6f783a7a9f0 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/META-INF/MANIFEST.MF
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
-Require-Bundle: org.eclipse.papyrus.core;bundle-version="0.9.0",
- org.eclipse.papyrus.controlmode.history;bundle-version="0.9.0",
- org.eclipse.papyrus.ui.toolbox;bundle-version="0.9.0",
+Require-Bundle: org.eclipse.papyrus.infra.core;bundle-version="0.9.0",
+ org.eclipse.papyrus.infra.services.controlmode.history;bundle-version="0.9.0",
+ org.eclipse.papyrus.infra.widgets.toolbox;bundle-version="0.9.0",
org.eclipse.core.expressions
Export-Package: org.eclipse.papyrus.core.resourceloading,
org.eclipse.papyrus.core.resourceloading.impl,
@@ -14,7 +14,6 @@ Bundle-Name: %pluginName
Bundle-Localization: plugin
Bundle-ManifestVersion: 2
Bundle-Activator: org.eclipse.papyrus.core.resourceloading.Activator
-Bundle-SymbolicName: org.eclipse.papyrus.core.resourceloading;singleto
- n:=true
+Bundle-SymbolicName: org.eclipse.papyrus.infra.services.resourceloading;singleton:=true
Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/core/resourceloading/Activator.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/core/resourceloading/Activator.java
index 38742c94c3a..c69d4678d6e 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/core/resourceloading/Activator.java
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.resourceloading/src/org/eclipse/papyrus/core/resourceloading/Activator.java
@@ -10,7 +10,7 @@ import org.osgi.framework.BundleContext;
public class Activator extends Plugin {
// The plug-in ID
- public static final String PLUGIN_ID = "org.eclipse.papyrus.core.resourceloading"; //$NON-NLS-1$
+ public static final String PLUGIN_ID = "org.eclipse.papyrus.infra.services.resourceloading"; //$NON-NLS-1$
// The shared instance
private static Activator plugin;
@@ -26,6 +26,7 @@ public class Activator extends Plugin {
*
* @see org.eclipse.core.runtime.Plugins#start(org.osgi.framework.BundleContext)
*/
+ @Override
public void start(BundleContext context) throws Exception {
super.start(context);
plugin = this;
@@ -36,6 +37,7 @@ public class Activator extends Plugin {
*
* @see org.eclipse.core.runtime.Plugin#stop(org.osgi.framework.BundleContext)
*/
+ @Override
public void stop(BundleContext context) throws Exception {
plugin = null;
super.stop(context);
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/.project b/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/.project
index c5c07e5792c..ed4b25fa46f 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/.project
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/.project
@@ -1,28 +1,28 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.validation</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>
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.eclipse.papyrus.infra.services.validation</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/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/META-INF/MANIFEST.MF b/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/META-INF/MANIFEST.MF
index d476ce7ab4b..7448a741b09 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/META-INF/MANIFEST.MF
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/META-INF/MANIFEST.MF
@@ -5,10 +5,10 @@ Require-Bundle: org.eclipse.ui,
org.eclipse.emf.ecore;bundle-version="2.6.1",
org.eclipse.core.resources;bundle-version="3.6.0",
org.apache.commons.lang;bundle-version="2.3.0",
- org.eclipse.emf.edit.ui;bundle-version:="2.6.0",
- org.eclipse.gmf.runtime.emf.commands.core;bundle-version:="1.0.100",
- org.eclipse.emf.facet.infra.browser.uicore;bundle-version:="0.1.0",
- org.eclipse.papyrus.core;bundle-version="0.9.0"
+ org.eclipse.emf.edit.ui;bundle-version="2.6.0",
+ org.eclipse.gmf.runtime.emf.commands.core;bundle-version="1.0.100",
+ org.eclipse.emf.facet.infra.browser.uicore;bundle-version="0.1.0",
+ org.eclipse.papyrus.infra.core;bundle-version="0.9.0"
Export-Package: org.eclipse.papyrus.validation
Bundle-Vendor: %pluginProvider
Bundle-ActivationPolicy: lazy
@@ -16,6 +16,6 @@ Bundle-Version: 0.9.0.qualifier
Bundle-Name: %pluginName
Bundle-ManifestVersion: 2
Bundle-Activator: org.eclipse.papyrus.validation.Activator
-Bundle-SymbolicName: org.eclipse.papyrus.validation;singleton:=true
+Bundle-SymbolicName: org.eclipse.papyrus.infra.services.validation;singleton:=true
Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/validation/Activator.java b/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/validation/Activator.java
index 1bb23c53c1a..ed3f9f984bc 100644
--- a/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/validation/Activator.java
+++ b/plugins/infra/services/org.eclipse.papyrus.infra.services.validation/src/org/eclipse/papyrus/validation/Activator.java
@@ -1,14 +1,14 @@
/*****************************************************************************
* Copyright (c) 2011 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:
- * Amine EL KOUHEN (CEA LIST/LIFL) - Amine.Elkouhen@cea.fr
+ * Amine EL KOUHEN (CEA LIST/LIFL) - Amine.Elkouhen@cea.fr
*****************************************************************************/
package org.eclipse.papyrus.validation;
@@ -24,7 +24,7 @@ public class Activator extends AbstractUIPlugin {
// The plug-in ID
/** The Constant PLUGIN_ID. */
- public static final String PLUGIN_ID = "org.eclipse.papyrus.validation"; //$NON-NLS-1$
+ public static final String PLUGIN_ID = "org.eclipse.papyrus.infra.services.validation"; //$NON-NLS-1$
// The shared instance
/** The plugin. */
@@ -50,7 +50,7 @@ public class Activator extends AbstractUIPlugin {
* @param context
* @throws Exception
*/
-
+
@Override
public void start(BundleContext context) throws Exception {
super.start(context);
@@ -69,7 +69,7 @@ public class Activator extends AbstractUIPlugin {
* @param context
* @throws Exception
*/
-
+
@Override
public void stop(BundleContext context) throws Exception {
plugin = null;
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.common/.project b/plugins/infra/table/org.eclipse.papyrus.infra.table.common/.project
index 5a82e72a65e..7605b36adae 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.common/.project
+++ b/plugins/infra/table/org.eclipse.papyrus.infra.table.common/.project
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>org.eclipse.papyrus.table.common</name>
+ <name>org.eclipse.papyrus.infra.table.common</name>
<comment></comment>
<projects>
</projects>
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.common/META-INF/MANIFEST.MF b/plugins/infra/table/org.eclipse.papyrus.infra.table.common/META-INF/MANIFEST.MF
index 0b52e6678c5..1b6614f9ec0 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.common/META-INF/MANIFEST.MF
+++ b/plugins/infra/table/org.eclipse.papyrus.infra.table.common/META-INF/MANIFEST.MF
@@ -1,17 +1,17 @@
Manifest-Version: 1.0
Require-Bundle: org.eclipse.emf.facet.widgets.nattable.instance,
org.eclipse.emf.facet.widgets.nattable,
- org.eclipse.papyrus.diagram.common;bundle-version:="0.9.0",
- org.eclipse.papyrus.widgets;bundle-version="0.9.0",
+ org.eclipse.papyrus.uml.diagram.common;bundle-version="0.9.0",
+ org.eclipse.papyrus.infra.widgets;bundle-version="0.9.0",
org.eclipse.papyrus.views.properties;bundle-version="0.9.0",
org.eclipse.emf.databinding;bundle-version="1.2.0",
- org.eclipse.papyrus.table.instance;bundle-version="0.9.0",
+ org.eclipse.papyrus.infra.table.instance;bundle-version="0.9.0",
org.eclipse.emf.facet.infra.query.core;bundle-version="0.1.0",
org.eclipse.emf.facet.infra.query.editor;bundle-version="0.1.0",
- org.eclipse.emf.facet.query.java;bundle-version:="0.1.0",
+ org.eclipse.emf.facet.query.java;bundle-version="0.1.0",
org.eclipse.emf.facet.infra.common.core;bundle-version="0.1.0",
- org.eclipse.papyrus.service.edit;bundle-version="0.9.0",
- org.eclipse.papyrus.commands;bundle-version="0.9.0"
+ org.eclipse.papyrus.infra.services.edit;bundle-version="0.9.0",
+ org.eclipse.papyrus.infra.gmfdiag.commands;bundle-version="0.9.0"
Export-Package: org.eclipse.papyrus.table.common,
org.eclipse.papyrus.table.common.dialog,
org.eclipse.papyrus.table.common.editor,
@@ -27,6 +27,6 @@ Bundle-Name: %pluginName
Bundle-Localization: plugin
Bundle-ManifestVersion: 2
Bundle-Activator: org.eclipse.papyrus.table.common.Activator
-Bundle-SymbolicName: org.eclipse.papyrus.table.common;singleton:=true
+Bundle-SymbolicName: org.eclipse.papyrus.infra.table.common;singleton:=true
Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.common/src/org/eclipse/papyrus/table/common/Activator.java b/plugins/infra/table/org.eclipse.papyrus.infra.table.common/src/org/eclipse/papyrus/table/common/Activator.java
index cb67449a030..9a9581ec2e2 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.common/src/org/eclipse/papyrus/table/common/Activator.java
+++ b/plugins/infra/table/org.eclipse.papyrus.infra.table.common/src/org/eclipse/papyrus/table/common/Activator.java
@@ -1,7 +1,7 @@
/*****************************************************************************
* Copyright (c) 2011 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
@@ -23,7 +23,7 @@ import org.osgi.framework.BundleContext;
public class Activator extends AbstractUIPlugin {
// The plug-in ID
- public static final String PLUGIN_ID = "org.eclipse.papyrus.table.common"; //$NON-NLS-1$
+ public static final String PLUGIN_ID = "org.eclipse.papyrus.infra.table.common"; //$NON-NLS-1$
// The shared instance
private static Activator plugin;
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.instance/.project b/plugins/infra/table/org.eclipse.papyrus.infra.table.instance/.project
index f5596956ceb..c95a6c4418d 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.instance/.project
+++ b/plugins/infra/table/org.eclipse.papyrus.infra.table.instance/.project
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>org.eclipse.papyrus.table.instance</name>
+ <name>org.eclipse.papyrus.infra.table.instance</name>
<comment></comment>
<projects>
</projects>
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.instance/META-INF/MANIFEST.MF b/plugins/infra/table/org.eclipse.papyrus.infra.table.instance/META-INF/MANIFEST.MF
index acb4fe20d38..1796c948505 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.instance/META-INF/MANIFEST.MF
+++ b/plugins/infra/table/org.eclipse.papyrus.infra.table.instance/META-INF/MANIFEST.MF
@@ -19,6 +19,5 @@ Bundle-Vendor: %providerName
Bundle-Version: 0.9.0.qualifier
Bundle-ManifestVersion: 2
Bundle-Activator: org.eclipse.papyrus.table.instance.Activator
-Bundle-SymbolicName: org.eclipse.papyrus.table.instance;singleton:=tru
- e
+Bundle-SymbolicName: org.eclipse.papyrus.infra.table.instance;singleton:=true
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.instance/src/org/eclipse/papyrus/table/instance/Activator.java b/plugins/infra/table/org.eclipse.papyrus.infra.table.instance/src/org/eclipse/papyrus/table/instance/Activator.java
index 8b42788be9f..76f15d18a6f 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.instance/src/org/eclipse/papyrus/table/instance/Activator.java
+++ b/plugins/infra/table/org.eclipse.papyrus.infra.table.instance/src/org/eclipse/papyrus/table/instance/Activator.java
@@ -1,7 +1,7 @@
/*****************************************************************************
* Copyright (c) 2011 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
@@ -22,7 +22,7 @@ import org.osgi.framework.BundleContext;
public class Activator extends AbstractUIPlugin {
// The plug-in ID
- public static final String PLUGIN_ID = "org.eclipse.papyrus.table.instance"; //$NON-NLS-1$
+ public static final String PLUGIN_ID = "org.eclipse.papyrus.infra.table.instance"; //$NON-NLS-1$
// The shared instance
private static Activator plugin;
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.menu/.project b/plugins/infra/table/org.eclipse.papyrus.infra.table.menu/.project
index 31d3e8240c4..2db93db7442 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.menu/.project
+++ b/plugins/infra/table/org.eclipse.papyrus.infra.table.menu/.project
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>org.eclipse.papyrus.table.menu</name>
+ <name>org.eclipse.papyrus.infra.table.menu</name>
<comment></comment>
<projects>
</projects>
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.menu/META-INF/MANIFEST.MF b/plugins/infra/table/org.eclipse.papyrus.infra.table.menu/META-INF/MANIFEST.MF
index f10f205e5b5..836710819af 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.menu/META-INF/MANIFEST.MF
+++ b/plugins/infra/table/org.eclipse.papyrus.infra.table.menu/META-INF/MANIFEST.MF
@@ -1,10 +1,10 @@
Manifest-Version: 1.0
Require-Bundle: org.eclipse.core.expressions,
org.eclipse.papyrus.uml.table.default;bundle-version="0.9.0",
- org.eclipse.papyrus.diagram.common;bundle-version:="0.9.0",
- org.eclipse.papyrus.diagram.menu;bundle-version:="0.9.0",
+ org.eclipse.papyrus.uml.diagram.common;bundle-version="0.9.0",
+ org.eclipse.papyrus.uml.diagram.menu;bundle-version="0.9.0",
org.eclipse.emf.facet.infra.common.core;bundle-version="0.1.0",
- org.eclipse.papyrus.table.common;bundle-version="0.9.0",
+ org.eclipse.papyrus.infra.table.common;bundle-version="0.9.0",
org.eclipse.emf.facet.widgets.nattable,
org.eclipse.emf.facet.widgets.nattable.instance;bundle-version="0.1.0",
org.eclipse.emf.facet.widgets.nattable.workbench;bundle-version="0.1.0"
@@ -18,6 +18,6 @@ Bundle-Name: %pluginName
Bundle-Localization: plugin
Bundle-ManifestVersion: 2
Bundle-Activator: org.eclipse.papyrus.table.menu.Activator
-Bundle-SymbolicName: org.eclipse.papyrus.table.menu;singleton:=true
+Bundle-SymbolicName: org.eclipse.papyrus.infra.table.menu;singleton:=true
Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.menu/src/org/eclipse/papyrus/table/menu/Activator.java b/plugins/infra/table/org.eclipse.papyrus.infra.table.menu/src/org/eclipse/papyrus/table/menu/Activator.java
index bc577a35781..c5fd5e9272e 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.menu/src/org/eclipse/papyrus/table/menu/Activator.java
+++ b/plugins/infra/table/org.eclipse.papyrus.infra.table.menu/src/org/eclipse/papyrus/table/menu/Activator.java
@@ -1,7 +1,7 @@
/*****************************************************************************
* Copyright (c) 2011 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
@@ -22,7 +22,7 @@ import org.osgi.framework.BundleContext;
public class Activator extends AbstractUIPlugin {
// The plug-in ID
- public static final String ID = "org.eclipse.papyrus.table.menu"; //$NON-NLS-1$
+ public static final String ID = "org.eclipse.papyrus.infra.table.menu"; //$NON-NLS-1$
// The shared instance
private static Activator plugin;
@@ -38,6 +38,7 @@ public class Activator extends AbstractUIPlugin {
*
* @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
*/
+ @Override
public void start(BundleContext context) throws Exception {
super.start(context);
plugin = this;
@@ -48,6 +49,7 @@ public class Activator extends AbstractUIPlugin {
*
* @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
*/
+ @Override
public void stop(BundleContext context) throws Exception {
plugin = null;
super.stop(context);
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.modelexplorer/.project b/plugins/infra/table/org.eclipse.papyrus.infra.table.modelexplorer/.project
index 271ebf04bf7..db2442f94ec 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.modelexplorer/.project
+++ b/plugins/infra/table/org.eclipse.papyrus.infra.table.modelexplorer/.project
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>org.eclipse.papyrus.table.modelexplorer</name>
+ <name>org.eclipse.papyrus.infra.table.modelexplorer</name>
<comment></comment>
<projects>
</projects>
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.modelexplorer/META-INF/MANIFEST.MF b/plugins/infra/table/org.eclipse.papyrus.infra.table.modelexplorer/META-INF/MANIFEST.MF
index 4d253fc0886..44ef7e6ecce 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.modelexplorer/META-INF/MANIFEST.MF
+++ b/plugins/infra/table/org.eclipse.papyrus.infra.table.modelexplorer/META-INF/MANIFEST.MF
@@ -5,7 +5,7 @@ Require-Bundle: org.eclipse.papyrus.resource;bundle-version="0.9.0",
org.eclipse.papyrus.views.modelexplorer;bundle-version="0.9.0",
org.eclipse.core.expressions,
org.eclipse.emf.facet.widgets.nattable.instance;bundle-version="0.1.0",
- org.eclipse.papyrus.table.instance;bundle-version="0.9.0",
+ org.eclipse.papyrus.infra.table.instance;bundle-version="0.9.0",
org.eclipse.uml2.uml,
org.eclipse.emf.facet.infra.query.core
Export-Package: org.eclipse.papyrus.table.modelexplorer,
@@ -19,7 +19,6 @@ Bundle-Name: %pluginName
Bundle-Localization: plugin
Bundle-ManifestVersion: 2
Bundle-Activator: org.eclipse.papyrus.table.modelexplorer.Activator
-Bundle-SymbolicName: org.eclipse.papyrus.table.modelexplorer;singleton
- :=true
+Bundle-SymbolicName: org.eclipse.papyrus.infra.table.modelexplorer;singleton:=true
Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.modelexplorer/src/org/eclipse/papyrus/table/modelexplorer/Activator.java b/plugins/infra/table/org.eclipse.papyrus.infra.table.modelexplorer/src/org/eclipse/papyrus/table/modelexplorer/Activator.java
index b831a96e9e3..af8c949991e 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.modelexplorer/src/org/eclipse/papyrus/table/modelexplorer/Activator.java
+++ b/plugins/infra/table/org.eclipse.papyrus.infra.table.modelexplorer/src/org/eclipse/papyrus/table/modelexplorer/Activator.java
@@ -1,7 +1,7 @@
/*****************************************************************************
* Copyright (c) 2011 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
@@ -31,7 +31,7 @@ import org.osgi.framework.BundleContext;
public class Activator extends AbstractUIPlugin {
// The plug-in ID
- public static final String PLUGIN_ID = "org.eclipse.papyrus.table.modelexplorer"; //$NON-NLS-1$
+ public static final String PLUGIN_ID = "org.eclipse.papyrus.infra.table.modelexplorer"; //$NON-NLS-1$
// The shared instance
private static Activator plugin;
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/.project b/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/.project
index 03ca67cb112..7232286a2cb 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/.project
+++ b/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/.project
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>org.eclipse.papyrus.properties.table</name>
+ <name>org.eclipse.papyrus.infra.table.properties</name>
<comment></comment>
<projects>
</projects>
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/META-INF/MANIFEST.MF b/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/META-INF/MANIFEST.MF
index 8d29267d66a..d1be77dda07 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/META-INF/MANIFEST.MF
+++ b/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/META-INF/MANIFEST.MF
@@ -4,11 +4,11 @@ Require-Bundle: org.eclipse.ui,
org.eclipse.papyrus.views.properties;bundle-version="0.9.0",
org.eclipse.papyrus.views.properties.model;bundle-version="0.9.0",
org.eclipse.emf.edit,
- org.eclipse.papyrus.widgets;bundle-version="0.9.0",
+ org.eclipse.papyrus.infra.widgets;bundle-version="0.9.0",
org.eclipse.emf.facet.infra.query.core;bundle-version="0.1.0",
org.eclipse.emf.databinding,
- org.eclipse.papyrus.log;bundle-version="0.9.0",
- org.eclipse.papyrus.table.instance;bundle-version="0.9.0",
+ org.eclipse.papyrus.infra.log;bundle-version="0.9.0",
+ org.eclipse.papyrus.infra.table.instance;bundle-version="0.9.0",
org.eclipse.emf.facet.widgets.nattable.instance;bundle-version="0.1.0"
Bundle-Vendor: %providerName
Bundle-ActivationPolicy: lazy
@@ -17,7 +17,6 @@ Bundle-Name: %pluginName
Bundle-Localization: plugin
Bundle-ManifestVersion: 2
Bundle-Activator: org.eclipse.papyrus.properties.table.Activator
-Bundle-SymbolicName: org.eclipse.papyrus.properties.table;singleton:=t
- rue
+Bundle-SymbolicName: org.eclipse.papyrus.infra.table.properties;singleton:=true
Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/src/org/eclipse/papyrus/properties/table/Activator.java b/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/src/org/eclipse/papyrus/properties/table/Activator.java
index 3f2aa5cd439..2b38d138c3a 100644
--- a/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/src/org/eclipse/papyrus/properties/table/Activator.java
+++ b/plugins/infra/table/org.eclipse.papyrus.infra.table.properties/src/org/eclipse/papyrus/properties/table/Activator.java
@@ -1,7 +1,7 @@
/*****************************************************************************
* Copyright (c) 2011 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
@@ -23,11 +23,11 @@ import org.osgi.framework.BundleContext;
public class Activator extends AbstractUIPlugin {
// The plug-in ID
- public static final String PLUGIN_ID = "org.eclipse.papyrus.properties.table"; //$NON-NLS-1$
+ public static final String PLUGIN_ID = "org.eclipse.papyrus.infra.table.properties"; //$NON-NLS-1$
// The shared instance
private static Activator plugin;
-
+
/** Logging helper */
public static LogHelper log;
/**
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/.project b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/.project
index 0b2087bca18..52b91e0485e 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/.project
+++ b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/.project
@@ -1,28 +1,28 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.papyrus.ui.toolbox</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>
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.eclipse.papyrus.infra.widgets.toolbox</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/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/META-INF/MANIFEST.MF b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/META-INF/MANIFEST.MF
index fd54dc3f2a1..b8147e2e705 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/META-INF/MANIFEST.MF
+++ b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/META-INF/MANIFEST.MF
@@ -1,5 +1,5 @@
Manifest-Version: 1.0
-Require-Bundle: org.eclipse.papyrus.core;bundle-version="0.9.0",
+Require-Bundle: org.eclipse.papyrus.infra.core;bundle-version="0.9.0",
org.eclipse.core.runtime,
org.eclipse.ui
Export-Package: org.eclipse.papyrus.ui.toolbox,
@@ -20,6 +20,6 @@ Bundle-Localization: plugin
Bundle-Name: %pluginName
Bundle-ManifestVersion: 2
Bundle-Activator: org.eclipse.papyrus.ui.toolbox.Activator
-Bundle-SymbolicName: org.eclipse.papyrus.ui.toolbox;singleton:=true
+Bundle-SymbolicName: org.eclipse.papyrus.infra.widgets.toolbox;singleton:=true
Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/ui/toolbox/Activator.java b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/ui/toolbox/Activator.java
index 5b6da69dfc3..393786bf4dc 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/ui/toolbox/Activator.java
+++ b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets.toolbox/src/org/eclipse/papyrus/ui/toolbox/Activator.java
@@ -1,7 +1,7 @@
/*****************************************************************************
* Copyright (c) 2008 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
@@ -9,7 +9,7 @@
*
* Contributors:
* Patrick Tessier (CEA LIST) Patrick.tessier@cea.fr - Initial API and implementation
- *
+ *
*****************************************************************************/
package org.eclipse.papyrus.ui.toolbox;
@@ -25,7 +25,7 @@ import org.osgi.framework.BundleContext;
public class Activator extends AbstractUIPlugin {
// The plug-in ID
- public static final String PLUGIN_ID = "org.eclipse.papyrus.ui.toolbox";
+ public static final String PLUGIN_ID = "org.eclipse.papyrus.infra.widgets.toolbox";
// The shared instance
private static Activator plugin;
@@ -41,6 +41,7 @@ public class Activator extends AbstractUIPlugin {
*
* @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
*/
+ @Override
public void start(BundleContext context) throws Exception {
super.start(context);
plugin = this;
@@ -51,6 +52,7 @@ public class Activator extends AbstractUIPlugin {
*
* @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
*/
+ @Override
public void stop(BundleContext context) throws Exception {
plugin = null;
super.stop(context);
@@ -78,7 +80,7 @@ public class Activator extends AbstractUIPlugin {
* @return the Image
*/
public static Image getImage(String iconPath, String defaultPlugin) {
- // see if the path is using platform:/... to get icon in the fragment, if it is in a fragment
+ // see if the path is using platform:/... to get icon in the fragment, if it is in a fragment
String key = defaultPlugin + iconPath;
ImageRegistry registry = getDefault().getImageRegistry();
Image image = registry.get(key);
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/.project b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/.project
index ba9e8ab7107..3de31c82458 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/.project
+++ b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/.project
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>org.eclipse.papyrus.widgets</name>
+ <name>org.eclipse.papyrus.infra.widgets</name>
<comment></comment>
<projects>
</projects>
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/META-INF/MANIFEST.MF b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/META-INF/MANIFEST.MF
index 3da77acf3a6..d3938db1efd 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/META-INF/MANIFEST.MF
+++ b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/META-INF/MANIFEST.MF
@@ -4,8 +4,8 @@ Require-Bundle: org.eclipse.ui,
org.eclipse.core.databinding.property;bundle-version="1.3.0",
org.eclipse.core.databinding,
org.eclipse.jface.databinding,
- org.eclipse.papyrus.log;bundle-version:="0.9.0",
- org.eclipse.ui.views.properties.tabbed;bundle-version:="3.5.100",
+ org.eclipse.papyrus.infra.log;bundle-version="0.9.0",
+ org.eclipse.ui.views.properties.tabbed;bundle-version="3.5.100",
org.eclipse.core.resources;bundle-version="3.7.100",
org.eclipse.ui.ide;bundle-version="3.7.0"
Export-Package: org.eclipse.papyrus.widgets,
@@ -22,6 +22,6 @@ Bundle-Name: %pluginName
Bundle-Localization: plugin
Bundle-ManifestVersion: 2
Bundle-Activator: org.eclipse.papyrus.widgets.Activator
-Bundle-SymbolicName: org.eclipse.papyrus.widgets
+Bundle-SymbolicName: org.eclipse.papyrus.infra.widgets
Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/widgets/Activator.java b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/widgets/Activator.java
index 05ddfd47749..2321144e4b8 100644
--- a/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/widgets/Activator.java
+++ b/plugins/infra/widget/org.eclipse.papyrus.infra.widgets/src/org/eclipse/papyrus/widgets/Activator.java
@@ -26,7 +26,7 @@ public class Activator extends AbstractUIPlugin {
/**
* The plug-in ID
*/
- public static final String PLUGIN_ID = "org.eclipse.papyrus.widgets"; //$NON-NLS-1$
+ public static final String PLUGIN_ID = "org.eclipse.papyrus.infra.widgets"; //$NON-NLS-1$
/**
* The shared instance
diff --git a/plugins/infra/xtext/org.eclipse.papyrus.infra.xtext.widgets/.project b/plugins/infra/xtext/org.eclipse.papyrus.infra.xtext.widgets/.project
index 5c764ec70c6..32731277245 100644
--- a/plugins/infra/xtext/org.eclipse.papyrus.infra.xtext.widgets/.project
+++ b/plugins/infra/xtext/org.eclipse.papyrus.infra.xtext.widgets/.project
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>org.eclipse.papyrus.widgets.xtext</name>
+ <name>org.eclipse.papyrus.infra.xtext.widgets</name>
<comment></comment>
<projects>
</projects>
diff --git a/plugins/infra/xtext/org.eclipse.papyrus.infra.xtext.widgets/META-INF/MANIFEST.MF b/plugins/infra/xtext/org.eclipse.papyrus.infra.xtext.widgets/META-INF/MANIFEST.MF
index a554690e988..42f3f7594e0 100644
--- a/plugins/infra/xtext/org.eclipse.papyrus.infra.xtext.widgets/META-INF/MANIFEST.MF
+++ b/plugins/infra/xtext/org.eclipse.papyrus.infra.xtext.widgets/META-INF/MANIFEST.MF
@@ -2,11 +2,11 @@ Manifest-Version: 1.0
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
org.eclipse.xtext.ui;bundle-version="1.0.1",
- org.eclipse.papyrus.widgets;bundle-version="0.9.0",
+ org.eclipse.papyrus.infra.widgets;bundle-version="0.9.0",
org.eclipse.core.databinding;bundle-version="1.3.100",
org.eclipse.core.expressions;bundle-version="3.4.200",
org.eclipse.ui.navigator;bundle-version="3.5.0",
- org.eclipse.papyrus.log;bundle-version="0.9.0",
+ org.eclipse.papyrus.infra.log;bundle-version="0.9.0",
org.eclipse.emf.compare;bundle-version="1.1.1",
org.eclipse.emf.compare.match;bundle-version="1.1.1",
org.eclipse.emf.compare.diff;bundle-version="1.1.1"
@@ -20,6 +20,6 @@ Bundle-Version: 0.9.0.qualifier
Bundle-Name: %Bundle-Name
Bundle-ManifestVersion: 2
Bundle-Activator: org.eclipse.papyrus.widgets.xtext.Activator
-Bundle-SymbolicName: org.eclipse.papyrus.widgets.xtext
+Bundle-SymbolicName: org.eclipse.papyrus.infra.xtext.widgets
Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/plugins/infra/xtext/org.eclipse.papyrus.infra.xtext.widgets/src/org/eclipse/papyrus/widgets/xtext/Activator.java b/plugins/infra/xtext/org.eclipse.papyrus.infra.xtext.widgets/src/org/eclipse/papyrus/widgets/xtext/Activator.java
index 5af9c76734b..19d82ae3ade 100644
--- a/plugins/infra/xtext/org.eclipse.papyrus.infra.xtext.widgets/src/org/eclipse/papyrus/widgets/xtext/Activator.java
+++ b/plugins/infra/xtext/org.eclipse.papyrus.infra.xtext.widgets/src/org/eclipse/papyrus/widgets/xtext/Activator.java
@@ -1,6 +1,6 @@
/*****************************************************************************
* 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
@@ -21,7 +21,7 @@ import org.osgi.framework.BundleContext;
public class Activator extends AbstractUIPlugin {
// The plug-in ID
- public static final String PLUGIN_ID = "org.eclipse.papyrus.widgets.xtext"; //$NON-NLS-1$
+ public static final String PLUGIN_ID = "org.eclipse.papyrus.infra.xtext.widgets"; //$NON-NLS-1$
// The shared instance
private static Activator plugin;

Back to the top