Merge remote-tracking branch 'origin/maintenance-0.13'
diff --git a/org.eclipse.gmt.modisco.examples/META-INF/MANIFEST.MF b/org.eclipse.gmt.modisco.examples/META-INF/MANIFEST.MF
index 9498a64..8a2f9ae 100644
--- a/org.eclipse.gmt.modisco.examples/META-INF/MANIFEST.MF
+++ b/org.eclipse.gmt.modisco.examples/META-INF/MANIFEST.MF
@@ -2,5 +2,5 @@
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.gmt.modisco.examples
-Bundle-Version: 0.13.1.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-Vendor: %Bundle-Vendor
diff --git a/org.eclipse.gmt.modisco.infra.browser.custom.core/META-INF/MANIFEST.MF b/org.eclipse.gmt.modisco.infra.browser.custom.core/META-INF/MANIFEST.MF
index 3589a19..8c1a688 100644
--- a/org.eclipse.gmt.modisco.infra.browser.custom.core/META-INF/MANIFEST.MF
+++ b/org.eclipse.gmt.modisco.infra.browser.custom.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.gmt.modisco.infra.browser.custom.core;singleton:=true
-Bundle-Version: 0.13.1.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-Activator: org.eclipse.gmt.modisco.infra.browser.custom.core.Activator
Bundle-Vendor: %Bundle-Vendor
Require-Bundle: org.eclipse.ui,
diff --git a/org.eclipse.gmt.modisco.infra.browser.custom.editor/META-INF/MANIFEST.MF b/org.eclipse.gmt.modisco.infra.browser.custom.editor/META-INF/MANIFEST.MF
index f1691f5..b104cf3 100644
--- a/org.eclipse.gmt.modisco.infra.browser.custom.editor/META-INF/MANIFEST.MF
+++ b/org.eclipse.gmt.modisco.infra.browser.custom.editor/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.gmt.modisco.infra.browser.custom.editor;singleton:=true
-Bundle-Version: 0.13.1.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-Activator: org.eclipse.gmt.modisco.infra.browser.custom.editor.Activator
Bundle-Vendor: %Bundle-Vendor
Require-Bundle: org.eclipse.ui,
diff --git a/org.eclipse.gmt.modisco.infra.browser.custom.examples.java.jdk/META-INF/MANIFEST.MF b/org.eclipse.gmt.modisco.infra.browser.custom.examples.java.jdk/META-INF/MANIFEST.MF
index 63e3cc3..a4fe7c8 100644
--- a/org.eclipse.gmt.modisco.infra.browser.custom.examples.java.jdk/META-INF/MANIFEST.MF
+++ b/org.eclipse.gmt.modisco.infra.browser.custom.examples.java.jdk/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.gmt.modisco.infra.browser.custom.examples.java.jdk;singleton:=true
-Bundle-Version: 0.13.1.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-Vendor:
%Bundle-Vendor
Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/org.eclipse.gmt.modisco.infra.browser.custom.examples.uml/META-INF/MANIFEST.MF b/org.eclipse.gmt.modisco.infra.browser.custom.examples.uml/META-INF/MANIFEST.MF
index 7831b5b..37a20c8 100644
--- a/org.eclipse.gmt.modisco.infra.browser.custom.examples.uml/META-INF/MANIFEST.MF
+++ b/org.eclipse.gmt.modisco.infra.browser.custom.examples.uml/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.gmt.modisco.infra.browser.custom.examples.uml;singleton:=true
-Bundle-Version: 0.13.1.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-Vendor:
%Bundle-Vendor
Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/org.eclipse.gmt.modisco.infra.browser.custom.ui/META-INF/MANIFEST.MF b/org.eclipse.gmt.modisco.infra.browser.custom.ui/META-INF/MANIFEST.MF
index 9fac94d..f1577a8 100644
--- a/org.eclipse.gmt.modisco.infra.browser.custom.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.gmt.modisco.infra.browser.custom.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.gmt.modisco.infra.browser.custom.ui;singleton:=true
-Bundle-Version: 0.13.1.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-Activator: org.eclipse.gmt.modisco.infra.browser.custom.ui.Activator
Bundle-Vendor: %Bundle-Vendor
Require-Bundle: org.eclipse.ui,
diff --git a/org.eclipse.gmt.modisco.infra.browser.custom/META-INF/MANIFEST.MF b/org.eclipse.gmt.modisco.infra.browser.custom/META-INF/MANIFEST.MF
index ceb7ae4..5310408 100644
--- a/org.eclipse.gmt.modisco.infra.browser.custom/META-INF/MANIFEST.MF
+++ b/org.eclipse.gmt.modisco.infra.browser.custom/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.gmt.modisco.infra.browser.custom;singleton:=true
-Bundle-Version: 0.13.1.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %Bundle-Vendor
Bundle-Localization: plugin
diff --git a/org.eclipse.gmt.modisco.infra.browser.uicore.examples.cnf/META-INF/MANIFEST.MF b/org.eclipse.gmt.modisco.infra.browser.uicore.examples.cnf/META-INF/MANIFEST.MF
index c766215..64969a4 100644
--- a/org.eclipse.gmt.modisco.infra.browser.uicore.examples.cnf/META-INF/MANIFEST.MF
+++ b/org.eclipse.gmt.modisco.infra.browser.uicore.examples.cnf/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.gmt.modisco.infra.browser.uicore.examples.cnf;singleton:=true
-Bundle-Version: 0.13.1.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-Activator: org.eclipse.gmt.modisco.infra.browser.uicore.examples.cnf.Activator
Bundle-Vendor: %Bundle-Vendor
Require-Bundle: org.eclipse.ui,
diff --git a/org.eclipse.gmt.modisco.infra.browser.uicore/META-INF/MANIFEST.MF b/org.eclipse.gmt.modisco.infra.browser.uicore/META-INF/MANIFEST.MF
index 6c21d9a..d39f267 100644
--- a/org.eclipse.gmt.modisco.infra.browser.uicore/META-INF/MANIFEST.MF
+++ b/org.eclipse.gmt.modisco.infra.browser.uicore/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.gmt.modisco.infra.browser.uicore;singleton:=true
-Bundle-Version: 0.13.1.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-ClassPath: .
Bundle-Activator: org.eclipse.gmt.modisco.infra.browser.uicore.internal.Activator
Bundle-Vendor: %Bundle-Vendor
diff --git a/org.eclipse.gmt.modisco.infra.browser/META-INF/MANIFEST.MF b/org.eclipse.gmt.modisco.infra.browser/META-INF/MANIFEST.MF
index 0498666..e33fa1e 100644
--- a/org.eclipse.gmt.modisco.infra.browser/META-INF/MANIFEST.MF
+++ b/org.eclipse.gmt.modisco.infra.browser/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.gmt.modisco.infra.browser;singleton:=true
-Bundle-Version: 0.13.1.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-ClassPath: .
Bundle-Activator: org.eclipse.gmt.modisco.infra.browser.MoDiscoBrowserPlugin$Implementation
Bundle-Vendor: %Bundle-Vendor
@@ -36,8 +36,9 @@
org.eclipse.gmt.modisco.infra.browser.uicore;bundle-version="0.8.0",
org.eclipse.ui.views.properties.tabbed;bundle-version="3.5.0",
org.eclipse.emf.facet.util.emf.ui;bundle-version="0.1.0",
- org.eclipse.emf.facet.util.emf.core;bundle-version="0.1.0",
- org.eclipse.emf.facet.util.core;bundle-version="1.0.0"
+ org.eclipse.emf.facet.util.emf.core;bundle-version="0.1.0",
+ org.eclipse.modisco.util.emf.core;bundle-version="1.0.0",
+ org.eclipse.emf.facet.util.core;bundle-version="1.0.0"
Eclipse-LazyStart: true
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/org.eclipse.gmt.modisco.infra.browser/src/org/eclipse/gmt/modisco/infra/browser/core/InstancesForMetaclass.java b/org.eclipse.gmt.modisco.infra.browser/src/org/eclipse/gmt/modisco/infra/browser/core/InstancesForMetaclass.java
index 8ac1f75..9cf832d 100644
--- a/org.eclipse.gmt.modisco.infra.browser/src/org/eclipse/gmt/modisco/infra/browser/core/InstancesForMetaclass.java
+++ b/org.eclipse.gmt.modisco.infra.browser/src/org/eclipse/gmt/modisco/infra/browser/core/InstancesForMetaclass.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2008, 2011 Mia-Software.
+ * Copyright (c) 2008, 2015 Mia-Software.
* 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
@@ -8,6 +8,7 @@
* Contributors:
* Nicolas Bros (Mia-Software) - initial API and implementation
* Nicolas Bros (Mia-Software) - Bug 341252 - [Model Browser] instances in composed models not displayed
+ * Grégoire Dupé (Mia-Software) - Bug 471096 - MetaclassInstance features have to be moved to an EMF dedicated plug-in
*******************************************************************************/
package org.eclipse.gmt.modisco.infra.browser.core;
@@ -24,10 +25,10 @@
import org.eclipse.gmt.modisco.infra.browser.MoDiscoBrowserPlugin;
import org.eclipse.gmt.modisco.infra.browser.editors.BrowserConfiguration;
import org.eclipse.gmt.modisco.infra.browser.uicore.internal.customization.CustomizationEngine;
-import org.eclipse.gmt.modisco.infra.common.core.internal.adapters.instances.MetaclassInstances;
import org.eclipse.gmt.modisco.infra.common.core.internal.utils.ModelUtils;
import org.eclipse.gmt.modisco.infra.facet.Facet;
import org.eclipse.gmt.modisco.infra.facet.core.adapters.instances.MetaclassInstancesAdapterFactoryWithFacet;
+import org.eclipse.modisco.util.emf.core.internal.allinstances.MetaclassInstances;
import org.eclipse.osgi.util.NLS;
/**
diff --git a/org.eclipse.gmt.modisco.infra.browser/src/org/eclipse/gmt/modisco/infra/browser/core/InstancesForMetaclasses.java b/org.eclipse.gmt.modisco.infra.browser/src/org/eclipse/gmt/modisco/infra/browser/core/InstancesForMetaclasses.java
index a24464d..e85bd7e 100644
--- a/org.eclipse.gmt.modisco.infra.browser/src/org/eclipse/gmt/modisco/infra/browser/core/InstancesForMetaclasses.java
+++ b/org.eclipse.gmt.modisco.infra.browser/src/org/eclipse/gmt/modisco/infra/browser/core/InstancesForMetaclasses.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2008, 2011 Mia-Software.
+ * Copyright (c) 2008, 2015 Mia-Software.
* 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
@@ -8,6 +8,7 @@
* Contributors:
* Nicolas Bros (Mia-Software) - initial API and implementation
* Nicolas Bros (Mia-Software) - Bug 341252 - [Model Browser] instances in composed models not displayed
+ * Grégoire Dupé (Mia-Software) - Bug 471096 - MetaclassInstance features have to be moved to an EMF dedicated plug-in
*******************************************************************************/
package org.eclipse.gmt.modisco.infra.browser.core;
@@ -26,13 +27,13 @@
import org.eclipse.emf.ecore.resource.Resource;
import org.eclipse.gmt.modisco.infra.browser.editors.BrowserConfiguration;
import org.eclipse.gmt.modisco.infra.browser.uicore.internal.util.EMFUtil;
-import org.eclipse.gmt.modisco.infra.common.core.internal.adapters.instances.MetaclassInstances;
-import org.eclipse.gmt.modisco.infra.common.core.internal.adapters.instances.ModelChangeListener;
import org.eclipse.gmt.modisco.infra.common.core.internal.utils.ModelUtils;
import org.eclipse.gmt.modisco.infra.facet.Facet;
import org.eclipse.gmt.modisco.infra.facet.core.FacetContext;
import org.eclipse.gmt.modisco.infra.facet.core.FacetContextListener;
import org.eclipse.gmt.modisco.infra.facet.core.adapters.instances.MetaclassInstancesAdapterFactoryWithFacet;
+import org.eclipse.modisco.util.emf.core.internal.allinstances.MetaclassInstances;
+import org.eclipse.modisco.util.emf.core.internal.allinstances.ModelChangeListener;
/**
* A list of metaclasses from the model, each metaclass having an associated
diff --git a/org.eclipse.gmt.modisco.infra.browser/src/org/eclipse/gmt/modisco/infra/browser/editors/EcoreBrowser.java b/org.eclipse.gmt.modisco.infra.browser/src/org/eclipse/gmt/modisco/infra/browser/editors/EcoreBrowser.java
index 5e1436d..3fe04b5 100644
--- a/org.eclipse.gmt.modisco.infra.browser/src/org/eclipse/gmt/modisco/infra/browser/editors/EcoreBrowser.java
+++ b/org.eclipse.gmt.modisco.infra.browser/src/org/eclipse/gmt/modisco/infra/browser/editors/EcoreBrowser.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2008, 2011 Mia-Software.
+ * Copyright (c) 2008, 2015 Mia-Software.
* 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
@@ -11,6 +11,7 @@
* Nicolas Guyomar (Mia-Software) - Code Synchronization
* Nicolas Guyomar (Mia_software) - Bug 333651 Remove of the MoDisco EPackage view and of the metamodel browsing button
* Gregoire Dupe (Mia-Software) - Bug 404263 - EditingDomainProvider does not work when using IResourceEditorInput
+ * Grégoire Dupé (Mia-Software) - Bug 471096 - MetaclassInstance features have to be moved to an EMF dedicated plug-in
* Gregoire Dupe (Mia-Software) - Bug 472182 - Missing debug information in EcoreBrowser.handleChangedResources(2636)
*******************************************************************************/
package org.eclipse.gmt.modisco.infra.browser.editors;
@@ -131,7 +132,6 @@
import org.eclipse.gmt.modisco.infra.browser.uicore.internal.model.ModelElementItem;
import org.eclipse.gmt.modisco.infra.browser.uicore.internal.util.EMFUtil;
import org.eclipse.gmt.modisco.infra.browser.uicore.internal.util.ImageProvider;
-import org.eclipse.gmt.modisco.infra.common.core.internal.adapters.instances.MetaclassInstances;
import org.eclipse.gmt.modisco.infra.common.core.internal.builder.AbstractMoDiscoCatalog.ModiscoCatalogChangeListener;
import org.eclipse.gmt.modisco.infra.common.core.logging.MoDiscoLogger;
import org.eclipse.gmt.modisco.infra.common.ui.internal.controls.FormStyleSashForm;
@@ -168,6 +168,7 @@
import org.eclipse.jface.viewers.TreeSelection;
import org.eclipse.jface.viewers.TreeViewer;
import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.modisco.util.emf.core.internal.allinstances.MetaclassInstances;
import org.eclipse.osgi.util.NLS;
import org.eclipse.swt.SWT;
import org.eclipse.swt.dnd.DND;
diff --git a/org.eclipse.gmt.modisco.infra.capabilities/META-INF/MANIFEST.MF b/org.eclipse.gmt.modisco.infra.capabilities/META-INF/MANIFEST.MF
index fc17425..83d92c7 100644
--- a/org.eclipse.gmt.modisco.infra.capabilities/META-INF/MANIFEST.MF
+++ b/org.eclipse.gmt.modisco.infra.capabilities/META-INF/MANIFEST.MF
@@ -2,5 +2,5 @@
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.gmt.modisco.infra.capabilities;singleton:=true
-Bundle-Version: 0.13.1.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-Vendor: %Bundle-Vendor
diff --git a/org.eclipse.gmt.modisco.infra.common.cdo.derby/META-INF/MANIFEST.MF b/org.eclipse.gmt.modisco.infra.common.cdo.derby/META-INF/MANIFEST.MF
index a13ccf4..53283d7 100644
--- a/org.eclipse.gmt.modisco.infra.common.cdo.derby/META-INF/MANIFEST.MF
+++ b/org.eclipse.gmt.modisco.infra.common.cdo.derby/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.gmt.modisco.infra.common.cdo.derby;singleton:=true
-Bundle-Version: 0.13.1.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-Activator: org.eclipse.gmt.modisco.infra.common.cdo.derby.internal.Activator
Bundle-Vendor: %Bundle-Vendor
Require-Bundle: org.eclipse.ui,
diff --git a/org.eclipse.gmt.modisco.infra.common.cdo/META-INF/MANIFEST.MF b/org.eclipse.gmt.modisco.infra.common.cdo/META-INF/MANIFEST.MF
index 5277c70..2a2fcf3 100644
--- a/org.eclipse.gmt.modisco.infra.common.cdo/META-INF/MANIFEST.MF
+++ b/org.eclipse.gmt.modisco.infra.common.cdo/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.gmt.modisco.infra.common.cdo;singleton:=true
-Bundle-Version: 0.13.1.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-Activator: org.eclipse.gmt.modisco.infra.common.cdo.internal.Activator
Bundle-Vendor: %Bundle-Vendor
Require-Bundle: org.eclipse.ui,
diff --git a/org.eclipse.gmt.modisco.infra.common.core/META-INF/MANIFEST.MF b/org.eclipse.gmt.modisco.infra.common.core/META-INF/MANIFEST.MF
index 8b7223e..88c7718 100644
--- a/org.eclipse.gmt.modisco.infra.common.core/META-INF/MANIFEST.MF
+++ b/org.eclipse.gmt.modisco.infra.common.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.gmt.modisco.infra.common.core;singleton:=true
-Bundle-Version: 0.13.1.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Localization: plugin
@@ -132,122 +132,6 @@
org.eclipse.gmt.modisco.xml.doc,
org.eclipse.gmt.modisco.xml.doc.source,
org.eclipse.gmt.modisco.xml.source",
- org.eclipse.gmt.modisco.infra.common.core.internal.adapters.instances;
- x-friends:="org.eclipse.gmt.modisco.dev.core,
- org.eclipse.gmt.modisco.doc,
- org.eclipse.gmt.modisco.doc.source,
- org.eclipse.gmt.modisco.infra.browser,
- org.eclipse.gmt.modisco.infra.browser.custom,
- org.eclipse.gmt.modisco.infra.browser.custom.core,
- org.eclipse.gmt.modisco.infra.browser.custom.core.source,
- org.eclipse.gmt.modisco.infra.browser.custom.editor,
- org.eclipse.gmt.modisco.infra.browser.custom.editor.source,
- org.eclipse.gmt.modisco.infra.browser.custom.examples.java.jdk,
- org.eclipse.gmt.modisco.infra.browser.custom.examples.java.jdk.source,
- org.eclipse.gmt.modisco.infra.browser.custom.examples.java.jdk.tests,
- org.eclipse.gmt.modisco.infra.browser.custom.examples.uml,
- org.eclipse.gmt.modisco.infra.browser.custom.examples.uml.source,
- org.eclipse.gmt.modisco.infra.browser.custom.examples.uml.tests,
- org.eclipse.gmt.modisco.infra.browser.custom.source,
- org.eclipse.gmt.modisco.infra.browser.custom.tests,
- org.eclipse.gmt.modisco.infra.browser.custom.ui,
- org.eclipse.gmt.modisco.infra.browser.custom.ui.source,
- org.eclipse.gmt.modisco.infra.browser.source,
- org.eclipse.gmt.modisco.infra.common.cdo,
- org.eclipse.gmt.modisco.infra.common.cdo.derby,
- org.eclipse.gmt.modisco.infra.common.cdo.derby.source,
- org.eclipse.gmt.modisco.infra.common.cdo.source,
- org.eclipse.gmt.modisco.infra.common.core,
- org.eclipse.gmt.modisco.infra.common.core.source,
- org.eclipse.gmt.modisco.infra.common.core.tests,
- org.eclipse.gmt.modisco.infra.common.ui,
- org.eclipse.gmt.modisco.infra.common.ui.source,
- org.eclipse.gmt.modisco.infra.discoverymanager,
- org.eclipse.gmt.modisco.infra.discoverymanager.source,
- org.eclipse.gmt.modisco.infra.doc,
- org.eclipse.gmt.modisco.infra.doc.source,
- org.eclipse.gmt.modisco.infra.facet,
- org.eclipse.gmt.modisco.infra.facet.core,
- org.eclipse.gmt.modisco.infra.facet.core.source,
- org.eclipse.gmt.modisco.infra.facet.doc,
- org.eclipse.gmt.modisco.infra.facet.doc.source,
- org.eclipse.gmt.modisco.infra.facet.edit,
- org.eclipse.gmt.modisco.infra.facet.edit.source,
- org.eclipse.gmt.modisco.infra.facet.editor,
- org.eclipse.gmt.modisco.infra.facet.editor.source,
- org.eclipse.gmt.modisco.infra.facet.source,
- org.eclipse.gmt.modisco.infra.facet.tests,
- org.eclipse.gmt.modisco.infra.facet.ui,
- org.eclipse.gmt.modisco.infra.facet.ui.source,
- org.eclipse.gmt.modisco.infra.query,
- org.eclipse.gmt.modisco.infra.query.core,
- org.eclipse.gmt.modisco.infra.query.core.source,
- org.eclipse.gmt.modisco.infra.query.doc,
- org.eclipse.gmt.modisco.infra.query.doc.source,
- org.eclipse.gmt.modisco.infra.query.edit,
- org.eclipse.gmt.modisco.infra.query.edit.source,
- org.eclipse.gmt.modisco.infra.query.editor,
- org.eclipse.gmt.modisco.infra.query.editor.source,
- org.eclipse.gmt.modisco.infra.query.jxpath,
- org.eclipse.gmt.modisco.infra.query.jxpath.source,
- org.eclipse.gmt.modisco.infra.query.source,
- org.eclipse.gmt.modisco.infra.query.tests,
- org.eclipse.gmt.modisco.infra.query.ui,
- org.eclipse.gmt.modisco.infra.query.ui.source,
- org.eclipse.gmt.modisco.java,
- org.eclipse.gmt.modisco.java.browser.customization,
- org.eclipse.gmt.modisco.java.browser.customization.source,
- org.eclipse.gmt.modisco.java.browser.customization.test,
- org.eclipse.gmt.modisco.java.cdo,
- org.eclipse.gmt.modisco.java.cdo.source,
- org.eclipse.gmt.modisco.java.classiceobject,
- org.eclipse.gmt.modisco.java.classiceobject.source,
- org.eclipse.gmt.modisco.java.discoverer,
- org.eclipse.gmt.modisco.java.discoverer.benchmark,
- org.eclipse.gmt.modisco.java.discoverer.benchmark.source,
- org.eclipse.gmt.modisco.java.discoverer.benchmark.tests,
- org.eclipse.gmt.modisco.java.discoverer.cdo,
- org.eclipse.gmt.modisco.java.discoverer.cdo.source,
- org.eclipse.gmt.modisco.java.discoverer.cdo.tests,
- org.eclipse.gmt.modisco.java.discoverer.source,
- org.eclipse.gmt.modisco.java.discoverer.tests,
- org.eclipse.gmt.modisco.java.discoverer.tests.source,
- org.eclipse.gmt.modisco.java.doc,
- org.eclipse.gmt.modisco.java.doc.source,
- org.eclipse.gmt.modisco.java.generation,
- org.eclipse.gmt.modisco.java.generation.source,
- org.eclipse.gmt.modisco.java.generation.tests,
- org.eclipse.gmt.modisco.java.nousages,
- org.eclipse.gmt.modisco.java.nousages.cdo,
- org.eclipse.gmt.modisco.java.nousages.cdo.source,
- org.eclipse.gmt.modisco.java.nousages.source,
- org.eclipse.gmt.modisco.java.queries,
- org.eclipse.gmt.modisco.java.queries.source,
- org.eclipse.gmt.modisco.java.queries.tests,
- org.eclipse.gmt.modisco.java.source,
- org.eclipse.gmt.modisco.kdm.source.discoverer,
- org.eclipse.gmt.modisco.kdm.source.discoverer.source,
- org.eclipse.gmt.modisco.kdm.uml2converter,
- org.eclipse.gmt.modisco.kdm.uml2converter.source,
- org.eclipse.gmt.modisco.omg.kdm,
- org.eclipse.gmt.modisco.omg.kdm.source,
- org.eclipse.gmt.modisco.omg.smm,
- org.eclipse.gmt.modisco.omg.smm.source,
- org.eclipse.gmt.modisco.tests,
- org.eclipse.gmt.modisco.tool.metricsvisualizationbuilder,
- org.eclipse.gmt.modisco.usecase.junit.helper,
- org.eclipse.gmt.modisco.usecase.modelplex.examples.customization,
- org.eclipse.gmt.modisco.workflow,
- org.eclipse.gmt.modisco.workflow.mwe,
- org.eclipse.gmt.modisco.workflow.mwe.source,
- org.eclipse.gmt.modisco.workflow.source,
- org.eclipse.gmt.modisco.xml,
- org.eclipse.gmt.modisco.xml.discoverer,
- org.eclipse.gmt.modisco.xml.discoverer.source,
- org.eclipse.gmt.modisco.xml.discoverer.tests,
- org.eclipse.gmt.modisco.xml.doc,
- org.eclipse.gmt.modisco.xml.doc.source,
- org.eclipse.gmt.modisco.xml.source",
org.eclipse.gmt.modisco.infra.common.core.internal.amwpropparser;
x-friends:="org.eclipse.gmt.modisco.dev.core,
org.eclipse.gmt.modisco.doc,
diff --git a/org.eclipse.gmt.modisco.infra.common.ui/META-INF/MANIFEST.MF b/org.eclipse.gmt.modisco.infra.common.ui/META-INF/MANIFEST.MF
index f76ff3a..ce65053 100644
--- a/org.eclipse.gmt.modisco.infra.common.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.gmt.modisco.infra.common.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.gmt.modisco.infra.common.ui;singleton:=true
-Bundle-Version: 0.13.1.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-Activator: org.eclipse.gmt.modisco.infra.common.ui.internal.MoDiscoCommonUIPlugin
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
diff --git a/org.eclipse.gmt.modisco.infra.discoverymanager/META-INF/MANIFEST.MF b/org.eclipse.gmt.modisco.infra.discoverymanager/META-INF/MANIFEST.MF
index 76ef85b..b51bf4e 100644
--- a/org.eclipse.gmt.modisco.infra.discoverymanager/META-INF/MANIFEST.MF
+++ b/org.eclipse.gmt.modisco.infra.discoverymanager/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.gmt.modisco.infra.discoverymanager;singleton:=true
Bundle-Vendor: %providerName
-Bundle-Version: 0.13.1.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-ClassPath: .
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/org.eclipse.gmt.modisco.infra.facet.core/META-INF/MANIFEST.MF b/org.eclipse.gmt.modisco.infra.facet.core/META-INF/MANIFEST.MF
index 24f6000..8025569 100644
--- a/org.eclipse.gmt.modisco.infra.facet.core/META-INF/MANIFEST.MF
+++ b/org.eclipse.gmt.modisco.infra.facet.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.gmt.modisco.infra.facet.core;singleton:=true
-Bundle-Version: 0.13.1.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-Activator: org.eclipse.gmt.modisco.infra.facet.core.internal.Activator
Bundle-Vendor: %Bundle-Vendor
Require-Bundle: org.eclipse.ui,
@@ -10,7 +10,8 @@
org.eclipse.core.resources,
org.eclipse.gmt.modisco.infra.common.core,
org.eclipse.gmt.modisco.infra.facet,
- org.eclipse.gmt.modisco.infra.query.core
+ org.eclipse.gmt.modisco.infra.query.core,
+ org.eclipse.modisco.util.emf.core;bundle-version="1.0.0"
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-ActivationPolicy: lazy
Export-Package: org.eclipse.gmt.modisco.infra.facet.core,
diff --git a/org.eclipse.gmt.modisco.infra.facet.core/src/org/eclipse/gmt/modisco/infra/facet/core/FacetContext.java b/org.eclipse.gmt.modisco.infra.facet.core/src/org/eclipse/gmt/modisco/infra/facet/core/FacetContext.java
index 7968159..0465500 100644
--- a/org.eclipse.gmt.modisco.infra.facet.core/src/org/eclipse/gmt/modisco/infra/facet/core/FacetContext.java
+++ b/org.eclipse.gmt.modisco.infra.facet.core/src/org/eclipse/gmt/modisco/infra/facet/core/FacetContext.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2009, 2011 Mia-Software.
+ * Copyright (c) 2009, 2015 Mia-Software.
* 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
@@ -8,6 +8,7 @@
* Contributors:
* Gregoire DUPE (Mia-Software)
* Nicolas Bros (Mia-Software)
+ * Grégoire Dupé (Mia-Software) - Bug 471096 - MetaclassInstance features have to be moved to an EMF dedicated plug-in
*******************************************************************************/
package org.eclipse.gmt.modisco.infra.facet.core;
@@ -29,7 +30,6 @@
import org.eclipse.emf.ecore.EStructuralFeature;
import org.eclipse.emf.ecore.resource.Resource;
import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.gmt.modisco.infra.common.core.internal.adapters.instances.MetaclassInstances;
import org.eclipse.gmt.modisco.infra.common.core.logging.MoDiscoLogger;
import org.eclipse.gmt.modisco.infra.facet.Facet;
import org.eclipse.gmt.modisco.infra.facet.FacetAttribute;
@@ -45,6 +45,7 @@
import org.eclipse.gmt.modisco.infra.query.core.AbstractModelQuery;
import org.eclipse.gmt.modisco.infra.query.core.ModelQuerySetCatalog;
import org.eclipse.gmt.modisco.infra.query.core.exception.ModelQueryException;
+import org.eclipse.modisco.util.emf.core.internal.allinstances.MetaclassInstances;
/**
* @author Gregoire DUPE
diff --git a/org.eclipse.gmt.modisco.infra.facet.core/src/org/eclipse/gmt/modisco/infra/facet/core/adapters/instances/MetaclassInstancesAdapterFactoryWithFacet.java b/org.eclipse.gmt.modisco.infra.facet.core/src/org/eclipse/gmt/modisco/infra/facet/core/adapters/instances/MetaclassInstancesAdapterFactoryWithFacet.java
index 88663c2..61fcdea 100644
--- a/org.eclipse.gmt.modisco.infra.facet.core/src/org/eclipse/gmt/modisco/infra/facet/core/adapters/instances/MetaclassInstancesAdapterFactoryWithFacet.java
+++ b/org.eclipse.gmt.modisco.infra.facet.core/src/org/eclipse/gmt/modisco/infra/facet/core/adapters/instances/MetaclassInstancesAdapterFactoryWithFacet.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2010, 2011 Mia-Software.
+ * Copyright (c) 2010, 2015 Mia-Software.
* 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
@@ -7,6 +7,7 @@
*
* Contributors:
* Nicolas Bros (Mia-Software) - initial API and implementation
+ * Grégoire Dupé (Mia-Software) - Bug 471096 - MetaclassInstance features have to be moved to an EMF dedicated plug-in
*******************************************************************************/
package org.eclipse.gmt.modisco.infra.facet.core.adapters.instances;
@@ -14,8 +15,8 @@
import org.eclipse.emf.common.notify.Notifier;
import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.gmt.modisco.infra.common.core.internal.adapters.instances.MetaclassInstances;
import org.eclipse.gmt.modisco.infra.facet.core.FacetContext;
+import org.eclipse.modisco.util.emf.core.internal.allinstances.MetaclassInstances;
/**
* @deprecated Replaced by EMF Facet
diff --git a/org.eclipse.gmt.modisco.infra.facet.core/src/org/eclipse/gmt/modisco/infra/facet/core/adapters/instances/MetaclassInstancesAdapterWithFacet.java b/org.eclipse.gmt.modisco.infra.facet.core/src/org/eclipse/gmt/modisco/infra/facet/core/adapters/instances/MetaclassInstancesAdapterWithFacet.java
index e1e2eb6..a82955a 100644
--- a/org.eclipse.gmt.modisco.infra.facet.core/src/org/eclipse/gmt/modisco/infra/facet/core/adapters/instances/MetaclassInstancesAdapterWithFacet.java
+++ b/org.eclipse.gmt.modisco.infra.facet.core/src/org/eclipse/gmt/modisco/infra/facet/core/adapters/instances/MetaclassInstancesAdapterWithFacet.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2010, 2011 Mia-Software.
+ * Copyright (c) 2010, 2015 Mia-Software.
* 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
@@ -7,6 +7,7 @@
*
* Contributors:
* Nicolas Bros (Mia-Software) - initial API and implementation
+ * Grégoire Dupé (Mia-Software) - Bug 471096 - MetaclassInstance features have to be moved to an EMF dedicated plug-in
*******************************************************************************/
package org.eclipse.gmt.modisco.infra.facet.core.adapters.instances;
@@ -22,7 +23,6 @@
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.gmt.modisco.infra.common.core.internal.adapters.instances.MetaclassInstancesAdapter;
import org.eclipse.gmt.modisco.infra.common.core.logging.MoDiscoLogger;
import org.eclipse.gmt.modisco.infra.facet.Facet;
import org.eclipse.gmt.modisco.infra.facet.core.FacetContext;
@@ -32,6 +32,7 @@
import org.eclipse.gmt.modisco.infra.facet.core.internal.extensions.RefreshStrategiesRegistry;
import org.eclipse.gmt.modisco.infra.query.core.exception.ModelQueryException;
import org.eclipse.gmt.modisco.infra.query.core.exception.ProjectDisabledException;
+import org.eclipse.modisco.util.emf.core.internal.allinstances.MetaclassInstancesAdapter;
/**
* An adapter that acts as a cache for lists of instances by EClass (extending
diff --git a/org.eclipse.gmt.modisco.infra.facet.edit/META-INF/MANIFEST.MF b/org.eclipse.gmt.modisco.infra.facet.edit/META-INF/MANIFEST.MF
index 0e78542..573f605 100644
--- a/org.eclipse.gmt.modisco.infra.facet.edit/META-INF/MANIFEST.MF
+++ b/org.eclipse.gmt.modisco.infra.facet.edit/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.gmt.modisco.infra.facet.edit;singleton:=true
-Bundle-Version: 0.13.1.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-ClassPath: .
Bundle-Activator: org.eclipse.gmt.modisco.infra.facet.edit.provider.FacetEditPlugin$Implementation
Bundle-Vendor: %providerName
diff --git a/org.eclipse.gmt.modisco.infra.facet.editor/META-INF/MANIFEST.MF b/org.eclipse.gmt.modisco.infra.facet.editor/META-INF/MANIFEST.MF
index fffa57b..47c85ff 100644
--- a/org.eclipse.gmt.modisco.infra.facet.editor/META-INF/MANIFEST.MF
+++ b/org.eclipse.gmt.modisco.infra.facet.editor/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.gmt.modisco.infra.facet.editor;singleton:=true
-Bundle-Version: 0.13.1.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-ClassPath: .
Bundle-Activator: org.eclipse.gmt.modisco.infra.facet.editor.presentation.FacetEditorPlugin$Implementation
Bundle-Vendor: %providerName
diff --git a/org.eclipse.gmt.modisco.infra.facet.examples.kdm/META-INF/MANIFEST.MF b/org.eclipse.gmt.modisco.infra.facet.examples.kdm/META-INF/MANIFEST.MF
index 4875f4a..d2974a4 100644
--- a/org.eclipse.gmt.modisco.infra.facet.examples.kdm/META-INF/MANIFEST.MF
+++ b/org.eclipse.gmt.modisco.infra.facet.examples.kdm/META-INF/MANIFEST.MF
@@ -14,4 +14,4 @@
org.eclipse.emf.ecore,
org.eclipse.gmt.modisco.infra.facet.core,
com.ibm.icu;bundle-version="4.2.1"
-Bundle-Version: 0.13.1.qualifier
+Bundle-Version: 1.0.0.qualifier
diff --git a/org.eclipse.gmt.modisco.infra.facet.ui/META-INF/MANIFEST.MF b/org.eclipse.gmt.modisco.infra.facet.ui/META-INF/MANIFEST.MF
index 478e798..6518c59 100644
--- a/org.eclipse.gmt.modisco.infra.facet.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.gmt.modisco.infra.facet.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.gmt.modisco.infra.facet.ui;singleton:=true
-Bundle-Version: 0.13.1.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-Activator: org.eclipse.gmt.modisco.infra.facet.ui.Activator
Bundle-Vendor: %Bundle-Vendor
Require-Bundle: org.eclipse.core.runtime,
diff --git a/org.eclipse.gmt.modisco.infra.facet/META-INF/MANIFEST.MF b/org.eclipse.gmt.modisco.infra.facet/META-INF/MANIFEST.MF
index 0d642e0..65a1dbd 100644
--- a/org.eclipse.gmt.modisco.infra.facet/META-INF/MANIFEST.MF
+++ b/org.eclipse.gmt.modisco.infra.facet/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.gmt.modisco.infra.facet;singleton:=true
-Bundle-Version: 0.13.1.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Localization: plugin
diff --git a/org.eclipse.gmt.modisco.infra.prefuse/META-INF/MANIFEST.MF b/org.eclipse.gmt.modisco.infra.prefuse/META-INF/MANIFEST.MF
index 8454104..e3ed602 100644
--- a/org.eclipse.gmt.modisco.infra.prefuse/META-INF/MANIFEST.MF
+++ b/org.eclipse.gmt.modisco.infra.prefuse/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.gmt.modisco.infra.prefuse;singleton:=true
-Bundle-Version: 0.13.1.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-Activator: org.eclipse.gmt.modisco.infra.prefuse.Activator
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
diff --git a/org.eclipse.gmt.modisco.infra.query.core/META-INF/MANIFEST.MF b/org.eclipse.gmt.modisco.infra.query.core/META-INF/MANIFEST.MF
index f951e7f..1d6ddca 100644
--- a/org.eclipse.gmt.modisco.infra.query.core/META-INF/MANIFEST.MF
+++ b/org.eclipse.gmt.modisco.infra.query.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.gmt.modisco.infra.query.core;singleton:=true
-Bundle-Version: 0.13.1.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-Activator: org.eclipse.gmt.modisco.infra.query.core.internal.Activator
Bundle-Vendor: %Bundle-Vendor
Require-Bundle: org.eclipse.core.runtime,
diff --git a/org.eclipse.gmt.modisco.infra.query.edit/META-INF/MANIFEST.MF b/org.eclipse.gmt.modisco.infra.query.edit/META-INF/MANIFEST.MF
index 728b528..a7d6b2b 100644
--- a/org.eclipse.gmt.modisco.infra.query.edit/META-INF/MANIFEST.MF
+++ b/org.eclipse.gmt.modisco.infra.query.edit/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.gmt.modisco.infra.query.edit;singleton:=true
-Bundle-Version: 0.13.1.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-ClassPath: .
Bundle-Activator: org.eclipse.gmt.modisco.infra.query.edit.provider.QueryEditPlugin$Implementation
Bundle-Vendor: %providerName
diff --git a/org.eclipse.gmt.modisco.infra.query.editor/META-INF/MANIFEST.MF b/org.eclipse.gmt.modisco.infra.query.editor/META-INF/MANIFEST.MF
index e165d53..4731d90 100644
--- a/org.eclipse.gmt.modisco.infra.query.editor/META-INF/MANIFEST.MF
+++ b/org.eclipse.gmt.modisco.infra.query.editor/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.gmt.modisco.infra.query.editor;singleton:=true
-Bundle-Version: 0.13.1.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-ClassPath: .
Bundle-Activator: org.eclipse.gmt.modisco.infra.query.editor.presentation.QueryEditorPlugin$Implementation
Bundle-Vendor: %providerName
diff --git a/org.eclipse.gmt.modisco.infra.query.jxpath/META-INF/MANIFEST.MF b/org.eclipse.gmt.modisco.infra.query.jxpath/META-INF/MANIFEST.MF
index 54f87cc..50f67bc 100644
--- a/org.eclipse.gmt.modisco.infra.query.jxpath/META-INF/MANIFEST.MF
+++ b/org.eclipse.gmt.modisco.infra.query.jxpath/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.gmt.modisco.infra.query.jxpath;singleton:=true
-Bundle-Version: 0.13.1.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Localization: plugin
diff --git a/org.eclipse.gmt.modisco.infra.query.ui/META-INF/MANIFEST.MF b/org.eclipse.gmt.modisco.infra.query.ui/META-INF/MANIFEST.MF
index 671650b..c9cd248 100644
--- a/org.eclipse.gmt.modisco.infra.query.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.gmt.modisco.infra.query.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.gmt.modisco.infra.query.ui;singleton:=true
-Bundle-Version: 0.13.1.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-Activator: org.eclipse.gmt.modisco.infra.query.ui.Activator
Bundle-Vendor: %Bundle-Vendor
Require-Bundle: org.eclipse.core.runtime,
diff --git a/org.eclipse.gmt.modisco.infra.query/META-INF/MANIFEST.MF b/org.eclipse.gmt.modisco.infra.query/META-INF/MANIFEST.MF
index 7b12585..13ee087 100644
--- a/org.eclipse.gmt.modisco.infra.query/META-INF/MANIFEST.MF
+++ b/org.eclipse.gmt.modisco.infra.query/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.gmt.modisco.infra.query;singleton:=true
-Bundle-Version: 0.13.1.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Localization: plugin
diff --git a/org.eclipse.gmt.modisco.java.browser.customization/META-INF/MANIFEST.MF b/org.eclipse.gmt.modisco.java.browser.customization/META-INF/MANIFEST.MF
index afbe682..6f13425 100644
--- a/org.eclipse.gmt.modisco.java.browser.customization/META-INF/MANIFEST.MF
+++ b/org.eclipse.gmt.modisco.java.browser.customization/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.gmt.modisco.java.browser.customization;singleton:=true
-Bundle-Version: 0.13.1.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-Vendor:
%Bundle-Vendor
Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/org.eclipse.gmt.modisco.java.cdo/META-INF/MANIFEST.MF b/org.eclipse.gmt.modisco.java.cdo/META-INF/MANIFEST.MF
index 8e071c7..760e8de 100644
--- a/org.eclipse.gmt.modisco.java.cdo/META-INF/MANIFEST.MF
+++ b/org.eclipse.gmt.modisco.java.cdo/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.gmt.modisco.java.cdo;singleton:=true
-Bundle-Version: 0.13.1.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Localization: plugin
diff --git a/org.eclipse.gmt.modisco.java.classiceobject/META-INF/MANIFEST.MF b/org.eclipse.gmt.modisco.java.classiceobject/META-INF/MANIFEST.MF
index aaf83fa..22f3ec0 100644
--- a/org.eclipse.gmt.modisco.java.classiceobject/META-INF/MANIFEST.MF
+++ b/org.eclipse.gmt.modisco.java.classiceobject/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.gmt.modisco.java.classiceobject;singleton:=true
-Bundle-Version: 0.13.1.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Localization: plugin
diff --git a/org.eclipse.gmt.modisco.java.discoverer.benchmark.tests/META-INF/MANIFEST.MF b/org.eclipse.gmt.modisco.java.discoverer.benchmark.tests/META-INF/MANIFEST.MF
index 8fc4cce..6e1ed67 100644
--- a/org.eclipse.gmt.modisco.java.discoverer.benchmark.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.gmt.modisco.java.discoverer.benchmark.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.gmt.modisco.java.discoverer.benchmark.tests
-Bundle-Version: 0.13.1.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-Activator: org.eclipse.gmt.modisco.java.discoverer.benchmark.tests.Activator
Bundle-Vendor: %Bundle-Vendor
Require-Bundle: org.eclipse.ui,
diff --git a/org.eclipse.gmt.modisco.java.discoverer.benchmark/META-INF/MANIFEST.MF b/org.eclipse.gmt.modisco.java.discoverer.benchmark/META-INF/MANIFEST.MF
index 6f64f30..5edcc21 100644
--- a/org.eclipse.gmt.modisco.java.discoverer.benchmark/META-INF/MANIFEST.MF
+++ b/org.eclipse.gmt.modisco.java.discoverer.benchmark/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.gmt.modisco.java.discoverer.benchmark;singleton:=true
-Bundle-Version: 0.13.1.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-Activator: org.eclipse.gmt.modisco.java.discoverer.benchmark.Activator
Bundle-Vendor: %Bundle-Vendor
Require-Bundle: org.eclipse.gmt.modisco.java;bundle-version="0.7.0",
diff --git a/org.eclipse.gmt.modisco.java.discoverer.cdo.tests/META-INF/MANIFEST.MF b/org.eclipse.gmt.modisco.java.discoverer.cdo.tests/META-INF/MANIFEST.MF
index aea247b..449d64e 100644
--- a/org.eclipse.gmt.modisco.java.discoverer.cdo.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.gmt.modisco.java.discoverer.cdo.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.gmt.modisco.java.discoverer.cdo.tests;singleton:=true
-Bundle-Version: 0.13.1.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-Activator: org.eclipse.gmt.modisco.java.discoverer.cdo.tests.Activator
Bundle-Vendor: %Bundle-Vendor
Require-Bundle: org.eclipse.gmt.modisco.infra.discoverymanager;bundle-version="0.5.1",
diff --git a/org.eclipse.gmt.modisco.java.discoverer.cdo/META-INF/MANIFEST.MF b/org.eclipse.gmt.modisco.java.discoverer.cdo/META-INF/MANIFEST.MF
index 47530a1..fefe92c 100644
--- a/org.eclipse.gmt.modisco.java.discoverer.cdo/META-INF/MANIFEST.MF
+++ b/org.eclipse.gmt.modisco.java.discoverer.cdo/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.gmt.modisco.java.discoverer.cdo
-Bundle-Version: 0.13.1.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-Activator: org.eclipse.gmt.modisco.java.discoverer.cdo.Activator
Bundle-Vendor: %Bundle-Vendor
Require-Bundle: org.eclipse.gmt.modisco.infra.discoverymanager;bundle-version="0.5.1",
diff --git a/org.eclipse.gmt.modisco.java.discoverer.tests/META-INF/MANIFEST.MF b/org.eclipse.gmt.modisco.java.discoverer.tests/META-INF/MANIFEST.MF
index 9b180cb..10373f3 100644
--- a/org.eclipse.gmt.modisco.java.discoverer.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.gmt.modisco.java.discoverer.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.gmt.modisco.java.discoverer.tests;singleton:=true
-Bundle-Version: 0.13.1.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-Activator: org.eclipse.gmt.modisco.java.discoverer.tests.Activator
Bundle-Vendor: %Bundle-Vendor
Require-Bundle: org.eclipse.gmt.modisco.infra.discoverymanager,
diff --git a/org.eclipse.gmt.modisco.java.discoverer/META-INF/MANIFEST.MF b/org.eclipse.gmt.modisco.java.discoverer/META-INF/MANIFEST.MF
index 80d6253..aa0fb31 100644
--- a/org.eclipse.gmt.modisco.java.discoverer/META-INF/MANIFEST.MF
+++ b/org.eclipse.gmt.modisco.java.discoverer/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@
Bundle-ActivationPolicy: lazy
Bundle-Vendor: %Bundle-Vendor
Bundle-SymbolicName: org.eclipse.gmt.modisco.java.discoverer;singleton:=true
-Bundle-Version: 0.13.1.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-Name: %Bundle-Name
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Require-Bundle: org.eclipse.core.runtime,
diff --git a/org.eclipse.gmt.modisco.java.generation/META-INF/MANIFEST.MF b/org.eclipse.gmt.modisco.java.generation/META-INF/MANIFEST.MF
index 65d02b0..3daaaf6 100644
--- a/org.eclipse.gmt.modisco.java.generation/META-INF/MANIFEST.MF
+++ b/org.eclipse.gmt.modisco.java.generation/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.gmt.modisco.java.generation;singleton:=true
-Bundle-Version: 0.13.1.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-Activator: org.eclipse.gmt.modisco.java.generation.Activator
Bundle-Vendor: %Bundle-Vendor
Require-Bundle: org.eclipse.core.runtime,
diff --git a/org.eclipse.gmt.modisco.java.nousages.cdo/META-INF/MANIFEST.MF b/org.eclipse.gmt.modisco.java.nousages.cdo/META-INF/MANIFEST.MF
index 6466a21..158b8dd 100644
--- a/org.eclipse.gmt.modisco.java.nousages.cdo/META-INF/MANIFEST.MF
+++ b/org.eclipse.gmt.modisco.java.nousages.cdo/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.gmt.modisco.java.nousages.cdo;singleton:=true
-Bundle-Version: 0.13.1.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Localization: plugin
diff --git a/org.eclipse.gmt.modisco.java.nousages/META-INF/MANIFEST.MF b/org.eclipse.gmt.modisco.java.nousages/META-INF/MANIFEST.MF
index 93a852f..3379034 100644
--- a/org.eclipse.gmt.modisco.java.nousages/META-INF/MANIFEST.MF
+++ b/org.eclipse.gmt.modisco.java.nousages/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.gmt.modisco.java.nousages;singleton:=true
-Bundle-Version: 0.13.1.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Localization: plugin
diff --git a/org.eclipse.gmt.modisco.java.queries/META-INF/MANIFEST.MF b/org.eclipse.gmt.modisco.java.queries/META-INF/MANIFEST.MF
index 5b86c9d..058fc09 100644
--- a/org.eclipse.gmt.modisco.java.queries/META-INF/MANIFEST.MF
+++ b/org.eclipse.gmt.modisco.java.queries/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.gmt.modisco.java.queries;singleton:=true
-Bundle-Version: 0.13.1.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-Vendor: %Bundle-Vendor
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-ActivationPolicy: lazy
diff --git a/org.eclipse.gmt.modisco.java/META-INF/MANIFEST.MF b/org.eclipse.gmt.modisco.java/META-INF/MANIFEST.MF
index 57103cb..4b1ff3d 100644
--- a/org.eclipse.gmt.modisco.java/META-INF/MANIFEST.MF
+++ b/org.eclipse.gmt.modisco.java/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.gmt.modisco.java;singleton:=true
-Bundle-Version: 0.13.1.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %Bundle-Vendor
Bundle-Localization: plugin
diff --git a/org.eclipse.gmt.modisco.kdm.browser.extension/META-INF/MANIFEST.MF b/org.eclipse.gmt.modisco.kdm.browser.extension/META-INF/MANIFEST.MF
index 69d7d78..501a866 100644
--- a/org.eclipse.gmt.modisco.kdm.browser.extension/META-INF/MANIFEST.MF
+++ b/org.eclipse.gmt.modisco.kdm.browser.extension/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.gmt.modisco.kdm.browser.extension;singleton:=true
-Bundle-Version: 0.13.1.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-Activator: org.eclipse.gmt.modisco.kdm.browser.extension.Activator
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
diff --git a/org.eclipse.gmt.modisco.kdm.source.discoverer/META-INF/MANIFEST.MF b/org.eclipse.gmt.modisco.kdm.source.discoverer/META-INF/MANIFEST.MF
index 4a63442..4e96427 100644
--- a/org.eclipse.gmt.modisco.kdm.source.discoverer/META-INF/MANIFEST.MF
+++ b/org.eclipse.gmt.modisco.kdm.source.discoverer/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.gmt.modisco.kdm.source.discoverer;singleton:=true
-Bundle-Version: 0.13.1.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-Activator: org.eclipse.gmt.modisco.kdm.source.discoverer.plugin.Activator
Bundle-Vendor: %providerName
Bundle-ClassPath: .
diff --git a/org.eclipse.gmt.modisco.kdm.uml2converter.tests/META-INF/MANIFEST.MF b/org.eclipse.gmt.modisco.kdm.uml2converter.tests/META-INF/MANIFEST.MF
index c7bca86..17dcc9a 100644
--- a/org.eclipse.gmt.modisco.kdm.uml2converter.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.gmt.modisco.kdm.uml2converter.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.gmt.modisco.kdm.uml2converter.tests;singleton:=true
-Bundle-Version: 0.13.1.qualifier
+Bundle-Version: 1.0.0.qualifier
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.ui,
org.eclipse.gmt.modisco.kdm.uml2converter,
diff --git a/org.eclipse.gmt.modisco.kdm.uml2converter/META-INF/MANIFEST.MF b/org.eclipse.gmt.modisco.kdm.uml2converter/META-INF/MANIFEST.MF
index 21195c5..c3883ce 100644
--- a/org.eclipse.gmt.modisco.kdm.uml2converter/META-INF/MANIFEST.MF
+++ b/org.eclipse.gmt.modisco.kdm.uml2converter/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.gmt.modisco.kdm.uml2converter;singleton:=true
-Bundle-Version: 0.13.1.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-Activator: org.eclipse.gmt.modisco.kdm.uml2converter.KdmToUml2Activator
Bundle-Vendor: %providerName
Bundle-ClassPath: .
diff --git a/org.eclipse.gmt.modisco.omg.kdm/META-INF/MANIFEST.MF b/org.eclipse.gmt.modisco.omg.kdm/META-INF/MANIFEST.MF
index 26b9acc..085bdff 100644
--- a/org.eclipse.gmt.modisco.omg.kdm/META-INF/MANIFEST.MF
+++ b/org.eclipse.gmt.modisco.omg.kdm/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.gmt.modisco.omg.kdm;singleton:=true
-Bundle-Version: 0.13.1.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Localization: plugin
diff --git a/org.eclipse.gmt.modisco.omg.smm/META-INF/MANIFEST.MF b/org.eclipse.gmt.modisco.omg.smm/META-INF/MANIFEST.MF
index 211dacc..703cf37 100644
--- a/org.eclipse.gmt.modisco.omg.smm/META-INF/MANIFEST.MF
+++ b/org.eclipse.gmt.modisco.omg.smm/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.gmt.modisco.omg.smm;singleton:=true
-Bundle-Version: 0.13.1.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Localization: plugin
diff --git a/org.eclipse.gmt.modisco.tool.metricsvisualizationbuilder/META-INF/MANIFEST.MF b/org.eclipse.gmt.modisco.tool.metricsvisualizationbuilder/META-INF/MANIFEST.MF
index ddee242..d91917a 100644
--- a/org.eclipse.gmt.modisco.tool.metricsvisualizationbuilder/META-INF/MANIFEST.MF
+++ b/org.eclipse.gmt.modisco.tool.metricsvisualizationbuilder/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.gmt.modisco.tool.metricsvisualizationbuilder
-Bundle-Version: 0.13.1.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-Vendor: %providerName
Bundle-ClassPath: .
Bundle-Localization: plugin
diff --git a/org.eclipse.gmt.modisco.usecase.modelfilter.dependencies/META-INF/MANIFEST.MF b/org.eclipse.gmt.modisco.usecase.modelfilter.dependencies/META-INF/MANIFEST.MF
index 7c80f45..cb25e6b 100644
--- a/org.eclipse.gmt.modisco.usecase.modelfilter.dependencies/META-INF/MANIFEST.MF
+++ b/org.eclipse.gmt.modisco.usecase.modelfilter.dependencies/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.gmt.modisco.usecase.modelfilter.dependencies;singleton:=true
-Bundle-Version: 0.13.1.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-Activator: org.eclipse.gmt.modisco.usecase.modelfilter.dependencies.Activator
Bundle-Vendor: %Bundle-Vendor
Require-Bundle: org.eclipse.core.runtime,
diff --git a/org.eclipse.gmt.modisco.usecase.modelfilter.methodcalls/META-INF/MANIFEST.MF b/org.eclipse.gmt.modisco.usecase.modelfilter.methodcalls/META-INF/MANIFEST.MF
index 434898b..5d70bc0 100644
--- a/org.eclipse.gmt.modisco.usecase.modelfilter.methodcalls/META-INF/MANIFEST.MF
+++ b/org.eclipse.gmt.modisco.usecase.modelfilter.methodcalls/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.gmt.modisco.usecase.modelfilter.methodcalls;singleton:=true
-Bundle-Version: 0.13.1.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-Activator: org.eclipse.gmt.modisco.usecase.modelfilter.methodcalls.Activator
Bundle-Vendor: %Bundle-Vendor
Require-Bundle: org.eclipse.core.runtime,
diff --git a/org.eclipse.gmt.modisco.usecase.modelfilter/META-INF/MANIFEST.MF b/org.eclipse.gmt.modisco.usecase.modelfilter/META-INF/MANIFEST.MF
index 1c05b7c..fd1105c 100644
--- a/org.eclipse.gmt.modisco.usecase.modelfilter/META-INF/MANIFEST.MF
+++ b/org.eclipse.gmt.modisco.usecase.modelfilter/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.eclipse.gmt.modisco.usecase.modelfilter;singleton:=true
-Bundle-Version: 0.13.1.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-Activator: org.eclipse.gmt.modisco.usecases.modelfilter.ModelFilterActivator
Require-Bundle: org.eclipse.ui,
org.eclipse.jdt.core,
diff --git a/org.eclipse.gmt.modisco.usecase.modelplex.examples.customization/META-INF/MANIFEST.MF b/org.eclipse.gmt.modisco.usecase.modelplex.examples.customization/META-INF/MANIFEST.MF
index 24610be..157c0b8 100644
--- a/org.eclipse.gmt.modisco.usecase.modelplex.examples.customization/META-INF/MANIFEST.MF
+++ b/org.eclipse.gmt.modisco.usecase.modelplex.examples.customization/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.gmt.modisco.usecase.modelplex.examples.customization;singleton:=true
-Bundle-Version: 0.13.1.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-Vendor: %Bundle-Vendor
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-ActivationPolicy: lazy
diff --git a/org.eclipse.gmt.modisco.usecase.simpletransformationschain/META-INF/MANIFEST.MF b/org.eclipse.gmt.modisco.usecase.simpletransformationschain/META-INF/MANIFEST.MF
index 8e55790..3180069 100644
--- a/org.eclipse.gmt.modisco.usecase.simpletransformationschain/META-INF/MANIFEST.MF
+++ b/org.eclipse.gmt.modisco.usecase.simpletransformationschain/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.eclipse.gmt.modisco.usecase.simpletransformationschain;singleton:=true
-Bundle-Version: 0.13.1.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-Activator: org.eclipse.gmt.modisco.usecase.simpletransformationschain.ModelplexKnowledgeDiscoveryFrameworkPlugin
Require-Bundle: org.eclipse.core.resources,
org.eclipse.ui,
diff --git a/org.eclipse.gmt.modisco.workflow.mwe/META-INF/MANIFEST.MF b/org.eclipse.gmt.modisco.workflow.mwe/META-INF/MANIFEST.MF
index daec971..729910d 100644
--- a/org.eclipse.gmt.modisco.workflow.mwe/META-INF/MANIFEST.MF
+++ b/org.eclipse.gmt.modisco.workflow.mwe/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.eclipse.gmt.modisco.workflow.mwe;singleton:=true
-Bundle-Version: 0.13.1.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-ClassPath: .
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/org.eclipse.gmt.modisco.workflow/META-INF/MANIFEST.MF b/org.eclipse.gmt.modisco.workflow/META-INF/MANIFEST.MF
index 0a87433..ca18c8f 100644
--- a/org.eclipse.gmt.modisco.workflow/META-INF/MANIFEST.MF
+++ b/org.eclipse.gmt.modisco.workflow/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.gmt.modisco.workflow;singleton:=true
-Bundle-Version: 0.13.1.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-ActivationPolicy: lazy
Bundle-Activator: org.eclipse.gmt.modisco.workflow.Activator
diff --git a/org.eclipse.gmt.modisco.xml.browser.customization/META-INF/MANIFEST.MF b/org.eclipse.gmt.modisco.xml.browser.customization/META-INF/MANIFEST.MF
index c0d230e..1d21123 100644
--- a/org.eclipse.gmt.modisco.xml.browser.customization/META-INF/MANIFEST.MF
+++ b/org.eclipse.gmt.modisco.xml.browser.customization/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.gmt.modisco.xml.browser.customization;singleton:=true
-Bundle-Version: 0.13.1.qualifier
+Bundle-Version: 1.0.0.qualifier
Require-Bundle: org.eclipse.gmt.modisco.infra.query.core
Bundle-ActivationPolicy: lazy
Bundle-Vendor: %Bundle-Vendor
diff --git a/org.eclipse.gmt.modisco.xml.discoverer.tests/META-INF/MANIFEST.MF b/org.eclipse.gmt.modisco.xml.discoverer.tests/META-INF/MANIFEST.MF
index aa7b8f2..29eac84 100644
--- a/org.eclipse.gmt.modisco.xml.discoverer.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.gmt.modisco.xml.discoverer.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.gmt.modisco.xml.discoverer.tests
-Bundle-Version: 0.13.1.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-Activator: org.eclipse.gmt.modisco.xml.discoverer.tests.JUnitPlugin
Bundle-Vendor: %Bundle-Vendor
Require-Bundle: org.eclipse.core.runtime,
diff --git a/org.eclipse.gmt.modisco.xml.discoverer/META-INF/MANIFEST.MF b/org.eclipse.gmt.modisco.xml.discoverer/META-INF/MANIFEST.MF
index 93e80f9..817f56f 100644
--- a/org.eclipse.gmt.modisco.xml.discoverer/META-INF/MANIFEST.MF
+++ b/org.eclipse.gmt.modisco.xml.discoverer/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.gmt.modisco.xml.discoverer;singleton:=true
-Bundle-Version: 0.13.1.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-Activator: org.eclipse.gmt.modisco.xml.discoverer.XmlActivator
Bundle-Vendor: %providerName
Require-Bundle: org.eclipse.core.runtime,
diff --git a/org.eclipse.gmt.modisco.xml/META-INF/MANIFEST.MF b/org.eclipse.gmt.modisco.xml/META-INF/MANIFEST.MF
index afb565f..f05e4fe 100644
--- a/org.eclipse.gmt.modisco.xml/META-INF/MANIFEST.MF
+++ b/org.eclipse.gmt.modisco.xml/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.gmt.modisco.xml;singleton:=true
-Bundle-Version: 0.13.1.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Localization: plugin
diff --git a/org.eclipse.modisco.all.feature/feature.xml b/org.eclipse.modisco.all.feature/feature.xml
index d4ffceb..1618071 100644
--- a/org.eclipse.modisco.all.feature/feature.xml
+++ b/org.eclipse.modisco.all.feature/feature.xml
@@ -12,7 +12,7 @@
<feature
id="org.eclipse.modisco.all.feature"
label="MoDisco's quality analysis reports"
- version="0.13.1.qualifier"
+ version="1.0.0.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.license"
license-feature-version="0.0.0">
diff --git a/org.eclipse.modisco.archi.tech.targetplatform/org.eclipse.modisco.archi.tech.targetplatform.target b/org.eclipse.modisco.archi.tech.targetplatform/org.eclipse.modisco.archi.tech.targetplatform.target
index 60c7396..dfa892a 100644
--- a/org.eclipse.modisco.archi.tech.targetplatform/org.eclipse.modisco.archi.tech.targetplatform.target
+++ b/org.eclipse.modisco.archi.tech.targetplatform/org.eclipse.modisco.archi.tech.targetplatform.target
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?pde version="3.6"?>
-<target name="org.eclipse.modisco.archi.tech.targetplatform" sequenceNumber="6">
+<target name="org.eclipse.modisco.archi.tech.targetplatform" sequenceNumber="11">
<locations>
<location includeAllPlatforms="false" includeMode="planner" includeSource="true" type="InstallableUnit">
<unit id="org.eclipse.m2m.atl.feature.group" version="3.1.0.v201006150240"/>
@@ -26,8 +26,8 @@
<repository location="http://download.eclipse.org/technology/epp/packages/helios/"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.emf.facet.sdk.feature.feature.group" version="1.0.1.201506241258"/>
-<unit id="org.eclipse.emf.facet.util.tests.feature.feature.group" version="1.0.1.201506241258"/>
+<unit id="org.eclipse.emf.facet.sdk.feature.feature.group" version="1.1.0.201508071644"/>
+<unit id="org.eclipse.emf.facet.util.tests.feature.feature.group" version="1.1.0.201508071644"/>
<repository location="http://download.eclipse.org/facet/updates/integration/"/>
</location>
<location includeAllPlatforms="false" includeMode="planner" includeSource="true" type="InstallableUnit">
diff --git a/org.eclipse.modisco.common.tests/META-INF/MANIFEST.MF b/org.eclipse.modisco.common.tests/META-INF/MANIFEST.MF
index 7526b1b..6cd322d 100644
--- a/org.eclipse.modisco.common.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.common.tests/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@
Bundle-Name: %Bundle-Name
Bundle-Vendor: %Bundle-Vendor
Bundle-SymbolicName: org.eclipse.modisco.common.tests;singleton:=true
-Bundle-Version: 0.13.1.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-Activator: org.eclipse.modisco.common.tests.Activator
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
diff --git a/org.eclipse.modisco.dev.doc/META-INF/MANIFEST.MF b/org.eclipse.modisco.dev.doc/META-INF/MANIFEST.MF
index 095d759..4398b5b 100644
--- a/org.eclipse.modisco.dev.doc/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.dev.doc/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.modisco.dev.doc;singleton:=true
-Bundle-Version: 0.13.1.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-Vendor: %Bundle-Vendor
Require-Bundle: org.eclipse.core.runtime
Bundle-ActivationPolicy: lazy
diff --git a/org.eclipse.modisco.doc.api.report.eclipsepackage/org.eclipse.modisco.doc.api.report.eclipsepackage.product b/org.eclipse.modisco.doc.api.report.eclipsepackage/org.eclipse.modisco.doc.api.report.eclipsepackage.product
index 40e0d55..8e263e7 100644
--- a/org.eclipse.modisco.doc.api.report.eclipsepackage/org.eclipse.modisco.doc.api.report.eclipsepackage.product
+++ b/org.eclipse.modisco.doc.api.report.eclipsepackage/org.eclipse.modisco.doc.api.report.eclipsepackage.product
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<?pde version="3.5"?>
-<product name="MoDisco API Use Report Package" uid="org.eclipse.modisco.doc.api.report.eclipsepackage" id="org.eclipse.sdk.ide" application="org.eclipse.ui.ide.workbench" version="0.13.1" useFeatures="true" includeLaunchers="true">
+<product name="MoDisco API Use Report Package" uid="org.eclipse.modisco.doc.api.report.eclipsepackage" id="org.eclipse.sdk.ide" application="org.eclipse.ui.ide.workbench" version="1.0.0" useFeatures="true" includeLaunchers="true">
<configIni use="default">
</configIni>
diff --git a/org.eclipse.modisco.doc.api.report/META-INF/MANIFEST.MF b/org.eclipse.modisco.doc.api.report/META-INF/MANIFEST.MF
index 2c5ba22..6f7fe5d 100644
--- a/org.eclipse.modisco.doc.api.report/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.doc.api.report/META-INF/MANIFEST.MF
@@ -2,6 +2,6 @@
Bundle-ManifestVersion: 2
Bundle-Name: MoDisco API Report (Incubation)
Bundle-SymbolicName: org.eclipse.modisco.doc.api.report;singleton:=true
-Bundle-Version: 0.13.1.qualifier
-Bundle-Vendor: Eclipse Modling Project
+Bundle-Version: 1.0.0.qualifier
+Bundle-Vendor: Eclipse Modeling Project
Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/org.eclipse.modisco.doc.metric.report/META-INF/MANIFEST.MF b/org.eclipse.modisco.doc.metric.report/META-INF/MANIFEST.MF
index ea429e8..4e4518d 100644
--- a/org.eclipse.modisco.doc.metric.report/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.doc.metric.report/META-INF/MANIFEST.MF
@@ -2,6 +2,6 @@
Bundle-ManifestVersion: 2
Bundle-Name: MoDisco Metrics Report (Incubation)
Bundle-SymbolicName: org.eclipse.modisco.doc.metric.report;singleton:=true
-Bundle-Version: 0.13.1.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/org.eclipse.modisco.doc.test.report/META-INF/MANIFEST.MF b/org.eclipse.modisco.doc.test.report/META-INF/MANIFEST.MF
index ff264de..bd740c5 100644
--- a/org.eclipse.modisco.doc.test.report/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.doc.test.report/META-INF/MANIFEST.MF
@@ -2,6 +2,6 @@
Bundle-ManifestVersion: 2
Bundle-Name: MoDisco Test Report (Incubation)
Bundle-SymbolicName: org.eclipse.modisco.doc.test.report;singleton:=true
-Bundle-Version: 0.13.1.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-Vendor: Eclipse Modeling Project
Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/org.eclipse.modisco.doc.test.report/pom.xsl b/org.eclipse.modisco.doc.test.report/pom.xsl
index 7e2b9ad..034faca 100644
--- a/org.eclipse.modisco.doc.test.report/pom.xsl
+++ b/org.eclipse.modisco.doc.test.report/pom.xsl
@@ -22,7 +22,7 @@
<dependency>
<groupId>org.eclipse.mdt</groupId>
<artifactId>org.eclipse.modisco.tests</artifactId>
- <version>0.13.1-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<type>eclipse-test-plugin</type>
</dependency>
</dependencies>
diff --git a/org.eclipse.modisco.doc/META-INF/MANIFEST.MF b/org.eclipse.modisco.doc/META-INF/MANIFEST.MF
index 7be2b07..e856340 100644
--- a/org.eclipse.modisco.doc/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.doc/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.modisco.doc;singleton:=true
-Bundle-Version: 0.13.1.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-Activator: org.eclipse.modisco.doc.internal.Activator
Bundle-Vendor: %Bundle-Vendor
Require-Bundle: org.eclipse.core.runtime,
diff --git a/org.eclipse.modisco.eclipseplugin.discoverer.ui/META-INF/MANIFEST.MF b/org.eclipse.modisco.eclipseplugin.discoverer.ui/META-INF/MANIFEST.MF
index 5dd1418..343ae59 100644
--- a/org.eclipse.modisco.eclipseplugin.discoverer.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.eclipseplugin.discoverer.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.modisco.eclipseplugin.discoverer.ui;singleton:=true
-Bundle-Version: 0.13.1.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-Activator: org.eclipse.modisco.eclipseplugin.discoverer.ui.Activator
Bundle-Vendor: %Bundle-Vendor
Require-Bundle: org.eclipse.ui,
diff --git a/org.eclipse.modisco.eclipseplugin.discoverer/META-INF/MANIFEST.MF b/org.eclipse.modisco.eclipseplugin.discoverer/META-INF/MANIFEST.MF
index 8cd4d63..5adbc95 100644
--- a/org.eclipse.modisco.eclipseplugin.discoverer/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.eclipseplugin.discoverer/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@
Bundle-Name: %Bundle-Name
Bundle-Vendor: %Bundle-Vendor
Bundle-SymbolicName: org.eclipse.modisco.eclipseplugin.discoverer;singleton:=true
-Bundle-Version: 0.13.1.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-Activator: org.eclipse.modisco.eclipseplugin.discoverer.Activator
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
diff --git a/org.eclipse.modisco.eclipseplugin/META-INF/MANIFEST.MF b/org.eclipse.modisco.eclipseplugin/META-INF/MANIFEST.MF
index df8822a..1ce6c99 100644
--- a/org.eclipse.modisco.eclipseplugin/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.eclipseplugin/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.modisco.eclipseplugin;singleton:=true
-Bundle-Version: 0.13.1.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Localization: plugin
diff --git a/org.eclipse.modisco.examples.feature/feature.xml b/org.eclipse.modisco.examples.feature/feature.xml
index 748f0f4..fd7c117 100644
--- a/org.eclipse.modisco.examples.feature/feature.xml
+++ b/org.eclipse.modisco.examples.feature/feature.xml
@@ -12,7 +12,7 @@
<feature
id="org.eclipse.modisco.examples.feature"
label="MoDisco Examples (Incubation)"
- version="0.13.1.qualifier"
+ version="1.0.0.qualifier"
provider-name="%providerName"
plugin="org.eclipse.gmt.modisco.examples"
license-feature="org.eclipse.license"
diff --git a/org.eclipse.modisco.infra.browser.custom.examples.generation/META-INF/MANIFEST.MF b/org.eclipse.modisco.infra.browser.custom.examples.generation/META-INF/MANIFEST.MF
index 1041e0a..b7ff31f 100644
--- a/org.eclipse.modisco.infra.browser.custom.examples.generation/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.infra.browser.custom.examples.generation/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.modisco.infra.browser.custom.examples.generation;singleton:=true
-Bundle-Version: 0.13.1.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-Activator: org.eclipse.modisco.infra.browser.custom.examples.generation.Activator
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
diff --git a/org.eclipse.modisco.infra.browser.custom.examples.java.jdk.tests/META-INF/MANIFEST.MF b/org.eclipse.modisco.infra.browser.custom.examples.java.jdk.tests/META-INF/MANIFEST.MF
index 4c7846a..3d2240a 100644
--- a/org.eclipse.modisco.infra.browser.custom.examples.java.jdk.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.infra.browser.custom.examples.java.jdk.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.modisco.infra.browser.custom.examples.java.jdk.tests
-Bundle-Version: 0.13.1.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-Activator: org.eclipse.modisco.infra.browser.custom.examples.java.jdk.tests.Activator
Bundle-Vendor: %Bundle-Vendor
Require-Bundle: org.eclipse.ui,
diff --git a/org.eclipse.modisco.infra.browser.custom.examples.uml.tests/META-INF/MANIFEST.MF b/org.eclipse.modisco.infra.browser.custom.examples.uml.tests/META-INF/MANIFEST.MF
index 492d3f4..cdf8a96 100644
--- a/org.eclipse.modisco.infra.browser.custom.examples.uml.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.infra.browser.custom.examples.uml.tests/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@
Bundle-Name: %Bundle-Name
Bundle-Vendor: %Bundle-Vendor
Bundle-SymbolicName: org.eclipse.modisco.infra.browser.custom.examples.uml.tests
-Bundle-Version: 0.13.1.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-Activator: org.eclipse.modisco.infra.browser.custom.examples.uml.tests.Activator
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
diff --git a/org.eclipse.modisco.infra.browser.custom.tests/META-INF/MANIFEST.MF b/org.eclipse.modisco.infra.browser.custom.tests/META-INF/MANIFEST.MF
index 477d120..9cf3055 100644
--- a/org.eclipse.modisco.infra.browser.custom.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.infra.browser.custom.tests/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@
Bundle-Name: %Bundle-Name
Bundle-Vendor: %Bundle-Vendor
Bundle-SymbolicName: org.eclipse.modisco.infra.browser.custom.tests;singleton:=true
-Bundle-Version: 0.13.1.qualifier
+Bundle-Version: 1.0.0.qualifier
Require-Bundle: org.junit;bundle-version="4.7.0",
org.eclipse.gmt.modisco.infra.common.core;bundle-version="0.7.0",
org.eclipse.core.resources;bundle-version="3.5.1",
diff --git a/org.eclipse.modisco.infra.browser.ecore.core/META-INF/MANIFEST.MF b/org.eclipse.modisco.infra.browser.ecore.core/META-INF/MANIFEST.MF
index b0b1626..639305e 100644
--- a/org.eclipse.modisco.infra.browser.ecore.core/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.infra.browser.ecore.core/META-INF/MANIFEST.MF
@@ -2,12 +2,13 @@
Bundle-ManifestVersion: 2
Bundle-Name: MoDisco Browser Ecore Core (Incubation)
Bundle-SymbolicName: org.eclipse.modisco.infra.browser.ecore.core;singleton:=true
-Bundle-Version: 0.13.1.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-Activator: org.eclipse.modisco.infra.browser.ecore.core.internal.Activator
Bundle-Vendor: Eclipse Modeling Project
-Require-Bundle: org.eclipse.core.runtime,
+Require-Bundle: org.eclipse.core.runtime;bundle-version="3.6.0",
org.eclipse.emf.facet.query.java.core;bundle-version="0.5.0",
org.eclipse.emf.ecore;bundle-version="2.6.0",
- org.eclipse.emf.facet.efacet.metamodel;bundle-version="0.4.0"
+ org.eclipse.emf.facet.efacet.metamodel;bundle-version="0.4.0",
+ org.eclipse.modisco.util.emf.core;bundle-version="1.0.0"
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-ActivationPolicy: lazy
diff --git a/org.eclipse.modisco.infra.browser.ecore.core/custom/hideDerivedReferences.custom b/org.eclipse.modisco.infra.browser.ecore.core/custom/hideDerivedReferences.custom
deleted file mode 100644
index d8c4b38..0000000
--- a/org.eclipse.modisco.infra.browser.ecore.core/custom/hideDerivedReferences.custom
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<custom:Customization
- xmi:version="2.0"
- xmlns:xmi="http://www.omg.org/XMI"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:custom="http://www.eclipse.org/emf/facet/custom/0.2.incubation/custom"
- xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
- xmlns:efacet="http://www.eclipse.org/emf/facet/efacet/0.2.incubation/efacet"
- xmlns:javaQuery="http://www.eclipse.org/emf/facet/query/java/0.2.incubation/javaquery"
- name="org.eclipse.modisco.infra.browser.ecore.core.hideDerivedReferences"
- nsURI="http://www.eclipse.org/MoDisco/infra/browser/ecore/0.13.0.incubation/hideDerviedReferences/"
- nsPrefix="hideDerviedReferences">
- <eClassifiers xsi:type="custom:EClassCustomization" name="EReference null">
- <extendedMetaclass href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
- <facetOperations name="isVisible">
- <eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
- <eParameters name="eStructuralFeature">
- <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//ETypedElement"/>
- </eParameters>
- <query xsi:type="javaQuery:JavaQuery" implementationClassName="org.eclipse.modisco.infra.browser.ecore.core.internal.hidederviedreferences.IsVisibleQuery"/>
- <override xsi:type="efacet:FacetOperation" href="../../../plugin/org.eclipse.emf.facet.custom.ui/resources/customproperties.efacet#//CustomizedEObject/isVisible"/>
- </facetOperations>
- <extendedFacets href="../../../plugin/org.eclipse.emf.facet.custom.ui/resources/customproperties.efacet#//CustomizedEObject"/>
- </eClassifiers>
-</custom:Customization>
diff --git a/org.eclipse.modisco.infra.browser.ecore.core/custom/hierarchicalEClass.custom b/org.eclipse.modisco.infra.browser.ecore.core/custom/hierarchicalEClass.custom
new file mode 100644
index 0000000..bd313df
--- /dev/null
+++ b/org.eclipse.modisco.infra.browser.ecore.core/custom/hierarchicalEClass.custom
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="ASCII"?><!--
+Copyright (c) 2015 Soft-Maint.
+
+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:
+ Thomas Cicognani (Soft-Maint) - Bug 471597 - [New Browser] Add a customization to display subclasses from an EClass
+-->
+<custom:Customization
+ xmi:version="2.0"
+ xmlns:xmi="http://www.omg.org/XMI"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:custom="http://www.eclipse.org/emf/facet/custom/0.2.incubation/custom"
+ xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
+ xmlns:efacet="http://www.eclipse.org/emf/facet/efacet/0.2.incubation/efacet"
+ xmlns:javaQuery="http://www.eclipse.org/emf/facet/query/java/0.2.incubation/javaquery"
+ name="org.eclipse.modisco.infra.browser.ecore.core.hierarchicalEClass.custom"
+ nsURI="http://www.eclipse.org/MoDisco/infra/browser/ecore/0.13.0.incubation/hierarchicalEClass/"
+ nsPrefix="hierarchicalEClass">
+ <eClassifiers xsi:type="custom:EClassCustomization" name="EClass null">
+ <extendedMetaclass href="http://www.eclipse.org/emf/2002/Ecore#//EClass"/>
+ <facetOperations name="children" upperBound="-1">
+ <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EStructuralFeature"/>
+ <eParameters name="eStructuralFeature">
+ <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//ETypedElement"/>
+ </eParameters>
+ <query xsi:type="custom:ETypedElementSwitchQuery">
+ <cases>
+ <value xsi:type="javaQuery:JavaQuery" implementationClassName="org.eclipse.modisco.infra.browser.ecore.core.internal.hierarchicaleclass.HierarchicalEClassCustomQuery"/>
+ </cases>
+ <cases>
+ <case xsi:type="ecore:EReference" href="http://www.eclipse.org/emf/2002/Ecore#//EModelElement/eAnnotations"/>
+ </cases>
+ <cases>
+ <case xsi:type="ecore:EAttribute" href="http://www.eclipse.org/emf/2002/Ecore#//ENamedElement/name"/>
+ </cases>
+ <cases>
+ <case xsi:type="ecore:EAttribute" href="http://www.eclipse.org/emf/2002/Ecore#//EPackage/nsURI"/>
+ </cases>
+ <cases>
+ <case xsi:type="ecore:EAttribute" href="http://www.eclipse.org/emf/2002/Ecore#//EPackage/nsPrefix"/>
+ </cases>
+ <cases>
+ <case xsi:type="ecore:EReference" href="http://www.eclipse.org/emf/2002/Ecore#//EPackage/eFactoryInstance"/>
+ </cases>
+ <cases>
+ <case xsi:type="ecore:EReference" href="http://www.eclipse.org/emf/2002/Ecore#//EPackage/eClassifiers"/>
+ </cases>
+ <cases>
+ <case xsi:type="ecore:EReference" href="http://www.eclipse.org/emf/2002/Ecore#//EPackage/eSubpackages"/>
+ </cases>
+ <cases>
+ <case xsi:type="ecore:EReference" href="http://www.eclipse.org/emf/2002/Ecore#//EPackage/eSuperPackage"/>
+ </cases>
+ </query>
+ <override xsi:type="efacet:FacetOperation" href="../../../plugin/org.eclipse.emf.facet.custom.ui/resources/customproperties.efacet#//CustomizedEObject/children"/>
+ </facetOperations>
+ <extendedFacets href="../../../plugin/org.eclipse.emf.facet.custom.ui/resources/customproperties.efacet#//CustomizedEObject"/>
+ </eClassifiers>
+</custom:Customization>
diff --git a/org.eclipse.modisco.infra.browser.ecore.core/facet/hierarchicalEClass.efacet b/org.eclipse.modisco.infra.browser.ecore.core/facet/hierarchicalEClass.efacet
new file mode 100644
index 0000000..b369dca
--- /dev/null
+++ b/org.eclipse.modisco.infra.browser.ecore.core/facet/hierarchicalEClass.efacet
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="ASCII"?><!--
+Copyright (c) 2015 Soft-Maint.
+
+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:
+ Thomas Cicognani (Soft-Maint) - Bug 471597 - [New Browser] Add a customization to display subclasses from an EClass
+-->
+<efacet:FacetSet
+ xmi:version="2.0"
+ xmlns:xmi="http://www.omg.org/XMI"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
+ xmlns:efacet="http://www.eclipse.org/emf/facet/efacet/0.2.incubation/efacet"
+ xmlns:javaQuery="http://www.eclipse.org/emf/facet/query/java/0.2.incubation/javaquery"
+ name="org.eclipse.modisco.infra.browser.ecore.core.hierarchicalEClass.facet"
+ nsURI="http://www.eclipse.org/MoDisco/infra/browser/ecore/0.13.0.incubation/hierarchicalEClass/"
+ nsPrefix="hierarchicalEClass">
+ <eClassifiers xsi:type="efacet:Facet" name="facet">
+ <extendedMetaclass href="http://www.eclipse.org/emf/2002/Ecore#//EClass"/>
+ <facetElements xsi:type="efacet:FacetReference" name="subClasses" upperBound="-1" volatile="true" transient="true" derived="true">
+ <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//EClass"/>
+ <query xsi:type="javaQuery:JavaQuery" canBeCached="true" implementationClassName="org.eclipse.modisco.infra.browser.ecore.core.internal.hierarchicaleclass.HierarchicalEClassFacetQuery"/>
+ </facetElements>
+ </eClassifiers>
+</efacet:FacetSet>
diff --git a/org.eclipse.modisco.infra.browser.ecore.core/plugin.xml b/org.eclipse.modisco.infra.browser.ecore.core/plugin.xml
index 857603b..56ef015 100644
--- a/org.eclipse.modisco.infra.browser.ecore.core/plugin.xml
+++ b/org.eclipse.modisco.infra.browser.ecore.core/plugin.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?eclipse version="3.4"?><!--
-Copyright (c) 2014 Mia-Software.
+Copyright (c) 2014, 2015 Mia-Software, and Soft-Maint.
All rights reserved. This program and the accompanying materials
are made available under the terms of the Eclipse Public License v1.0
@@ -8,16 +8,16 @@
http://www.eclipse.org/legal/epl-v10.html
Contributors:
- Gregoire Dupe (Mia-Software) - Bug 358914 - [Move to EMF Facet][Browser] Switch to EMF Facet
+ Gregoire Dupe (Mia-Software) - Bug 358914 - [Move to EMF Facet][Browser] Switch to EMF Facet
+ Thomas Cicognani (Soft-Maint) - Bug 442041 - A customization hiding empty references
+ Thomas Cicognani (Soft-Maint) - Bug 471447 - [New Browser] Add a customization counting instances by EClass
+ Thomas Cicognani (Soft-Maint) - Bug 471597 - [New Browser] Add a customization to display subclasses from an EClass
+ Thomas Cicognani (Mia-Software) - Bug 470962 - Add shortcuts to activate customs
-->
<plugin>
<extension point="org.eclipse.emf.facet.util.emf.core.modeldeclaration">
- <modeldeclaration file="custom/hideDerivedReferences.custom"/>
- <modeldeclaration
- file="custom/ePackageContainsEClass.custom">
- </modeldeclaration>
- <modeldeclaration
- file="custom/linksCount.custom">
- </modeldeclaration>
+ <modeldeclaration file="custom/ePackageContainsEClass.custom"/>
+ <modeldeclaration file="custom/hierarchicalEClass.custom"/>
+ <modeldeclaration file="facet/hierarchicalEClass.efacet" />
</extension>
</plugin>
diff --git a/org.eclipse.modisco.infra.browser.ecore.core/src/org/eclipse/modisco/infra/browser/ecore/core/internal/hidederviedreferences/IsVisibleQuery.java b/org.eclipse.modisco.infra.browser.ecore.core/src/org/eclipse/modisco/infra/browser/ecore/core/internal/hidederviedreferences/IsVisibleQuery.java
deleted file mode 100644
index 558b233..0000000
--- a/org.eclipse.modisco.infra.browser.ecore.core/src/org/eclipse/modisco/infra/browser/ecore/core/internal/hidederviedreferences/IsVisibleQuery.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/**
- * Copyright (c) 2014 Mia-Software.
- * 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:
- * Gregoire Dupe (Mia-Software) - Bug 358914 - [Move to EMF Facet][Browser] Switch to EMF Facet
- */
-package org.eclipse.modisco.infra.browser.ecore.core.internal.hidederviedreferences;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.facet.efacet.core.IFacetManager;
-import org.eclipse.emf.facet.efacet.core.exception.DerivedTypedElementException;
-import org.eclipse.emf.facet.query.java.core.IJavaQuery2;
-import org.eclipse.emf.facet.query.java.core.IParameterValueList2;
-
-public class IsVisibleQuery implements IJavaQuery2<EObject, Boolean> {
- public Boolean evaluate(final EObject context,
- final IParameterValueList2 parameterValues,
- final IFacetManager facetManager)
- throws DerivedTypedElementException {
- boolean result = false;
- if (parameterValues.size() == 0) {
- result = true;
- } else {
- final Object paramValue = parameterValues.get(0).getValue();
- if (paramValue instanceof EStructuralFeature) {
- final EStructuralFeature eStructFeature = (EStructuralFeature) paramValue;
- result = !eStructFeature.isDerived();
- } else {
- throw new DerivedTypedElementException(
- "Unexpected parameter type"); //$NON-NLS-1$
- }
- }
- return Boolean.valueOf(result);
- }
-}
diff --git a/org.eclipse.modisco.infra.browser.ecore.core/src/org/eclipse/modisco/infra/browser/ecore/core/internal/hierarchicaleclass/HierarchicalEClassCustomQuery.java b/org.eclipse.modisco.infra.browser.ecore.core/src/org/eclipse/modisco/infra/browser/ecore/core/internal/hierarchicaleclass/HierarchicalEClassCustomQuery.java
new file mode 100644
index 0000000..b519400
--- /dev/null
+++ b/org.eclipse.modisco.infra.browser.ecore.core/src/org/eclipse/modisco/infra/browser/ecore/core/internal/hierarchicaleclass/HierarchicalEClassCustomQuery.java
@@ -0,0 +1,53 @@
+/**
+ * Copyright (c) 2015 Soft-Maint.
+ * 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:
+ * Thomas Cicognani (Soft-Maint) - Bug 471597 - [New Browser] Add a customization to display subclasses from an EClass
+ */
+package org.eclipse.modisco.infra.browser.ecore.core.internal.hierarchicaleclass;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.resource.ResourceSet;
+import org.eclipse.emf.facet.efacet.core.FacetUtils;
+import org.eclipse.emf.facet.efacet.core.IFacetManager;
+import org.eclipse.emf.facet.efacet.core.exception.DerivedTypedElementException;
+import org.eclipse.emf.facet.efacet.metamodel.v0_2_0.efacet.DerivedTypedElement;
+import org.eclipse.emf.facet.efacet.metamodel.v0_2_0.efacet.Facet;
+import org.eclipse.emf.facet.efacet.metamodel.v0_2_0.efacet.FacetSet;
+import org.eclipse.emf.facet.query.java.core.IJavaQuery3;
+import org.eclipse.emf.facet.query.java.core.IParameterValueList2;
+
+public class HierarchicalEClassCustomQuery implements
+ IJavaQuery3<EClass, List<EStructuralFeature>> {
+
+ public List<EStructuralFeature> evaluate(final EClass context,
+ final IParameterValueList2 parameterValues,
+ final IFacetManager facetMgr,
+ final DerivedTypedElement derivedTypeElt)
+ throws DerivedTypedElementException {
+ final List<EStructuralFeature> result = new ArrayList<EStructuralFeature>();
+ final ResourceSet resourceSet = facetMgr.getResourceSet();
+ final URI uri = URI
+ .createPlatformPluginURI(
+ "/org.eclipse.modisco.infra.browser.ecore.core/facet/hierarchicalEClass.efacet", //$NON-NLS-1$
+ true);
+ final Resource ressource = resourceSet.getResource(uri, true);
+ final FacetSet facetSet = (FacetSet) ressource.getContents().get(0);
+ final Facet facet = FacetUtils.getFacet(facetSet, "facet"); //$NON-NLS-1$
+ final EStructuralFeature eStructFeature = FacetUtils.getETypedElement(
+ facet, "subClasses", EStructuralFeature.class); //$NON-NLS-1$
+ result.add(eStructFeature);
+ return result;
+ }
+
+}
diff --git a/org.eclipse.modisco.infra.browser.ecore.core/src/org/eclipse/modisco/infra/browser/ecore/core/internal/hierarchicaleclass/HierarchicalEClassFacetQuery.java b/org.eclipse.modisco.infra.browser.ecore.core/src/org/eclipse/modisco/infra/browser/ecore/core/internal/hierarchicaleclass/HierarchicalEClassFacetQuery.java
new file mode 100644
index 0000000..10a640e
--- /dev/null
+++ b/org.eclipse.modisco.infra.browser.ecore.core/src/org/eclipse/modisco/infra/browser/ecore/core/internal/hierarchicaleclass/HierarchicalEClassFacetQuery.java
@@ -0,0 +1,32 @@
+/**
+ * Copyright (c) 2015 Soft-Maint.
+ * 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:
+ * Thomas Cicognani (Soft-Maint) - Bug 471597 - [New Browser] Add a customization to display subclasses from an EClass
+ */
+package org.eclipse.modisco.infra.browser.ecore.core.internal.hierarchicaleclass;
+
+import java.util.List;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.facet.efacet.core.IFacetManager;
+import org.eclipse.emf.facet.efacet.core.exception.DerivedTypedElementException;
+import org.eclipse.emf.facet.query.java.core.IJavaQuery2;
+import org.eclipse.emf.facet.query.java.core.IParameterValueList2;
+import org.eclipse.modisco.util.emf.core.subclasses.SubClassesUtils;
+
+public class HierarchicalEClassFacetQuery implements
+ IJavaQuery2<EClass, List<EClass>> {
+
+ public List<EClass> evaluate(final EClass context,
+ final IParameterValueList2 parameterValues,
+ final IFacetManager facetManager)
+ throws DerivedTypedElementException {
+ return SubClassesUtils.getSubClasses(context);
+ }
+
+}
diff --git a/org.eclipse.modisco.infra.browser.ecore.core/src/org/eclipse/modisco/infra/browser/ecore/core/internal/linkscount/LinksCountQuery.java b/org.eclipse.modisco.infra.browser.ecore.core/src/org/eclipse/modisco/infra/browser/ecore/core/internal/linkscount/LinksCountQuery.java
deleted file mode 100644
index fd892fe..0000000
--- a/org.eclipse.modisco.infra.browser.ecore.core/src/org/eclipse/modisco/infra/browser/ecore/core/internal/linkscount/LinksCountQuery.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/**
- * Copyright (c) 2014 Soft-Maint.
- * 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:
- * Thomas Cicognani (Soft-Maint) - Bug 442017 - A customization counting elements by reference
- */
-package org.eclipse.modisco.infra.browser.ecore.core.internal.linkscount;
-
-
-public class LinksCountQuery {
- //FIXME
-}
-/*
-import java.util.Collection;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.ETypedElement;
-import org.eclipse.emf.facet.efacet.core.IFacetManager;
-import org.eclipse.emf.facet.efacet.core.exception.DerivedTypedElementException;
-import org.eclipse.emf.facet.efacet.core.exception.FacetManagerException;
-import org.eclipse.emf.facet.efacet.metamodel.v0_2_0.efacet.DerivedTypedElement;
-import org.eclipse.emf.facet.query.java.core.IJavaQuery3;
-import org.eclipse.emf.facet.query.java.core.IParameterValueList2;
-
-public class LinksCountQuery implements IJavaQuery3<EObject, String> {
- public String evaluate(final EObject source,
- final IParameterValueList2 parameterValues,
- final IFacetManager facetManager, final DerivedTypedElement feature)
- throws DerivedTypedElementException {
- try {
- String size = ""; //$NON-NLS-1$
- if (parameterValues != null) {
- final ETypedElement sfParam = (ETypedElement) parameterValues
- .getParameterValueByName("eStructuralFeature").getValue(); //$NON-NLS-1$
- if (sfParam instanceof EReference) {
- size = getSizeForReference(source, facetManager, sfParam);
- }
- }
- return facetManager.getSuperValueOf(feature, source,
- parameterValues, String.class) + size;
- } catch (FacetManagerException e) {
- throw new DerivedTypedElementException(e);
- }
- }
-
- private static String getSizeForReference(final EObject source,
- final IFacetManager facetManager, final ETypedElement sfParam)
- throws FacetManagerException {
- String size = ""; //$NON-NLS-1$
- final Object object = facetManager.getOrInvoke(source, sfParam,
- Object.class);
- if (object instanceof Collection) {
- final Collection<?> collection = (Collection<?>) object;
- final int listSize = collection.size();
- if (listSize > 0) {
- size = String.format(" (%d)", //$NON-NLS-1$
- Integer.valueOf(listSize));
- }
- } else if (object != null) {
- size = " (1)"; //$NON-NLS-1$
- }
- return size;
- }
-}
-*/
diff --git a/org.eclipse.modisco.infra.browser.ecore.ui/.checkstyle b/org.eclipse.modisco.infra.browser.ecore.ui/.checkstyle
new file mode 100644
index 0000000..c8d3032
--- /dev/null
+++ b/org.eclipse.modisco.infra.browser.ecore.ui/.checkstyle
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright (c) 2015 Mia-Software
+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:
+ Grégoire Dupé (Mia-Software) - Bug 471020 - Ecore Explorer View
+-->
+<fileset-config file-format-version="1.2.0" simple-config="true">
+ <local-check-config name="EmfFacet"
+ location="../org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet.checkstyle"
+ type="project"
+ description=""/>
+ <fileset name="all" enabled="true" check-config-name="EmfFacet" local="true">
+ <file-match-pattern match-pattern="." include-pattern="true"/>
+ <file-match-pattern match-pattern="Messages.java" include-pattern="false"/>
+ </fileset>
+</fileset-config>
diff --git a/org.eclipse.modisco.infra.browser.ecore.ui/.classpath b/org.eclipse.modisco.infra.browser.ecore.ui/.classpath
new file mode 100644
index 0000000..7c69e91
--- /dev/null
+++ b/org.eclipse.modisco.infra.browser.ecore.ui/.classpath
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright (c) 2015 Mia-Software
+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:
+ Grégoire Dupé (Mia-Software) - Bug 471020 - Ecore Explorer View
+-->
+<classpath>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/org.eclipse.modisco.infra.browser.ecore.ui/.pmd b/org.eclipse.modisco.infra.browser.ecore.ui/.pmd
new file mode 100644
index 0000000..9c6d087
--- /dev/null
+++ b/org.eclipse.modisco.infra.browser.ecore.ui/.pmd
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright (c) 2015 Mia-Software
+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:
+ Grégoire Dupé (Mia-Software) - Bug 471020 - Ecore Explorer View
+-->
+<pmd>
+ <useProjectRuleSet>true</useProjectRuleSet>
+ <ruleSetFile>../org.eclipse.emf.facet.archi.tech.rules/pmd/ruleset.xml</ruleSetFile>
+ <includeDerivedFiles>false</includeDerivedFiles>
+ <violationsAsErrors>true</violationsAsErrors>
+</pmd>
diff --git a/org.eclipse.modisco.infra.browser.ecore.ui/.project b/org.eclipse.modisco.infra.browser.ecore.ui/.project
new file mode 100644
index 0000000..eb78108
--- /dev/null
+++ b/org.eclipse.modisco.infra.browser.ecore.ui/.project
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright (c) 2015 Mia-Software
+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:
+ Grégoire Dupé (Mia-Software) - Bug 471020 - Ecore Explorer View
+-->
+<projectDescription>
+ <name>org.eclipse.modisco.infra.browser.ecore.ui</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>
+ <buildCommand>
+ <name>net.sf.eclipsecs.core.CheckstyleBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>net.sourceforge.pmd.eclipse.plugin.pmdBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.pde.PluginNature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
+ <nature>net.sourceforge.pmd.eclipse.plugin.pmdNature</nature>
+ </natures>
+</projectDescription>
diff --git a/org.eclipse.modisco.infra.browser.ecore.ui/.settings/org.eclipse.core.resources.prefs b/org.eclipse.modisco.infra.browser.ecore.ui/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..4824b80
--- /dev/null
+++ b/org.eclipse.modisco.infra.browser.ecore.ui/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,2 @@
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/org.eclipse.modisco.infra.browser.ecore.ui/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.modisco.infra.browser.ecore.ui/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000..44217f8
--- /dev/null
+++ b/org.eclipse.modisco.infra.browser.ecore.ui/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,7 @@
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.5
diff --git a/org.eclipse.modisco.infra.browser.ecore.ui/META-INF/MANIFEST.MF b/org.eclipse.modisco.infra.browser.ecore.ui/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..7a153fe
--- /dev/null
+++ b/org.eclipse.modisco.infra.browser.ecore.ui/META-INF/MANIFEST.MF
@@ -0,0 +1,25 @@
+Manifest-Version: 1.0
+Require-Bundle: org.eclipse.ui;bundle-version="3.6.0",
+ org.eclipse.core.runtime;bundle-version="3.6.0",
+ org.eclipse.emf.ecore;bundle-version="2.6.0",
+ org.eclipse.emf.facet.custom.ui;bundle-version="0.3.0",
+ org.eclipse.emf.facet.efacet.core;bundle-version="0.3.0",
+ org.eclipse.emf.facet.custom.core;bundle-version="0.3.0",
+ org.eclipse.emf.edit;bundle-version="2.6.0",
+ org.eclipse.ui.ide;bundle-version="3.6.0",
+ org.eclipse.emf.edit.ui;bundle-version="2.6.0",
+ org.eclipse.emf.facet.query.java.core;bundle-version="1.0.0",
+ org.eclipse.emf.facet.util.ui;bundle-version="1.0.0",
+ org.eclipse.modisco.util.emf.core;bundle-version="1.0.0",
+ org.eclipse.emf.facet.efacet.ui;bundle-version="1.1.0",
+ org.eclipse.core.expressions;bundle-version="3.4.200",
+ org.eclipse.emf.facet.util.swt;bundle-version="1.0.1"
+Bundle-Vendor: %Bundle-Vendor
+Bundle-ActivationPolicy: lazy
+Bundle-Version: 1.0.0.qualifier
+Bundle-Name: %Bundle-Name
+Bundle-ManifestVersion: 2
+Bundle-Activator: org.eclipse.modisco.infra.browser.ecore.ui.internal.Activator
+Bundle-SymbolicName: org.eclipse.modisco.infra.browser.ecore.ui;singleton:=true
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
+
diff --git a/org.eclipse.modisco.infra.browser.ecore.ui/OSGI-INF/l10n/bundle.properties b/org.eclipse.modisco.infra.browser.ecore.ui/OSGI-INF/l10n/bundle.properties
new file mode 100644
index 0000000..5b1d9ab
--- /dev/null
+++ b/org.eclipse.modisco.infra.browser.ecore.ui/OSGI-INF/l10n/bundle.properties
@@ -0,0 +1,12 @@
+# Copyright (c) 2015 Mia-Software
+# 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:
+# Grégoire Dupé (Mia-Software) - Bug 471020 - Ecore Explorer View
+# Thomas Cicognani (Mia-Software) - Bug 470962 - Add shortcuts to activate customs
+Bundle-Vendor = Eclipse Modeling Project
+Bundle-Name = MoDisco Ecore Explorer (Incubation)
+EcoreExplorer = Ecore Explorer
diff --git a/org.eclipse.modisco.infra.browser.ecore.ui/about.html b/org.eclipse.modisco.infra.browser.ecore.ui/about.html
new file mode 100644
index 0000000..ab78a61
--- /dev/null
+++ b/org.eclipse.modisco.infra.browser.ecore.ui/about.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<title>About</title>
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+
+<p>June 18, 2015</p>
+<h3>License</h3>
+
+<p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available
+at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+For purposes of the EPL, "Program" will mean the Content.</p>
+
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is
+being redistributed by another party ("Redistributor") and different terms and conditions may
+apply to your use of any object code in the Content. Check the Redistributor's license that was
+provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/org.eclipse.modisco.infra.browser.ecore.ui/build.properties b/org.eclipse.modisco.infra.browser.ecore.ui/build.properties
new file mode 100644
index 0000000..1a4afab
--- /dev/null
+++ b/org.eclipse.modisco.infra.browser.ecore.ui/build.properties
@@ -0,0 +1,20 @@
+ # Copyright (c) 2015 Mia-Software, and Soft-Maint
+# 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:
+# Grégoire Dupé (Mia-Software) - Bug 471020 - Ecore Explorer View
+# Thomas Cicognani (Soft-Maint) - Bug 471020 - Ecore Explorer View
+# Thomas Cicognani (Soft-Maint) - Bug 471447 - [New Browser] Add a customization counting instances by EClass
+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+ .,\
+ plugin.xml,\
+ OSGI-INF/,\
+ icons/,\
+ about.html,\
+ custom/
+src.includes = about.html
diff --git a/org.eclipse.modisco.infra.browser.ecore.ui/custom/nbInstancesEClassByResource.custom b/org.eclipse.modisco.infra.browser.ecore.ui/custom/nbInstancesEClassByResource.custom
new file mode 100644
index 0000000..9400e54
--- /dev/null
+++ b/org.eclipse.modisco.infra.browser.ecore.ui/custom/nbInstancesEClassByResource.custom
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="ASCII"?><!--
+Copyright (c) 2015 Soft-Maint, and Mia-Software.
+
+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:
+ Thomas Cicognani (Soft-Maint) - Bug 472041 - [New Browser] Add a customization counting instances by EClass in the same Resource
+ Thomas Cicognani (Mia-Software) - Bug 470962 - Add shortcuts to activate customs
+-->
+<custom:Customization
+ xmi:version="2.0"
+ xmlns:xmi="http://www.omg.org/XMI"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:custom="http://www.eclipse.org/emf/facet/custom/0.2.incubation/custom"
+ xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
+ xmlns:efacet="http://www.eclipse.org/emf/facet/efacet/0.2.incubation/efacet"
+ xmlns:javaQuery="http://www.eclipse.org/emf/facet/query/java/0.2.incubation/javaquery"
+ name="org.eclipse.modisco.infra.browser.ecore.ui.nbInstancesEClassByResource"
+ nsURI="http://www.eclipse.org/MoDisco/infra/browser/ecore/0.13.0.incubation/nbInstancesEClassByResource"
+ nsPrefix="nbInstancesEClassByResource">
+ <eClassifiers xsi:type="custom:EClassCustomization" name="EObject null">
+ <extendedMetaclass href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
+ <facetOperations name="label" lowerBound="1">
+ <eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eParameters name="eStructuralFeature">
+ <eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//ETypedElement"/>
+ </eParameters>
+ <query xsi:type="javaQuery:JavaQuery" implementationClassName="org.eclipse.modisco.infra.browser.ecore.ui.internal.custom.NbInstancesEClassByResourceQuery"/>
+ <override xsi:type="efacet:FacetOperation" href="../../../plugin/org.eclipse.emf.facet.custom.ui/resources/customproperties.efacet#//CustomizedEObject/label"/>
+ </facetOperations>
+ <extendedFacets href="../../../plugin/org.eclipse.emf.facet.custom.ui/resources/customproperties.efacet#//CustomizedEObject"/>
+ </eClassifiers>
+</custom:Customization>
diff --git a/org.eclipse.modisco.infra.browser.ecore.core/custom/linksCount.custom b/org.eclipse.modisco.infra.browser.ecore.ui/custom/nbInstancesEClassByResourceSet.custom
similarity index 63%
rename from org.eclipse.modisco.infra.browser.ecore.core/custom/linksCount.custom
rename to org.eclipse.modisco.infra.browser.ecore.ui/custom/nbInstancesEClassByResourceSet.custom
index 0e4decd..370550e 100644
--- a/org.eclipse.modisco.infra.browser.ecore.core/custom/linksCount.custom
+++ b/org.eclipse.modisco.infra.browser.ecore.ui/custom/nbInstancesEClassByResourceSet.custom
@@ -1,5 +1,15 @@
-<?xml version="1.0" encoding="ASCII"?>
-<custom:Customization xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:custom="http://www.eclipse.org/emf/facet/custom/0.2.incubation/custom" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:efacet="http://www.eclipse.org/emf/facet/efacet/0.2.incubation/efacet" xmlns:javaQuery="http://www.eclipse.org/emf/facet/query/java/0.2.incubation/javaquery" name="org.eclipse.modisco.infra.browser.ecore.core.linksCount" nsURI="http://www.eclipse.org/MoDisco/infra/browser/ecore/0.13.0.incubation/linksCount" nsPrefix="linksCount">
+<?xml version="1.0" encoding="ASCII"?><!--
+Copyright (c) 2015 Soft-Maint.
+
+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:
+ Thomas Cicognani (Soft-Maint) - Bug 471447 - [New Browser] Add a customization counting instances by EClass
+-->
+<custom:Customization xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:custom="http://www.eclipse.org/emf/facet/custom/0.2.incubation/custom" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:efacet="http://www.eclipse.org/emf/facet/efacet/0.2.incubation/efacet" xmlns:javaQuery="http://www.eclipse.org/emf/facet/query/java/0.2.incubation/javaquery" name="org.eclipse.modisco.infra.browser.ecore.ui.nbInstancesEClassByResourceSet" nsURI="http://www.eclipse.org/MoDisco/infra/browser/ecore/0.13.0.incubation/nbInstancesEClassByResourceSet" nsPrefix="nbInstancesEClassByResourceSet">
<eClassifiers xsi:type="custom:EClassCustomization" name="EObject null">
<extendedMetaclass href="http://www.eclipse.org/emf/2002/Ecore#//EObject"/>
<facetOperations name="label" lowerBound="1">
@@ -7,7 +17,7 @@
<eParameters name="eStructuralFeature">
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/emf/2002/Ecore#//ETypedElement"/>
</eParameters>
- <query xsi:type="javaQuery:JavaQuery" implementationClassName="org.eclipse.modisco.infra.browser.ecore.core.internal.linkscount.LinksCountQuery"/>
+ <query xsi:type="javaQuery:JavaQuery" implementationClassName="org.eclipse.modisco.infra.browser.ecore.ui.internal.custom.NbInstancesEClassByResourceSetQuery"/>
<override xsi:type="efacet:FacetOperation" href="../../../plugin/org.eclipse.emf.facet.custom.ui/resources/customproperties.efacet#//CustomizedEObject/label"/>
</facetOperations>
<extendedFacets href="../../../plugin/org.eclipse.emf.facet.custom.ui/resources/customproperties.efacet#//CustomizedEObject"/>
diff --git a/org.eclipse.modisco.infra.browser.ecore.ui/icons/MoDiscoModelIcon.gif b/org.eclipse.modisco.infra.browser.ecore.ui/icons/MoDiscoModelIcon.gif
new file mode 100644
index 0000000..239367a
--- /dev/null
+++ b/org.eclipse.modisco.infra.browser.ecore.ui/icons/MoDiscoModelIcon.gif
Binary files differ
diff --git a/org.eclipse.modisco.infra.browser.ecore.ui/plugin.xml b/org.eclipse.modisco.infra.browser.ecore.ui/plugin.xml
new file mode 100644
index 0000000..4cffa83
--- /dev/null
+++ b/org.eclipse.modisco.infra.browser.ecore.ui/plugin.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?eclipse version="3.4"?>
+<!--
+Copyright (c) 2015 Mia-Software, and Soft-Maint
+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:
+ Grégoire Dupé (Mia-Software) - Bug 471020 - Ecore Explorer View
+ Thomas Cicognani (Soft-Maint) - Bug 471020 - Ecore Explorer View
+ Thomas Cicognani (Soft-Maint) - Bug 471447 - [New Browser] Add a customization counting instances by EClass
+ Thomas Cicognani (Soft-Maint) - Bug 472041 - [New Browser] Add a customization counting instances by EClass in the same Resource
+ Thomas Cicognani (Mia-Software) - Bug 470962 - Add shortcuts to activate customs
+-->
+<plugin>
+ <extension point="org.eclipse.ui.views">
+ <view
+ class="org.eclipse.modisco.infra.browser.ecore.ui.internal.view.EcoreExplorerView"
+ icon="icons/MoDiscoModelIcon.gif"
+ id="org.eclipse.modisco.infra.browser.ecore.ui.view1"
+ name="%EcoreExplorer"
+ restorable="true"/>
+ </extension>
+ <extension point="org.eclipse.ui.menus">
+ <menuContribution
+ allPopups="false"
+ locationURI="toolbar:org.eclipse.modisco.infra.browser.ecore.ui.view1">
+ <command
+ commandId="org.eclipse.emf.facet.ui.loadCustomization"
+ id="org.eclipse.modisco.infra.browser.ecore.ui.menu.loadCustomization"
+ label="Load/Unload customizations"
+ style="pulldown">
+ </command>
+ <command
+ commandId="org.eclipse.emf.facet.efacet.ui.loadFacet"
+ id="org.eclipse.modisco.infra.browser.ecore.ui.menu.loadFacet"
+ label="Load/Unload facets"
+ style="pulldown">
+ </command>
+ </menuContribution>
+ <menuContribution
+ allPopups="false"
+ locationURI="menu:org.eclipse.modisco.infra.browser.ecore.ui.menu.loadCustomization">
+ <dynamic
+ class="org.eclipse.modisco.infra.browser.ecore.ui.internal.handler.LoadCustomShortcutsMenu"
+ id="org.eclipse.modisco.infra.browser.ecore.ui.menu.loadCustomization.dynamic">
+ </dynamic>
+ </menuContribution>
+ <menuContribution
+ allPopups="false"
+ locationURI="menu:org.eclipse.modisco.infra.browser.ecore.ui.menu.loadFacet">
+ <dynamic
+ class="org.eclipse.modisco.infra.browser.ecore.ui.internal.handler.LoadFacetSetShortcutsMenu"
+ id="org.eclipse.modisco.infra.browser.ecore.ui.menu.loadFacet.dynamic">
+ </dynamic>
+ </menuContribution>
+ </extension>
+ <extension
+ point="org.eclipse.emf.facet.util.emf.core.modeldeclaration">
+ <modeldeclaration
+ file="custom/nbInstancesEClassByResourceSet.custom">
+ </modeldeclaration>
+ <modeldeclaration
+ file="custom/nbInstancesEClassByResource.custom">
+ </modeldeclaration>
+ </extension>
+</plugin>
diff --git a/org.eclipse.modisco.infra.browser.ecore.ui/src/org/eclipse/modisco/infra/browser/ecore/ui/internal/Activator.java b/org.eclipse.modisco.infra.browser.ecore.ui/src/org/eclipse/modisco/infra/browser/ecore/ui/internal/Activator.java
new file mode 100644
index 0000000..0b8acec
--- /dev/null
+++ b/org.eclipse.modisco.infra.browser.ecore.ui/src/org/eclipse/modisco/infra/browser/ecore/ui/internal/Activator.java
@@ -0,0 +1,50 @@
+/**
+ * Copyright (c) 2015 Mia-Software
+ * 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:
+ * Grégoire Dupé (Mia-Software) - Bug 471020 - Ecore Explorer View
+ */
+package org.eclipse.modisco.infra.browser.ecore.ui.internal;
+
+import org.eclipse.core.runtime.Plugin;
+import org.osgi.framework.BundleContext;
+
+@SuppressWarnings("PMD.UseSingleton")
+// @SuppressWarnings("PMD.UseSingleton") We cannot conforms to this rule because
+// this class is an Eclipse plug-in activator which will be instantiated by the
+// Eclipse framework.
+public class Activator extends Plugin {
+
+ private static Activator plugin;
+
+ @Override
+ @SuppressWarnings("PMD.SignatureDeclareThrowsException")
+ // @SuppressWarnings("PMD.SignatureDeclareThrowsException") We have to use
+ // this signature because this is an override of an Eclipse framework's
+ // method.
+ public void start(final BundleContext bundleContext) throws Exception {
+ super.start(bundleContext);
+ Activator.plugin = this;
+ }
+
+ @Override
+ @SuppressWarnings("PMD.SignatureDeclareThrowsException")
+ // @SuppressWarnings("PMD.SignatureDeclareThrowsException") We have to use
+ // this signature because this is an override of an Eclipse framework's
+ // method.
+ public void stop(final BundleContext bundleContext) throws Exception {
+ // NOPMD: PMD say "Assigning an Object to null is a code smell."
+ // No choice to right it in another way : this is an Eclipse pattern.
+ Activator.plugin = null; // NOPMD by gdupe on 30/03/12 10:19
+ super.stop(bundleContext);
+ }
+
+ public static Plugin getDefault() {
+ return Activator.plugin;
+ }
+
+}
diff --git a/org.eclipse.modisco.infra.browser.ecore.ui/src/org/eclipse/modisco/infra/browser/ecore/ui/internal/Messages.java b/org.eclipse.modisco.infra.browser.ecore.ui/src/org/eclipse/modisco/infra/browser/ecore/ui/internal/Messages.java
new file mode 100644
index 0000000..df654a7
--- /dev/null
+++ b/org.eclipse.modisco.infra.browser.ecore.ui/src/org/eclipse/modisco/infra/browser/ecore/ui/internal/Messages.java
@@ -0,0 +1,35 @@
+/**
+ * Copyright (c) 2015 Soft-Maint, and Mia-Software.
+ * 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:
+ * Thomas Cicognani (Soft-Maint) - Bug 471020 - Ecore Explorer View
+ * Thomas Cicognani (Mia-Software) - Bug 470962 - Add shortcuts to activate customs
+ */
+package org.eclipse.modisco.infra.browser.ecore.ui.internal;
+
+import org.eclipse.osgi.util.NLS;
+
+public class Messages extends NLS {
+ private static final String BUNDLE_NAME = Messages.class.getPackage().getName() + ".messages"; //$NON-NLS-1$
+
+ public static String EcoreInstancesExplorerComposite_Instances;
+ public static String EcoreMetaExplorerComposite_Metas;
+ public static String EcoreExplorerShortcutUtils_NbInstancesEClassByResource;
+ public static String EcoreExplorerShortcutUtils_NbInstancesEClassByResourceSet;
+ public static String EcoreExplorerShortcutUtils_EClassFromEPackage;
+ public static String EcoreExplorerShortcutUtils_EClassSubclasses;
+ public static String EcoreExplorerShortcutUtils_EClassHierarchy;
+
+ static {
+ // initialize resource bundle
+ NLS.initializeMessages(Messages.BUNDLE_NAME, Messages.class);
+ }
+
+ private Messages() {
+ // Empty
+ }
+}
diff --git a/org.eclipse.modisco.infra.browser.ecore.ui/src/org/eclipse/modisco/infra/browser/ecore/ui/internal/custom/NbInstancesEClassByResourceQuery.java b/org.eclipse.modisco.infra.browser.ecore.ui/src/org/eclipse/modisco/infra/browser/ecore/ui/internal/custom/NbInstancesEClassByResourceQuery.java
new file mode 100644
index 0000000..1ee2146
--- /dev/null
+++ b/org.eclipse.modisco.infra.browser.ecore.ui/src/org/eclipse/modisco/infra/browser/ecore/ui/internal/custom/NbInstancesEClassByResourceQuery.java
@@ -0,0 +1,51 @@
+/**
+ * Copyright (c) 2015 Soft-Maint.
+ * 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:
+ * Thomas Cicognani (Soft-Maint) - Bug 472041 - [New Browser] Add a customization counting instances by EClass in the same Resource
+ */
+package org.eclipse.modisco.infra.browser.ecore.ui.internal.custom;
+
+import java.util.Set;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.facet.efacet.core.IFacetManager;
+import org.eclipse.emf.facet.efacet.core.exception.DerivedTypedElementException;
+import org.eclipse.emf.facet.efacet.metamodel.v0_2_0.efacet.DerivedTypedElement;
+import org.eclipse.emf.facet.query.java.core.IJavaQuery3;
+import org.eclipse.emf.facet.query.java.core.IParameterValueList2;
+import org.eclipse.modisco.infra.browser.ecore.ui.internal.widget.InternalUtils;
+
+/**
+ * Add the number of instances of an EClass (in the same Resource) at the end of
+ * the name
+ */
+public class NbInstancesEClassByResourceQuery implements
+ IJavaQuery3<EObject, String> {
+
+ public String evaluate(final EObject source,
+ final IParameterValueList2 parameterValues,
+ final IFacetManager facetManager, final DerivedTypedElement feature)
+ throws DerivedTypedElementException {
+ try {
+ String instancesNbStr = ""; //$NON-NLS-1$
+ if (source instanceof EClass) {
+ final EClass eClass = (EClass) source;
+ final Set<EObject> allInstances = InternalUtils
+ .getInstancesOfFromCurrentResources(eClass);
+ instancesNbStr = String.format(" (%d)", //$NON-NLS-1$
+ Integer.valueOf(allInstances.size()));
+ }
+ return facetManager.getSuperValueOf(feature, source,
+ parameterValues, String.class) + instancesNbStr;
+ } catch (Exception e) {
+ throw new DerivedTypedElementException(e);
+ }
+ }
+
+}
diff --git a/org.eclipse.modisco.infra.browser.ecore.ui/src/org/eclipse/modisco/infra/browser/ecore/ui/internal/custom/NbInstancesEClassByResourceSetQuery.java b/org.eclipse.modisco.infra.browser.ecore.ui/src/org/eclipse/modisco/infra/browser/ecore/ui/internal/custom/NbInstancesEClassByResourceSetQuery.java
new file mode 100644
index 0000000..dfd1e57
--- /dev/null
+++ b/org.eclipse.modisco.infra.browser.ecore.ui/src/org/eclipse/modisco/infra/browser/ecore/ui/internal/custom/NbInstancesEClassByResourceSetQuery.java
@@ -0,0 +1,50 @@
+/**
+ * Copyright (c) 2015 Soft-Maint.
+ * 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:
+ * Thomas Cicognani (Soft-Maint) - Bug 471447 - [New Browser] Add a customization counting instances by EClass
+ * Thomas Cicognani (Soft-Maint) - Bug 472041 - [New Browser] Add a customization counting instances by EClass in the same Resource
+ */
+package org.eclipse.modisco.infra.browser.ecore.ui.internal.custom;
+
+import java.util.Set;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.facet.efacet.core.IFacetManager;
+import org.eclipse.emf.facet.efacet.core.exception.DerivedTypedElementException;
+import org.eclipse.emf.facet.efacet.metamodel.v0_2_0.efacet.DerivedTypedElement;
+import org.eclipse.emf.facet.query.java.core.IJavaQuery3;
+import org.eclipse.emf.facet.query.java.core.IParameterValueList2;
+import org.eclipse.modisco.infra.browser.ecore.ui.internal.widget.InternalUtils;
+
+/**
+ * Add the number of instances of an EClass (in the ResourceSet) at the end of the name
+ */
+public class NbInstancesEClassByResourceSetQuery implements IJavaQuery3<EObject, String> {
+
+ public String evaluate(final EObject source,
+ final IParameterValueList2 parameterValues,
+ final IFacetManager facetManager, final DerivedTypedElement feature)
+ throws DerivedTypedElementException {
+ try {
+ String instancesNbStr = ""; //$NON-NLS-1$
+ if (source instanceof EClass) {
+ final EClass eClass = (EClass) source;
+ final Set<EObject> allInstances = InternalUtils
+ .getInstancesOfFromCurrentResourceSets(eClass);
+ instancesNbStr = String.format(" (%d)", //$NON-NLS-1$
+ Integer.valueOf(allInstances.size()));
+ }
+ return facetManager.getSuperValueOf(feature, source,
+ parameterValues, String.class) + instancesNbStr;
+ } catch (Exception e) {
+ throw new DerivedTypedElementException(e);
+ }
+ }
+
+}
diff --git a/org.eclipse.modisco.infra.browser.ecore.ui/src/org/eclipse/modisco/infra/browser/ecore/ui/internal/exported/IEcoreExplorerWidget.java b/org.eclipse.modisco.infra.browser.ecore.ui/src/org/eclipse/modisco/infra/browser/ecore/ui/internal/exported/IEcoreExplorerWidget.java
new file mode 100644
index 0000000..93dd65f
--- /dev/null
+++ b/org.eclipse.modisco.infra.browser.ecore.ui/src/org/eclipse/modisco/infra/browser/ecore/ui/internal/exported/IEcoreExplorerWidget.java
@@ -0,0 +1,34 @@
+/**
+ * Copyright (c) 2015 Soft-Maint, and Mia-Software
+ * 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:
+ * Thomas Cicognani (Soft-Maint) - Bug 471020 - Ecore Explorer View
+ * Thomas Cicognani (Soft-Maint) - Bug 472041 - [New Browser] Add a customization counting instances by EClass in the same Resource
+ * Grégoire Dupé (Mia-Software) - Bug 471020 - Ecore Explorer View
+ */
+package org.eclipse.modisco.infra.browser.ecore.ui.internal.exported;
+
+import java.util.Collection;
+import java.util.Set;
+
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EObject;
+
+/**
+ * @noextend
+ * @noimplement
+ */
+public interface IEcoreExplorerWidget extends IAdaptable {
+
+ void changeInput(Collection<EObject> eObjects);
+
+ Set<EObject> getInstancesOfFromCurrentResources(EClass eClass);
+
+ Set<EObject> getInstancesOfFromCurrentResourceSets(EClass eClass);
+
+}
diff --git a/org.eclipse.modisco.infra.browser.ecore.ui/src/org/eclipse/modisco/infra/browser/ecore/ui/internal/exported/IEcoreExplorerWidgetFactory.java b/org.eclipse.modisco.infra.browser.ecore.ui/src/org/eclipse/modisco/infra/browser/ecore/ui/internal/exported/IEcoreExplorerWidgetFactory.java
new file mode 100644
index 0000000..cd2da1f
--- /dev/null
+++ b/org.eclipse.modisco.infra.browser.ecore.ui/src/org/eclipse/modisco/infra/browser/ecore/ui/internal/exported/IEcoreExplorerWidgetFactory.java
@@ -0,0 +1,34 @@
+/**
+ * Copyright (c) 2015 Soft-Maint, and Mia-Software
+ * 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:
+ * Thomas Cicognani (Soft-Maint) - Bug 471020 - Ecore Explorer View
+ * Grégoire Dupé (Mia-Software) - Bug 471020 - Ecore Explorer View
+ */
+package org.eclipse.modisco.infra.browser.ecore.ui.internal.exported;
+
+import org.eclipse.jface.action.MenuManager;
+import org.eclipse.modisco.infra.browser.ecore.ui.internal.widget.EcoreExplorerWidgetFactory;
+import org.eclipse.swt.widgets.Composite;
+
+/**
+ * @noextend
+ * @noimplement
+ */
+public interface IEcoreExplorerWidgetFactory {
+
+ IEcoreExplorerWidgetFactory DEFAULT = new EcoreExplorerWidgetFactory();
+
+ /**
+ * Constructor called by a Dialog window because a Dialog doesn't have any
+ * MenuManager. A default MenuManager is created.
+ */
+ IEcoreExplorerWidget createWidget(Composite parent);
+
+ IEcoreExplorerWidget createWidget(Composite parent, MenuManager menuManager);
+
+}
diff --git a/org.eclipse.modisco.infra.browser.ecore.ui/src/org/eclipse/modisco/infra/browser/ecore/ui/internal/exported/IView.java b/org.eclipse.modisco.infra.browser.ecore.ui/src/org/eclipse/modisco/infra/browser/ecore/ui/internal/exported/IView.java
new file mode 100644
index 0000000..4d5de7d
--- /dev/null
+++ b/org.eclipse.modisco.infra.browser.ecore.ui/src/org/eclipse/modisco/infra/browser/ecore/ui/internal/exported/IView.java
@@ -0,0 +1,24 @@
+/**
+ * Copyright (c) 2015 Soft-Maint, and Mia-Software
+ * 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:
+ * Thomas Cicognani (Soft-Maint) - Bug 471020 - Ecore Explorer View
+ * Grégoire Dupé (Mia-Software) - Bug 471020 - Ecore Explorer View
+ */
+package org.eclipse.modisco.infra.browser.ecore.ui.internal.exported;
+
+//TODO Must be moved to org.eclipe.modisco.util.ui
+
+/**
+ * @noextend
+ * @noimplement
+ */
+public interface IView<W extends Object> {
+
+ W getWidget();
+
+}
\ No newline at end of file
diff --git a/org.eclipse.modisco.infra.browser.ecore.ui/src/org/eclipse/modisco/infra/browser/ecore/ui/internal/handler/LoadCustomShortcutsMenu.java b/org.eclipse.modisco.infra.browser.ecore.ui/src/org/eclipse/modisco/infra/browser/ecore/ui/internal/handler/LoadCustomShortcutsMenu.java
new file mode 100644
index 0000000..1aa927f
--- /dev/null
+++ b/org.eclipse.modisco.infra.browser.ecore.ui/src/org/eclipse/modisco/infra/browser/ecore/ui/internal/handler/LoadCustomShortcutsMenu.java
@@ -0,0 +1,24 @@
+/**
+ * Copyright (c) 2015 Mia-Software.
+ * 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:
+ * Thomas Cicognani (Mia-Software) - Bug 470962 - Add shortcuts to activate customs
+ */
+package org.eclipse.modisco.infra.browser.ecore.ui.internal.handler;
+
+import org.eclipse.emf.facet.custom.ui.LoadCustomShortcutsMenuUtils;
+import org.eclipse.jface.action.IContributionItem;
+import org.eclipse.ui.actions.CompoundContributionItem;
+
+public class LoadCustomShortcutsMenu extends CompoundContributionItem {
+
+ @Override
+ protected IContributionItem[] getContributionItems() {
+ return LoadCustomShortcutsMenuUtils.getCustomItemsFromCurrentPart();
+ }
+
+}
diff --git a/org.eclipse.modisco.infra.browser.ecore.ui/src/org/eclipse/modisco/infra/browser/ecore/ui/internal/handler/LoadFacetSetShortcutsMenu.java b/org.eclipse.modisco.infra.browser.ecore.ui/src/org/eclipse/modisco/infra/browser/ecore/ui/internal/handler/LoadFacetSetShortcutsMenu.java
new file mode 100644
index 0000000..d0e1bc6
--- /dev/null
+++ b/org.eclipse.modisco.infra.browser.ecore.ui/src/org/eclipse/modisco/infra/browser/ecore/ui/internal/handler/LoadFacetSetShortcutsMenu.java
@@ -0,0 +1,24 @@
+/**
+ * Copyright (c) 2015 Mia-Software.
+ * 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:
+ * Thomas Cicognani (Mia-Software) - Bug 470962 - Add shortcuts to activate customs
+ */
+package org.eclipse.modisco.infra.browser.ecore.ui.internal.handler;
+
+import org.eclipse.emf.facet.efacet.ui.LoadFacetSetShortcutsMenuUtils;
+import org.eclipse.jface.action.IContributionItem;
+import org.eclipse.ui.actions.CompoundContributionItem;
+
+public class LoadFacetSetShortcutsMenu extends CompoundContributionItem {
+
+ @Override
+ protected IContributionItem[] getContributionItems() {
+ return LoadFacetSetShortcutsMenuUtils.getFacetSetItemsFromCurrentPart();
+ }
+
+}
diff --git a/org.eclipse.modisco.infra.browser.ecore.ui/src/org/eclipse/modisco/infra/browser/ecore/ui/internal/messages.properties b/org.eclipse.modisco.infra.browser.ecore.ui/src/org/eclipse/modisco/infra/browser/ecore/ui/internal/messages.properties
new file mode 100644
index 0000000..1b505be
--- /dev/null
+++ b/org.eclipse.modisco.infra.browser.ecore.ui/src/org/eclipse/modisco/infra/browser/ecore/ui/internal/messages.properties
@@ -0,0 +1,18 @@
+###############################################################################
+# Copyright (c) 2015 Soft-Maint, and Mia-Software.
+# 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:
+# Thomas Cicognani (Soft-Maint) - Bug 471020 - Ecore Explorer View
+# Thomas Cicognani (Mia-Software) - Bug 470962 - Add shortcuts to activate customs
+###############################################################################
+EcoreInstancesExplorerComposite_Instances=Instances
+EcoreMetaExplorerComposite_Metas=Metas
+EcoreExplorerShortcutUtils_NbInstancesEClassByResource = Show The Number Of Instances From An EClass, In The Same Resource
+EcoreExplorerShortcutUtils_NbInstancesEClassByResourceSet = Show The Number Of Instances From An EClass, In The Same ResourceSet
+EcoreExplorerShortcutUtils_EClassFromEPackage=Show Contained EClass From EPackage
+EcoreExplorerShortcutUtils_EClassSubclasses=Show EClass Subclasses
+EcoreExplorerShortcutUtils_EClassHierarchy=Show EClass Hierarchy
diff --git a/org.eclipse.modisco.infra.browser.ecore.ui/src/org/eclipse/modisco/infra/browser/ecore/ui/internal/sync/generated/SynchronizedEcoreExplorerWidget.java b/org.eclipse.modisco.infra.browser.ecore.ui/src/org/eclipse/modisco/infra/browser/ecore/ui/internal/sync/generated/SynchronizedEcoreExplorerWidget.java
new file mode 100644
index 0000000..d6afb37
--- /dev/null
+++ b/org.eclipse.modisco.infra.browser.ecore.ui/src/org/eclipse/modisco/infra/browser/ecore/ui/internal/sync/generated/SynchronizedEcoreExplorerWidget.java
@@ -0,0 +1,63 @@
+/**
+ * Copyright (c) 2015 Soft-Maint
+ * 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:
+ * Thomas Cicognani (Soft-Maint) - Bug 471020 - Ecore Explorer View
+ * Thomas Cicognani (Soft-Maint) - Bug 472041 - [New Browser] Add a customization counting instances by EClass in the same Resource
+ */
+package org.eclipse.modisco.infra.browser.ecore.ui.internal.sync.generated;
+
+import org.eclipse.emf.facet.util.ui.internal.exported.displaysync.SynchronizedObject;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.emf.facet.util.ui.internal.exported.displaysync.AbstractVoidExceptionFreeRunnable;
+import org.eclipse.emf.facet.util.ui.internal.exported.displaysync.AbstractExceptionFreeRunnable;
+
+@SuppressWarnings("PMD.ExcessivePublicCount")
+public class SynchronizedEcoreExplorerWidget extends SynchronizedObject<org.eclipse.modisco.infra.browser.ecore.ui.internal.exported.IEcoreExplorerWidget> implements org.eclipse.modisco.infra.browser.ecore.ui.internal.exported.IEcoreExplorerWidget {
+
+ public SynchronizedEcoreExplorerWidget(final org.eclipse.modisco.infra.browser.ecore.ui.internal.exported.IEcoreExplorerWidget object, final Display display) {
+ super(object, display);
+ }
+ public final java.lang.Object getAdapter(
+ @SuppressWarnings("rawtypes") // @SuppressWarnings("rawtypes"): tci> Because of the implementation
+ final java.lang.Class parm0) {
+ return safeSyncExec(new AbstractExceptionFreeRunnable<java.lang.Object>() {
+ @Override
+ public java.lang.Object safeRun() {
+ return SynchronizedEcoreExplorerWidget.this.getSynchronizedObject().getAdapter(parm0);
+ }
+ });
+ }
+
+ public final void changeInput(final java.util.Collection<org.eclipse.emf.ecore.EObject> parm0) {
+ voidExceptionFreeRunnable(new AbstractVoidExceptionFreeRunnable() {
+ @Override
+ public void voidSafeRun() {
+ SynchronizedEcoreExplorerWidget.this.getSynchronizedObject().changeInput(parm0);
+ }
+ });
+ }
+
+ public final java.util.Set<org.eclipse.emf.ecore.EObject> getInstancesOfFromCurrentResourceSets(final org.eclipse.emf.ecore.EClass parm0) {
+ return safeSyncExec(new AbstractExceptionFreeRunnable<java.util.Set<org.eclipse.emf.ecore.EObject>>() {
+ @Override
+ public java.util.Set<org.eclipse.emf.ecore.EObject> safeRun() {
+ return SynchronizedEcoreExplorerWidget.this.getSynchronizedObject().getInstancesOfFromCurrentResourceSets(parm0);
+ }
+ });
+ }
+
+ public final java.util.Set<org.eclipse.emf.ecore.EObject> getInstancesOfFromCurrentResources(final org.eclipse.emf.ecore.EClass parm0) {
+ return safeSyncExec(new AbstractExceptionFreeRunnable<java.util.Set<org.eclipse.emf.ecore.EObject>>() {
+ @Override
+ public java.util.Set<org.eclipse.emf.ecore.EObject> safeRun() {
+ return SynchronizedEcoreExplorerWidget.this.getSynchronizedObject().getInstancesOfFromCurrentResources(parm0);
+ }
+ });
+ }
+
+}
diff --git a/org.eclipse.modisco.infra.browser.ecore.ui/src/org/eclipse/modisco/infra/browser/ecore/ui/internal/view/EcoreExplorerView.java b/org.eclipse.modisco.infra.browser.ecore.ui/src/org/eclipse/modisco/infra/browser/ecore/ui/internal/view/EcoreExplorerView.java
new file mode 100644
index 0000000..a363f1b
--- /dev/null
+++ b/org.eclipse.modisco.infra.browser.ecore.ui/src/org/eclipse/modisco/infra/browser/ecore/ui/internal/view/EcoreExplorerView.java
@@ -0,0 +1,145 @@
+/**
+ * Copyright (c) 2015 Mia-Software, and Soft-Maint
+ * 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:
+ * Grégoire Dupé (Mia-Software) - Bug 471020 - Ecore Explorer View
+ * Thomas Cicognani (Soft-Maint) - Bug 471020 - Ecore Explorer View
+ */
+package org.eclipse.modisco.infra.browser.ecore.ui.internal.view;
+
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Set;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.jface.action.MenuManager;
+import org.eclipse.jface.action.Separator;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.ISelectionProvider;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.modisco.infra.browser.ecore.ui.internal.exported.IEcoreExplorerWidget;
+import org.eclipse.modisco.infra.browser.ecore.ui.internal.exported.IEcoreExplorerWidgetFactory;
+import org.eclipse.modisco.infra.browser.ecore.ui.internal.exported.IView;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.ui.ISelectionListener;
+import org.eclipse.ui.ISelectionService;
+import org.eclipse.ui.IWorkbenchActionConstants;
+import org.eclipse.ui.IWorkbenchPage;
+import org.eclipse.ui.IWorkbenchPart;
+import org.eclipse.ui.IWorkbenchWindow;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.part.ViewPart;
+
+public class EcoreExplorerView extends ViewPart implements
+ IView<IEcoreExplorerWidget> {
+
+ private IEcoreExplorerWidget widget;
+
+ private final EcoreExplorerWindowListener wListener;
+
+ private final ISelectionListener selectionListener = new ISelectionListener() {
+ public void selectionChanged(final IWorkbenchPart part,
+ final ISelection selection) {
+ if (!part.equals(EcoreExplorerView.this)) {
+ EcoreExplorerView.this.changeInput(selection);
+ }
+ }
+ };
+
+ public EcoreExplorerView() {
+ super();
+ final IWorkbenchWindow[] windows = PlatformUI.getWorkbench()
+ .getWorkbenchWindows();
+ this.wListener = new EcoreExplorerWindowListener(this);
+ for (IWorkbenchWindow window : windows) {
+ window.addPageListener(this.wListener);
+ for (IWorkbenchPage page : window.getPages()) {
+ page.addPartListener(this.wListener);
+ }
+ }
+ }
+
+ private ISelectionService getSelectionService() {
+ final IWorkbenchWindow wWindow = getSite().getWorkbenchWindow();
+ return wWindow.getSelectionService();
+ }
+
+ /**
+ * Change the input from a selection in the Workbench
+ */
+ protected final boolean changeInput(final ISelection selection) {
+ final Set<EObject> eObjects = new HashSet<EObject>();
+ if (selection instanceof IStructuredSelection) {
+ final IStructuredSelection structSelection = (IStructuredSelection) selection;
+ for (Object object : structSelection.toArray()) {
+ final EObject eObject = Utils.getResolvedEObject(object);
+ if (eObject != null) {
+ eObjects.add(eObject);
+ }
+ }
+ }
+ changeInput(eObjects);
+ return !eObjects.isEmpty();
+ }
+
+ public void changeInput(final Collection<EObject> eObjects) {
+ this.widget.changeInput(eObjects);
+ }
+
+ @Override
+ public void createPartControl(final Composite parent) {
+ final MenuManager menuManager = new MenuManager("#PopUp"); //$NON-NLS-1$
+ menuManager.add(new Separator(IWorkbenchActionConstants.MB_ADDITIONS));
+
+ this.widget = IEcoreExplorerWidgetFactory.DEFAULT.createWidget(parent,
+ menuManager);
+
+ final ISelectionProvider widgetSP = (ISelectionProvider) this.widget
+ .getAdapter(ISelectionProvider.class);
+ getSite().registerContextMenu(menuManager, widgetSP);
+ getSite().setSelectionProvider(widgetSP);
+ getSelectionService().addSelectionListener(this.selectionListener);
+ }
+
+ @Override
+ public void setFocus() {
+ // Nothing to do
+ }
+
+ @Override
+ public Object getAdapter(@SuppressWarnings("rawtypes") final Class adapter) {
+ /* @SuppressWarnings("rawtypes"): gdupe> Imposed by the super class */
+ Object result;
+ if (adapter.isInstance(this)) {
+ result = this;
+ } else {
+ result = this.widget.getAdapter(adapter);
+ if (result == null) {
+ result = super.getAdapter(adapter);
+ }
+ }
+ return result;
+ }
+
+ @Override
+ public void dispose() {
+ getSelectionService().removeSelectionListener(this.selectionListener);
+ final IWorkbenchWindow[] windows = PlatformUI.getWorkbench()
+ .getWorkbenchWindows();
+ for (IWorkbenchWindow window : windows) {
+ window.removePageListener(this.wListener);
+ for (IWorkbenchPage page : window.getPages()) {
+ page.removePartListener(this.wListener);
+ }
+ }
+ super.dispose();
+ }
+
+ public IEcoreExplorerWidget getWidget() {
+ return this.widget;
+ }
+}
diff --git a/org.eclipse.modisco.infra.browser.ecore.ui/src/org/eclipse/modisco/infra/browser/ecore/ui/internal/view/EcoreExplorerWindowListener.java b/org.eclipse.modisco.infra.browser.ecore.ui/src/org/eclipse/modisco/infra/browser/ecore/ui/internal/view/EcoreExplorerWindowListener.java
new file mode 100644
index 0000000..4090082
--- /dev/null
+++ b/org.eclipse.modisco.infra.browser.ecore.ui/src/org/eclipse/modisco/infra/browser/ecore/ui/internal/view/EcoreExplorerWindowListener.java
@@ -0,0 +1,121 @@
+/**
+ * Copyright (c) 2015 Mia-Software, and Soft-Maint
+ * 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:
+ * Grégoire Dupé (Mia-Software) - Bug 471020 - Ecore Explorer View
+ * Thomas Cicognani (Soft-Maint) - Bug 471020 - Ecore Explorer View
+ */
+package org.eclipse.modisco.infra.browser.ecore.ui.internal.view;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.resource.ResourceSet;
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.emf.edit.domain.IEditingDomainProvider;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.ISelectionProvider;
+import org.eclipse.jface.viewers.StructuredSelection;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.IEditorSite;
+import org.eclipse.ui.IPageListener;
+import org.eclipse.ui.IPartListener2;
+import org.eclipse.ui.IWorkbenchPage;
+import org.eclipse.ui.IWorkbenchPart;
+import org.eclipse.ui.IWorkbenchPartReference;
+import org.eclipse.ui.part.EditorPart;
+
+public class EcoreExplorerWindowListener implements IPageListener,
+ IPartListener2 {
+
+ private final EcoreExplorerView view;
+
+ public EcoreExplorerWindowListener(final EcoreExplorerView view) {
+ this.view = view;
+ }
+
+ public void pageActivated(final IWorkbenchPage page) {
+ changeInput(page);
+ }
+
+ public void pageClosed(final IWorkbenchPage page) {
+ changeInput(page);
+ }
+
+ public void pageOpened(final IWorkbenchPage page) {
+ changeInput(page);
+ page.addPartListener(this);
+ }
+
+ public void partActivated(final IWorkbenchPartReference partRef) {
+ changeInput(partRef.getPart(false));
+ }
+
+ public void partBroughtToTop(final IWorkbenchPartReference partRef) {
+ changeInput(partRef.getPart(false));
+ }
+
+ public void partClosed(final IWorkbenchPartReference partRef) {
+ final IWorkbenchPage page = partRef.getPage();
+ final IEditorPart activeEditor = page.getActiveEditor();
+ if (activeEditor == null) {
+ this.view.changeInput(new StructuredSelection());
+ } else {
+ changeInput(activeEditor);
+ }
+ }
+
+ public void partDeactivated(final IWorkbenchPartReference partRef) {
+ changeInput(partRef.getPart(false));
+ }
+
+ public void partOpened(final IWorkbenchPartReference partRef) {
+ changeInput(partRef.getPart(false));
+ }
+
+ public void partHidden(final IWorkbenchPartReference partRef) {
+ changeInput(partRef.getPart(false));
+ }
+
+ public void partVisible(final IWorkbenchPartReference partRef) {
+ changeInput(partRef.getPart(false));
+ }
+
+ public void partInputChanged(final IWorkbenchPartReference partRef) {
+ changeInput(partRef.getPart(false));
+ }
+
+ private void changeInput(final IWorkbenchPage page) {
+ final IWorkbenchPart part = page.getActivePart();
+ if (part != null) {
+ changeInput(part);
+ }
+ }
+
+ private void changeInput(final IWorkbenchPart part) {
+ if (part instanceof EditorPart) {
+ final EditorPart editorPart = (EditorPart) part;
+ final IEditorSite editorSite = editorPart.getEditorSite();
+ final ISelectionProvider selectionProvider = editorSite.getSelectionProvider();
+ final ISelection selection = selectionProvider.getSelection();
+ if (!this.view.changeInput(selection)) {
+ final IEditingDomainProvider edProvider = (IEditingDomainProvider) part
+ .getAdapter(IEditingDomainProvider.class);
+ final EditingDomain editingDomain = edProvider
+ .getEditingDomain();
+ final ResourceSet resourceSet = editingDomain.getResourceSet();
+ final Set<EObject> eObjects = new HashSet<EObject>();
+ for (Resource resource : resourceSet.getResources()) {
+ eObjects.addAll(resource.getContents());
+ }
+ this.view.changeInput(eObjects);
+ }
+ }
+ }
+}
diff --git a/org.eclipse.modisco.infra.browser.ecore.ui/src/org/eclipse/modisco/infra/browser/ecore/ui/internal/view/Utils.java b/org.eclipse.modisco.infra.browser.ecore.ui/src/org/eclipse/modisco/infra/browser/ecore/ui/internal/view/Utils.java
new file mode 100644
index 0000000..6ed19e8
--- /dev/null
+++ b/org.eclipse.modisco.infra.browser.ecore.ui/src/org/eclipse/modisco/infra/browser/ecore/ui/internal/view/Utils.java
@@ -0,0 +1,79 @@
+/**
+ * Copyright (c) 2015 Mia-Software, and Soft-Maint
+ * 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:
+ * Grégoire Dupé (Mia-Software) - Bug 471020 - Ecore Explorer View
+ * Thomas Cicognani (Soft-Maint) - Bug 471020 - Ecore Explorer View
+ */
+package org.eclipse.modisco.infra.browser.ecore.ui.internal.view;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.resource.ResourceSet;
+import org.eclipse.emf.facet.custom.metamodel.v0_2_0.internal.treeproxy.EObjectTreeElement;
+import org.eclipse.emf.facet.custom.metamodel.v0_2_0.internal.treeproxy.EStructuralFeatureTreeElement;
+import org.eclipse.emf.facet.custom.ui.CustomizedContentProviderUtils;
+
+public final class Utils {
+
+ private Utils() {
+ // Must not be used
+ }
+
+ public static ResourceSet getResourceSet(final Object object) {
+ ResourceSet result = null;
+ if (object instanceof EObject) {
+ final EObject eObject = (EObject) object;
+ result = eObject.eResource().getResourceSet();
+ }
+ return result;
+ }
+
+ public static EPackage getEPackage(final Object object) {
+ EPackage result = null;
+ if (object instanceof EObject) {
+ final EObject eObject = (EObject) object;
+ result = getEPackage(eObject);
+ }
+ return result;
+ }
+
+ public static EPackage getEPackage(final EObject eObject) {
+ EPackage result;
+ final EObject resolvedEObject = getResolvedEObject(eObject);
+ final EClass eClass = resolvedEObject.eClass();
+ result = eClass.getEPackage();
+ return result;
+ }
+
+ public static EObject getResolvedEObject(final Object object) {
+ EObject result = null;
+ if (object instanceof EObject) {
+ final EObject eObject = (EObject) object;
+ result = getResolvedEObject(eObject);
+ }
+ return result;
+ }
+
+ public static EObject getResolvedEObject(final EObject eObject) {
+ EObject resolvedEObject = eObject;
+ if (eObject instanceof EObjectTreeElement) {
+ final EObjectTreeElement treeElt = (EObjectTreeElement) eObject;
+ final Object resolvedObject = CustomizedContentProviderUtils
+ .resolve(treeElt);
+ if (resolvedObject instanceof EObject) {
+ resolvedEObject = (EObject) resolvedObject;
+ }
+ } else if (eObject instanceof EStructuralFeatureTreeElement) {
+ final EStructuralFeatureTreeElement sfTreeElt = (EStructuralFeatureTreeElement) eObject;
+ final EObjectTreeElement eContainer = (EObjectTreeElement) sfTreeElt.eContainer();
+ resolvedEObject = eContainer.getEObject();
+ }
+ return resolvedEObject;
+ }
+}
diff --git a/org.eclipse.modisco.infra.browser.ecore.ui/src/org/eclipse/modisco/infra/browser/ecore/ui/internal/widget/EcoreExplorerAdapter.java b/org.eclipse.modisco.infra.browser.ecore.ui/src/org/eclipse/modisco/infra/browser/ecore/ui/internal/widget/EcoreExplorerAdapter.java
new file mode 100644
index 0000000..4b23598
--- /dev/null
+++ b/org.eclipse.modisco.infra.browser.ecore.ui/src/org/eclipse/modisco/infra/browser/ecore/ui/internal/widget/EcoreExplorerAdapter.java
@@ -0,0 +1,46 @@
+/**
+ * Copyright (c) 2015 Soft-Maint
+ * 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:
+ * Thomas Cicognani (Soft-Maint) - Bug 471020 - Ecore Explorer View
+ */
+package org.eclipse.modisco.infra.browser.ecore.ui.internal.widget;
+
+import org.eclipse.emf.common.notify.Adapter;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.Notifier;
+import org.eclipse.modisco.infra.browser.ecore.ui.internal.exported.IEcoreExplorerWidget;
+
+public class EcoreExplorerAdapter implements Adapter {
+
+ private final IEcoreExplorerWidget widget;
+
+ public EcoreExplorerAdapter(final IEcoreExplorerWidget widget) {
+ this.widget = widget;
+ }
+
+ public void notifyChanged(final Notification notification) {
+ // DO NOTHING
+ }
+
+ public Notifier getTarget() {
+ return null;
+ }
+
+ public void setTarget(final Notifier newTarget) {
+ // DO NOTHING
+ }
+
+ public boolean isAdapterForType(final Object type) {
+ return false;
+ }
+
+ public IEcoreExplorerWidget getWidget() {
+ return this.widget;
+ }
+
+}
diff --git a/org.eclipse.modisco.infra.browser.ecore.ui/src/org/eclipse/modisco/infra/browser/ecore/ui/internal/widget/EcoreExplorerShortcutUtils.java b/org.eclipse.modisco.infra.browser.ecore.ui/src/org/eclipse/modisco/infra/browser/ecore/ui/internal/widget/EcoreExplorerShortcutUtils.java
new file mode 100644
index 0000000..f6ce736
--- /dev/null
+++ b/org.eclipse.modisco.infra.browser.ecore.ui/src/org/eclipse/modisco/infra/browser/ecore/ui/internal/widget/EcoreExplorerShortcutUtils.java
@@ -0,0 +1,147 @@
+/**
+ * Copyright (c) 2015 Mia-Software.
+ * 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:
+ * Thomas Cicognani (Mia-Software) - Bug 470962 - Add shortcuts to activate customs
+ */
+package org.eclipse.modisco.infra.browser.ecore.ui.internal.widget;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.resource.ResourceSet;
+import org.eclipse.emf.facet.custom.metamodel.v0_2_0.custom.Customization;
+import org.eclipse.emf.facet.custom.ui.ICustomizationManagerProvider2.ICustomShortcut;
+import org.eclipse.emf.facet.efacet.metamodel.v0_2_0.efacet.FacetSet;
+import org.eclipse.emf.facet.efacet.ui.IFacetManagerProvider2.IFacetSetShortcut;
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.modisco.infra.browser.ecore.ui.internal.Activator;
+import org.eclipse.modisco.infra.browser.ecore.ui.internal.Messages;
+import org.osgi.framework.Bundle;
+
+public final class EcoreExplorerShortcutUtils {
+
+ private EcoreExplorerShortcutUtils() {
+ // DO NOTHING
+ }
+
+ public static List<ICustomShortcut> getCustomShortcuts(
+ final ResourceSet resourceSet) {
+ final List<ICustomShortcut> shortcuts = new ArrayList<ICustomShortcut>();
+ final Bundle bundle = Activator.getDefault().getBundle();
+ final String bundleName = bundle.getSymbolicName();
+
+ final String uriStr = String
+ .format("platform:/plugin/%s/custom/nbInstancesEClassByResource.custom", //$NON-NLS-1$
+ bundleName);
+ shortcuts
+ .add(createCustomShortcut(
+ resourceSet,
+ uriStr,
+ Messages.EcoreExplorerShortcutUtils_NbInstancesEClassByResource));
+
+ final String uriStr2 = String
+ .format("platform:/plugin/%s/custom/nbInstancesEClassByResourceSet.custom", //$NON-NLS-1$
+ bundleName);
+ shortcuts
+ .add(createCustomShortcut(
+ resourceSet,
+ uriStr2,
+ Messages.EcoreExplorerShortcutUtils_NbInstancesEClassByResourceSet));
+
+ shortcuts
+ .add(createCustomShortcut(
+ resourceSet,
+ "platform:/plugin/org.eclipse.modisco.infra.browser.ecore.core/custom/ePackageContainsEClass.custom", //$NON-NLS-1$
+ Messages.EcoreExplorerShortcutUtils_EClassFromEPackage));
+
+ shortcuts
+ .add(createCustomShortcut(
+ resourceSet,
+ "platform:/plugin/org.eclipse.modisco.infra.browser.ecore.core/custom/hierarchicalEClass.custom", //$NON-NLS-1$
+ Messages.EcoreExplorerShortcutUtils_EClassHierarchy));
+
+ return shortcuts;
+ }
+
+ public static List<IFacetSetShortcut> getFacetSetShortcuts(
+ final ResourceSet resourceSet) {
+ final List<IFacetSetShortcut> shortcuts = new ArrayList<IFacetSetShortcut>();
+
+ shortcuts
+ .add(createFacetSetShortcut(
+ resourceSet,
+ "platform:/plugin/org.eclipse.modisco.infra.browser.ecore.core/facet/hierarchicalEClass.efacet", //$NON-NLS-1$
+ Messages.EcoreExplorerShortcutUtils_EClassSubclasses));
+
+ return shortcuts;
+ }
+
+ private static ICustomShortcut createCustomShortcut(
+ final ResourceSet resourceSet, final String uriStr,
+ final String label) {
+ return createCustomShortcut(resourceSet, uriStr, label, null);
+ }
+
+ private static ICustomShortcut createCustomShortcut(
+ final ResourceSet resourceSet, final String uriStr,
+ final String label, final ImageDescriptor icon) {
+ final Customization custom = (Customization) getObjectFromURI(uriStr,
+ resourceSet);
+ return new ICustomShortcut() {
+ public String getLabel() {
+ return label;
+ }
+
+ public Customization getCustom() {
+ return custom;
+ }
+
+ public ImageDescriptor getIcon() {
+ return icon;
+ }
+ };
+ }
+
+ private static IFacetSetShortcut createFacetSetShortcut(
+ final ResourceSet resourceSet, final String uriStr,
+ final String label) {
+ return createFacetSetShortcut(resourceSet, uriStr, label, null);
+ }
+
+ private static IFacetSetShortcut createFacetSetShortcut(
+ final ResourceSet resourceSet, final String uriStr,
+ final String label, final ImageDescriptor icon) {
+ final FacetSet facetSet = (FacetSet) getObjectFromURI(uriStr,
+ resourceSet);
+ return new IFacetSetShortcut() {
+ public String getLabel() {
+ return label;
+ }
+
+ public FacetSet getFacetSet() {
+ return facetSet;
+ }
+
+ public ImageDescriptor getIcon() {
+ return icon;
+ }
+ };
+ }
+
+ private static EObject getObjectFromURI(final String uriStr,
+ final ResourceSet resourceSet) {
+ final URI uri = URI.createURI(uriStr);
+ final Resource resource = resourceSet.getResource(uri, true);
+ final EList<EObject> contents = resource.getContents();
+ return contents.get(0);
+ }
+}
diff --git a/org.eclipse.modisco.infra.browser.ecore.ui/src/org/eclipse/modisco/infra/browser/ecore/ui/internal/widget/EcoreExplorerWidget.java b/org.eclipse.modisco.infra.browser.ecore.ui/src/org/eclipse/modisco/infra/browser/ecore/ui/internal/widget/EcoreExplorerWidget.java
new file mode 100644
index 0000000..c2b8370
--- /dev/null
+++ b/org.eclipse.modisco.infra.browser.ecore.ui/src/org/eclipse/modisco/infra/browser/ecore/ui/internal/widget/EcoreExplorerWidget.java
@@ -0,0 +1,132 @@
+/**
+ * Copyright (c) 2015 Soft-Maint
+ * 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:
+ * Thomas Cicognani (Soft-Maint) - Bug 471020 - Ecore Explorer View
+ * Thomas Cicognani (Soft-Maint) - Bug 472041 - [New Browser] Add a customization counting instances by EClass in the same Resource
+ */
+package org.eclipse.modisco.infra.browser.ecore.ui.internal.widget;
+
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.resource.ResourceSet;
+import org.eclipse.jface.action.MenuManager;
+import org.eclipse.modisco.infra.browser.ecore.ui.internal.exported.IEcoreExplorerWidget;
+import org.eclipse.modisco.infra.browser.ecore.ui.internal.view.Utils;
+import org.eclipse.modisco.infra.browser.ecore.ui.internal.widget.EcoreExplorerWidgetComposite.IEClassSelectionListener;
+import org.eclipse.modisco.util.emf.core.allinstances.AllInstancesUtils;
+import org.eclipse.swt.widgets.Composite;
+
+public class EcoreExplorerWidget implements IEcoreExplorerWidget {
+
+ private final EcoreExplorerWidgetComposite composite;
+ private final Set<Resource> currentResources = new HashSet<Resource>();
+ private final Set<EPackage> displayedEPkgs = new HashSet<EPackage>();
+
+ EcoreExplorerWidget(final Composite parent) {
+ this(parent, new MenuManager(EcoreExplorerWidget.class.getName(),
+ EcoreExplorerWidget.class.getName()));
+ }
+
+ EcoreExplorerWidget(final Composite parent, final MenuManager menuManager) {
+ this.composite = new EcoreExplorerWidgetComposite(parent, menuManager);
+ this.composite.addEClassSelectionListener(new IEClassSelectionListener() {
+ public void onEClassSelected(final Set<EClass> eClasses) {
+ EcoreExplorerWidget.this.displayInstancesOf(eClasses);
+ }
+ });
+ }
+
+ protected void displayInstancesOf(final Set<EClass> eClasses) {
+ final Set<EObject> allInstances = new HashSet<EObject>();
+ for (EClass eClass : eClasses) {
+ final Set<EObject> eClassInstances = getInstancesOfFromCurrentResources(eClass);
+ allInstances.addAll(eClassInstances);
+ }
+ this.composite.displayInstances(allInstances);
+ }
+
+ public Set<EObject> getInstancesOfFromCurrentResources(final EClass eClass) {
+ final Set<EObject> allInstances = new HashSet<EObject>();
+ for (Resource resource : this.currentResources) {
+ final List<EObject> instances = AllInstancesUtils
+ .allInstances(eClass, resource, false);
+ allInstances.addAll(instances);
+ }
+ return allInstances;
+ }
+
+
+ public Set<EObject> getInstancesOfFromCurrentResourceSets(
+ final EClass eClass) {
+ final Set<EObject> result = new HashSet<EObject>();
+ final Set<Resource> allResources = new HashSet<Resource>();
+ for (Resource resource : this.currentResources) {
+ final ResourceSet resourceSet = resource.getResourceSet();
+ if (resourceSet != null) {
+ allResources.addAll(resourceSet.getResources());
+ }
+ }
+ for (Resource resource : allResources) {
+ final List<EObject> instances = AllInstancesUtils.allInstances(
+ eClass, resource, false);
+ result.addAll(instances);
+ }
+ return result;
+ }
+
+ public Object getAdapter(@SuppressWarnings("rawtypes") final Class adapter) {
+ // @SuppressWarnings("rawtypes") Raw Type because of the implementation
+ Object result = null;
+ if (adapter.isInstance(this)) {
+ result = this;
+ } else if (adapter.isInstance(this.composite)) {
+ result = this.composite;
+ }
+ return result;
+ }
+
+ public void changeInput(final Collection<EObject> eObjects) {
+ for (EPackage ePackage : this.displayedEPkgs) {
+ removeAllAdapter(ePackage);
+ }
+ final Set<EPackage> pkgsToDisplay = new HashSet<EPackage>();
+ for (EObject eObject : eObjects) {
+ final Resource eResource = eObject.eResource();
+ this.currentResources.add(eResource);
+ final EPackage ePackage = Utils.getEPackage(eObject);
+ pkgsToDisplay.add(ePackage);
+ }
+ for (EPackage ePackage : pkgsToDisplay) {
+ removeAllAdapter(ePackage);
+ @SuppressWarnings("PMD.AvoidInstantiatingObjectsInLoops")
+ /*
+ * @SuppressWarnings("PMD.AvoidInstantiatingObjectsInLoops"): tci>
+ * We have to create a new adapter for each package
+ */
+ final EcoreExplorerAdapter adapter = new EcoreExplorerAdapter(this);
+ ePackage.eAdapters().add(adapter);
+ }
+ this.displayedEPkgs.clear();
+ this.displayedEPkgs.addAll(pkgsToDisplay);
+ this.composite.changeInput(pkgsToDisplay);
+ }
+
+ private static void removeAllAdapter(final EPackage ePackage) {
+ final List<EcoreExplorerAdapter> adaptersToRemove = InternalUtils
+ .getEcoreExplorerAdapters(ePackage);
+ ePackage.eAdapters().removeAll(adaptersToRemove);
+ }
+
+}
diff --git a/org.eclipse.modisco.infra.browser.ecore.ui/src/org/eclipse/modisco/infra/browser/ecore/ui/internal/widget/EcoreExplorerWidgetComposite.java b/org.eclipse.modisco.infra.browser.ecore.ui/src/org/eclipse/modisco/infra/browser/ecore/ui/internal/widget/EcoreExplorerWidgetComposite.java
new file mode 100644
index 0000000..8998e58
--- /dev/null
+++ b/org.eclipse.modisco.infra.browser.ecore.ui/src/org/eclipse/modisco/infra/browser/ecore/ui/internal/widget/EcoreExplorerWidgetComposite.java
@@ -0,0 +1,199 @@
+/**
+ * Copyright (c) 2015 Soft-Maint, and Mia-Software.
+ * 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:
+ * Thomas Cicognani (Soft-Maint) - Bug 471020 - Ecore Explorer View
+ * Thomas Cicognani (Mia-Software) - Bug 470962 - Add shortcuts to activate customs
+ */
+package org.eclipse.modisco.infra.browser.ecore.ui.internal.widget;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.resource.ResourceSet;
+import org.eclipse.emf.facet.custom.core.ICustomizationManager;
+import org.eclipse.emf.facet.custom.ui.ICustomizationManagerProvider2;
+import org.eclipse.emf.facet.efacet.core.IFacetManager;
+import org.eclipse.emf.facet.efacet.ui.IFacetManagerProvider2;
+import org.eclipse.jface.action.MenuManager;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.ISelectionChangedListener;
+import org.eclipse.jface.viewers.ISelectionProvider;
+import org.eclipse.jface.viewers.IStructuredSelection;
+import org.eclipse.jface.viewers.SelectionChangedEvent;
+import org.eclipse.modisco.infra.browser.ecore.ui.internal.view.Utils;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.custom.SashForm;
+import org.eclipse.swt.graphics.Point;
+import org.eclipse.swt.layout.FillLayout;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Event;
+import org.eclipse.swt.widgets.Listener;
+
+public class EcoreExplorerWidgetComposite extends Composite implements
+ ISelectionProvider, ICustomizationManagerProvider2,
+ IFacetManagerProvider2 {
+
+ interface IEClassSelectionListener {
+ void onEClassSelected(Set<EClass> eClasses);
+ }
+
+ private ISelection lastSelection = null;
+ private final SashForm sashForm;
+ private final EcoreMetaExplorerComposite metaComposite;
+ private final EcoreInstancesExplorerComposite instComposite;
+ private final List<IEClassSelectionListener> listeners = new ArrayList<IEClassSelectionListener>();
+ private final List<ICustomShortcut> customShortcuts;
+ private final List<IFacetSetShortcut> facetSetShortcuts;
+
+ public EcoreExplorerWidgetComposite(final Composite parent,
+ final MenuManager menuManager) {
+ super(parent, SWT.NONE);
+
+ setLayout(new FillLayout());
+
+ this.sashForm = new SashForm(this, SWT.VERTICAL);
+
+ this.metaComposite = new EcoreMetaExplorerComposite(this.sashForm,
+ menuManager);
+ this.instComposite = new EcoreInstancesExplorerComposite(this.sashForm);
+
+ this.metaComposite
+ .addSelectionChangedListener(new ISelectionChangedListener() {
+ public void selectionChanged(
+ final SelectionChangedEvent event) {
+ final ISelection metaSelection = getMetaSelection();
+ setLastSelection(metaSelection);
+ updateAllInstances(metaSelection);
+ }
+ });
+
+ this.instComposite
+ .addSelectionChangedListener(new ISelectionChangedListener() {
+ public void selectionChanged(
+ final SelectionChangedEvent event) {
+ final ISelection metaSelection = getInstanceSelection();
+ setLastSelection(metaSelection);
+ }
+ });
+
+ addListener(SWT.Resize, new Listener() {
+ public void handleEvent(final Event event) {
+ updateSashOrientation();
+ }
+ });
+
+ final ResourceSet customRS = getCustomizationManager().getResourceSet();
+ this.customShortcuts = EcoreExplorerShortcutUtils
+ .getCustomShortcuts(customRS);
+
+ final ResourceSet facetSetRS = getFacetManager().getResourceSet();
+ this.facetSetShortcuts = EcoreExplorerShortcutUtils
+ .getFacetSetShortcuts(facetSetRS);
+ }
+
+ protected ISelection getMetaSelection() {
+ return this.metaComposite.getSelection();
+ }
+
+ protected ISelection getInstanceSelection() {
+ return this.instComposite.getSelection();
+ }
+
+ protected void setLastSelection(final ISelection selection) {
+ this.lastSelection = selection;
+ }
+
+ protected final void updateAllInstances(final ISelection metaSelection) {
+ final Set<EClass> allEClasses = new HashSet<EClass>();
+ if (metaSelection instanceof IStructuredSelection) {
+ final IStructuredSelection structSelection = (IStructuredSelection) metaSelection;
+ for (Object selectedObj : structSelection.toArray()) {
+ final EObject eObject = Utils.getResolvedEObject(selectedObj);
+ if (eObject instanceof EClass) {
+ final EClass eClass = (EClass) eObject;
+ allEClasses.add(eClass);
+ }
+ }
+ }
+ notifyEClassSelected(allEClasses);
+ }
+
+ protected void updateSashOrientation() {
+ final Point compositeSize = getSize();
+ if (compositeSize.x > compositeSize.y) {
+ this.sashForm.setOrientation(SWT.HORIZONTAL);
+ } else {
+ this.sashForm.setOrientation(SWT.VERTICAL);
+ }
+ }
+
+ public void changeInput(final Collection<EPackage> ePackages) {
+ this.instComposite.clearInput();
+ this.metaComposite.changeInput(ePackages);
+ }
+
+ public ICustomizationManager getCustomizationManager() {
+ return this.metaComposite.getCustomizationManager();
+ }
+
+ public IFacetManager getFacetManager() {
+ return this.metaComposite.getFacetManager();
+ }
+
+ public List<IFacetSetShortcut> getFacetSetShortcuts() {
+ return Collections.unmodifiableList(this.facetSetShortcuts);
+ }
+
+ public List<ICustomShortcut> getCustomShortcuts() {
+ return Collections.unmodifiableList(this.customShortcuts);
+ }
+
+ public void addSelectionChangedListener(
+ final ISelectionChangedListener listener) {
+ this.metaComposite.addSelectionChangedListener(listener);
+ this.instComposite.addSelectionChangedListener(listener);
+ }
+
+ public ISelection getSelection() {
+ return this.lastSelection;
+ }
+
+ public void removeSelectionChangedListener(
+ final ISelectionChangedListener listener) {
+ this.metaComposite.removeSelectionChangedListener(listener);
+ this.instComposite.removeSelectionChangedListener(listener);
+ }
+
+ public void setSelection(final ISelection selection) {
+ this.metaComposite.setSelection(selection);
+ this.instComposite.setSelection(selection);
+ }
+
+ public void addEClassSelectionListener(final IEClassSelectionListener listener) {
+ this.listeners.add(listener);
+ }
+
+ private void notifyEClassSelected(final Set<EClass> eClasses) {
+ for (IEClassSelectionListener listener : this.listeners) {
+ listener.onEClassSelected(eClasses);
+ }
+ }
+
+ public void displayInstances(final Set<EObject> eObjects) {
+ this.instComposite.changeInput(eObjects);
+
+ }
+
+}
diff --git a/org.eclipse.modisco.infra.browser.ecore.ui/src/org/eclipse/modisco/infra/browser/ecore/ui/internal/widget/EcoreExplorerWidgetFactory.java b/org.eclipse.modisco.infra.browser.ecore.ui/src/org/eclipse/modisco/infra/browser/ecore/ui/internal/widget/EcoreExplorerWidgetFactory.java
new file mode 100644
index 0000000..ecb9d41
--- /dev/null
+++ b/org.eclipse.modisco.infra.browser.ecore.ui/src/org/eclipse/modisco/infra/browser/ecore/ui/internal/widget/EcoreExplorerWidgetFactory.java
@@ -0,0 +1,34 @@
+/**
+ * Copyright (c) 2015 Soft-Maint
+ * 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:
+ * Thomas Cicognani (Soft-Maint) - Bug 471020 - Ecore Explorer View
+ */
+package org.eclipse.modisco.infra.browser.ecore.ui.internal.widget;
+
+import org.eclipse.jface.action.MenuManager;
+import org.eclipse.modisco.infra.browser.ecore.ui.internal.exported.IEcoreExplorerWidget;
+import org.eclipse.modisco.infra.browser.ecore.ui.internal.exported.IEcoreExplorerWidgetFactory;
+import org.eclipse.modisco.infra.browser.ecore.ui.internal.sync.generated.SynchronizedEcoreExplorerWidget;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Display;
+
+public class EcoreExplorerWidgetFactory implements IEcoreExplorerWidgetFactory {
+
+ public IEcoreExplorerWidget createWidget(final Composite parent) {
+ final EcoreExplorerWidget widget = new EcoreExplorerWidget(parent);
+ return new SynchronizedEcoreExplorerWidget(widget, Display.getDefault());
+ }
+
+ public IEcoreExplorerWidget createWidget(final Composite parent,
+ final MenuManager menuManager) {
+ final EcoreExplorerWidget widget = new EcoreExplorerWidget(parent,
+ menuManager);
+ return new SynchronizedEcoreExplorerWidget(widget, Display.getDefault());
+ }
+
+}
diff --git a/org.eclipse.modisco.infra.browser.ecore.ui/src/org/eclipse/modisco/infra/browser/ecore/ui/internal/widget/EcoreInstancesExplorerComposite.java b/org.eclipse.modisco.infra.browser.ecore.ui/src/org/eclipse/modisco/infra/browser/ecore/ui/internal/widget/EcoreInstancesExplorerComposite.java
new file mode 100644
index 0000000..8d6627b
--- /dev/null
+++ b/org.eclipse.modisco.infra.browser.ecore.ui/src/org/eclipse/modisco/infra/browser/ecore/ui/internal/widget/EcoreInstancesExplorerComposite.java
@@ -0,0 +1,140 @@
+/**
+ * Copyright (c) 2015 Soft-Maint
+ * 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:
+ * Thomas Cicognani (Soft-Maint) - Bug 471020 - Ecore Explorer View
+ */
+package org.eclipse.modisco.infra.browser.ecore.ui.internal.widget;
+
+import java.util.Collection;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.resource.ResourceSet;
+import org.eclipse.emf.facet.custom.core.ICustomizationManager;
+import org.eclipse.emf.facet.custom.core.ICustomizationManagerFactory;
+import org.eclipse.emf.facet.custom.ui.ICustomizedContentProviderFactory;
+import org.eclipse.emf.facet.custom.ui.IResolvingCustomizedLabelProviderFactory;
+import org.eclipse.emf.facet.efacet.core.IFacetManager;
+import org.eclipse.emf.facet.efacet.core.IFacetManagerFactory;
+import org.eclipse.emf.facet.efacet.core.IFacetManagerListener;
+import org.eclipse.jface.viewers.IContentProvider;
+import org.eclipse.jface.viewers.ILabelProvider;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.ISelectionChangedListener;
+import org.eclipse.jface.viewers.ISelectionProvider;
+import org.eclipse.jface.viewers.TreeViewer;
+import org.eclipse.modisco.infra.browser.ecore.ui.internal.Messages;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Label;
+
+public class EcoreInstancesExplorerComposite extends Composite implements
+ ISelectionProvider {
+
+ private IFacetManager currentfacetMgr = null;
+
+ private final TreeViewer tree;
+
+ private final IFacetManagerListener facetMgrListener = new IFacetManagerListener() {
+ public void facetManagerChanged() {
+ EcoreInstancesExplorerComposite.this.facetManagerChanged();
+ }
+ };
+
+ public EcoreInstancesExplorerComposite(final Composite parent) {
+ super(parent, SWT.NONE);
+
+ setLayout(new GridLayout(1, true));
+
+ final Label label = new Label(this, SWT.NONE);
+ label.setText(Messages.EcoreInstancesExplorerComposite_Instances);
+
+ this.tree = new TreeViewer(this);
+ this.tree.getControl().setLayoutData(
+ new GridData(SWT.FILL, SWT.FILL, true, true));
+ }
+
+ protected void facetManagerChanged() {
+ final Object[] expandedElts = this.tree.getExpandedElements();
+ this.tree.refresh();
+ this.tree.setExpandedElements(expandedElts);
+ }
+
+ public void changeInput(final Collection<EObject> eObjects) {
+ if (this.tree == null || eObjects == null || eObjects.isEmpty()
+ || eObjects.equals(this.tree.getInput())) {
+ clearInput();
+ } else {
+ /*
+ * Here we assume that all the Eobject are owned by the same
+ * resourceSet
+ */
+ final EObject eObject = (EObject) eObjects.toArray()[0];
+ final Resource eResource = eObject.eResource();
+ final ResourceSet resourceSet = eResource.getResourceSet();
+ final IFacetManager newFacetManager = IFacetManagerFactory.DEFAULT
+ .getOrCreateDefaultFacetManager(resourceSet);
+ if (newFacetManager != this.currentfacetMgr) {
+ /*
+ * We clear the tree to optimize the tree computation, the
+ * setInplut is called againt at the end of the method
+ */
+ clearInput();
+
+ newFacetManager.addListener(this.facetMgrListener);
+ this.currentfacetMgr = newFacetManager;
+ final ICustomizationManager customizationMgr = ICustomizationManagerFactory.DEFAULT
+ .createICustomizationManager(this.currentfacetMgr);
+ final ILabelProvider labelProvider = IResolvingCustomizedLabelProviderFactory.DEFAULT
+ .createCustomizedLabelProvider(customizationMgr);
+ final IContentProvider contentProvider = ICustomizedContentProviderFactory.DEFAULT
+ .createCustomizedTreeContentProvider(customizationMgr);
+ this.tree.setContentProvider(contentProvider);
+ this.tree.setLabelProvider(labelProvider);
+ }
+ this.tree.setInput(eObjects);
+ this.tree.refresh();
+ }
+ }
+
+ public void clearInput() {
+ if (this.currentfacetMgr != null && !this.tree.getTree().isDisposed()) {
+ this.currentfacetMgr.removeListener(this.facetMgrListener);
+ this.tree.setInput(null);
+ }
+ }
+
+ @Override
+ public void dispose() {
+ if (this.currentfacetMgr != null) {
+ this.currentfacetMgr.removeListener(this.facetMgrListener);
+ }
+ super.dispose();
+ }
+
+ public void addSelectionChangedListener(
+ final ISelectionChangedListener listener) {
+ this.tree.addSelectionChangedListener(listener);
+ }
+
+ public ISelection getSelection() {
+ return this.tree.getSelection();
+ }
+
+ public void removeSelectionChangedListener(
+ final ISelectionChangedListener listener) {
+ this.tree.removeSelectionChangedListener(listener);
+ }
+
+ public void setSelection(final ISelection selection) {
+ this.tree.setSelection(selection);
+ }
+
+}
diff --git a/org.eclipse.modisco.infra.browser.ecore.ui/src/org/eclipse/modisco/infra/browser/ecore/ui/internal/widget/EcoreMetaExplorerComposite.java b/org.eclipse.modisco.infra.browser.ecore.ui/src/org/eclipse/modisco/infra/browser/ecore/ui/internal/widget/EcoreMetaExplorerComposite.java
new file mode 100644
index 0000000..dd975a0
--- /dev/null
+++ b/org.eclipse.modisco.infra.browser.ecore.ui/src/org/eclipse/modisco/infra/browser/ecore/ui/internal/widget/EcoreMetaExplorerComposite.java
@@ -0,0 +1,131 @@
+/**
+ * Copyright (c) 2015 Soft-Maint
+ * 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:
+ * Thomas Cicognani (Soft-Maint) - Bug 471020 - Ecore Explorer View
+ */
+package org.eclipse.modisco.infra.browser.ecore.ui.internal.widget;
+
+import java.util.Collection;
+import java.util.Collections;
+
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
+import org.eclipse.emf.facet.custom.core.ICustomizationManager;
+import org.eclipse.emf.facet.custom.core.ICustomizationManagerFactory;
+import org.eclipse.emf.facet.custom.ui.ICustomizedContentProviderFactory;
+import org.eclipse.emf.facet.custom.ui.IResolvingCustomizedLabelProviderFactory;
+import org.eclipse.emf.facet.efacet.core.IFacetManager;
+import org.eclipse.emf.facet.efacet.core.IFacetManagerFactory;
+import org.eclipse.emf.facet.efacet.core.IFacetManagerListener;
+import org.eclipse.jface.action.MenuManager;
+import org.eclipse.jface.viewers.IContentProvider;
+import org.eclipse.jface.viewers.ILabelProvider;
+import org.eclipse.jface.viewers.ISelection;
+import org.eclipse.jface.viewers.ISelectionChangedListener;
+import org.eclipse.jface.viewers.ISelectionProvider;
+import org.eclipse.jface.viewers.TreeViewer;
+import org.eclipse.modisco.infra.browser.ecore.ui.internal.Messages;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.layout.GridData;
+import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Label;
+import org.eclipse.swt.widgets.Menu;
+
+public class EcoreMetaExplorerComposite extends Composite implements ISelectionProvider {
+
+ private final TreeViewer tree;
+ private final IFacetManager facetManager;
+ private final ICustomizationManager customizationMgr;
+
+ private final IFacetManagerListener facetMgrListener = new IFacetManagerListener() {
+ public void facetManagerChanged() {
+ EcoreMetaExplorerComposite.this.facetManagerChanged();
+ }
+ };
+
+ public EcoreMetaExplorerComposite(final Composite parent, final MenuManager menuManager) {
+ super(parent, SWT.NONE);
+
+ setLayout(new GridLayout(1, true));
+
+ final Label label = new Label(this, SWT.NONE);
+ label.setText(Messages.EcoreMetaExplorerComposite_Metas);
+
+ this.tree = new TreeViewer(this);
+ this.tree.getControl().setLayoutData(
+ new GridData(SWT.FILL, SWT.FILL, true, true));
+
+ this.facetManager = IFacetManagerFactory.DEFAULT
+ .getOrCreateDefaultFacetManager(new ResourceSetImpl());
+ this.customizationMgr = ICustomizationManagerFactory.DEFAULT
+ .createICustomizationManager(this.facetManager);
+ final ILabelProvider labelProvider = IResolvingCustomizedLabelProviderFactory.DEFAULT
+ .createCustomizedLabelProvider(this.customizationMgr);
+ final IContentProvider contentProvider = ICustomizedContentProviderFactory.DEFAULT
+ .createCustomizedTreeContentProvider(this.customizationMgr);
+ this.tree.setContentProvider(contentProvider);
+ this.tree.setLabelProvider(labelProvider);
+ this.tree.setInput(Collections.EMPTY_LIST);
+ final Menu createContextMenu = menuManager.createContextMenu(this.tree
+ .getControl());
+ this.tree.getControl().setMenu(createContextMenu);
+ /* Drag and drop is not used currently
+ final int operations = DND.DROP_COPY | DND.DROP_MOVE;
+ final Transfer[] transferTypes = new Transfer[] { LocalTransfer
+ .getInstance() };
+ */
+ this.facetManager.addListener(this.facetMgrListener);
+ }
+
+ protected void facetManagerChanged() {
+ final Object[] expanededElts = this.tree.getExpandedElements();
+ this.tree.refresh();
+ this.tree.setExpandedElements(expanededElts);
+ }
+
+ public void changeInput(final Collection<EPackage> ePackages) {
+ if (this.tree != null && !this.tree.getTree().isDisposed()
+ && !ePackages.equals(this.tree.getInput())) {
+ this.tree.setInput(ePackages);
+ this.tree.refresh();
+ }
+ }
+
+ public ICustomizationManager getCustomizationManager() {
+ return this.customizationMgr;
+ }
+
+ public IFacetManager getFacetManager() {
+ return this.facetManager;
+ }
+
+ public void addSelectionChangedListener(
+ final ISelectionChangedListener listener) {
+ this.tree.addSelectionChangedListener(listener);
+ }
+
+ public ISelection getSelection() {
+ return this.tree.getSelection();
+ }
+
+ public void removeSelectionChangedListener(
+ final ISelectionChangedListener listener) {
+ this.tree.removeSelectionChangedListener(listener);
+ }
+
+ public void setSelection(final ISelection selection) {
+ this.tree.setSelection(selection);
+ }
+
+ @Override
+ public void dispose() {
+ this.facetManager.addListener(this.facetMgrListener);
+ super.dispose();
+ }
+}
diff --git a/org.eclipse.modisco.infra.browser.ecore.ui/src/org/eclipse/modisco/infra/browser/ecore/ui/internal/widget/InternalUtils.java b/org.eclipse.modisco.infra.browser.ecore.ui/src/org/eclipse/modisco/infra/browser/ecore/ui/internal/widget/InternalUtils.java
new file mode 100644
index 0000000..61b08d9
--- /dev/null
+++ b/org.eclipse.modisco.infra.browser.ecore.ui/src/org/eclipse/modisco/infra/browser/ecore/ui/internal/widget/InternalUtils.java
@@ -0,0 +1,76 @@
+/**
+ * Copyright (c) 2015 Soft-Maint
+ * 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:
+ * Thomas Cicognani (Soft-Maint) - Bug 471020 - Ecore Explorer View
+ * Thomas Cicognani (Soft-Maint) - Bug 472041 - [New Browser] Add a customization counting instances by EClass in the same Resource
+ */
+package org.eclipse.modisco.infra.browser.ecore.ui.internal.widget;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import org.eclipse.emf.common.notify.Adapter;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.modisco.infra.browser.ecore.ui.internal.exported.IEcoreExplorerWidget;
+
+public final class InternalUtils {
+
+ private InternalUtils() {
+ // DO NOTHING
+ }
+
+ public static List<EcoreExplorerAdapter> getEcoreExplorerAdapters(
+ final EPackage ePackage) {
+ final List<EcoreExplorerAdapter> adaptersToRemove = new ArrayList<EcoreExplorerAdapter>();
+ for (Adapter adapter : ePackage.eAdapters()) {
+ if (adapter instanceof EcoreExplorerAdapter) {
+ final EcoreExplorerAdapter ecoreExplAdapt = (EcoreExplorerAdapter) adapter;
+ adaptersToRemove.add(ecoreExplAdapt);
+ }
+ }
+ return adaptersToRemove;
+ }
+
+ private static List<EcoreExplorerAdapter> getEcoreExplorerAdapters(
+ final EClass eClass) {
+ final EPackage ePackage = eClass.getEPackage();
+ return getEcoreExplorerAdapters(ePackage);
+ }
+
+ public static Set<EObject> getInstancesOfFromCurrentResources(
+ final EClass eClass) {
+ final Set<EObject> result = new HashSet<EObject>();
+ final List<EcoreExplorerAdapter> adapters = getEcoreExplorerAdapters(eClass);
+ for (EcoreExplorerAdapter adapter : adapters) {
+ final IEcoreExplorerWidget widget = adapter.getWidget();
+ final Set<EObject> eObjects = widget
+ .getInstancesOfFromCurrentResources(eClass);
+ result.addAll(eObjects);
+ }
+ return result;
+ }
+
+ public static Set<EObject> getInstancesOfFromCurrentResourceSets(
+ final EClass eClass) {
+ final Set<EObject> result = new HashSet<EObject>();
+ final List<EcoreExplorerAdapter> adapters = getEcoreExplorerAdapters(eClass);
+ for (EcoreExplorerAdapter adapter : adapters) {
+ final IEcoreExplorerWidget widget = adapter.getWidget();
+ final Set<EObject> eObjects = widget
+ .getInstancesOfFromCurrentResourceSets(eClass);
+ result.addAll(eObjects);
+ }
+ return result;
+ }
+
+
+}
diff --git a/org.eclipse.modisco.infra.browser.editor.ui/META-INF/MANIFEST.MF b/org.eclipse.modisco.infra.browser.editor.ui/META-INF/MANIFEST.MF
index 66cbb9d..e19658a 100644
--- a/org.eclipse.modisco.infra.browser.editor.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.infra.browser.editor.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.modisco.infra.browser.editor.ui;singleton:=true
-Bundle-Version: 0.13.1.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-Activator: org.eclipse.modisco.infra.browser.editor.ui.internal.Activator
Bundle-Vendor: %Bundle-Vendor
Require-Bundle: org.eclipse.ui,
@@ -14,6 +14,10 @@
org.eclipse.core.resources;bundle-version="3.6.0",
org.eclipse.emf.facet.util.emf.ui;bundle-version="0.3.0",
org.eclipse.emf.facet.util.core;bundle-version="0.3.0",
- org.eclipse.emf.ecore.edit;bundle-version="2.6.0"
+ org.eclipse.emf.ecore.edit;bundle-version="2.6.0",
+ org.eclipse.emf.facet.util.ui;bundle-version="0.5.0",
+ org.eclipse.emf.facet.efacet.ui
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-ActivationPolicy: lazy
+Export-Package: org.eclipse.modisco.infra.browser.editor.ui,
+ org.eclipse.modisco.infra.browser.editor.ui.exceptions
diff --git a/org.eclipse.modisco.infra.browser.editor.ui/OSGI-INF/l10n/bundle.properties b/org.eclipse.modisco.infra.browser.editor.ui/OSGI-INF/l10n/bundle.properties
index 3a8219c..86e64cc 100644
--- a/org.eclipse.modisco.infra.browser.editor.ui/OSGI-INF/l10n/bundle.properties
+++ b/org.eclipse.modisco.infra.browser.editor.ui/OSGI-INF/l10n/bundle.properties
@@ -1,4 +1,4 @@
-# Copyright (c) 2014 Soft-Maint.
+# Copyright (c) 2014, 2015 Mia-Software, and Soft-Maint.
# 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
@@ -10,6 +10,10 @@
# Thomas Cicognani (Soft-Maint) - Bug 442718 - Implement copy action in the new MoDisco Browser
# Thomas Cicognani (Soft-Maint) - Bug 442714 - New toolbar action to show/hide eContainer link
# Grégoire Dupé (Mia-Software) - Bug 469263 - [Unit Test Failure] org.eclipse.modisco.tests.BundleTest.name
+# Thomas Cicognani (Soft-Maint) - Bug 470962 - Add shortcuts to activate customs
+# Thomas Cicognani (Soft-Maint) - Bug 471597 - [New Browser] Add a customization to display subclasses from an EClass
+# Thomas Cicognani (Soft-Maint) - Bug 472041 - [New Browser] Add a customization counting instances by EClass in the same Resource
+# Thomas Cicognani (Mia-Software) - Bug 470962 - Add shortcuts to activate customs
#Properties file for org.eclipse.emf.facet.widgets.tree.ui.workbench
Bundle-Vendor = Eclipse Modeling Project
Bundle-Name = MoDisco Tree Widgets (Incubation)
@@ -17,6 +21,10 @@
modiscoBrowserToolbarLabel = MoDisco Browser
LoadUnloadFacets = Load/Unload facets
LoadUnloadCustoms = Load/Unload customizations
-ShowLinksLabel = Show number of links
+ShowLinksLabel = Show number of links
ShowEContainerLabel = Show eContainer link
-CopyLabel = Copy
+CopyLabel = Copy
+HideEmptyReferences = Hide Empty References
+HideDerivedReferences = Hide Derived References
+showEClassSubclasses = Show EClass Subclasses
+showEClassSubclassesFromEClass = Show EClass Subclasses From An EClass
diff --git a/org.eclipse.modisco.infra.browser.editor.ui/plugin.xml b/org.eclipse.modisco.infra.browser.editor.ui/plugin.xml
index d04e259..d1565d6 100644
--- a/org.eclipse.modisco.infra.browser.editor.ui/plugin.xml
+++ b/org.eclipse.modisco.infra.browser.editor.ui/plugin.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<?eclipse version="3.4"?>
<!--
- Copyright (c) 2014 Mia-Software.
+ Copyright (c) 2014, 2015 Mia-Software, and Soft-Maint.
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
@@ -10,9 +10,13 @@
Contributors:
Gregoire Dupe (Mia-Software) - Bug 358914 - [Move to EMF Facet][Browser] Switch to EMF Facet
Thomas Cicognani (Soft-Maint) - Bug 442019 - Toolbar actions disappear when focus is not on the browser
- Thomas Cicognani (Soft-Maint) - Bug 442257 - New toolbar actions to (des)activate customizations
+ Thomas Cicognani (Soft-Maint) - Bug 442257 - New toolbar actions to (des)activate customizations
Thomas Cicognani (Soft-Maint) - Bug 442718 - Implement copy action in the new MoDisco Browser
- Thomas Cicognani (Soft-Maint) - Bug 442714 - New toolbar action to show/hide eContainer link
+ Thomas Cicognani (Soft-Maint) - Bug 442714 - New toolbar action to show/hide eContainer link
+ Thomas Cicognani (Soft-Maint) - Bug 442800 - API to open new MoDisco Browser
+ Thomas Cicognani (Soft-Maint) - Bug 470962 - Add shortcuts to activate customs
+ Thomas Cicognani (Soft-Maint) - Bug 471597 - [New Browser] Add a customization to display subclasses from an EClass
+ Thomas Cicognani (Soft-Maint) - Bug 472041 - [New Browser] Add a customization counting instances by EClass in the same Resource
-->
<plugin>
<extension point="org.eclipse.ui.editors">
@@ -31,6 +35,12 @@
<resourceViewer
class="org.eclipse.modisco.infra.browser.editor.ui.internal.opener.ResourceBrowserOpener">
</resourceViewer>
+ <eObjectViewer
+ class="org.eclipse.modisco.infra.browser.editor.ui.internal.opener.ResourceBrowserOpener">
+ </eObjectViewer>
+ <ePackageViewer
+ class="org.eclipse.modisco.infra.browser.editor.ui.internal.opener.ResourceBrowserOpener">
+ </ePackageViewer>
</extension>
<extension
point="org.eclipse.ui.menus">
@@ -84,32 +94,9 @@
</with>
</visibleWhen>
</command>
- <command
- commandId="org.eclipse.modisco.infra.browser.editor.ui.command.linkscount"
- label="%ShowLinksLabel"
- style="toggle">
- <visibleWhen
- checkEnabled="true">
- <with
- variable="activeEditor">
- <instanceof
- value="org.eclipse.modisco.infra.browser.editor.ui.internal.editor.TreeEditor">
- </instanceof>
- </with>
- </visibleWhen>
- </command>
</toolbar>
</menuContribution>
<menuContribution
- allPopups="false"
- locationURI="menu:org.eclipse.modisco.util.emffacet.ui.menu.loadCustomization">
- <command
- commandId="org.eclipse.modisco.infra.browser.editor.ui.command.linkscount"
- label="%ShowLinksLabel"
- style="toggle">
- </command>
- </menuContribution>
- <menuContribution
allPopups="true"
locationURI="popup:org.eclipse.ui.popup.any">
<command
@@ -127,18 +114,22 @@
</visibleWhen>
</command>
</menuContribution>
- </extension>
- <extension
- point="org.eclipse.ui.commands">
- <command
- defaultHandler="org.eclipse.modisco.infra.browser.editor.ui.internal.handlers.LinksCountHandler"
- id="org.eclipse.modisco.infra.browser.editor.ui.command.linkscount"
- name="%ShowLinksLabel">
- <state
- class="org.eclipse.modisco.infra.browser.editor.ui.internal.handlers.LinksCountState"
- id="org.eclipse.ui.commands.toggleState">
- </state>
- </command>
+ <menuContribution
+ allPopups="false"
+ locationURI="menu:org.eclipse.modisco.util.emffacet.ui.menu.loadCustomization">
+ <dynamic
+ class="org.eclipse.modisco.infra.browser.editor.ui.internal.handlers.LoadCustomShortcutsMenu"
+ id="org.eclipse.modisco.util.emffacet.ui.menu.loadCustomization.dynamic">
+ </dynamic>
+ </menuContribution>
+ <menuContribution
+ allPopups="false"
+ locationURI="menu:org.eclipse.modisco.util.emffacet.menu.ui.loadFacet">
+ <dynamic
+ class="org.eclipse.modisco.infra.browser.editor.ui.internal.handlers.LoadFacetSetShortcutsMenu"
+ id="org.eclipse.modisco.util.emffacet.menu.ui.loadFacet.dynamic">
+ </dynamic>
+ </menuContribution>
</extension>
<extension
point="org.eclipse.ui.handlers">
diff --git a/org.eclipse.modisco.infra.browser.editor.ui/src/org/eclipse/modisco/infra/browser/editor/ui/ITreeEditor.java b/org.eclipse.modisco.infra.browser.editor.ui/src/org/eclipse/modisco/infra/browser/editor/ui/ITreeEditor.java
new file mode 100644
index 0000000..13751b3
--- /dev/null
+++ b/org.eclipse.modisco.infra.browser.editor.ui/src/org/eclipse/modisco/infra/browser/editor/ui/ITreeEditor.java
@@ -0,0 +1,17 @@
+/**
+ * Copyright (c) 2015 Soft-Maint.
+ * 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:
+ * Thomas Cicognani (Soft-Maint) - Bug 442800 - API to open new MoDisco Browser
+ */
+package org.eclipse.modisco.infra.browser.editor.ui;
+
+public interface ITreeEditor {
+
+ // DO NOTHING YET
+
+}
diff --git a/org.eclipse.modisco.infra.browser.editor.ui/src/org/eclipse/modisco/infra/browser/editor/ui/ITreeEditorOpener.java b/org.eclipse.modisco.infra.browser.editor.ui/src/org/eclipse/modisco/infra/browser/editor/ui/ITreeEditorOpener.java
new file mode 100644
index 0000000..712ce2e
--- /dev/null
+++ b/org.eclipse.modisco.infra.browser.editor.ui/src/org/eclipse/modisco/infra/browser/editor/ui/ITreeEditorOpener.java
@@ -0,0 +1,32 @@
+/**
+ * Copyright (c) 2015 Soft-Maint.
+ * 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:
+ * Thomas Cicognani (Soft-Maint) - Bug 442800 - API to open new MoDisco Browser
+ */
+package org.eclipse.modisco.infra.browser.editor.ui;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.resource.ResourceSet;
+import org.eclipse.modisco.infra.browser.editor.ui.exceptions.TreeEditorOpenerException;
+import org.eclipse.modisco.infra.browser.editor.ui.internal.editor.TreeEditorOpener;
+
+public interface ITreeEditorOpener {
+
+ ITreeEditorOpener DEFAULT = new TreeEditorOpener();
+
+ ITreeEditor openWithEObject(EObject eObject)
+ throws TreeEditorOpenerException;
+
+ ITreeEditor openWithResource(Resource resource)
+ throws TreeEditorOpenerException;
+
+ ITreeEditor openWithResourceSet(ResourceSet resourceSet)
+ throws TreeEditorOpenerException;
+
+}
diff --git a/org.eclipse.modisco.infra.browser.editor.ui/src/org/eclipse/modisco/infra/browser/editor/ui/exceptions/TreeEditorOpenerException.java b/org.eclipse.modisco.infra.browser.editor.ui/src/org/eclipse/modisco/infra/browser/editor/ui/exceptions/TreeEditorOpenerException.java
new file mode 100644
index 0000000..210adda
--- /dev/null
+++ b/org.eclipse.modisco.infra.browser.editor.ui/src/org/eclipse/modisco/infra/browser/editor/ui/exceptions/TreeEditorOpenerException.java
@@ -0,0 +1,26 @@
+/**
+ * Copyright (c) 2015 Soft-Maint.
+ * 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:
+ * Thomas Cicognani (Soft-Maint) - Bug 442800 - API to open new MoDisco Browser
+ * Grégoire Dupé (Mia-Software) - Bug 442800 - API to open new MoDisco Browser
+ */
+package org.eclipse.modisco.infra.browser.editor.ui.exceptions;
+
+/**
+ * @noextend clients must not extend this class
+ * @noinstantiate clients must not instantiate this class
+ */
+public class TreeEditorOpenerException extends Exception {
+
+ private static final long serialVersionUID = -4055299672749732009L;
+
+ public TreeEditorOpenerException(final Throwable throwable) {
+ super(throwable);
+ }
+
+}
diff --git a/org.eclipse.modisco.infra.browser.editor.ui/src/org/eclipse/modisco/infra/browser/editor/ui/internal/Messages.java b/org.eclipse.modisco.infra.browser.editor.ui/src/org/eclipse/modisco/infra/browser/editor/ui/internal/Messages.java
index a289550..57a9e71 100644
--- a/org.eclipse.modisco.infra.browser.editor.ui/src/org/eclipse/modisco/infra/browser/editor/ui/internal/Messages.java
+++ b/org.eclipse.modisco.infra.browser.editor.ui/src/org/eclipse/modisco/infra/browser/editor/ui/internal/Messages.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2014 Mia-Software.
+ * Copyright (c) 2014, 2015 Mia-Software, and Soft-Maint.
* 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
@@ -7,14 +7,21 @@
*
* Contributors:
* Gregoire Dupe (Mia-Software) - Bug 358914 - [Move to EMF Facet][Browser] Switch to EMF Facet
+ * Thomas Cicognani (Soft-Maint) - Bug 442800 - API to open new MoDisco Browser
+ * Thomas Cicognani (Mia-Software) - Bug 470962 - Add shortcuts to activate customs
*/
package org.eclipse.modisco.infra.browser.editor.ui.internal;
import org.eclipse.osgi.util.NLS;
public class Messages extends NLS {
- private static final String BUNDLE_NAME = "org.eclipse.modisco.infra.browser.editor.ui.messages"; //$NON-NLS-1$
- public static String ResourceBrowserOpener_EmfFacetDefaultTreeBrowser;
+ private static final String BUNDLE_NAME = Messages.class.getPackage().getName() + ".messages"; //$NON-NLS-1$
+
+ public static String ResourceBrowserOpener_MoDiscoDefaultTreeBrowser;
+ public static String TreeEditorShortcutUtils_CustomHideDerivedReferences;
+ public static String TreeEditorShortcutUtils_CustomHideEmptyReferences;
+ public static String TreeEditorShortcutUtils_CustomShowLinksCount;
+
static {
// initialize resource bundle
NLS.initializeMessages(BUNDLE_NAME, Messages.class);
diff --git a/org.eclipse.modisco.infra.browser.editor.ui/src/org/eclipse/modisco/infra/browser/editor/ui/internal/editor/TreeEditor.java b/org.eclipse.modisco.infra.browser.editor.ui/src/org/eclipse/modisco/infra/browser/editor/ui/internal/editor/TreeEditor.java
index 3ce011f..00a9f85 100644
--- a/org.eclipse.modisco.infra.browser.editor.ui/src/org/eclipse/modisco/infra/browser/editor/ui/internal/editor/TreeEditor.java
+++ b/org.eclipse.modisco.infra.browser.editor.ui/src/org/eclipse/modisco/infra/browser/editor/ui/internal/editor/TreeEditor.java
@@ -1,16 +1,22 @@
/**
- * Copyright (c) 2014 Mia-Software.
+ * Copyright (c) 2014, 2015 Mia-Software, and Soft-Maint.
* 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:
- * Gregoire Dupe (Mia-Software) - Bug 358914 - [Move to EMF Facet][Browser] Switch to EMF Facet
- * Thomas Cicognani (Soft-Maint) - Bug 442718 - Implement copy action in the new MoDisco Browser
+ * Gregoire Dupe (Mia-Software) - Bug 358914 - [Move to EMF Facet][Browser] Switch to EMF Facet
+ * Thomas Cicognani (Soft-Maint) - Bug 442718 - Implement copy action in the new MoDisco Browser
+ * Thomas Cicognani (Soft-Maint) - Bug 442800 - API to open new MoDisco Browser
+ * Grégoire Dupé (Mia-Software) - Bug 442800 - API to open new MoDisco Browser
+ * Thomas Cicognani (Mia-Software) - Bug 470962 - Add shortcuts to activate customs
*/
package org.eclipse.modisco.infra.browser.editor.ui.internal.editor;
+import java.util.ArrayList;
+import java.util.List;
+
import org.eclipse.core.resources.IFile;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IProgressMonitor;
@@ -19,6 +25,7 @@
import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.resource.Resource;
import org.eclipse.emf.ecore.resource.ResourceSet;
import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
@@ -27,20 +34,22 @@
import org.eclipse.emf.edit.domain.IEditingDomainProvider;
import org.eclipse.emf.facet.custom.core.ICustomizationManager;
import org.eclipse.emf.facet.custom.core.ICustomizationManagerFactory;
-import org.eclipse.emf.facet.custom.core.ICustomizationManagerProvider;
+import org.eclipse.emf.facet.custom.ui.ICustomizationManagerProvider2;
import org.eclipse.emf.facet.custom.ui.ICustomizedContentProviderFactory;
import org.eclipse.emf.facet.custom.ui.IResolvingCustomizedLabelProviderFactory;
import org.eclipse.emf.facet.efacet.core.IFacetManager;
import org.eclipse.emf.facet.efacet.core.IFacetManagerFactory;
import org.eclipse.emf.facet.efacet.core.IFacetManagerListener;
-import org.eclipse.emf.facet.efacet.core.IFacetManagerProvider;
+import org.eclipse.emf.facet.efacet.ui.IFacetManagerProvider2;
import org.eclipse.jface.action.MenuManager;
import org.eclipse.jface.viewers.IContentProvider;
import org.eclipse.jface.viewers.ILabelProvider;
import org.eclipse.jface.viewers.ISelectionProvider;
import org.eclipse.jface.viewers.TreeViewer;
+import org.eclipse.modisco.infra.browser.editor.ui.ITreeEditor;
import org.eclipse.modisco.infra.browser.editor.ui.internal.Activator;
import org.eclipse.modisco.infra.browser.editor.ui.internal.opener.ResourceEditorInput;
+import org.eclipse.modisco.infra.browser.editor.ui.internal.opener.ResourceSetEditorInput;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Menu;
import org.eclipse.ui.IEditorInput;
@@ -50,7 +59,7 @@
import org.eclipse.ui.part.FileEditorInput;
public class TreeEditor extends EditorPart implements IEditingDomainProvider,
- IFacetManagerProvider, ICustomizationManagerProvider {
+ IFacetManagerProvider2, ICustomizationManagerProvider2, ITreeEditor {
private static final String EDITOR_ID = Activator.getDefault().getBundle()
.getSymbolicName() + ".TreeEditor"; //$NON-NLS-1$
@@ -61,6 +70,8 @@
private ICustomizationManager customManager;
private TreeViewer tree;
private IFacetManagerListener facetMgrListener;
+ private List<IFacetSetShortcut> facetSetShortcuts;
+ private List<ICustomShortcut> customShortcuts;
@Override
public void doSave(final IProgressMonitor monitor) {
@@ -89,11 +100,31 @@
final ResourceEditorInput resourceEI = (ResourceEditorInput) input;
this.resource = resourceEI.getResource();
this.resourceSet = this.resource.getResourceSet();
+ } else if (input instanceof ResourceSetEditorInput) {
+ final ResourceSetEditorInput resourceSetEI = (ResourceSetEditorInput) input;
+ this.resourceSet = resourceSetEI.getResourceSet();
+ } else {
+ final String message = String.format(
+ "The EditorInput (%s) is not compatible with the TreeEditor", //$NON-NLS-1$
+ input.getClass().getName()
+ );
+ throw new IllegalArgumentException(message);
+ }
+ if (this.resourceSet == null) {
+ /*
+ * "this.resourceSet" is null while opening an ecore model stored in
+ * EPackage.Registry.INSTANCE. this.resourceSet must not be null,
+ * because we need it to instantiate the facetManager.
+ */
+ this.resourceSet = new ResourceSetImpl();
}
final AdapterFactory adapterFactory = new AdapterFactoryImpl();
final CommandStack commandStack = new BasicCommandStack();
this.editingDomain = new AdapterFactoryEditingDomain(adapterFactory,
commandStack, this.resourceSet);
+
+ this.facetSetShortcuts = TreeEditorShortcutUtils.getFacetSetShortcuts(this.resourceSet);
+ this.customShortcuts = TreeEditorShortcutUtils.getCustomShortcuts(this.resourceSet);
}
@@ -130,7 +161,17 @@
.createCustomizedTreeContentProvider(this.customManager);
this.tree.setContentProvider(contentProvider);
this.tree.setLabelProvider(labelProvider);
- this.tree.setInput(this.resource.getContents());
+
+ final List<EObject> contents = new ArrayList<EObject>();
+ if (this.resource == null) {
+ for (Resource res : this.resourceSet.getResources()) {
+ contents.addAll(res.getContents());
+ }
+ } else {
+ contents.addAll(this.resource.getContents());
+ }
+ this.tree.setInput(contents);
+
getSite().setSelectionProvider(this.tree);
this.facetMgrListener = new IFacetManagerListener() {
public void facetManagerChanged() {
@@ -179,10 +220,18 @@
return this.customManager;
}
+ public List<ICustomShortcut> getCustomShortcuts() {
+ return this.customShortcuts;
+ }
+
public IFacetManager getFacetManager() {
return this.facetManager;
}
+ public List<IFacetSetShortcut> getFacetSetShortcuts() {
+ return this.facetSetShortcuts;
+ }
+
@Override
public void dispose() {
this.facetManager.removeListener(this.facetMgrListener);
@@ -192,4 +241,5 @@
public ILabelProvider getViewerLabelProvider() {
return (ILabelProvider) this.tree.getLabelProvider();
}
+
}
diff --git a/org.eclipse.modisco.infra.browser.editor.ui/src/org/eclipse/modisco/infra/browser/editor/ui/internal/editor/TreeEditorOpener.java b/org.eclipse.modisco.infra.browser.editor.ui/src/org/eclipse/modisco/infra/browser/editor/ui/internal/editor/TreeEditorOpener.java
new file mode 100644
index 0000000..0e4afb6
--- /dev/null
+++ b/org.eclipse.modisco.infra.browser.editor.ui/src/org/eclipse/modisco/infra/browser/editor/ui/internal/editor/TreeEditorOpener.java
@@ -0,0 +1,74 @@
+/**
+ * Copyright (c) 2015 Soft-Maint.
+ * 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:
+ * Thomas Cicognani (Soft-Maint) - Bug 442800 - API to open new MoDisco Browser
+ */
+package org.eclipse.modisco.infra.browser.editor.ui.internal.editor;
+
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.resource.ResourceSet;
+import org.eclipse.emf.facet.util.ui.internal.exported.handler.HandlerUtils;
+import org.eclipse.modisco.infra.browser.editor.ui.ITreeEditor;
+import org.eclipse.modisco.infra.browser.editor.ui.ITreeEditorOpener;
+import org.eclipse.modisco.infra.browser.editor.ui.exceptions.TreeEditorOpenerException;
+import org.eclipse.modisco.infra.browser.editor.ui.internal.opener.ResourceEditorInput;
+import org.eclipse.modisco.infra.browser.editor.ui.internal.opener.ResourceSetEditorInput;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.ui.IEditorInput;
+import org.eclipse.ui.IWorkbenchPage;
+import org.eclipse.ui.PartInitException;
+
+public class TreeEditorOpener implements ITreeEditorOpener {
+
+ private static TreeEditor openEditor(final IEditorInput editorInput)
+ throws TreeEditorOpenerException {
+ final TreeEditor[] editor = new TreeEditor[1];
+ final PartInitException[] exception = new PartInitException[1];
+
+ Display.getDefault().syncExec(new Runnable() {
+ public void run() {
+ final IWorkbenchPage activePage = HandlerUtils.getActivePage();
+ if (activePage != null) {
+ try {
+ editor[0] = (TreeEditor) activePage.openEditor(
+ editorInput, TreeEditor.getEditorId());
+ } catch (PartInitException e) {
+ exception[0] = e;
+ }
+ }
+ }
+ });
+
+ if (exception[0] != null) {
+ throw new TreeEditorOpenerException(exception[0]);
+ }
+ return editor[0];
+ }
+
+ public ITreeEditor openWithEObject(final EObject eObject)
+ throws TreeEditorOpenerException {
+ final Resource resource = eObject.eResource();
+ return openWithResource(resource);
+ }
+
+ public ITreeEditor openWithResource(final Resource resource)
+ throws TreeEditorOpenerException {
+ final ResourceEditorInput editorInput = new ResourceEditorInput(
+ resource);
+ return openEditor(editorInput);
+ }
+
+ public ITreeEditor openWithResourceSet(final ResourceSet resourceSet)
+ throws TreeEditorOpenerException {
+ final ResourceSetEditorInput editorInput = new ResourceSetEditorInput(
+ resourceSet);
+ return openEditor(editorInput);
+ }
+
+}
diff --git a/org.eclipse.modisco.infra.browser.editor.ui/src/org/eclipse/modisco/infra/browser/editor/ui/internal/editor/TreeEditorShortcutUtils.java b/org.eclipse.modisco.infra.browser.editor.ui/src/org/eclipse/modisco/infra/browser/editor/ui/internal/editor/TreeEditorShortcutUtils.java
new file mode 100644
index 0000000..8fe8891
--- /dev/null
+++ b/org.eclipse.modisco.infra.browser.editor.ui/src/org/eclipse/modisco/infra/browser/editor/ui/internal/editor/TreeEditorShortcutUtils.java
@@ -0,0 +1,127 @@
+/**
+ * Copyright (c) 2015 Mia-Software.
+ * 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:
+ * Thomas Cicognani (Mia-Software) - Bug 470962 - Add shortcuts to activate customs
+ * Grégoire Dupé (Mia-Software) - Bug 470962 - Add shortcuts to activate customs
+ */
+package org.eclipse.modisco.infra.browser.editor.ui.internal.editor;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.resource.ResourceSet;
+import org.eclipse.emf.facet.custom.metamodel.v0_2_0.custom.Customization;
+import org.eclipse.emf.facet.custom.ui.ICustomizationManagerProvider2.ICustomShortcut;
+import org.eclipse.emf.facet.efacet.metamodel.v0_2_0.efacet.FacetSet;
+import org.eclipse.emf.facet.efacet.ui.IFacetManagerProvider2.IFacetSetShortcut;
+import org.eclipse.emf.facet.util.core.Logger;
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.modisco.infra.browser.editor.ui.internal.Activator;
+import org.eclipse.modisco.infra.browser.editor.ui.internal.Messages;
+
+public final class TreeEditorShortcutUtils {
+
+ private TreeEditorShortcutUtils() {
+ // DO NOTHING
+ }
+
+ public static List<ICustomShortcut> getCustomShortcuts(
+ final ResourceSet resourceSet) {
+ final List<ICustomShortcut> shortcuts = new ArrayList<ICustomShortcut>();
+ addShortcut(resourceSet, shortcuts,
+ "platform:/plugin/org.eclipse.emf.facet.ecore.ui/custom/hideDerivedReferences.custom", //$NON-NLS-1$
+ Messages.TreeEditorShortcutUtils_CustomHideDerivedReferences);
+ addShortcut(resourceSet, shortcuts,
+ "platform:/plugin/org.eclipse.emf.facet.ecore.ui/custom/hideEmptyReferences.custom", //$NON-NLS-1$
+ Messages.TreeEditorShortcutUtils_CustomHideEmptyReferences);
+ addShortcut(resourceSet, shortcuts,
+ "platform:/plugin/org.eclipse.emf.facet.ecore.ui/custom/linksCount.custom", //$NON-NLS-1$
+ Messages.TreeEditorShortcutUtils_CustomShowLinksCount);
+ return shortcuts;
+ }
+
+ private static void addShortcut(final ResourceSet resourceSet,
+ final List<ICustomShortcut> shortcuts, final String uri,
+ final String menuItemLabel) {
+ try {
+ shortcuts.add(createCustomShortcut(resourceSet, uri, menuItemLabel));
+ } catch (Exception e) {
+ Logger.logError(e, Activator.getDefault());
+ }
+ }
+
+ public static List<IFacetSetShortcut> getFacetSetShortcuts(
+ final ResourceSet resourceSet) {
+ return Collections.emptyList();
+ }
+
+ private static ICustomShortcut createCustomShortcut(
+ final ResourceSet resourceSet, final String uriStr,
+ final String label) {
+ return createCustomShortcut(resourceSet, uriStr, label, null);
+ }
+
+ private static ICustomShortcut createCustomShortcut(
+ final ResourceSet resourceSet, final String uriStr,
+ final String label, final ImageDescriptor icon) {
+ final Customization custom = (Customization) getObjectFromURI(uriStr,
+ resourceSet);
+ return new ICustomShortcut() {
+ public String getLabel() {
+ return label;
+ }
+
+ public Customization getCustom() {
+ return custom;
+ }
+
+ public ImageDescriptor getIcon() {
+ return icon;
+ }
+ };
+ }
+
+ private static IFacetSetShortcut createFacetSetShortcut(
+ final ResourceSet resourceSet, final String uriStr,
+ final String label) {
+ return createFacetSetShortcut(resourceSet, uriStr, label, null);
+ }
+
+ private static IFacetSetShortcut createFacetSetShortcut(
+ final ResourceSet resourceSet, final String uriStr,
+ final String label, final ImageDescriptor icon) {
+ final FacetSet facetSet = (FacetSet) getObjectFromURI(uriStr,
+ resourceSet);
+ return new IFacetSetShortcut() {
+ public String getLabel() {
+ return label;
+ }
+
+ public FacetSet getFacetSet() {
+ return facetSet;
+ }
+
+ public ImageDescriptor getIcon() {
+ return icon;
+ }
+ };
+ }
+
+ private static EObject getObjectFromURI(final String uriStr,
+ final ResourceSet resourceSet) {
+ final URI uri = URI.createURI(uriStr);
+ final Resource resource = resourceSet.getResource(uri, true);
+ final EList<EObject> contents = resource.getContents();
+ return contents.get(0);
+ }
+}
diff --git a/org.eclipse.modisco.infra.browser.editor.ui/src/org/eclipse/modisco/infra/browser/editor/ui/internal/handlers/AbstractFacetSetActivatorHandler.java b/org.eclipse.modisco.infra.browser.editor.ui/src/org/eclipse/modisco/infra/browser/editor/ui/internal/handlers/AbstractFacetSetActivatorHandler.java
deleted file mode 100644
index adc365b..0000000
--- a/org.eclipse.modisco.infra.browser.editor.ui/src/org/eclipse/modisco/infra/browser/editor/ui/internal/handlers/AbstractFacetSetActivatorHandler.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/**
- * Copyright (c) 2014 Soft-Maint.
- * 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:
- * Thomas Cicognani (Soft-Maint) - Bug 442257 - New toolbar actions to (des)activate customizations
- * Thomas Cicognani (Soft-Maint) - Bug 442714 - New toolbar action to show/hide eContainer link
- */
-package org.eclipse.modisco.infra.browser.editor.ui.internal.handlers;
-
-import java.util.List;
-
-import org.eclipse.core.commands.AbstractHandler;
-import org.eclipse.core.commands.ExecutionEvent;
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.emf.facet.custom.core.ICustomizationManager;
-import org.eclipse.emf.facet.custom.core.ICustomizationManagerProvider;
-import org.eclipse.emf.facet.efacet.core.IFacetManager;
-import org.eclipse.emf.facet.efacet.core.IFacetSetCatalogManager;
-import org.eclipse.emf.facet.efacet.core.IFacetSetCatalogManagerFactory;
-import org.eclipse.emf.facet.efacet.metamodel.v0_2_0.efacet.FacetSet;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.handlers.HandlerUtil;
-
-/**
- * Abstract Handler to manage menu toolbar shortcuts. These shortcuts allow
- * users to (des)activate facet sets (customizations are facet sets). If you
- * want to create a menu shortcut, your Handler must extends this class
- */
-public abstract class AbstractFacetSetActivatorHandler extends AbstractHandler {
-
- /**
- * Execute the Handler
- *
- * @param event
- * The execution event that contains the application context
- * @param facetSetID
- * ID of the facet set linked to this Handler
- * @return the result of the execution. Reserved for future use, can be
- * null.
- * @throws ExecutionException
- */
- protected static Object execute(final ExecutionEvent event,
- final String facetSetID) throws ExecutionException {
- final boolean toggle = HandlerUtil.toggleCommandState(event
- .getCommand());
- final IWorkbenchPart activePart = HandlerUtil.getActivePart(event);
- if (activePart != null) {
- final ICustomizationManagerProvider customMgrProvider = (ICustomizationManagerProvider) activePart
- .getAdapter(ICustomizationManagerProvider.class);
- if (customMgrProvider != null) {
- execute(facetSetID, toggle, customMgrProvider);
- }
- }
- return null;
- }
-
- private static void execute(final String facetSetID, final boolean toggle,
- final ICustomizationManagerProvider customMgrProvider) {
- final ICustomizationManager manager = customMgrProvider
- .getCustomizationManager();
-
- final IFacetSetCatalogManager catalog = IFacetSetCatalogManagerFactory.DEFAULT
- .getOrCreateFacetSetCatalogManager(manager.getResourceSet());
-
- FacetSet facetSetToActive = null;
- for (FacetSet facetSet : catalog.getRegisteredFacetSets()) {
- if (facetSetID.equals(facetSet.getName())) {
- facetSetToActive = facetSet;
- break;
- }
- }
- if (facetSetToActive != null) {
- final IFacetManager facetManager = manager.getFacetManager();
- final List<FacetSet> managedFacetSets = facetManager
- .getManagedFacetSets();
- if (toggle) {
- managedFacetSets.remove(facetSetToActive);
- } else {
- if (!managedFacetSets.contains(facetSetToActive)) {
- managedFacetSets.add(0, facetSetToActive);
- }
- }
- }
- }
-
-}
diff --git a/org.eclipse.modisco.infra.browser.editor.ui/src/org/eclipse/modisco/infra/browser/editor/ui/internal/handlers/AbstractFacetSetActivatorToggleState.java b/org.eclipse.modisco.infra.browser.editor.ui/src/org/eclipse/modisco/infra/browser/editor/ui/internal/handlers/AbstractFacetSetActivatorToggleState.java
deleted file mode 100644
index a370820..0000000
--- a/org.eclipse.modisco.infra.browser.editor.ui/src/org/eclipse/modisco/infra/browser/editor/ui/internal/handlers/AbstractFacetSetActivatorToggleState.java
+++ /dev/null
@@ -1,122 +0,0 @@
-/**
- * Copyright (c) 2014 Soft-Maint.
- * 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:
- * Thomas Cicognani (Soft-Maint) - Bug 442257 - New toolbar actions to (des)activate customizations
- * Thomas Cicognani (Soft-Maint) - Bug 442714 - New toolbar action to show/hide eContainer link
- */
-package org.eclipse.modisco.infra.browser.editor.ui.internal.handlers;
-
-import java.util.List;
-
-import org.eclipse.emf.facet.efacet.core.IFacetManager;
-import org.eclipse.emf.facet.efacet.core.IFacetManagerListener;
-import org.eclipse.emf.facet.efacet.metamodel.v0_2_0.efacet.FacetSet;
-import org.eclipse.jface.commands.ToggleState;
-import org.eclipse.modisco.infra.browser.editor.ui.internal.editor.TreeEditor;
-import org.eclipse.ui.IPartListener;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PlatformUI;
-
-/**
- * Abstract ToggleState to manage menu toolbar shortcuts. These shortcuts allow
- * users to (des)activate facet sets (customizations are facet sets). If you
- * want to create a menu shortcut, your ToggleState must extends this class
- */
-public abstract class AbstractFacetSetActivatorToggleState extends ToggleState {
-
- private final IPartListener partListener;
- private final IFacetManagerListener facetMgrListener;
-
- private IFacetManager facetManager;
- private final String facetSetID;
-
- protected AbstractFacetSetActivatorToggleState(final String facetSetID) {
- /*
- * No persistence and initialized to FALSE (unchecked button)
- */
- super();
- setShouldPersist(false);
- setValue(Boolean.FALSE);
- this.facetSetID = facetSetID;
- this.partListener = new IPartListener() {
- public void partOpened(final IWorkbenchPart part) {
- // DO NOTHING
- }
-
- public void partDeactivated(final IWorkbenchPart part) {
- // DO NOTHING
- }
-
- public void partClosed(final IWorkbenchPart part) {
- // DO NOTHING
- }
-
- public void partBroughtToTop(final IWorkbenchPart part) {
- // DO NOTHING
- }
-
- public void partActivated(final IWorkbenchPart part) {
- AbstractFacetSetActivatorToggleState.this.partActivated(part);
- }
- };
-
- this.facetMgrListener = new IFacetManagerListener() {
- public void facetManagerChanged() {
- changeToggleState();
- }
- };
- }
-
- protected void partActivated(final IWorkbenchPart part) {
- if (part instanceof TreeEditor) {
- final TreeEditor treeEditor = (TreeEditor) part;
- this.facetManager = treeEditor.getFacetManager();
- this.facetManager.removeListener(this.facetMgrListener);
- this.facetManager.addListener(this.facetMgrListener);
- changeToggleState();
- }
- }
-
- /**
- * Check if the facet set linked to this ToogleState is activated. If so,
- * the ToggleState is checked
- */
- protected void changeToggleState() {
- final List<FacetSet> facetSets = this.facetManager
- .getManagedFacetSets();
- for (FacetSet facetSet : facetSets) {
- if (this.facetSetID.equals(facetSet.getName())) {
- setValue(Boolean.TRUE);
- break;
- } else if (!this.getValue().equals(Boolean.FALSE)) {
- setValue(Boolean.FALSE);
- }
- }
- }
-
- @Override
- public Object getValue() {
- /*
- * Add a listener which changes all ToggleStates when user changes the
- * activated editor
- */
- final IWorkbenchWindow window = PlatformUI.getWorkbench()
- .getActiveWorkbenchWindow();
- if (window != null) {
- final IWorkbenchPage activePage = window.getActivePage();
- if (activePage != null) {
- activePage.removePartListener(this.partListener);
- activePage.addPartListener(this.partListener);
- }
- }
- return super.getValue();
- }
-
-}
diff --git a/org.eclipse.modisco.infra.browser.editor.ui/src/org/eclipse/modisco/infra/browser/editor/ui/internal/handlers/EContainerHandler.java b/org.eclipse.modisco.infra.browser.editor.ui/src/org/eclipse/modisco/infra/browser/editor/ui/internal/handlers/EContainerHandler.java
deleted file mode 100644
index bc43f0e..0000000
--- a/org.eclipse.modisco.infra.browser.editor.ui/src/org/eclipse/modisco/infra/browser/editor/ui/internal/handlers/EContainerHandler.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * Copyright (c) 2014 Soft-Maint.
- * 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:
- * Thomas Cicognani (Soft-Maint) - Bug 442714 - New toolbar action to show/hide eContainer link
- */
-package org.eclipse.modisco.infra.browser.editor.ui.internal.handlers;
-
-import org.eclipse.core.commands.ExecutionEvent;
-import org.eclipse.core.commands.ExecutionException;
-
-public class EContainerHandler extends AbstractFacetSetActivatorHandler {
-
- private static final String FACET_SET_ID = "org.eclipse.emf.facet.ecore.econtainer"; //$NON-NLS-1$
-
- public Object execute(final ExecutionEvent event) throws ExecutionException {
- return execute(event, FACET_SET_ID);
- }
-
-}
diff --git a/org.eclipse.modisco.infra.browser.editor.ui/src/org/eclipse/modisco/infra/browser/editor/ui/internal/handlers/EContainerToggleState.java b/org.eclipse.modisco.infra.browser.editor.ui/src/org/eclipse/modisco/infra/browser/editor/ui/internal/handlers/EContainerToggleState.java
deleted file mode 100644
index 065a3ef..0000000
--- a/org.eclipse.modisco.infra.browser.editor.ui/src/org/eclipse/modisco/infra/browser/editor/ui/internal/handlers/EContainerToggleState.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/**
- * Copyright (c) 2014 Soft-Maint.
- * 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:
- * Thomas Cicognani (Soft-Maint) - Bug 442714 - New toolbar action to show/hide eContainer link
- */
-package org.eclipse.modisco.infra.browser.editor.ui.internal.handlers;
-
-public class EContainerToggleState extends AbstractFacetSetActivatorToggleState {
-
- private static final String FACET_SET_ID = "org.eclipse.emf.facet.ecore.econtainer"; //$NON-NLS-1$
-
- public EContainerToggleState() {
- super(FACET_SET_ID);
- }
-
-}
diff --git a/org.eclipse.modisco.infra.browser.editor.ui/src/org/eclipse/modisco/infra/browser/editor/ui/internal/handlers/LinksCountHandler.java b/org.eclipse.modisco.infra.browser.editor.ui/src/org/eclipse/modisco/infra/browser/editor/ui/internal/handlers/LinksCountHandler.java
deleted file mode 100644
index 7b3ab34..0000000
--- a/org.eclipse.modisco.infra.browser.editor.ui/src/org/eclipse/modisco/infra/browser/editor/ui/internal/handlers/LinksCountHandler.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * Copyright (c) 2014 Soft-Maint.
- * 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:
- * Thomas Cicognani (Soft-Maint) - Bug 442257 - New toolbar actions to (des)activate customizations
- * Thomas Cicognani (Soft-Maint) - Bug 442714 - New toolbar action to show/hide eContainer link
- */
-package org.eclipse.modisco.infra.browser.editor.ui.internal.handlers;
-
-import org.eclipse.core.commands.ExecutionEvent;
-import org.eclipse.core.commands.ExecutionException;
-
-public class LinksCountHandler extends AbstractFacetSetActivatorHandler {
-
- private static final String CUSTOM_ID = "org.eclipse.modisco.infra.browser.ecore.core.linksCount"; //$NON-NLS-1$
-
- public Object execute(final ExecutionEvent event) throws ExecutionException {
- return execute(event, CUSTOM_ID);
- }
-
-}
diff --git a/org.eclipse.modisco.infra.browser.editor.ui/src/org/eclipse/modisco/infra/browser/editor/ui/internal/handlers/LinksCountState.java b/org.eclipse.modisco.infra.browser.editor.ui/src/org/eclipse/modisco/infra/browser/editor/ui/internal/handlers/LinksCountState.java
deleted file mode 100644
index dd3c542..0000000
--- a/org.eclipse.modisco.infra.browser.editor.ui/src/org/eclipse/modisco/infra/browser/editor/ui/internal/handlers/LinksCountState.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * Copyright (c) 2014 Soft-Maint.
- * 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:
- * Thomas Cicognani (Soft-Maint) - Bug 442257 - New toolbar actions to (des)activate customizations
- * Thomas Cicognani (Soft-Maint) - Bug 442714 - New toolbar action to show/hide eContainer link
- */
-package org.eclipse.modisco.infra.browser.editor.ui.internal.handlers;
-
-public class LinksCountState extends AbstractFacetSetActivatorToggleState {
-
- private static final String CUSTOM_ID = "org.eclipse.modisco.infra.browser.ecore.core.linksCount"; //$NON-NLS-1$
-
- public LinksCountState() {
- super(CUSTOM_ID);
- }
-
-}
diff --git a/org.eclipse.modisco.infra.browser.editor.ui/src/org/eclipse/modisco/infra/browser/editor/ui/internal/handlers/LoadCustomShortcutsMenu.java b/org.eclipse.modisco.infra.browser.editor.ui/src/org/eclipse/modisco/infra/browser/editor/ui/internal/handlers/LoadCustomShortcutsMenu.java
new file mode 100644
index 0000000..24f5430
--- /dev/null
+++ b/org.eclipse.modisco.infra.browser.editor.ui/src/org/eclipse/modisco/infra/browser/editor/ui/internal/handlers/LoadCustomShortcutsMenu.java
@@ -0,0 +1,24 @@
+/**
+ * Copyright (c) 2015 Mia-Software.
+ * 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:
+ * Thomas Cicognani (Mia-Software) - Bug 470962 - Add shortcuts to activate customs
+ */
+package org.eclipse.modisco.infra.browser.editor.ui.internal.handlers;
+
+import org.eclipse.emf.facet.custom.ui.LoadCustomShortcutsMenuUtils;
+import org.eclipse.jface.action.IContributionItem;
+import org.eclipse.ui.actions.CompoundContributionItem;
+
+public class LoadCustomShortcutsMenu extends CompoundContributionItem {
+
+ @Override
+ protected IContributionItem[] getContributionItems() {
+ return LoadCustomShortcutsMenuUtils.getCustomItemsFromCurrentEditor();
+ }
+
+}
diff --git a/org.eclipse.modisco.infra.browser.editor.ui/src/org/eclipse/modisco/infra/browser/editor/ui/internal/handlers/LoadFacetSetShortcutsMenu.java b/org.eclipse.modisco.infra.browser.editor.ui/src/org/eclipse/modisco/infra/browser/editor/ui/internal/handlers/LoadFacetSetShortcutsMenu.java
new file mode 100644
index 0000000..4ac1e9b
--- /dev/null
+++ b/org.eclipse.modisco.infra.browser.editor.ui/src/org/eclipse/modisco/infra/browser/editor/ui/internal/handlers/LoadFacetSetShortcutsMenu.java
@@ -0,0 +1,25 @@
+/**
+ * Copyright (c) 2015 Mia-Software.
+ * 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:
+ * Thomas Cicognani (Mia-Software) - Bug 470962 - Add shortcuts to activate customs
+ */
+package org.eclipse.modisco.infra.browser.editor.ui.internal.handlers;
+
+import org.eclipse.emf.facet.efacet.ui.LoadFacetSetShortcutsMenuUtils;
+import org.eclipse.jface.action.IContributionItem;
+import org.eclipse.ui.actions.CompoundContributionItem;
+
+public class LoadFacetSetShortcutsMenu extends CompoundContributionItem {
+
+ @Override
+ protected IContributionItem[] getContributionItems() {
+ return LoadFacetSetShortcutsMenuUtils
+ .getFacetSetItemsFromCurrentEditor();
+ }
+
+}
diff --git a/org.eclipse.modisco.infra.browser.editor.ui/src/org/eclipse/modisco/infra/browser/editor/ui/internal/messages.properties b/org.eclipse.modisco.infra.browser.editor.ui/src/org/eclipse/modisco/infra/browser/editor/ui/internal/messages.properties
index 62ec593..0b64a23 100644
--- a/org.eclipse.modisco.infra.browser.editor.ui/src/org/eclipse/modisco/infra/browser/editor/ui/internal/messages.properties
+++ b/org.eclipse.modisco.infra.browser.editor.ui/src/org/eclipse/modisco/infra/browser/editor/ui/internal/messages.properties
@@ -1,4 +1,4 @@
-# Copyright (c) 2014 Mia-Software.
+# Copyright (c) 2014, 2015 Mia-Software, and Soft-Maint.
# 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
@@ -6,5 +6,10 @@
#
# Contributors:
# Gregoire Dupe (Mia-Software) - Bug 358914 - [Move to EMF Facet][Browser] Switch to EMF Facet
+# Thomas Cicognani (Soft-Maint) - Bug 442800 - API to open new MoDisco Browser
+# Thomas Cicognani (Mia-Software) - Bug 470962 - Add shortcuts to activate customs
#
-ResourceBrowserOpener_EmfFacetDefaultTreeBrowser=EMF Facet Default Tree Browser
+ResourceBrowserOpener_MoDiscoDefaultTreeBrowser=MoDisco Model Browser V2
+TreeEditorShortcutUtils_CustomHideDerivedReferences=Hide Derived References
+TreeEditorShortcutUtils_CustomHideEmptyReferences=Hide Empty References
+TreeEditorShortcutUtils_CustomShowLinksCount=Show Links Count
diff --git a/org.eclipse.modisco.infra.browser.editor.ui/src/org/eclipse/modisco/infra/browser/editor/ui/internal/opener/ResourceBrowserOpener.java b/org.eclipse.modisco.infra.browser.editor.ui/src/org/eclipse/modisco/infra/browser/editor/ui/internal/opener/ResourceBrowserOpener.java
index 3f89638..9b8bfa6 100644
--- a/org.eclipse.modisco.infra.browser.editor.ui/src/org/eclipse/modisco/infra/browser/editor/ui/internal/opener/ResourceBrowserOpener.java
+++ b/org.eclipse.modisco.infra.browser.editor.ui/src/org/eclipse/modisco/infra/browser/editor/ui/internal/opener/ResourceBrowserOpener.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2014 Mia-Software.
+ * Copyright (c) 2014, 2015 Mia-Software, and Soft-Maint.
* 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
@@ -7,44 +7,46 @@
*
* Contributors:
* Gregoire Dupe (Mia-Software) - Bug 358914 - [Move to EMF Facet][Browser] Switch to EMF Facet
+ * Thomas Cicognani (Soft-Maint) - Bug 442800 - API to open new MoDisco Browser
*/
package org.eclipse.modisco.infra.browser.editor.ui.internal.opener;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EPackage;
import org.eclipse.emf.ecore.resource.Resource;
import org.eclipse.emf.facet.util.core.Logger;
+import org.eclipse.emf.facet.util.emf.core.IEObjectBrowserOpener;
+import org.eclipse.emf.facet.util.emf.core.IEPackageBrowserOpener;
import org.eclipse.emf.facet.util.emf.core.IResourceBrowserOpener;
+import org.eclipse.modisco.infra.browser.editor.ui.ITreeEditorOpener;
+import org.eclipse.modisco.infra.browser.editor.ui.exceptions.TreeEditorOpenerException;
import org.eclipse.modisco.infra.browser.editor.ui.internal.Activator;
import org.eclipse.modisco.infra.browser.editor.ui.internal.Messages;
-import org.eclipse.modisco.infra.browser.editor.ui.internal.editor.TreeEditor;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.IWorkbench;
-import org.eclipse.ui.IWorkbenchPage;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.ide.IDE;
-public class ResourceBrowserOpener implements IResourceBrowserOpener {
+public class ResourceBrowserOpener implements IResourceBrowserOpener, IEObjectBrowserOpener, IEPackageBrowserOpener {
public void openResource(final Resource resource) {
- Display.getDefault().syncExec(new Runnable() {
- public void run() {
- try {
- final IWorkbench workbench = PlatformUI.getWorkbench();
- final IWorkbenchWindow window = workbench
- .getActiveWorkbenchWindow();
- final IWorkbenchPage page = window.getActivePage();
- IDE.openEditor(page, new ResourceEditorInput(resource),
- TreeEditor.getEditorId(), true);
- } catch (Exception e) {
- Logger.logError(e, Activator.getDefault());
- }
- }
- });
-
+ try {
+ ITreeEditorOpener.DEFAULT.openWithResource(resource);
+ } catch (TreeEditorOpenerException e) {
+ Logger.logError(e, Activator.getDefault());
+ }
}
public String getBrowserName() {
- return Messages.ResourceBrowserOpener_EmfFacetDefaultTreeBrowser;
+ return Messages.ResourceBrowserOpener_MoDiscoDefaultTreeBrowser;
+ }
+
+ public void openEObject(final EObject eObject) {
+ try {
+ ITreeEditorOpener.DEFAULT.openWithEObject(eObject);
+ } catch (TreeEditorOpenerException e) {
+ Logger.logError(e, Activator.getDefault());
+ }
+ }
+
+ public void openEPackage(final EPackage ePackage) {
+ openEObject(ePackage);
}
}
diff --git a/org.eclipse.modisco.infra.browser.editor.ui/src/org/eclipse/modisco/infra/browser/editor/ui/internal/opener/ResourceEditorInput.java b/org.eclipse.modisco.infra.browser.editor.ui/src/org/eclipse/modisco/infra/browser/editor/ui/internal/opener/ResourceEditorInput.java
index 130bd17..90c7fa8 100644
--- a/org.eclipse.modisco.infra.browser.editor.ui/src/org/eclipse/modisco/infra/browser/editor/ui/internal/opener/ResourceEditorInput.java
+++ b/org.eclipse.modisco.infra.browser.editor.ui/src/org/eclipse/modisco/infra/browser/editor/ui/internal/opener/ResourceEditorInput.java
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2014 Mia-Software.
+ * Copyright (c) 2014, 2015 Mia-Software, and Soft-Maint.
* 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
@@ -7,6 +7,7 @@
*
* Contributors:
* Gregoire Dupe (Mia-Software) - Bug 358914 - [Move to EMF Facet][Browser] Switch to EMF Facet
+ * Thomas Cicognani (Soft-Maint) - Bug 442800 - API to open new MoDisco Browser
*/
package org.eclipse.modisco.infra.browser.editor.ui.internal.opener;
@@ -67,7 +68,7 @@
if (other instanceof ResourceEditorInput) {
final ResourceEditorInput otherEditorInput = (ResourceEditorInput) other;
final Resource otherResource = otherEditorInput.getResource();
- result = otherResource.equals(getResource());
+ result = otherResource.equals(this.resource);
}
return result;
}
diff --git a/org.eclipse.modisco.infra.browser.editor.ui/src/org/eclipse/modisco/infra/browser/editor/ui/internal/opener/ResourceSetEditorInput.java b/org.eclipse.modisco.infra.browser.editor.ui/src/org/eclipse/modisco/infra/browser/editor/ui/internal/opener/ResourceSetEditorInput.java
new file mode 100644
index 0000000..f544ad1
--- /dev/null
+++ b/org.eclipse.modisco.infra.browser.editor.ui/src/org/eclipse/modisco/infra/browser/editor/ui/internal/opener/ResourceSetEditorInput.java
@@ -0,0 +1,72 @@
+/**
+ * Copyright (c) 2015 Soft-Maint.
+ * 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:
+ * Thomas Cicognani (Soft-Maint) - Bug 442800 - API to open new MoDisco Browser
+ */
+package org.eclipse.modisco.infra.browser.editor.ui.internal.opener;
+
+import org.eclipse.emf.ecore.resource.ResourceSet;
+import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.ui.IEditorInput;
+import org.eclipse.ui.IPersistableElement;
+
+public class ResourceSetEditorInput implements IEditorInput {
+
+ private final ResourceSet resourceSet;
+
+ public ResourceSetEditorInput(final ResourceSet resourceSet) {
+ this.resourceSet = resourceSet;
+ }
+
+ public ResourceSet getResourceSet() {
+ return this.resourceSet;
+ }
+
+ @Override
+ public boolean equals(final Object other) {
+ boolean result = false;
+ if (other instanceof ResourceSetEditorInput) {
+ final ResourceSetEditorInput otherEditorInput = (ResourceSetEditorInput) other;
+ final ResourceSet otherResourceSet = otherEditorInput
+ .getResourceSet();
+ result = otherResourceSet.equals(this.resourceSet);
+ }
+ return result;
+ }
+
+ @Override
+ public int hashCode() {
+ return this.resourceSet.hashCode();
+ }
+
+ public Object getAdapter(@SuppressWarnings("rawtypes") final Class adapter) {
+ // @SuppressWarnings("rawtypes") : imposed by the implemented interface.
+ return null;
+ }
+
+ public boolean exists() {
+ return false;
+ }
+
+ public ImageDescriptor getImageDescriptor() {
+ return null;
+ }
+
+ public String getName() {
+ return this.resourceSet.toString();
+ }
+
+ public IPersistableElement getPersistable() {
+ return null;
+ }
+
+ public String getToolTipText() {
+ return getName();
+ }
+
+}
diff --git a/org.eclipse.modisco.infra.browser.feature/feature.xml b/org.eclipse.modisco.infra.browser.feature/feature.xml
index ec9eda3..c652807 100644
--- a/org.eclipse.modisco.infra.browser.feature/feature.xml
+++ b/org.eclipse.modisco.infra.browser.feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.modisco.infra.browser.feature"
label="%featureName"
- version="0.13.1.qualifier"
+ version="1.0.0.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.license"
license-feature-version="0.0.0">
diff --git a/org.eclipse.modisco.infra.browser.tests/META-INF/MANIFEST.MF b/org.eclipse.modisco.infra.browser.tests/META-INF/MANIFEST.MF
index cc0891b..28bb112 100644
--- a/org.eclipse.modisco.infra.browser.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.infra.browser.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.modisco.infra.browser.tests;singleton:=true
-Bundle-Version: 0.13.1.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Require-Bundle: org.eclipse.swtbot.swt.finder;resolution:=optional,
org.eclipse.swtbot.eclipse.finder,
diff --git a/org.eclipse.modisco.infra.cdo.derby.feature/feature.xml b/org.eclipse.modisco.infra.cdo.derby.feature/feature.xml
index b36d082..fd8d592 100644
--- a/org.eclipse.modisco.infra.cdo.derby.feature/feature.xml
+++ b/org.eclipse.modisco.infra.cdo.derby.feature/feature.xml
@@ -12,7 +12,7 @@
<feature
id="org.eclipse.modisco.infra.cdo.derby.feature"
label="MoDisco CDO server with Derby (Incubation)"
- version="0.13.1.qualifier"
+ version="1.0.0.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.license"
license-feature-version="0.0.0">
diff --git a/org.eclipse.modisco.infra.common.core.tests/META-INF/MANIFEST.MF b/org.eclipse.modisco.infra.common.core.tests/META-INF/MANIFEST.MF
index 9e8a266..b620fc7 100644
--- a/org.eclipse.modisco.infra.common.core.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.infra.common.core.tests/META-INF/MANIFEST.MF
@@ -2,14 +2,15 @@
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.modisco.infra.common.core.tests;singleton:=true
-Bundle-Version: 0.13.1.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-Vendor: %Bundle-Vendor
Require-Bundle: org.junit;bundle-version="4.7.0",
org.eclipse.gmt.modisco.infra.common.core;bundle-version="0.8.0",
org.eclipse.core.runtime;bundle-version="3.5.0",
org.eclipse.core.resources;bundle-version="3.5.0",
org.eclipse.gmt.modisco.infra.facet;bundle-version="0.8.0",
- org.eclipse.uml2.uml
+ org.eclipse.uml2.uml,
+ org.eclipse.modisco.util.emf.core;bundle-version="1.0.0"
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-ActivationPolicy: lazy
Bundle-Activator: org.eclipse.modisco.infra.common.core.tests.Activator
diff --git a/org.eclipse.modisco.infra.common.core.tests/src/org/eclipse/modisco/infra/common/core/tests/Bug336903Test.java b/org.eclipse.modisco.infra.common.core.tests/src/org/eclipse/modisco/infra/common/core/tests/Bug336903Test.java
index 6f5cae2..43caae1 100644
--- a/org.eclipse.modisco.infra.common.core.tests/src/org/eclipse/modisco/infra/common/core/tests/Bug336903Test.java
+++ b/org.eclipse.modisco.infra.common.core.tests/src/org/eclipse/modisco/infra/common/core/tests/Bug336903Test.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2011 Mia-Software.
+ * Copyright (c) 2011, 2015 Mia-Software.
* 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
@@ -7,6 +7,7 @@
*
* Contributors:
* Fabien Giquel (Mia-Software)
+ * Grégoire Dupé (Mia-Software) - Bug 471096 - MetaclassInstance features have to be moved to an EMF dedicated plug-in
*******************************************************************************/
package org.eclipse.modisco.infra.common.core.tests;
@@ -19,8 +20,8 @@
import org.eclipse.emf.ecore.resource.Resource;
import org.eclipse.emf.ecore.resource.ResourceSet;
import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
-import org.eclipse.gmt.modisco.infra.common.core.internal.adapters.instances.MetaclassInstances;
-import org.eclipse.gmt.modisco.infra.common.core.internal.adapters.instances.MetaclassInstancesAdapterFactory;
+import org.eclipse.modisco.util.emf.core.internal.allinstances.MetaclassInstances;
+import org.eclipse.modisco.util.emf.core.internal.allinstances.MetaclassInstancesAdapterFactory;
import org.eclipse.uml2.uml.Model;
import org.eclipse.uml2.uml.TemplateSignature;
import org.eclipse.uml2.uml.UMLFactory;
diff --git a/org.eclipse.modisco.infra.common.core.tests/src/org/eclipse/modisco/infra/common/core/tests/MetaclassInstancesTest.java b/org.eclipse.modisco.infra.common.core.tests/src/org/eclipse/modisco/infra/common/core/tests/MetaclassInstancesTest.java
index 507941a..3be7e5f 100644
--- a/org.eclipse.modisco.infra.common.core.tests/src/org/eclipse/modisco/infra/common/core/tests/MetaclassInstancesTest.java
+++ b/org.eclipse.modisco.infra.common.core.tests/src/org/eclipse/modisco/infra/common/core/tests/MetaclassInstancesTest.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2010 Mia-Software.
+ * Copyright (c) 2010, 2015 Mia-Software.
* 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
@@ -7,6 +7,7 @@
*
* Contributors:
* Nicolas Bros (Mia-Software)
+ * Grégoire Dupé (Mia-Software) - Bug 471096 - MetaclassInstance features have to be moved to an EMF dedicated plug-in
*******************************************************************************/
package org.eclipse.modisco.infra.common.core.tests;
@@ -28,8 +29,8 @@
import org.eclipse.emf.ecore.resource.ResourceSet;
import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.gmt.modisco.infra.common.core.internal.adapters.instances.MetaclassInstances;
-import org.eclipse.gmt.modisco.infra.common.core.internal.adapters.instances.MetaclassInstancesAdapterFactory;
+import org.eclipse.modisco.util.emf.core.internal.allinstances.MetaclassInstances;
+import org.eclipse.modisco.util.emf.core.internal.allinstances.MetaclassInstancesAdapterFactory;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
diff --git a/org.eclipse.modisco.infra.discovery.benchmark.core/META-INF/MANIFEST.MF b/org.eclipse.modisco.infra.discovery.benchmark.core/META-INF/MANIFEST.MF
index 376df88..3d80c30 100644
--- a/org.eclipse.modisco.infra.discovery.benchmark.core/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.infra.discovery.benchmark.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.modisco.infra.discovery.benchmark.core;singleton:=true
-Bundle-Version: 0.13.1.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-Activator: org.eclipse.modisco.infra.discovery.benchmark.core.internal.Activator
Bundle-Vendor: %Bundle-Vendor
Require-Bundle: org.eclipse.core.runtime,
diff --git a/org.eclipse.modisco.infra.discovery.benchmark.doc.archi/META-INF/MANIFEST.MF b/org.eclipse.modisco.infra.discovery.benchmark.doc.archi/META-INF/MANIFEST.MF
index 6bc63c9..a21da11 100644
--- a/org.eclipse.modisco.infra.discovery.benchmark.doc.archi/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.infra.discovery.benchmark.doc.archi/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.modisco.infra.discovery.benchmark.doc.archi;singleton:=true
-Bundle-Version: 0.13.1.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-Activator: org.eclipse.modisco.infra.discovery.benchmark.doc.archi.internal.Activator
Bundle-Vendor: %Bundle-Vendor
Require-Bundle: org.eclipse.core.runtime
diff --git a/org.eclipse.modisco.infra.discovery.benchmark.feature/feature.xml b/org.eclipse.modisco.infra.discovery.benchmark.feature/feature.xml
index 6d22802..201851a 100644
--- a/org.eclipse.modisco.infra.discovery.benchmark.feature/feature.xml
+++ b/org.eclipse.modisco.infra.discovery.benchmark.feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.modisco.infra.discovery.benchmark.feature"
label="MoDisco Infrastructure Discovery Benchmark (Incubation)"
- version="0.13.1.qualifier"
+ version="1.0.0.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.license"
license-feature-version="0.0.0">
diff --git a/org.eclipse.modisco.infra.discovery.benchmark.metamodel/META-INF/MANIFEST.MF b/org.eclipse.modisco.infra.discovery.benchmark.metamodel/META-INF/MANIFEST.MF
index e04438e..a074ca2 100644
--- a/org.eclipse.modisco.infra.discovery.benchmark.metamodel/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.infra.discovery.benchmark.metamodel/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.modisco.infra.discovery.benchmark.metamodel;singleton:=true
-Bundle-Version: 0.13.1.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %Bundle-Vendor
Bundle-Localization: plugin
diff --git a/org.eclipse.modisco.infra.discovery.benchmark.ui/META-INF/MANIFEST.MF b/org.eclipse.modisco.infra.discovery.benchmark.ui/META-INF/MANIFEST.MF
index 49a3f02..694e3b9 100644
--- a/org.eclipse.modisco.infra.discovery.benchmark.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.infra.discovery.benchmark.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.modisco.infra.discovery.benchmark.ui;singleton:=true
-Bundle-Version: 0.13.1.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-Activator: org.eclipse.modisco.infra.discovery.benchmark.ui.Activator
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
diff --git a/org.eclipse.modisco.infra.discovery.benchmark/META-INF/MANIFEST.MF b/org.eclipse.modisco.infra.discovery.benchmark/META-INF/MANIFEST.MF
index 0c0f3f3..8c55ab0 100644
--- a/org.eclipse.modisco.infra.discovery.benchmark/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.infra.discovery.benchmark/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.modisco.infra.discovery.benchmark;singleton:=true
-Bundle-Version: 0.13.1.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %Bundle-Vendor
Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/org.eclipse.modisco.infra.discovery.core.tests/META-INF/MANIFEST.MF b/org.eclipse.modisco.infra.discovery.core.tests/META-INF/MANIFEST.MF
index ac89f41..90755b7 100644
--- a/org.eclipse.modisco.infra.discovery.core.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.infra.discovery.core.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.modisco.infra.discovery.core.tests;singleton:=true
-Bundle-Version: 0.13.1.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-Activator: org.eclipse.modisco.infra.discovery.core.tests.Activator
Bundle-Vendor: %Bundle-Vendor
Require-Bundle: org.eclipse.core.runtime,
diff --git a/org.eclipse.modisco.infra.discovery.core/META-INF/MANIFEST.MF b/org.eclipse.modisco.infra.discovery.core/META-INF/MANIFEST.MF
index 1ad0e04..69552d5 100644
--- a/org.eclipse.modisco.infra.discovery.core/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.infra.discovery.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.modisco.infra.discovery.core;singleton:=true
-Bundle-Version: 0.13.1.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-Activator: org.eclipse.modisco.infra.discovery.core.internal.Activator
Bundle-Vendor: %Bundle-Vendor
Require-Bundle: org.eclipse.core.runtime,
diff --git a/org.eclipse.modisco.infra.discovery.ui.tests/META-INF/MANIFEST.MF b/org.eclipse.modisco.infra.discovery.ui.tests/META-INF/MANIFEST.MF
index 5eb7572..afd4ee0 100644
--- a/org.eclipse.modisco.infra.discovery.ui.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.infra.discovery.ui.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.modisco.infra.discovery.ui.tests;singleton:=true
-Bundle-Version: 0.13.1.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-Activator: org.eclipse.modisco.infra.discovery.ui.tests.Activator
Bundle-Vendor: %Bundle-Vendor
Require-Bundle: org.eclipse.core.runtime,
diff --git a/org.eclipse.modisco.infra.discovery.ui/META-INF/MANIFEST.MF b/org.eclipse.modisco.infra.discovery.ui/META-INF/MANIFEST.MF
index a42ea61..ba04b2a 100644
--- a/org.eclipse.modisco.infra.discovery.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.infra.discovery.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.modisco.infra.discovery.ui;singleton:=true
-Bundle-Version: 0.13.1.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-Activator: org.eclipse.modisco.infra.discovery.ui.Activator
Bundle-Vendor: %Bundle-Vendor
Require-Bundle: org.eclipse.ui,
diff --git a/org.eclipse.modisco.infra.discovery/META-INF/MANIFEST.MF b/org.eclipse.modisco.infra.discovery/META-INF/MANIFEST.MF
index da7ceb7..7ee63b0 100644
--- a/org.eclipse.modisco.infra.discovery/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.infra.discovery/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.modisco.infra.discovery;singleton:=true
-Bundle-Version: 0.13.1.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Localization: plugin
diff --git a/org.eclipse.modisco.infra.discoverymanager.tests/META-INF/MANIFEST.MF b/org.eclipse.modisco.infra.discoverymanager.tests/META-INF/MANIFEST.MF
index 2cf80f2..b161c32 100644
--- a/org.eclipse.modisco.infra.discoverymanager.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.infra.discoverymanager.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.modisco.infra.discoverymanager.tests
-Bundle-Version: 0.13.1.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-Activator: org.eclipse.modisco.infra.discovery.tests.Activator
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.jface;bundle-version="3.6.0",
diff --git a/org.eclipse.modisco.infra.doc.tests/META-INF/MANIFEST.MF b/org.eclipse.modisco.infra.doc.tests/META-INF/MANIFEST.MF
index f6fdf26..7543951 100644
--- a/org.eclipse.modisco.infra.doc.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.infra.doc.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.modisco.infra.doc.tests
-Bundle-Version: 0.13.1.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-Activator: org.eclipse.modisco.infra.doc.tests.Activator
Bundle-Vendor: %Bundle-Vendor
Require-Bundle: org.eclipse.core.runtime,
diff --git a/org.eclipse.modisco.infra.facet.tests/META-INF/MANIFEST.MF b/org.eclipse.modisco.infra.facet.tests/META-INF/MANIFEST.MF
index a859a04..4fd8c6c 100644
--- a/org.eclipse.modisco.infra.facet.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.infra.facet.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.modisco.infra.facet.tests;singleton:=true
-Bundle-Version: 0.13.1.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Localization: plugin
diff --git a/org.eclipse.modisco.infra.omg.doc/META-INF/MANIFEST.MF b/org.eclipse.modisco.infra.omg.doc/META-INF/MANIFEST.MF
index f92b5cf..d63d6bd 100644
--- a/org.eclipse.modisco.infra.omg.doc/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.infra.omg.doc/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.modisco.infra.omg.doc;singleton:=true
-Bundle-Version: 0.13.1.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-Vendor: %Bundle-Vendor
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.help
diff --git a/org.eclipse.modisco.infra.omg.feature/feature.xml b/org.eclipse.modisco.infra.omg.feature/feature.xml
index b420838..c57ea35 100644
--- a/org.eclipse.modisco.infra.omg.feature/feature.xml
+++ b/org.eclipse.modisco.infra.omg.feature/feature.xml
@@ -12,7 +12,7 @@
<feature
id="org.eclipse.modisco.infra.omg.feature"
label="MoDisco OMG meta-models implementations and tools (Incubation)"
- version="0.13.1.qualifier"
+ version="1.0.0.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.license"
license-feature-version="0.0.0">
diff --git a/org.eclipse.modisco.infra.query.tests/META-INF/MANIFEST.MF b/org.eclipse.modisco.infra.query.tests/META-INF/MANIFEST.MF
index 534c66c..b288d59 100644
--- a/org.eclipse.modisco.infra.query.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.infra.query.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.modisco.infra.query.tests;singleton:=true
-Bundle-Version: 0.13.1.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-Activator: org.eclipse.modisco.infra.query.tests.Activator
Bundle-Vendor: %Bundle-Vendor
Require-Bundle: org.eclipse.gmt.modisco.infra.common.ui;bundle-version="0.6.0",
diff --git a/org.eclipse.modisco.infrastructure.doc.archi/META-INF/MANIFEST.MF b/org.eclipse.modisco.infrastructure.doc.archi/META-INF/MANIFEST.MF
index 72bbf41..3db374c 100644
--- a/org.eclipse.modisco.infrastructure.doc.archi/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.infrastructure.doc.archi/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.modisco.infrastructure.doc.archi;singleton:=true
-Bundle-Version: 0.13.1.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-Vendor: %Bundle-Vendor
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.help
diff --git a/org.eclipse.modisco.infrastructure.doc/META-INF/MANIFEST.MF b/org.eclipse.modisco.infrastructure.doc/META-INF/MANIFEST.MF
index 9a084b0..ecc71fa 100644
--- a/org.eclipse.modisco.infrastructure.doc/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.infrastructure.doc/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.modisco.infrastructure.doc;singleton:=true
-Bundle-Version: 0.13.1.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-Vendor: %Bundle-Vendor
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.help
diff --git a/org.eclipse.modisco.infrastructure.feature/feature.xml b/org.eclipse.modisco.infrastructure.feature/feature.xml
index 155fa02..9e7ad73 100644
--- a/org.eclipse.modisco.infrastructure.feature/feature.xml
+++ b/org.eclipse.modisco.infrastructure.feature/feature.xml
@@ -7,12 +7,13 @@
http://www.eclipse.org/legal/epl-v10.html
Contributors:
- Nicolas Bros (Mia-Software) - initial API and implementation
+ Nicolas Bros (Mia-Software) - initial API and implementation
+ Grégoire Dupé (Mia-Software) - Bug 471096 - MetaclassInstance features have to be moved to an EMF dedicated plug-in
-->
<feature
id="org.eclipse.modisco.infrastructure.feature"
label="MoDisco Infrastructure (Incubation)"
- version="0.13.1.qualifier"
+ version="1.0.0.qualifier"
provider-name="%providerName"
plugin="org.eclipse.gmt.modisco.infra.common.core"
license-feature="org.eclipse.license"
@@ -269,4 +270,11 @@
install-size="0"
version="0.0.0"/>
+ <plugin
+ id="org.eclipse.modisco.util.emf.core"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
</feature>
diff --git a/org.eclipse.modisco.java.browser.customization.tests/META-INF/MANIFEST.MF b/org.eclipse.modisco.java.browser.customization.tests/META-INF/MANIFEST.MF
index 8d7c2df..509496e 100644
--- a/org.eclipse.modisco.java.browser.customization.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.java.browser.customization.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.modisco.java.browser.customization.tests;singleton:=true
-Bundle-Version: 0.13.1.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-Activator: org.eclipse.modisco.java.browser.customization.test.Activator
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
diff --git a/org.eclipse.modisco.java.cdo.feature/feature.xml b/org.eclipse.modisco.java.cdo.feature/feature.xml
index 92b162d..cd31de8 100644
--- a/org.eclipse.modisco.java.cdo.feature/feature.xml
+++ b/org.eclipse.modisco.java.cdo.feature/feature.xml
@@ -12,7 +12,7 @@
<feature
id="org.eclipse.modisco.java.cdo.feature"
label="MoDisco CDO Java Discoverer feature (Incubation)"
- version="0.13.1.qualifier"
+ version="1.0.0.qualifier"
provider-name="%providerName"
plugin="org.eclipse.gmt.modisco.java.cdo"
license-feature="org.eclipse.license"
diff --git a/org.eclipse.modisco.java.composition.browser.customization/META-INF/MANIFEST.MF b/org.eclipse.modisco.java.composition.browser.customization/META-INF/MANIFEST.MF
index 3ab8e19..748fe27 100644
--- a/org.eclipse.modisco.java.composition.browser.customization/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.java.composition.browser.customization/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.modisco.java.composition.browser.customization;singleton:=true
-Bundle-Version: 0.13.1.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-Activator: org.eclipse.modisco.java.composition.browser.customization.Activator
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.gmt.modisco.infra.common.core,
diff --git a/org.eclipse.modisco.java.composition.discoverer.benchmark/META-INF/MANIFEST.MF b/org.eclipse.modisco.java.composition.discoverer.benchmark/META-INF/MANIFEST.MF
index 2508cad..e94efe8 100644
--- a/org.eclipse.modisco.java.composition.discoverer.benchmark/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.java.composition.discoverer.benchmark/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.modisco.java.composition.discoverer.benchmark;singleton:=true
-Bundle-Version: 0.13.1.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-Activator: org.eclipse.modisco.java.composition.discoverer.benchmark.Activator
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.modisco.java.composition.discoverer;bundle-version="0.0.9",
diff --git a/org.eclipse.modisco.java.composition.discoverer.tests/META-INF/MANIFEST.MF b/org.eclipse.modisco.java.composition.discoverer.tests/META-INF/MANIFEST.MF
index 5c6e644..bc93ca6 100644
--- a/org.eclipse.modisco.java.composition.discoverer.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.java.composition.discoverer.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.modisco.java.composition.discoverer.tests;singleton:=true
-Bundle-Version: 0.13.1.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-Activator: org.eclipse.modisco.java.composition.discoverer.tests.JUnitPlugin
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.ui;bundle-version="3.6.0",
diff --git a/org.eclipse.modisco.java.composition.discoverer.ui/META-INF/MANIFEST.MF b/org.eclipse.modisco.java.composition.discoverer.ui/META-INF/MANIFEST.MF
index 52b54f1..1c0ad5e 100644
--- a/org.eclipse.modisco.java.composition.discoverer.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.java.composition.discoverer.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.modisco.java.composition.discoverer.ui;singleton:=true
-Bundle-Version: 0.13.1.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-Activator: org.eclipse.modisco.java.composition.discoverer.ui.internal.Activator
Bundle-Vendor: %Bundle-Vendor
Require-Bundle: org.eclipse.ui,
diff --git a/org.eclipse.modisco.java.composition.discoverer/META-INF/MANIFEST.MF b/org.eclipse.modisco.java.composition.discoverer/META-INF/MANIFEST.MF
index 113a8fe..7ece37a 100644
--- a/org.eclipse.modisco.java.composition.discoverer/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.java.composition.discoverer/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.modisco.java.composition.discoverer;singleton:=true
-Bundle-Version: 0.13.1.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-Activator: org.eclipse.modisco.java.composition.discoverer.Activator
Bundle-Vendor: %Bundle-Vendor
Require-Bundle: org.eclipse.ui,
diff --git a/org.eclipse.modisco.java.composition.ui/META-INF/MANIFEST.MF b/org.eclipse.modisco.java.composition.ui/META-INF/MANIFEST.MF
index 8e15535..4c0d137 100644
--- a/org.eclipse.modisco.java.composition.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.java.composition.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.modisco.java.composition.ui;singleton:=true
-Bundle-Version: 0.13.1.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-Activator: org.eclipse.modisco.java.composition.ui.Activator
Require-Bundle: org.eclipse.ui,
org.eclipse.ui.ide;bundle-version="3.6.0",
diff --git a/org.eclipse.modisco.java.composition/META-INF/MANIFEST.MF b/org.eclipse.modisco.java.composition/META-INF/MANIFEST.MF
index 3d1bd5e..a0bae1b 100644
--- a/org.eclipse.modisco.java.composition/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.java.composition/META-INF/MANIFEST.MF
@@ -9,7 +9,7 @@
fra.query.core;bundle-version="0.9.0"
Bundle-Vendor: %Bundle-Vendor
Bundle-ClassPath: .
-Bundle-Version: 0.13.1.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-Name: %Bundle-Name
Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.eclipse.modisco.java.composition;singleton:=true
diff --git a/org.eclipse.modisco.java.discoverer.benchmark.feature/feature.xml b/org.eclipse.modisco.java.discoverer.benchmark.feature/feature.xml
index 96d92c0..0535de6 100644
--- a/org.eclipse.modisco.java.discoverer.benchmark.feature/feature.xml
+++ b/org.eclipse.modisco.java.discoverer.benchmark.feature/feature.xml
@@ -12,7 +12,7 @@
<feature
id="org.eclipse.modisco.java.discoverer.benchmark.feature"
label="MoDisco Java Discoverer Benchmark feature (Incubation)"
- version="0.13.1.qualifier"
+ version="1.0.0.qualifier"
provider-name="%providerName"
plugin="org.eclipse.gmt.modisco.java.discoverer.benchmark"
license-feature="org.eclipse.license"
diff --git a/org.eclipse.modisco.java.discoverer.benchmark.javaBenchmark/META-INF/MANIFEST.MF b/org.eclipse.modisco.java.discoverer.benchmark.javaBenchmark/META-INF/MANIFEST.MF
index 0c7a35a..b1f70fe 100644
--- a/org.eclipse.modisco.java.discoverer.benchmark.javaBenchmark/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.java.discoverer.benchmark.javaBenchmark/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.modisco.java.discoverer.benchmark.javaBenchmark;singleton:=true
-Bundle-Version: 0.13.1.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %Bundle-Vendor
Bundle-Localization: OSGI-INF/l10n/bundle
diff --git a/org.eclipse.modisco.java.discoverer.benchmark.tests/META-INF/MANIFEST.MF b/org.eclipse.modisco.java.discoverer.benchmark.tests/META-INF/MANIFEST.MF
index 117682c..1e95fd5 100644
--- a/org.eclipse.modisco.java.discoverer.benchmark.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.java.discoverer.benchmark.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.modisco.java.discoverer.benchmark.tests
-Bundle-Version: 0.13.1.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-Activator: org.eclipse.modisco.java.discoverer.benchmark.tests.Activator
Bundle-Vendor: %Bundle-Vendor
Require-Bundle: org.eclipse.ui,
diff --git a/org.eclipse.modisco.java.discoverer.benchmark/META-INF/MANIFEST.MF b/org.eclipse.modisco.java.discoverer.benchmark/META-INF/MANIFEST.MF
index 37bb758..8dc0012 100644
--- a/org.eclipse.modisco.java.discoverer.benchmark/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.java.discoverer.benchmark/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.modisco.java.discoverer.benchmark;singleton:=true
-Bundle-Version: 0.13.1.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-Activator: org.eclipse.modisco.java.discoverer.benchmark.Activator
Bundle-Vendor: %Bundle-Vendor
Require-Bundle: org.eclipse.gmt.modisco.java;bundle-version="0.7.0",
diff --git a/org.eclipse.modisco.java.discoverer.cdo.tests/META-INF/MANIFEST.MF b/org.eclipse.modisco.java.discoverer.cdo.tests/META-INF/MANIFEST.MF
index 0f30ae8..deba22e 100644
--- a/org.eclipse.modisco.java.discoverer.cdo.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.java.discoverer.cdo.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.modisco.java.discoverer.cdo.tests;singleton:=true
-Bundle-Version: 0.13.1.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-Activator: org.eclipse.modisco.java.discoverer.cdo.tests.Activator
Bundle-Vendor: %Bundle-Vendor
Require-Bundle: org.eclipse.ui;bundle-version="3.5.0",
diff --git a/org.eclipse.modisco.java.discoverer.cdo/META-INF/MANIFEST.MF b/org.eclipse.modisco.java.discoverer.cdo/META-INF/MANIFEST.MF
index 72c1a16..f21f7b3 100644
--- a/org.eclipse.modisco.java.discoverer.cdo/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.java.discoverer.cdo/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.modisco.java.discoverer.cdo
-Bundle-Version: 0.13.1.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-Activator: org.eclipse.modisco.java.discoverer.cdo.Activator
Bundle-Vendor: %Bundle-Vendor
Require-Bundle: org.eclipse.ui;bundle-version="3.5.0",
diff --git a/org.eclipse.modisco.java.discoverer.tests/META-INF/MANIFEST.MF b/org.eclipse.modisco.java.discoverer.tests/META-INF/MANIFEST.MF
index aada3a7..30b719a 100644
--- a/org.eclipse.modisco.java.discoverer.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.java.discoverer.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.modisco.java.discoverer.tests;singleton:=true
-Bundle-Version: 0.13.1.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-Activator: org.eclipse.modisco.java.discoverer.tests.Activator
Bundle-Vendor: %Bundle-Vendor
Require-Bundle: org.eclipse.ui;bundle-version="3.5.0",
diff --git a/org.eclipse.modisco.java.discoverer.ui/META-INF/MANIFEST.MF b/org.eclipse.modisco.java.discoverer.ui/META-INF/MANIFEST.MF
index 3624da3..b2a39e4 100644
--- a/org.eclipse.modisco.java.discoverer.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.java.discoverer.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.modisco.java.discoverer.ui;singleton:=true
-Bundle-Version: 0.13.1.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-Activator: org.eclipse.modisco.java.discoverer.ui.internal.Activator
Bundle-Vendor: %Bundle-Vendor
Require-Bundle: org.eclipse.ui,
diff --git a/org.eclipse.modisco.java.discoverer/META-INF/MANIFEST.MF b/org.eclipse.modisco.java.discoverer/META-INF/MANIFEST.MF
index 7faca47..595b6a5 100644
--- a/org.eclipse.modisco.java.discoverer/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.java.discoverer/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@
Bundle-ActivationPolicy: lazy
Bundle-Vendor: %Bundle-Vendor
Bundle-SymbolicName: org.eclipse.modisco.java.discoverer;singleton:=true
-Bundle-Version: 0.13.1.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-Name: %Bundle-Name
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Require-Bundle: org.eclipse.gmt.modisco.infra.common.core,
diff --git a/org.eclipse.modisco.java.doc.archi/META-INF/MANIFEST.MF b/org.eclipse.modisco.java.doc.archi/META-INF/MANIFEST.MF
index a1c4df9..c91afcb 100644
--- a/org.eclipse.modisco.java.doc.archi/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.java.doc.archi/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.modisco.java.doc.archi;singleton:=true
-Bundle-Version: 0.13.1.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-Vendor: %Bundle-Vendor
Require-Bundle: org.eclipse.core.runtime
Bundle-ActivationPolicy: lazy
diff --git a/org.eclipse.modisco.java.doc/META-INF/MANIFEST.MF b/org.eclipse.modisco.java.doc/META-INF/MANIFEST.MF
index 7442136..347c80c 100644
--- a/org.eclipse.modisco.java.doc/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.java.doc/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.modisco.java.doc;singleton:=true
-Bundle-Version: 0.13.1.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-Vendor: %Bundle-Vendor
Require-Bundle: org.eclipse.core.runtime
Bundle-ActivationPolicy: lazy
diff --git a/org.eclipse.modisco.java.feature/feature.xml b/org.eclipse.modisco.java.feature/feature.xml
index e1edbd5..c20104c 100644
--- a/org.eclipse.modisco.java.feature/feature.xml
+++ b/org.eclipse.modisco.java.feature/feature.xml
@@ -12,7 +12,7 @@
<feature
id="org.eclipse.modisco.java.feature"
label="MoDisco Java Feature (Incubation)"
- version="0.13.1.qualifier"
+ version="1.0.0.qualifier"
provider-name="%providerName"
plugin="org.eclipse.gmt.modisco.java"
license-feature="org.eclipse.license"
diff --git a/org.eclipse.modisco.java.generation.tests/META-INF/MANIFEST.MF b/org.eclipse.modisco.java.generation.tests/META-INF/MANIFEST.MF
index af166bf..875d053 100644
--- a/org.eclipse.modisco.java.generation.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.java.generation.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.modisco.java.generation.tests
-Bundle-Version: 0.13.1.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-Activator: org.eclipse.modisco.java.generation.tests.Activator
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
diff --git a/org.eclipse.modisco.java.queries.tests/META-INF/MANIFEST.MF b/org.eclipse.modisco.java.queries.tests/META-INF/MANIFEST.MF
index 8cddf92..6575e42 100644
--- a/org.eclipse.modisco.java.queries.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.java.queries.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.modisco.java.queries.tests;singleton:=true
-Bundle-Version: 0.13.1.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-Activator: org.eclipse.modisco.java.queries.tests.Activator
Require-Bundle: org.eclipse.ui,
org.eclipse.gmt.modisco.infra.common.core;bundle-version="0.8.0",
diff --git a/org.eclipse.modisco.jee.doc.archi/META-INF/MANIFEST.MF b/org.eclipse.modisco.jee.doc.archi/META-INF/MANIFEST.MF
index 762355d..406bb89 100644
--- a/org.eclipse.modisco.jee.doc.archi/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.jee.doc.archi/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.modisco.jee.doc.archi;singleton:=true
-Bundle-Version: 0.13.1.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-Vendor: %Bundle-Vendor
Require-Bundle: org.eclipse.core.runtime
Bundle-ActivationPolicy: lazy
diff --git a/org.eclipse.modisco.jee.doc/META-INF/MANIFEST.MF b/org.eclipse.modisco.jee.doc/META-INF/MANIFEST.MF
index 8b95ee5..144fedb 100644
--- a/org.eclipse.modisco.jee.doc/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.jee.doc/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.modisco.jee.doc;singleton:=true
-Bundle-Version: 0.13.1.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-Vendor: %Bundle-Vendor
Require-Bundle: org.eclipse.core.runtime
Bundle-ActivationPolicy: lazy
diff --git a/org.eclipse.modisco.jee.ejbjar.discoverer.tests/META-INF/MANIFEST.MF b/org.eclipse.modisco.jee.ejbjar.discoverer.tests/META-INF/MANIFEST.MF
index 7b1f957..51c0909 100644
--- a/org.eclipse.modisco.jee.ejbjar.discoverer.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.jee.ejbjar.discoverer.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.modisco.jee.ejbjar.discoverer.tests;singleton:=true
-Bundle-Version: 0.13.1.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-Activator: org.eclipse.modisco.jee.ejbjar.discoverer.tests.JUnitPlugin
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
diff --git a/org.eclipse.modisco.jee.ejbjar.discoverer.ui/META-INF/MANIFEST.MF b/org.eclipse.modisco.jee.ejbjar.discoverer.ui/META-INF/MANIFEST.MF
index c543948..72e7b0f 100644
--- a/org.eclipse.modisco.jee.ejbjar.discoverer.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.jee.ejbjar.discoverer.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.modisco.jee.ejbjar.discoverer.ui;singleton:=true
-Bundle-Version: 0.13.1.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-Activator: org.eclipse.modisco.jee.ejbjar.discoverer.ui.Activator
Bundle-Vendor: %Bundle-Vendor
Require-Bundle: org.eclipse.ui,
diff --git a/org.eclipse.modisco.jee.ejbjar.discoverer/META-INF/MANIFEST.MF b/org.eclipse.modisco.jee.ejbjar.discoverer/META-INF/MANIFEST.MF
index 11c114e..7c30a85 100644
--- a/org.eclipse.modisco.jee.ejbjar.discoverer/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.jee.ejbjar.discoverer/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.modisco.jee.ejbjar.discoverer;singleton:=true
-Bundle-Version: 0.13.1.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-Activator: org.eclipse.modisco.jee.ejbjar.discoverer.EjbJarActivator
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
diff --git a/org.eclipse.modisco.jee.ejbjar/META-INF/MANIFEST.MF b/org.eclipse.modisco.jee.ejbjar/META-INF/MANIFEST.MF
index 8126ccf..f5d1abd 100644
--- a/org.eclipse.modisco.jee.ejbjar/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.jee.ejbjar/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.modisco.jee.ejbjar;singleton:=true
-Bundle-Version: 0.13.1.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %Bundle-Vendor
Bundle-Localization: plugin
diff --git a/org.eclipse.modisco.jee.facet/META-INF/MANIFEST.MF b/org.eclipse.modisco.jee.facet/META-INF/MANIFEST.MF
index 60432dc..2734b9c 100644
--- a/org.eclipse.modisco.jee.facet/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.jee.facet/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.modisco.jee.facet;singleton:=true
-Bundle-Version: 0.13.1.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-Activator: org.eclipse.modisco.jee.facet.JEEFacetActivator
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
diff --git a/org.eclipse.modisco.jee.feature/feature.xml b/org.eclipse.modisco.jee.feature/feature.xml
index 8f884e5..c3e01b3 100644
--- a/org.eclipse.modisco.jee.feature/feature.xml
+++ b/org.eclipse.modisco.jee.feature/feature.xml
@@ -12,7 +12,7 @@
<feature
id="org.eclipse.modisco.jee.feature"
label="MoDisco JEE feature (Incubation)"
- version="0.13.1.qualifier"
+ version="1.0.0.qualifier"
provider-name="%providerName"
plugin="org.eclipse.modisco.jee"
license-feature="org.eclipse.license"
diff --git a/org.eclipse.modisco.jee.jsp.browser.customization/META-INF/MANIFEST.MF b/org.eclipse.modisco.jee.jsp.browser.customization/META-INF/MANIFEST.MF
index 21b369c..5975d38 100644
--- a/org.eclipse.modisco.jee.jsp.browser.customization/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.jee.jsp.browser.customization/META-INF/MANIFEST.MF
@@ -6,7 +6,7 @@
Bundle-Vendor: %Bundle-Vendor
Bundle-ActivationPolicy: lazy
Bundle-ClassPath: .,bin
-Bundle-Version: 0.13.1.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-Name: %Bundle-Name
Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.eclipse.modisco.jee.jsp.browser.customization
diff --git a/org.eclipse.modisco.jee.jsp.discoverer.tests/META-INF/MANIFEST.MF b/org.eclipse.modisco.jee.jsp.discoverer.tests/META-INF/MANIFEST.MF
index 6c256e1..dcd82aa 100644
--- a/org.eclipse.modisco.jee.jsp.discoverer.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.jee.jsp.discoverer.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.modisco.jee.jsp.discoverer.tests;singleton:=true
-Bundle-Version: 0.13.1.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-Activator: org.eclipse.modisco.jee.jsp.discoverer.tests.Activator
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
diff --git a/org.eclipse.modisco.jee.jsp.discoverer.ui/META-INF/MANIFEST.MF b/org.eclipse.modisco.jee.jsp.discoverer.ui/META-INF/MANIFEST.MF
index 4e798dd..cc4ddc0 100644
--- a/org.eclipse.modisco.jee.jsp.discoverer.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.jee.jsp.discoverer.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.modisco.jee.jsp.discoverer.ui;singleton:=true
-Bundle-Version: 0.13.1.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-Activator: org.eclipse.modisco.jee.jsp.discoverer.ui.Activator
Bundle-Vendor: %Bundle-Vendor
Require-Bundle: org.eclipse.ui,
diff --git a/org.eclipse.modisco.jee.jsp.discoverer/META-INF/MANIFEST.MF b/org.eclipse.modisco.jee.jsp.discoverer/META-INF/MANIFEST.MF
index c6817bd..8423a70 100644
--- a/org.eclipse.modisco.jee.jsp.discoverer/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.jee.jsp.discoverer/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.modisco.jee.jsp.discoverer;singleton:=true
-Bundle-Version: 0.13.1.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-Activator: org.eclipse.modisco.jee.jsp.discoverer.JspActivator
Bundle-Vendor: %Bundle-Vendor
Require-Bundle: org.eclipse.ui,
diff --git a/org.eclipse.modisco.jee.jsp.generation.tests/META-INF/MANIFEST.MF b/org.eclipse.modisco.jee.jsp.generation.tests/META-INF/MANIFEST.MF
index 5b9b756..f77f09e 100644
--- a/org.eclipse.modisco.jee.jsp.generation.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.jee.jsp.generation.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.modisco.jee.jsp.generation.tests
-Bundle-Version: 0.13.1.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-Activator: org.eclipse.modisco.jee.jsp.generation.tests.Activator
Bundle-Vendor: %Bundle-Vendor
Require-Bundle: org.eclipse.ui,
diff --git a/org.eclipse.modisco.jee.jsp.generation/META-INF/MANIFEST.MF b/org.eclipse.modisco.jee.jsp.generation/META-INF/MANIFEST.MF
index 932e2e3..a75c3df 100644
--- a/org.eclipse.modisco.jee.jsp.generation/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.jee.jsp.generation/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.modisco.jee.jsp.generation
-Bundle-Version: 0.13.1.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-Activator: org.eclipse.modisco.jee.jsp.generation.Activator
Bundle-Vendor: %Bundle-Vendor
Require-Bundle: org.eclipse.core.runtime,
diff --git a/org.eclipse.modisco.jee.jsp/META-INF/MANIFEST.MF b/org.eclipse.modisco.jee.jsp/META-INF/MANIFEST.MF
index a716d05..9322d81 100644
--- a/org.eclipse.modisco.jee.jsp/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.jee.jsp/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.modisco.jee.jsp;singleton:=true
-Bundle-Version: 0.13.1.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %Bundle-Vendor
Bundle-Localization: plugin
diff --git a/org.eclipse.modisco.jee.queries.tests/META-INF/MANIFEST.MF b/org.eclipse.modisco.jee.queries.tests/META-INF/MANIFEST.MF
index ebde58b..c0cb08b 100644
--- a/org.eclipse.modisco.jee.queries.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.jee.queries.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.modisco.jee.queries.tests;singleton:=true
-Bundle-Version: 0.13.1.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-Activator: org.eclipse.modisco.jee.queries.tests.JUnitPlugin
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
diff --git a/org.eclipse.modisco.jee.queries/META-INF/MANIFEST.MF b/org.eclipse.modisco.jee.queries/META-INF/MANIFEST.MF
index ea9947a..8faf500 100644
--- a/org.eclipse.modisco.jee.queries/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.jee.queries/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.modisco.jee.queries;singleton:=true
-Bundle-Version: 0.13.1.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-Activator: org.eclipse.modisco.jee.queries.JEEQueriesActivator
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
diff --git a/org.eclipse.modisco.jee.webapp.discoverer.tests/META-INF/MANIFEST.MF b/org.eclipse.modisco.jee.webapp.discoverer.tests/META-INF/MANIFEST.MF
index 0ffd0ed..4bde2ff 100644
--- a/org.eclipse.modisco.jee.webapp.discoverer.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.jee.webapp.discoverer.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.modisco.jee.webapp.discoverer.tests
-Bundle-Version: 0.13.1.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-Vendor: %Bundle-Vendor
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-ActivationPolicy: lazy
diff --git a/org.eclipse.modisco.jee.webapp.discoverer.ui/META-INF/MANIFEST.MF b/org.eclipse.modisco.jee.webapp.discoverer.ui/META-INF/MANIFEST.MF
index aba5d08..580bdbf 100644
--- a/org.eclipse.modisco.jee.webapp.discoverer.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.jee.webapp.discoverer.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.modisco.jee.webapp.discoverer.ui;singleton:=true
-Bundle-Version: 0.13.1.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-Activator: org.eclipse.modisco.jee.webapp.discoverer.ui.Activator
Bundle-Vendor: %Bundle-Vendor
Require-Bundle: org.eclipse.ui,
diff --git a/org.eclipse.modisco.jee.webapp.discoverer/META-INF/MANIFEST.MF b/org.eclipse.modisco.jee.webapp.discoverer/META-INF/MANIFEST.MF
index c60f335..49ea793 100644
--- a/org.eclipse.modisco.jee.webapp.discoverer/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.jee.webapp.discoverer/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.modisco.jee.webapp.discoverer;singleton:=true
-Bundle-Version: 0.13.1.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-Activator: org.eclipse.modisco.jee.webapp.discoverer.WebXmlActivator
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
diff --git a/org.eclipse.modisco.jee.webapp/META-INF/MANIFEST.MF b/org.eclipse.modisco.jee.webapp/META-INF/MANIFEST.MF
index b5112e5..1bf82aa 100644
--- a/org.eclipse.modisco.jee.webapp/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.jee.webapp/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.modisco.jee.webapp;singleton:=true
-Bundle-Version: 0.13.1.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-ClassPath: .
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/org.eclipse.modisco.jee/META-INF/MANIFEST.MF b/org.eclipse.modisco.jee/META-INF/MANIFEST.MF
index 3cc62dc..e243a01 100644
--- a/org.eclipse.modisco.jee/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.jee/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.modisco.jee;singleton:=true
-Bundle-Version: 0.13.1.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-Vendor: %Bundle-Vendor
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Require-Bundle: org.eclipse.gmt.modisco.infra.discoverymanager;bundle-version="0.9.0",
diff --git a/org.eclipse.modisco.kdm.source.discoverer.ui/META-INF/MANIFEST.MF b/org.eclipse.modisco.kdm.source.discoverer.ui/META-INF/MANIFEST.MF
index ea48bb2..b6dbaa2 100644
--- a/org.eclipse.modisco.kdm.source.discoverer.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.kdm.source.discoverer.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.modisco.kdm.source.discoverer.ui;singleton:=true
-Bundle-Version: 0.13.1.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-Activator: org.eclipse.modisco.kdm.source.discoverer.ui.internal.Activator
Bundle-Vendor: %Bundle-Vendor
Require-Bundle: org.eclipse.ui,
diff --git a/org.eclipse.modisco.kdm.source.discoverer/META-INF/MANIFEST.MF b/org.eclipse.modisco.kdm.source.discoverer/META-INF/MANIFEST.MF
index 19c127d..1f04620 100644
--- a/org.eclipse.modisco.kdm.source.discoverer/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.kdm.source.discoverer/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.modisco.kdm.source.discoverer;singleton:=true
-Bundle-Version: 0.13.1.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-Activator: org.eclipse.modisco.kdm.source.discoverer.internal.Activator
Bundle-Vendor: %Bundle-Vendor
Require-Bundle: org.eclipse.core.runtime,
diff --git a/org.eclipse.modisco.kdm.source.extension.ui.browser/META-INF/MANIFEST.MF b/org.eclipse.modisco.kdm.source.extension.ui.browser/META-INF/MANIFEST.MF
index 1ba9084..86492a3 100644
--- a/org.eclipse.modisco.kdm.source.extension.ui.browser/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.kdm.source.extension.ui.browser/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.modisco.kdm.source.extension.ui.browser;singleton:=true
-Bundle-Version: 0.13.1.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-Activator: org.eclipse.modisco.kdm.source.extension.ui.browser.Activator
Bundle-Vendor: %Bundle-Vendor
Require-Bundle: org.eclipse.ui,
diff --git a/org.eclipse.modisco.kdm.source.extension.ui/META-INF/MANIFEST.MF b/org.eclipse.modisco.kdm.source.extension.ui/META-INF/MANIFEST.MF
index 27a7ae5..ead3a31 100644
--- a/org.eclipse.modisco.kdm.source.extension.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.kdm.source.extension.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.modisco.kdm.source.extension.ui;singleton:=true
-Bundle-Version: 0.13.1.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-Activator: org.eclipse.modisco.kdm.source.extension.ui.Activator
Require-Bundle: org.eclipse.ui,
org.eclipse.ui.ide;bundle-version="3.6.0",
diff --git a/org.eclipse.modisco.kdm.source.extension/META-INF/MANIFEST.MF b/org.eclipse.modisco.kdm.source.extension/META-INF/MANIFEST.MF
index 0420299..a4a3df0 100644
--- a/org.eclipse.modisco.kdm.source.extension/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.kdm.source.extension/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.modisco.kdm.source.extension;singleton:=true
-Bundle-Version: 0.13.1.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %Bundle-Vendor
Bundle-Activator: org.eclipse.modisco.kdm.source.extension.Activator
diff --git a/org.eclipse.modisco.kdm.uml2converter.tests/META-INF/MANIFEST.MF b/org.eclipse.modisco.kdm.uml2converter.tests/META-INF/MANIFEST.MF
index 923101a..95d0a2a 100644
--- a/org.eclipse.modisco.kdm.uml2converter.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.kdm.uml2converter.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.modisco.kdm.uml2converter.tests;singleton:=true
-Bundle-Version: 0.13.1.qualifier
+Bundle-Version: 1.0.0.qualifier
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.ui,
org.eclipse.emf.common,
diff --git a/org.eclipse.modisco.kdm.uml2converter.ui/META-INF/MANIFEST.MF b/org.eclipse.modisco.kdm.uml2converter.ui/META-INF/MANIFEST.MF
index 9ba4ae5..c79c2b9 100644
--- a/org.eclipse.modisco.kdm.uml2converter.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.kdm.uml2converter.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.modisco.kdm.uml2converter.ui;singleton:=true
-Bundle-Version: 0.13.1.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-Activator: org.eclipse.modisco.kdm.uml2converter.ui.internal.Activator
Bundle-Vendor: %Bundle-Vendor
Require-Bundle: org.eclipse.ui,
diff --git a/org.eclipse.modisco.kdm.uml2converter/META-INF/MANIFEST.MF b/org.eclipse.modisco.kdm.uml2converter/META-INF/MANIFEST.MF
index 30d30ac..7bbcded 100644
--- a/org.eclipse.modisco.kdm.uml2converter/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.kdm.uml2converter/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.modisco.kdm.uml2converter;singleton:=true
-Bundle-Version: 0.13.1.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-Activator: org.eclipse.modisco.kdm.uml2converter.internal.KdmToUml2Activator
Bundle-Vendor: %Bundle-Vendor
Bundle-ClassPath: .
diff --git a/org.eclipse.modisco.manifest.discoverer.ui/META-INF/MANIFEST.MF b/org.eclipse.modisco.manifest.discoverer.ui/META-INF/MANIFEST.MF
index 02d11c2..986de5a 100644
--- a/org.eclipse.modisco.manifest.discoverer.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.manifest.discoverer.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.modisco.manifest.discoverer.ui;singleton:=true
-Bundle-Version: 0.13.1.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-Activator: org.eclipse.modisco.manifest.discoverer.ui.Activator
Bundle-Vendor: %Bundle-Vendor
Require-Bundle: org.eclipse.ui,
diff --git a/org.eclipse.modisco.manifest.discoverer/META-INF/MANIFEST.MF b/org.eclipse.modisco.manifest.discoverer/META-INF/MANIFEST.MF
index 1ac2a4c..2ccead0 100644
--- a/org.eclipse.modisco.manifest.discoverer/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.manifest.discoverer/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.modisco.manifest.discoverer;singleton:=true
-Bundle-Version: 0.13.1.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-Activator: org.eclipse.modisco.manifest.discoverer.Activator
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.core.resources;bundle-version="3.6.0",
diff --git a/org.eclipse.modisco.manifest/META-INF/MANIFEST.MF b/org.eclipse.modisco.manifest/META-INF/MANIFEST.MF
index 4c04103..628fef7 100644
--- a/org.eclipse.modisco.manifest/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.manifest/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.modisco.manifest;singleton:=true
-Bundle-Version: 0.13.1.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Localization: plugin
diff --git a/org.eclipse.modisco.omg.gastm/META-INF/MANIFEST.MF b/org.eclipse.modisco.omg.gastm/META-INF/MANIFEST.MF
index 7235baf..6af69e9 100644
--- a/org.eclipse.modisco.omg.gastm/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.omg.gastm/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.modisco.omg.gastm;singleton:=true
-Bundle-Version: 0.13.1.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Localization: plugin
diff --git a/org.eclipse.modisco.omg.smm/META-INF/MANIFEST.MF b/org.eclipse.modisco.omg.smm/META-INF/MANIFEST.MF
index 5c90f56..00ca7a1 100644
--- a/org.eclipse.modisco.omg.smm/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.omg.smm/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.modisco.omg.smm;singleton:=true
-Bundle-Version: 0.13.1.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Localization: plugin
diff --git a/org.eclipse.modisco.properties.discoverer.ui/META-INF/MANIFEST.MF b/org.eclipse.modisco.properties.discoverer.ui/META-INF/MANIFEST.MF
index 1de64f3..f75019a 100644
--- a/org.eclipse.modisco.properties.discoverer.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.properties.discoverer.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.modisco.properties.discoverer.ui;singleton:=true
-Bundle-Version: 0.13.1.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-Activator: org.eclipse.modisco.properties.discoverer.ui.Activator
Bundle-Vendor: %Bundle-Vendor
Require-Bundle: org.eclipse.ui,
diff --git a/org.eclipse.modisco.properties.discoverer/META-INF/MANIFEST.MF b/org.eclipse.modisco.properties.discoverer/META-INF/MANIFEST.MF
index 274198a..81637c3 100644
--- a/org.eclipse.modisco.properties.discoverer/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.properties.discoverer/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.modisco.properties.discoverer;singleton:=true
-Bundle-Version: 0.13.1.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-Activator: org.eclipse.modisco.properties.discoverer.Activator
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.core.resources;bundle-version="3.6.0",
diff --git a/org.eclipse.modisco.releng.tycho/helios/releng.properties b/org.eclipse.modisco.releng.tycho/helios/releng.properties
index 56a411a..96d49e8 100644
--- a/org.eclipse.modisco.releng.tycho/helios/releng.properties
+++ b/org.eclipse.modisco.releng.tycho/helios/releng.properties
@@ -20,7 +20,7 @@
#The following informations will be used as maven pom parent informations
product.group.id=org.eclipse.mdt
-product.version=0.13.1
+product.version=1.0.0
#How the releng tools should find relevant bundles
updatesite.source.location=${product.source.location}/org.eclipse.modisco.updatesite
diff --git a/org.eclipse.modisco.releng.tycho/helios/targetPlatform.xml b/org.eclipse.modisco.releng.tycho/helios/targetPlatform.xml
index ae22ac7..9372e95 100644
--- a/org.eclipse.modisco.releng.tycho/helios/targetPlatform.xml
+++ b/org.eclipse.modisco.releng.tycho/helios/targetPlatform.xml
@@ -16,6 +16,6 @@
<groupId>org.eclipse.mdt</groupId>
<artifactId>org.eclipse.modisco.archi.tech.targetplatform</artifactId>
<classifier>org.eclipse.modisco.archi.tech.targetplatform</classifier>
- <version>0.13.1</version>
+ <version>1.0.0</version>
</artifact>
</target>
\ No newline at end of file
diff --git a/org.eclipse.modisco.releng.tycho/indigo/releng.properties b/org.eclipse.modisco.releng.tycho/indigo/releng.properties
index e44372c..60c5898 100644
--- a/org.eclipse.modisco.releng.tycho/indigo/releng.properties
+++ b/org.eclipse.modisco.releng.tycho/indigo/releng.properties
@@ -20,7 +20,7 @@
#The following informations will be used as maven pom parent informations
product.group.id=org.eclipse.mdt
-product.version=0.13.1
+product.version=1.0.0
#How the releng tools should find relevant bundles
updatesite.source.location=${product.source.location}/org.eclipse.modisco.updatesite
diff --git a/org.eclipse.modisco.releng.tycho/indigo/targetPlatform.xml b/org.eclipse.modisco.releng.tycho/indigo/targetPlatform.xml
index c3fca23..e4d8031 100644
--- a/org.eclipse.modisco.releng.tycho/indigo/targetPlatform.xml
+++ b/org.eclipse.modisco.releng.tycho/indigo/targetPlatform.xml
@@ -16,6 +16,6 @@
<groupId>org.eclipse.mdt</groupId>
<artifactId>org.eclipse.modisco.archi.tech.targetplatform</artifactId>
<classifier>org.eclipse.modisco.archi.tech.targetplatform-indigo</classifier>
- <version>0.13.1</version>
+ <version>1.0.0</version>
</artifact>
</target>
\ No newline at end of file
diff --git a/org.eclipse.modisco.releng.tycho/local/releng.properties b/org.eclipse.modisco.releng.tycho/local/releng.properties
index 5cfdfb6..59071ec 100644
--- a/org.eclipse.modisco.releng.tycho/local/releng.properties
+++ b/org.eclipse.modisco.releng.tycho/local/releng.properties
@@ -20,7 +20,7 @@
#The following informations will be used as maven pom parent informations
product.group.id=org.eclipse.mdt
-product.version=0.13.1
+product.version=1.0.0
#How the releng tools should find relevant bundles
updatesite.source.location=${product.source.location}/org.eclipse.modisco.updatesite
diff --git a/org.eclipse.modisco.releng.tycho/releasetrain/dependencies_updatesites.xml b/org.eclipse.modisco.releng.tycho/releasetrain/dependencies_updatesites.xml
index 4b272ea..e1f5f52 100644
--- a/org.eclipse.modisco.releng.tycho/releasetrain/dependencies_updatesites.xml
+++ b/org.eclipse.modisco.releng.tycho/releasetrain/dependencies_updatesites.xml
@@ -26,5 +26,10 @@
<id>Eclipse License</id>
<layout>p2</layout>
<url>http://download.eclipse.org/cbi/updates/license/</url>
- </repository>
+ </repository>
+ <repository>
+ <id>EMF Facet</id>
+ <layout>p2</layout>
+ <url>http://download.eclipse.org/facet/updates/integration/1.1.0/I201507100802/</url>
+ </repository>
</repositories>
\ No newline at end of file
diff --git a/org.eclipse.modisco.releng.tycho/releasetrain/releng.properties b/org.eclipse.modisco.releng.tycho/releasetrain/releng.properties
index 12ddc90..b00ef14 100644
--- a/org.eclipse.modisco.releng.tycho/releasetrain/releng.properties
+++ b/org.eclipse.modisco.releng.tycho/releasetrain/releng.properties
@@ -20,7 +20,7 @@
#The following informations will be used as maven pom parent informations
product.group.id=org.eclipse.mdt
-product.version=0.13.1
+product.version=1.0.0
#How the releng tools should find relevant bundles
updatesite.source.location=${product.source.location}/org.eclipse.modisco.updatesite
diff --git a/org.eclipse.modisco.sdk.doc/META-INF/MANIFEST.MF b/org.eclipse.modisco.sdk.doc/META-INF/MANIFEST.MF
index 19014db..cee0a93 100644
--- a/org.eclipse.modisco.sdk.doc/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.sdk.doc/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.modisco.sdk.doc;singleton:=true
-Bundle-Version: 0.13.1.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-Vendor: %Bundle-Vendor
Require-Bundle: org.eclipse.core.runtime
Bundle-ActivationPolicy: lazy
diff --git a/org.eclipse.modisco.sdk.feature/feature.xml b/org.eclipse.modisco.sdk.feature/feature.xml
index 86e52d1..d64b8d6 100644
--- a/org.eclipse.modisco.sdk.feature/feature.xml
+++ b/org.eclipse.modisco.sdk.feature/feature.xml
@@ -12,7 +12,7 @@
<feature
id="org.eclipse.modisco.sdk.feature"
label="MoDisco SDK (Incubation)"
- version="0.13.1.qualifier"
+ version="1.0.0.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.license"
license-feature-version="0.0.0">
diff --git a/org.eclipse.modisco.smm.quality/META-INF/MANIFEST.MF b/org.eclipse.modisco.smm.quality/META-INF/MANIFEST.MF
index 6792136..c9ab732 100644
--- a/org.eclipse.modisco.smm.quality/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.smm.quality/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.modisco.smm.quality;singleton:=true
-Bundle-Version: 0.13.1.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Localization: plugin
diff --git a/org.eclipse.modisco.tests/META-INF/MANIFEST.MF b/org.eclipse.modisco.tests/META-INF/MANIFEST.MF
index 649b8ed..25bb2fe 100644
--- a/org.eclipse.modisco.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.modisco.tests
-Bundle-Version: 0.13.1.qualifier
+Bundle-Version: 1.0.0.qualifier
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.modisco.infra.browser.custom.examples.uml.tests;bundle-version="0.8.0",
org.eclipse.modisco.infra.browser.custom.tests;bundle-version="0.8.0",
diff --git a/org.eclipse.modisco.tests/src/org/eclipse/modisco/tests/BundleTest.java b/org.eclipse.modisco.tests/src/org/eclipse/modisco/tests/BundleTest.java
index f873d37..c33732f 100644
--- a/org.eclipse.modisco.tests/src/org/eclipse/modisco/tests/BundleTest.java
+++ b/org.eclipse.modisco.tests/src/org/eclipse/modisco/tests/BundleTest.java
@@ -36,7 +36,7 @@
@Test
public void version() {
- testManifestProperty("Bundle-Version", "0\\.13\\.1\\..*"); //$NON-NLS-1$ //$NON-NLS-2$
+ testManifestProperty("Bundle-Version", "1\\.0\\.0\\..*"); //$NON-NLS-1$ //$NON-NLS-2$
}
@Test
diff --git a/org.eclipse.modisco.thirdparties.feature/feature.xml b/org.eclipse.modisco.thirdparties.feature/feature.xml
index f2cd45f..6a8ab9a 100644
--- a/org.eclipse.modisco.thirdparties.feature/feature.xml
+++ b/org.eclipse.modisco.thirdparties.feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.modisco.thirdparties"
label="%featureName"
- version="0.13.1.qualifier"
+ version="1.0.0.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.license"
license-feature-version="0.0.0">
diff --git a/org.eclipse.modisco.updatesite/site.xml b/org.eclipse.modisco.updatesite/site.xml
index c666aae..051d90a 100644
--- a/org.eclipse.modisco.updatesite/site.xml
+++ b/org.eclipse.modisco.updatesite/site.xml
@@ -1,48 +1,48 @@
<?xml version="1.0" encoding="UTF-8"?>
<site>
- <feature url="features/org.eclipse.modisco.examples.feature_0.13.1.qualifier.jar" id="org.eclipse.modisco.examples.feature" version="0.13.1.qualifier">
+ <feature url="features/org.eclipse.modisco.examples.feature_1.0.0.qualifier.jar" id="org.eclipse.modisco.examples.feature" version="1.0.0.qualifier">
<category name="org.eclipse.modisco.updatesite.dev"/>
</feature>
- <feature url="features/org.eclipse.modisco.infra.cdo.derby.feature_0.13.1.qualifier.jar" id="org.eclipse.modisco.infra.cdo.derby.feature" version="0.13.1.qualifier">
+ <feature url="features/org.eclipse.modisco.infra.cdo.derby.feature_1.0.0.qualifier.jar" id="org.eclipse.modisco.infra.cdo.derby.feature" version="1.0.0.qualifier">
<category name="org.eclipse.modisco.updatesite.cdo"/>
</feature>
- <feature url="features/org.eclipse.modisco.infra.omg.feature_0.13.1.qualifier.jar" id="org.eclipse.modisco.infra.omg.feature" version="0.13.1.qualifier">
+ <feature url="features/org.eclipse.modisco.infra.omg.feature_1.0.0.qualifier.jar" id="org.eclipse.modisco.infra.omg.feature" version="1.0.0.qualifier">
<category name="org.eclipse.modisco.updatesite.infrastructure"/>
</feature>
- <feature url="features/org.eclipse.modisco.infrastructure.feature_0.13.1.qualifier.jar" id="org.eclipse.modisco.infrastructure.feature" version="0.13.1.qualifier">
+ <feature url="features/org.eclipse.modisco.infrastructure.feature_1.0.0.qualifier.jar" id="org.eclipse.modisco.infrastructure.feature" version="1.0.0.qualifier">
<category name="org.eclipse.modisco.updatesite.infrastructure"/>
</feature>
- <feature url="features/org.eclipse.modisco.java.cdo.feature_0.13.1.qualifier.jar" id="org.eclipse.modisco.java.cdo.feature" version="0.13.1.qualifier">
+ <feature url="features/org.eclipse.modisco.java.cdo.feature_1.0.0.qualifier.jar" id="org.eclipse.modisco.java.cdo.feature" version="1.0.0.qualifier">
<category name="org.eclipse.modisco.updatesite.cdo"/>
</feature>
- <feature url="features/org.eclipse.modisco.java.feature_0.13.1.qualifier.jar" id="org.eclipse.modisco.java.feature" version="0.13.1.qualifier">
+ <feature url="features/org.eclipse.modisco.java.feature_1.0.0.qualifier.jar" id="org.eclipse.modisco.java.feature" version="1.0.0.qualifier">
<category name="org.eclipse.modisco.updatesite.technologies"/>
</feature>
- <feature url="features/org.eclipse.modisco.jee.feature_0.13.1.qualifier.jar" id="org.eclipse.modisco.jee.feature" version="0.13.1.qualifier">
+ <feature url="features/org.eclipse.modisco.jee.feature_1.0.0.qualifier.jar" id="org.eclipse.modisco.jee.feature" version="1.0.0.qualifier">
<category name="org.eclipse.modisco.updatesite.technologies"/>
</feature>
- <feature url="features/org.eclipse.modisco.sdk.feature_0.13.1.qualifier.jar" id="org.eclipse.modisco.sdk.feature" version="0.13.1.qualifier">
+ <feature url="features/org.eclipse.modisco.sdk.feature_1.0.0.qualifier.jar" id="org.eclipse.modisco.sdk.feature" version="1.0.0.qualifier">
<category name="org.eclipse.modisco.updatesite.main"/>
</feature>
- <feature url="features/org.eclipse.modisco.usecase.modelfilter.feature_0.13.1.qualifier.jar" id="org.eclipse.modisco.usecase.modelfilter.feature" version="0.13.1.qualifier">
+ <feature url="features/org.eclipse.modisco.usecase.modelfilter.feature_1.0.0.qualifier.jar" id="org.eclipse.modisco.usecase.modelfilter.feature" version="1.0.0.qualifier">
<category name="org.eclipse.modisco.updatesite.usecases"/>
</feature>
- <feature url="features/org.eclipse.modisco.usecase.simpletransformationschain.feature_0.13.1.qualifier.jar" id="org.eclipse.modisco.usecase.simpletransformationschain.feature" version="0.13.1.qualifier">
+ <feature url="features/org.eclipse.modisco.usecase.simpletransformationschain.feature_1.0.0.qualifier.jar" id="org.eclipse.modisco.usecase.simpletransformationschain.feature" version="1.0.0.qualifier">
<category name="org.eclipse.modisco.updatesite.usecases"/>
</feature>
- <feature url="features/org.eclipse.modisco.xml.feature_0.13.1.qualifier.jar" id="org.eclipse.modisco.xml.feature" version="0.13.1.qualifier">
+ <feature url="features/org.eclipse.modisco.xml.feature_1.0.0.qualifier.jar" id="org.eclipse.modisco.xml.feature" version="1.0.0.qualifier">
<category name="org.eclipse.modisco.updatesite.technologies"/>
</feature>
- <feature url="features/org.eclipse.modisco.infra.discovery.benchmark.feature_0.13.1.qualifier.jar" id="org.eclipse.modisco.infra.discovery.benchmark.feature" version="0.13.1.qualifier">
+ <feature url="features/org.eclipse.modisco.infra.discovery.benchmark.feature_1.0.0.qualifier.jar" id="org.eclipse.modisco.infra.discovery.benchmark.feature" version="1.0.0.qualifier">
<category name="org.eclipse.modisco.updatesite.dev"/>
</feature>
- <feature url="features/org.eclipse.modisco.all.feature_0.13.1.qualifier.jar" id="org.eclipse.modisco.all.feature" version="0.13.1.qualifier">
+ <feature url="features/org.eclipse.modisco.all.feature_1.0.0.qualifier.jar" id="org.eclipse.modisco.all.feature" version="1.0.0.qualifier">
<category name="org.eclipse.modisco.updatesite.dev"/>
</feature>
- <feature url="features/org.eclipse.modisco.thirdparties_0.13.1.qualifier.jar" id="org.eclipse.modisco.thirdparties" version="0.13.1.qualifier">
+ <feature url="features/org.eclipse.modisco.thirdparties_1.0.0.qualifier.jar" id="org.eclipse.modisco.thirdparties" version="1.0.0.qualifier">
<category name="org.eclipse.modisco.updatesite.dev"/>
</feature>
- <feature url="features/org.eclipse.modisco.infra.browser.feature_0.13.1.qualifier.jar" id="org.eclipse.modisco.infra.browser.feature" version="0.13.1.qualifier">
+ <feature url="features/org.eclipse.modisco.infra.browser.feature_1.0.0.qualifier.jar" id="org.eclipse.modisco.infra.browser.feature" version="1.0.0.qualifier">
<category name="org.eclipse.modisco.updatesite.infrastructure"/>
</feature>
<category-def name="org.eclipse.modisco.updatesite.infrastructure" label="Infrastrucutre"/>
diff --git a/org.eclipse.modisco.usecase.java.samplemetrics/META-INF/MANIFEST.MF b/org.eclipse.modisco.usecase.java.samplemetrics/META-INF/MANIFEST.MF
index 7e36780..88deee7 100644
--- a/org.eclipse.modisco.usecase.java.samplemetrics/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.usecase.java.samplemetrics/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.modisco.usecase.java.samplemetrics;singleton:=true
-Bundle-Version: 0.13.1.qualifier
+Bundle-Version: 1.0.0.qualifier
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.gmt.modisco.infra.common.core,
org.eclipse.gmt.modisco.infra.query.core
diff --git a/org.eclipse.modisco.usecase.java.samplerefactoring/META-INF/MANIFEST.MF b/org.eclipse.modisco.usecase.java.samplerefactoring/META-INF/MANIFEST.MF
index 0baa063..19ec526 100644
--- a/org.eclipse.modisco.usecase.java.samplerefactoring/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.usecase.java.samplerefactoring/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.modisco.usecase.java.samplerefactoring;singleton:=true
-Bundle-Version: 0.13.1.qualifier
+Bundle-Version: 1.0.0.qualifier
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.gmt.modisco.infra.common.core,
org.eclipse.gmt.modisco.infra.query.core
diff --git a/org.eclipse.modisco.usecase.modelfilter.dependencies.ui/META-INF/MANIFEST.MF b/org.eclipse.modisco.usecase.modelfilter.dependencies.ui/META-INF/MANIFEST.MF
index 7fa1d28..a4939c2 100644
--- a/org.eclipse.modisco.usecase.modelfilter.dependencies.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.usecase.modelfilter.dependencies.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.modisco.usecase.modelfilter.dependencies.ui;singleton:=true
-Bundle-Version: 0.13.1.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-Activator: org.eclipse.modisco.usecase.modelfilter.dependencies.ui.internal.Activator
Bundle-Vendor: %Bundle-Vendor
Require-Bundle: org.eclipse.core.runtime,
diff --git a/org.eclipse.modisco.usecase.modelfilter.doc/META-INF/MANIFEST.MF b/org.eclipse.modisco.usecase.modelfilter.doc/META-INF/MANIFEST.MF
index 41d4ee2..56c0204 100644
--- a/org.eclipse.modisco.usecase.modelfilter.doc/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.usecase.modelfilter.doc/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.modisco.usecase.modelfilter.doc;singleton:=true
-Bundle-Version: 0.13.1.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-Vendor: %Bundle-Vendor
Require-Bundle: org.eclipse.core.runtime
Bundle-ActivationPolicy: lazy
diff --git a/org.eclipse.modisco.usecase.modelfilter.feature/feature.xml b/org.eclipse.modisco.usecase.modelfilter.feature/feature.xml
index b744fed..28c7c9f 100644
--- a/org.eclipse.modisco.usecase.modelfilter.feature/feature.xml
+++ b/org.eclipse.modisco.usecase.modelfilter.feature/feature.xml
@@ -12,7 +12,7 @@
<feature
id="org.eclipse.modisco.usecase.modelfilter.feature"
label="MoDisco Model Filter (Incubation)"
- version="0.13.1.qualifier"
+ version="1.0.0.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.license"
license-feature-version="0.0.0">
diff --git a/org.eclipse.modisco.usecase.modelfilter.methodcalls.discoverer.ui/META-INF/MANIFEST.MF b/org.eclipse.modisco.usecase.modelfilter.methodcalls.discoverer.ui/META-INF/MANIFEST.MF
index 248e284..df78aec 100644
--- a/org.eclipse.modisco.usecase.modelfilter.methodcalls.discoverer.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.usecase.modelfilter.methodcalls.discoverer.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.modisco.usecase.modelfilter.methodcalls.discoverer.ui;singleton:=true
-Bundle-Version: 0.13.1.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-Activator: org.eclipse.modisco.usecase.modelfilter.methodcalls.discoverer.ui.internal.Activator
Bundle-Vendor: %Bundle-Vendor
Require-Bundle: org.eclipse.core.runtime,
diff --git a/org.eclipse.modisco.usecase.modelfilter.methodcalls.discoverer/META-INF/MANIFEST.MF b/org.eclipse.modisco.usecase.modelfilter.methodcalls.discoverer/META-INF/MANIFEST.MF
index 55a7aa4..bb5dbd8 100644
--- a/org.eclipse.modisco.usecase.modelfilter.methodcalls.discoverer/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.usecase.modelfilter.methodcalls.discoverer/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.modisco.usecase.modelfilter.methodcalls.discoverer;singleton:=true
-Bundle-Version: 0.13.1.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-Activator: org.eclipse.modisco.usecase.modelfilter.methodcalls.discoverer.internal.Activator
Bundle-Vendor: %Bundle-Vendor
Require-Bundle: org.eclipse.core.runtime,
diff --git a/org.eclipse.modisco.usecase.modelfilter.methodcalls/META-INF/MANIFEST.MF b/org.eclipse.modisco.usecase.modelfilter.methodcalls/META-INF/MANIFEST.MF
index 7bad322..a6aa4a5 100644
--- a/org.eclipse.modisco.usecase.modelfilter.methodcalls/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.usecase.modelfilter.methodcalls/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.modisco.usecase.modelfilter.methodcalls;singleton:=true
-Bundle-Version: 0.13.1.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-Vendor: %Bundle-Vendor
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.gmt.modisco.java;bundle-version="0.9.0",
diff --git a/org.eclipse.modisco.usecase.modelfilter.tests/META-INF/MANIFEST.MF b/org.eclipse.modisco.usecase.modelfilter.tests/META-INF/MANIFEST.MF
index c3dd6c1..071e772 100644
--- a/org.eclipse.modisco.usecase.modelfilter.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.usecase.modelfilter.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.modisco.usecase.modelfilter.tests;singleton:=true
-Bundle-Version: 0.13.1.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-Activator: org.eclipse.modisco.usecase.modelfilter.tests.Activator
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
diff --git a/org.eclipse.modisco.usecase.modelfilter.ui/META-INF/MANIFEST.MF b/org.eclipse.modisco.usecase.modelfilter.ui/META-INF/MANIFEST.MF
index a274810..81927ac 100644
--- a/org.eclipse.modisco.usecase.modelfilter.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.usecase.modelfilter.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.modisco.usecase.modelfilter.ui;singleton:=true
-Bundle-Version: 0.13.1.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-Activator: org.eclipse.modisco.usecase.modelfilter.ui.internal.Activator
Bundle-Vendor: %Bundle-Vendor
Require-Bundle: org.eclipse.ui,
diff --git a/org.eclipse.modisco.usecase.modelfilter/META-INF/MANIFEST.MF b/org.eclipse.modisco.usecase.modelfilter/META-INF/MANIFEST.MF
index 0bdad20..58c73c0 100644
--- a/org.eclipse.modisco.usecase.modelfilter/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.usecase.modelfilter/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.eclipse.modisco.usecase.modelfilter;singleton:=true
-Bundle-Version: 0.13.1.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-Activator: org.eclipse.modisco.usecase.modelfilter.internal.Activator
Require-Bundle: org.eclipse.jdt.core,
org.eclipse.m2m.atl.engine;bundle-version="3.0.0",
diff --git a/org.eclipse.modisco.usecase.simpletransformationchain.doc/META-INF/MANIFEST.MF b/org.eclipse.modisco.usecase.simpletransformationchain.doc/META-INF/MANIFEST.MF
index 7d101dd..fb203f5 100644
--- a/org.eclipse.modisco.usecase.simpletransformationchain.doc/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.usecase.simpletransformationchain.doc/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.modisco.usecase.simpletransformationchain.doc;singleton:=true
-Bundle-Version: 0.13.1.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-Vendor: %Bundle-Vendor
Require-Bundle: org.eclipse.core.runtime
Bundle-ActivationPolicy: lazy
diff --git a/org.eclipse.modisco.usecase.simpletransformationschain.feature/feature.xml b/org.eclipse.modisco.usecase.simpletransformationschain.feature/feature.xml
index 7aab035..34f141d 100644
--- a/org.eclipse.modisco.usecase.simpletransformationschain.feature/feature.xml
+++ b/org.eclipse.modisco.usecase.simpletransformationschain.feature/feature.xml
@@ -12,7 +12,7 @@
<feature
id="org.eclipse.modisco.usecase.simpletransformationschain.feature"
label="MoDisco Simple transformations chain (Incubation)"
- version="0.13.1.qualifier"
+ version="1.0.0.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.license"
license-feature-version="0.0.0">
diff --git a/org.eclipse.modisco.usecase.simpletransformationschain.ui/META-INF/MANIFEST.MF b/org.eclipse.modisco.usecase.simpletransformationschain.ui/META-INF/MANIFEST.MF
index 3a92844..509e961 100644
--- a/org.eclipse.modisco.usecase.simpletransformationschain.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.usecase.simpletransformationschain.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.modisco.usecase.simpletransformationschain.ui;singleton:=true
-Bundle-Version: 0.13.1.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-Activator: org.eclipse.modisco.usecase.simpletransformationschain.ui.internal.Activator
Bundle-Vendor: %Bundle-Vendor
Require-Bundle: org.eclipse.ui,
diff --git a/org.eclipse.modisco.usecase.simpletransformationschain/META-INF/MANIFEST.MF b/org.eclipse.modisco.usecase.simpletransformationschain/META-INF/MANIFEST.MF
index befdd59..7120b1c 100644
--- a/org.eclipse.modisco.usecase.simpletransformationschain/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.usecase.simpletransformationschain/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.eclipse.modisco.usecase.simpletransformationschain;singleton:=true
-Bundle-Version: 0.13.1.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-Activator: org.eclipse.modisco.usecase.simpletransformationschain.internal.Activator
Require-Bundle: org.eclipse.core.resources,
org.eclipse.jdt.core,
diff --git a/org.eclipse.modisco.util.atl.core/META-INF/MANIFEST.MF b/org.eclipse.modisco.util.atl.core/META-INF/MANIFEST.MF
index 62f8d62..cc61844 100644
--- a/org.eclipse.modisco.util.atl.core/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.util.atl.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.modisco.util.atl.core
-Bundle-Version: 0.13.1.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-Activator: org.eclipse.modisco.util.atl.core.internal.Activator
Bundle-Vendor: %Bundle-Vendor
Require-Bundle: org.eclipse.core.runtime,
diff --git a/org.eclipse.modisco.util.emf.core/.checkstyle b/org.eclipse.modisco.util.emf.core/.checkstyle
new file mode 100644
index 0000000..f34270b
--- /dev/null
+++ b/org.eclipse.modisco.util.emf.core/.checkstyle
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright (c) 2015 Mia-Software
+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:
+ Grégoire Dupé (Mia-Software) - Bug 471096 - MetaclassInstance features have to be moved to an EMF dedicated plug-in
+-->
+<fileset-config file-format-version="1.2.0" simple-config="true" sync-formatter="false">
+ <local-check-config name="EmfFacet" location="../org.eclipse.emf.facet.archi.tech.rules/checkstyle/EmfFacet.checkstyle" type="project" description=""/>
+ <fileset name="all" enabled="true" check-config-name="EmfFacet" local="true">
+ <file-match-pattern match-pattern="." include-pattern="true"/>
+ <file-match-pattern match-pattern="Messages.java" include-pattern="false"/>
+ </fileset>
+</fileset-config>
diff --git a/org.eclipse.modisco.util.emf.core/.classpath b/org.eclipse.modisco.util.emf.core/.classpath
new file mode 100644
index 0000000..20538c2
--- /dev/null
+++ b/org.eclipse.modisco.util.emf.core/.classpath
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright (c) 2015 Mia-Software
+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:
+ Grégoire Dupé (Mia-Software) - Bug 471096 - MetaclassInstance features have to be moved to an EMF dedicated plug-in
+-->
+<classpath>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/org.eclipse.modisco.util.emf.core/.pmd b/org.eclipse.modisco.util.emf.core/.pmd
new file mode 100644
index 0000000..0cf0059
--- /dev/null
+++ b/org.eclipse.modisco.util.emf.core/.pmd
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright (c) 2015 Mia-Software
+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:
+ Grégoire Dupé (Mia-Software) - Bug 471096 - MetaclassInstance features have to be moved to an EMF dedicated plug-in
+-->
+<pmd>
+ <useProjectRuleSet>true</useProjectRuleSet>
+ <ruleSetFile>../org.eclipse.emf.facet.archi.tech.rules/pmd/ruleset.xml</ruleSetFile>
+ <includeDerivedFiles>false</includeDerivedFiles>
+ <violationsAsErrors>true</violationsAsErrors>
+</pmd>
diff --git a/org.eclipse.modisco.util.emf.core/.project b/org.eclipse.modisco.util.emf.core/.project
new file mode 100644
index 0000000..f8e69c9
--- /dev/null
+++ b/org.eclipse.modisco.util.emf.core/.project
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright (c) 2015 Mia-Software
+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:
+ Grégoire Dupé (Mia-Software) - Bug 471096 - MetaclassInstance features have to be moved to an EMF dedicated plug-in
+-->
+<projectDescription>
+ <name>org.eclipse.modisco.util.emf.core</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>
+ <buildCommand>
+ <name>net.sourceforge.pmd.eclipse.plugin.pmdBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>net.sf.eclipsecs.core.CheckstyleBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.pde.PluginNature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>net.sourceforge.pmd.eclipse.plugin.pmdNature</nature>
+ <nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
+ </natures>
+</projectDescription>
diff --git a/org.eclipse.modisco.util.emf.core/.settings/org.eclipse.core.resources.prefs b/org.eclipse.modisco.util.emf.core/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 0000000..7b53629
--- /dev/null
+++ b/org.eclipse.modisco.util.emf.core/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,10 @@
+# Copyright (c) 2015 Mia-Software
+# 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:
+# Grégoire Dupé (Mia-Software) - Bug 471096 - MetaclassInstance features have to be moved to an EMF dedicated plug-in
+eclipse.preferences.version=1
+encoding/<project>=UTF-8
diff --git a/org.eclipse.modisco.util.emf.core/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.modisco.util.emf.core/.settings/org.eclipse.jdt.core.prefs
new file mode 100644
index 0000000..9713788
--- /dev/null
+++ b/org.eclipse.modisco.util.emf.core/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,15 @@
+# Copyright (c) 2015 Mia-Software
+# 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:
+# Grégoire Dupé (Mia-Software) - Bug 471096 - MetaclassInstance features have to be moved to an EMF dedicated plug-in
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.5
diff --git a/org.eclipse.modisco.util.emf.core/META-INF/MANIFEST.MF b/org.eclipse.modisco.util.emf.core/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..270129a
--- /dev/null
+++ b/org.eclipse.modisco.util.emf.core/META-INF/MANIFEST.MF
@@ -0,0 +1,16 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: MoDisco EMF Utils (Incubation)
+Bundle-SymbolicName: org.eclipse.modisco.util.emf.core
+Bundle-Version: 1.0.0.qualifier
+Bundle-Activator: org.eclipse.modisco.util.emf.core.internal.Activator
+Bundle-Vendor: Eclipse Modeling Project
+Require-Bundle: org.eclipse.core.runtime,
+ org.eclipse.emf.ecore;bundle-version="2.6.0",
+ org.eclipse.emf.facet.util.core;bundle-version="1.0.0",
+ org.eclipse.emf.transaction;bundle-version="1.4.0"
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Bundle-ActivationPolicy: lazy
+Export-Package: org.eclipse.modisco.util.emf.core.allinstances,
+ org.eclipse.modisco.util.emf.core.internal.allinstances;x-internal:=true,
+ org.eclipse.modisco.util.emf.core.subclasses
diff --git a/org.eclipse.modisco.util.emf.core/about.html b/org.eclipse.modisco.util.emf.core/about.html
new file mode 100644
index 0000000..d9d9080
--- /dev/null
+++ b/org.eclipse.modisco.util.emf.core/about.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<title>About</title>
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+
+<p>June 26, 2015</p>
+<h3>License</h3>
+
+<p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available
+at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
+For purposes of the EPL, "Program" will mean the Content.</p>
+
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is
+being redistributed by another party ("Redistributor") and different terms and conditions may
+apply to your use of any object code in the Content. Check the Redistributor's license that was
+provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
+
+</body>
+</html>
\ No newline at end of file
diff --git a/org.eclipse.modisco.util.emf.core/build.properties b/org.eclipse.modisco.util.emf.core/build.properties
new file mode 100644
index 0000000..4cf2138
--- /dev/null
+++ b/org.eclipse.modisco.util.emf.core/build.properties
@@ -0,0 +1,14 @@
+# Copyright (c) 2015 Mia-Software
+# 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:
+# Grégoire Dupé (Mia-Software) - Bug 471096 - MetaclassInstance features have to be moved to an EMF dedicated plug-in
+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+ .,\
+ about.html
+src.includes = about.html
diff --git a/org.eclipse.modisco.util.emf.core/src/org/eclipse/modisco/util/emf/core/allinstances/AllInstancesUtils.java b/org.eclipse.modisco.util.emf.core/src/org/eclipse/modisco/util/emf/core/allinstances/AllInstancesUtils.java
new file mode 100644
index 0000000..2183cb5
--- /dev/null
+++ b/org.eclipse.modisco.util.emf.core/src/org/eclipse/modisco/util/emf/core/allinstances/AllInstancesUtils.java
@@ -0,0 +1,39 @@
+/**
+ * Copyright (c) 2015 Mia-Software
+ * 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:
+ * Grégoire Dupé (Mia-Software) - Bug 471096 - MetaclassInstance features have to be moved to an EMF dedicated plug-in
+ */
+package org.eclipse.modisco.util.emf.core.allinstances;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.modisco.util.emf.core.internal.allinstances.MetaclassInstances;
+import org.eclipse.modisco.util.emf.core.internal.allinstances.MetaclassInstancesAdapterFactory;
+
+/**
+ * @since 1.0.0
+ */
+public final class AllInstancesUtils {
+
+ private AllInstancesUtils() {
+ // Must not be used
+ }
+
+ public static List<EObject> allInstances(final EClass eClass,
+ final Resource resource, final boolean includingSubTypes) {
+ final List<EObject> result = new ArrayList<EObject>();
+ final MetaclassInstances instances = (MetaclassInstances) MetaclassInstancesAdapterFactory
+ .getInstance().adapt(resource, MetaclassInstances.class);
+ result.addAll(instances.getInstances(eClass, includingSubTypes));
+ return result;
+ }
+}
diff --git a/org.eclipse.modisco.util.emf.core/src/org/eclipse/modisco/util/emf/core/internal/Activator.java b/org.eclipse.modisco.util.emf.core/src/org/eclipse/modisco/util/emf/core/internal/Activator.java
new file mode 100644
index 0000000..8d34bed
--- /dev/null
+++ b/org.eclipse.modisco.util.emf.core/src/org/eclipse/modisco/util/emf/core/internal/Activator.java
@@ -0,0 +1,50 @@
+/**
+ * Copyright (c) 2015 Mia-Software
+ * 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:
+ * Grégoire Dupé (Mia-Software) - Bug 471096 - MetaclassInstance features have to be moved to an EMF dedicated plug-in
+ */
+package org.eclipse.modisco.util.emf.core.internal;
+
+import org.eclipse.core.runtime.Plugin;
+import org.osgi.framework.BundleContext;
+
+@SuppressWarnings("PMD.UseSingleton")
+// @SuppressWarnings("PMD.UseSingleton") We cannot conforms to this rule because
+// this class is an Eclipse plug-in activator which will be instantiated by the
+// Eclipse framework.
+public class Activator extends Plugin {
+
+ private static Activator plugin;
+
+ @Override
+ @SuppressWarnings("PMD.SignatureDeclareThrowsException")
+ // @SuppressWarnings("PMD.SignatureDeclareThrowsException") We have to use
+ // this signature because this is an override of an Eclipse framework's
+ // method.
+ public void start(final BundleContext bundleContext) throws Exception {
+ super.start(bundleContext);
+ Activator.plugin = this;
+ }
+
+ @Override
+ @SuppressWarnings("PMD.SignatureDeclareThrowsException")
+ // @SuppressWarnings("PMD.SignatureDeclareThrowsException") We have to use
+ // this signature because this is an override of an Eclipse framework's
+ // method.
+ public void stop(final BundleContext bundleContext) throws Exception {
+ // NOPMD: PMD say "Assigning an Object to null is a code smell."
+ // No choice to right it in another way : this is an Eclipse pattern.
+ Activator.plugin = null; // NOPMD by gdupe on 30/03/12 10:19
+ super.stop(bundleContext);
+ }
+
+ public static Plugin getDefault() {
+ return Activator.plugin;
+ }
+
+}
\ No newline at end of file
diff --git a/org.eclipse.gmt.modisco.infra.common.core/src/org/eclipse/gmt/modisco/infra/common/core/internal/adapters/instances/MetaclassInstances.java b/org.eclipse.modisco.util.emf.core/src/org/eclipse/modisco/util/emf/core/internal/allinstances/MetaclassInstances.java
similarity index 76%
rename from org.eclipse.gmt.modisco.infra.common.core/src/org/eclipse/gmt/modisco/infra/common/core/internal/adapters/instances/MetaclassInstances.java
rename to org.eclipse.modisco.util.emf.core/src/org/eclipse/modisco/util/emf/core/internal/allinstances/MetaclassInstances.java
index fd619a4..36c3c53 100644
--- a/org.eclipse.gmt.modisco.infra.common.core/src/org/eclipse/gmt/modisco/infra/common/core/internal/adapters/instances/MetaclassInstances.java
+++ b/org.eclipse.modisco.util.emf.core/src/org/eclipse/modisco/util/emf/core/internal/allinstances/MetaclassInstances.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2010, 2011 Mia-Software.
+ * Copyright (c) 2010, 2015 Mia-Software.
* 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
@@ -8,8 +8,10 @@
* Contributors:
* Nicolas Bros (Mia-Software) - initial API and implementation
* Nicolas Bros (Mia-Software) - Bug 339930 - Anticipate UI freeze : MoDisco project & externalize Strings
+ * Grégoire Dupé (Mia-Software) - Bug 471096 - MetaclassInstance features have to be moved to an EMF dedicated plug-in
+ * Fabien Giquel (Mia-Software) - Bug 471096 - MetaclassInstance features have to be moved to an EMF dedicated plug-in
*******************************************************************************/
-package org.eclipse.gmt.modisco.infra.common.core.internal.adapters.instances;
+package org.eclipse.modisco.util.emf.core.internal.allinstances;
import java.util.Collection;
@@ -29,7 +31,7 @@
*/
Collection<EObject> getInstances(EClass eClass, boolean includingSubclasses);
- /** Clears the cache and recomputes its contents */
+ /** Clears the cache. Cache will be computed again at next access */
void clearCache();
/** Add a listener to be notified when the model changes */
diff --git a/org.eclipse.gmt.modisco.infra.common.core/src/org/eclipse/gmt/modisco/infra/common/core/internal/adapters/instances/MetaclassInstancesAdapter.java b/org.eclipse.modisco.util.emf.core/src/org/eclipse/modisco/util/emf/core/internal/allinstances/MetaclassInstancesAdapter.java
similarity index 83%
rename from org.eclipse.gmt.modisco.infra.common.core/src/org/eclipse/gmt/modisco/infra/common/core/internal/adapters/instances/MetaclassInstancesAdapter.java
rename to org.eclipse.modisco.util.emf.core/src/org/eclipse/modisco/util/emf/core/internal/allinstances/MetaclassInstancesAdapter.java
index ef89e63..a6e577a 100644
--- a/org.eclipse.gmt.modisco.infra.common.core/src/org/eclipse/gmt/modisco/infra/common/core/internal/adapters/instances/MetaclassInstancesAdapter.java
+++ b/org.eclipse.modisco.util.emf.core/src/org/eclipse/modisco/util/emf/core/internal/allinstances/MetaclassInstancesAdapter.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2010, 2011 Mia-Software.
+ * Copyright (c) 2010, 2015 Mia-Software.
* 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
@@ -12,8 +12,10 @@
* Nicolas Bros (Mia-Software) - Bug 327633 - [Model Browser] avoid blocking the UI
* Fabien Giquel (Mia-Software) - Bug 336903 - [Model Browser] : metaclasses cache issue with some model update events
* Nicolas Bros (Mia-Software) - Bug 339930 - Anticipate UI freeze : MoDisco project & externalize Strings
+ * Grégoire Dupé (Mia-Software) - Bug 471096 - MetaclassInstance features have to be moved to an EMF dedicated plug-in
+ * Fabien Giquel (Mia-Software) - Bug 471096 - MetaclassInstance features have to be moved to an EMF dedicated plug-in
*******************************************************************************/
-package org.eclipse.gmt.modisco.infra.common.core.internal.adapters.instances;
+package org.eclipse.modisco.util.emf.core.internal.allinstances;
import java.util.ArrayList;
import java.util.Collection;
@@ -35,8 +37,11 @@
import org.eclipse.emf.ecore.EReference;
import org.eclipse.emf.ecore.resource.Resource;
import org.eclipse.emf.ecore.resource.impl.ResourceImpl;
-import org.eclipse.gmt.modisco.infra.common.core.internal.CommonModiscoActivator;
-import org.eclipse.gmt.modisco.infra.common.core.logging.MoDiscoLogger;
+import org.eclipse.emf.edit.domain.EditingDomain;
+import org.eclipse.emf.edit.domain.IEditingDomainProvider;
+import org.eclipse.emf.facet.util.core.Logger;
+import org.eclipse.emf.transaction.TransactionalEditingDomain;
+import org.eclipse.modisco.util.emf.core.internal.Activator;
/**
* An adapter that acts as a cache for lists of instances by EClass. It works by
@@ -55,6 +60,9 @@
private Map<EClass, Set<EObject>> instancesByEClass;
/** All the model elements of the metaclass or one of its sub-types */
private Map<EClass, Set<EObject>> instancesByType;
+
+ /** Indicates if cache has been cleared and must be computed at next access */
+ private boolean cacheInvalidated;
/** model change listeners */
private final List<ModelChangeListener> listeners = new ArrayList<ModelChangeListener>();
@@ -67,21 +75,65 @@
// this is to allow sub-classes to do initialization in their
// constructor before calling clearCache()
if (clearCache) {
- clearCache();
+ clearAndComputeCache();
}
}
-
- public synchronized void clearCache() {
- this.instancesByEClass = new HashMap<EClass, Set<EObject>>();
- this.instancesByType = new HashMap<EClass, Set<EObject>>();
-
- TreeIterator<EObject> allContents = this.resource.getAllContents();
+
+ protected void clearAndComputeCache() {
+ synchronized (this) {
+ this.instancesByEClass = new HashMap<EClass, Set<EObject>>();
+ this.instancesByType = new HashMap<EClass, Set<EObject>>();
+
+ final TransactionalEditingDomain transactDomain = getTransactionalEditingDomain(this.resource);
+
+ if (transactDomain == null) {
+ // Standard case
+ computeCache();
+ } else {
+ try {
+ // prevent from concurrent model access in external tool
+ transactDomain.runExclusive(new Runnable() {
+ public void run() {
+ computeCache();
+ }
+ });
+ } catch (InterruptedException e) {
+ Logger.logWarning(e,
+ "InterruptedException during Model allOfClass computing.", Activator.getDefault()); //$NON-NLS-1$
+ // task was interrupted, trying without exclusive access
+ computeCache();
+ }
+ }
+
+ this.cacheInvalidated = false;
+ }
+ }
+
+ public void clearCache() {
+ synchronized (this) {
+ this.instancesByEClass = new HashMap<EClass, Set<EObject>>();
+ this.instancesByType = new HashMap<EClass, Set<EObject>>();
+
+ this.cacheInvalidated = true;
+ }
+ }
+
+ private void validateCache() {
+ if (this.cacheInvalidated) {
+ clearAndComputeCache();
+ }
+ this.cacheInvalidated = false;
+ }
+
+ private void computeCache() {
+ final TreeIterator<EObject> allContents = this.resource.getAllContents();
while (allContents.hasNext()) {
- EObject eObject = allContents.next();
+ final EObject eObject = allContents.next();
addModelElement(eObject, false);
}
}
+
/**
* Add a new element to the set of elements corresponding to its metaclass.
*
@@ -99,8 +151,8 @@
List<EClass> eClasses = getEClasses(element);
for (EClass eClass : eClasses) {
if (eClass == null) {
- MoDiscoLogger.logWarning(
- "Element has null eClass: " + element, CommonModiscoActivator.getDefault()); //$NON-NLS-1$
+ Logger.logWarning(
+ "Element has null eClass: " + element, Activator.getDefault()); //$NON-NLS-1$
continue;
}
@@ -430,6 +482,7 @@
public synchronized Collection<EObject> getInstances(final EClass eClass,
final boolean includingSubclasses) {
+ validateCache();
final Set<EObject> set;
if (includingSubclasses) {
set = this.instancesByType.get(eClass);
@@ -473,4 +526,18 @@
listener.modelChanged(msg);
}
}
+
+ private static TransactionalEditingDomain getTransactionalEditingDomain(
+ final Resource aResource) {
+ TransactionalEditingDomain transactDomain = null;
+ if (aResource != null
+ && aResource.getResourceSet() instanceof IEditingDomainProvider) {
+ EditingDomain editDomain = ((IEditingDomainProvider) aResource
+ .getResourceSet()).getEditingDomain();
+ if (editDomain instanceof TransactionalEditingDomain) {
+ transactDomain = (TransactionalEditingDomain) editDomain;
+ }
+ }
+ return transactDomain;
+ }
}
diff --git a/org.eclipse.gmt.modisco.infra.common.core/src/org/eclipse/gmt/modisco/infra/common/core/internal/adapters/instances/MetaclassInstancesAdapterFactory.java b/org.eclipse.modisco.util.emf.core/src/org/eclipse/modisco/util/emf/core/internal/allinstances/MetaclassInstancesAdapterFactory.java
similarity index 85%
rename from org.eclipse.gmt.modisco.infra.common.core/src/org/eclipse/gmt/modisco/infra/common/core/internal/adapters/instances/MetaclassInstancesAdapterFactory.java
rename to org.eclipse.modisco.util.emf.core/src/org/eclipse/modisco/util/emf/core/internal/allinstances/MetaclassInstancesAdapterFactory.java
index aff7d69..575e212 100644
--- a/org.eclipse.gmt.modisco.infra.common.core/src/org/eclipse/gmt/modisco/infra/common/core/internal/adapters/instances/MetaclassInstancesAdapterFactory.java
+++ b/org.eclipse.modisco.util.emf.core/src/org/eclipse/modisco/util/emf/core/internal/allinstances/MetaclassInstancesAdapterFactory.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2010, 2011 Mia-Software.
+ * Copyright (c) 2010, 2015 Mia-Software.
* 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
@@ -7,8 +7,9 @@
*
* Contributors:
* Nicolas Bros (Mia-Software) - initial API and implementation
+ * Grégoire Dupé (Mia-Software) - Bug 471096 - MetaclassInstance features have to be moved to an EMF dedicated plug-in
*******************************************************************************/
-package org.eclipse.gmt.modisco.infra.common.core.internal.adapters.instances;
+package org.eclipse.modisco.util.emf.core.internal.allinstances;
import org.eclipse.emf.common.notify.Adapter;
import org.eclipse.emf.common.notify.AdapterFactory;
@@ -20,7 +21,7 @@
private static final AdapterFactory INSTANCE = new MetaclassInstancesAdapterFactory();
private MetaclassInstancesAdapterFactory() {
- // singleton
+ super();
}
public static AdapterFactory getInstance() {
diff --git a/org.eclipse.gmt.modisco.infra.common.core/src/org/eclipse/gmt/modisco/infra/common/core/internal/adapters/instances/ModelChangeListener.java b/org.eclipse.modisco.util.emf.core/src/org/eclipse/modisco/util/emf/core/internal/allinstances/ModelChangeListener.java
similarity index 72%
rename from org.eclipse.gmt.modisco.infra.common.core/src/org/eclipse/gmt/modisco/infra/common/core/internal/adapters/instances/ModelChangeListener.java
rename to org.eclipse.modisco.util.emf.core/src/org/eclipse/modisco/util/emf/core/internal/allinstances/ModelChangeListener.java
index 980e9ef..3a413f0 100644
--- a/org.eclipse.gmt.modisco.infra.common.core/src/org/eclipse/gmt/modisco/infra/common/core/internal/adapters/instances/ModelChangeListener.java
+++ b/org.eclipse.modisco.util.emf.core/src/org/eclipse/modisco/util/emf/core/internal/allinstances/ModelChangeListener.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2010, 2011 Mia-Software.
+ * Copyright (c) 2010, 2015 Mia-Software.
* 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
@@ -7,8 +7,9 @@
*
* Contributors:
* Nicolas Bros (Mia-Software) - initial API and implementation
+ * Grégoire Dupé (Mia-Software) - Bug 471096 - MetaclassInstance features have to be moved to an EMF dedicated plug-in
*******************************************************************************/
-package org.eclipse.gmt.modisco.infra.common.core.internal.adapters.instances;
+package org.eclipse.modisco.util.emf.core.internal.allinstances;
import org.eclipse.emf.common.notify.Notification;
diff --git a/org.eclipse.modisco.util.emf.core/src/org/eclipse/modisco/util/emf/core/internal/subclasses/SubClassesAdapter.java b/org.eclipse.modisco.util.emf.core/src/org/eclipse/modisco/util/emf/core/internal/subclasses/SubClassesAdapter.java
new file mode 100644
index 0000000..01fe58a
--- /dev/null
+++ b/org.eclipse.modisco.util.emf.core/src/org/eclipse/modisco/util/emf/core/internal/subclasses/SubClassesAdapter.java
@@ -0,0 +1,49 @@
+/**
+ * Copyright (c) 2015 Soft-Maint.
+ * 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:
+ * Thomas Cicognani (Soft-Maint) - Bug 471597 - [New Browser] Add a customization to display subclasses from an EClass
+ */
+package org.eclipse.modisco.util.emf.core.internal.subclasses;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import org.eclipse.emf.common.notify.Adapter;
+import org.eclipse.emf.common.notify.Notification;
+import org.eclipse.emf.common.notify.Notifier;
+import org.eclipse.emf.ecore.EClass;
+
+public class SubClassesAdapter implements Adapter {
+
+ private final Set<EClass> subClasses = new HashSet<EClass>();
+
+ public void notifyChanged(final Notification notification) {
+ // Nothing to do
+ }
+
+ public Notifier getTarget() {
+ return null;
+ }
+
+ public void setTarget(final Notifier newTarget) {
+ // Nothing to do
+ }
+
+ public boolean isAdapterForType(final Object type) {
+ return false;
+ }
+
+ public Set<EClass> getSubclasses() {
+ return this.subClasses;
+ }
+
+ public void add(final EClass superClass) {
+ this.subClasses.add(superClass);
+ }
+
+}
diff --git a/org.eclipse.modisco.util.emf.core/src/org/eclipse/modisco/util/emf/core/subclasses/SubClassesUtils.java b/org.eclipse.modisco.util.emf.core/src/org/eclipse/modisco/util/emf/core/subclasses/SubClassesUtils.java
new file mode 100644
index 0000000..85cf73b
--- /dev/null
+++ b/org.eclipse.modisco.util.emf.core/src/org/eclipse/modisco/util/emf/core/subclasses/SubClassesUtils.java
@@ -0,0 +1,102 @@
+/**
+ * Copyright (c) 2015 Soft-Maint, and Mia-Software.
+ * 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:
+ * Thomas Cicognani (Soft-Maint) - Bug 471597 - [New Browser] Add a customization to display subclasses from an EClass
+ * Thomas Cicognani (Mia-Software) - Bug 475374 - Cannot use SubClassesUtils on an EPackage which is not in the Registry
+ */
+package org.eclipse.modisco.util.emf.core.subclasses;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Set;
+
+import org.eclipse.emf.common.notify.Adapter;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EClassifier;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.modisco.util.emf.core.internal.subclasses.SubClassesAdapter;
+
+/**
+ * @since 1.0.0
+ */
+public final class SubClassesUtils {
+
+ private static boolean initialized = false;
+
+ private SubClassesUtils() {
+ // Must not be used
+ }
+
+ public static List<EClass> getSubClasses(final EClass eClass) {
+ initAdapters();
+ SubClassesAdapter subClassesAdapter = getAdapterFor(eClass);
+ if (subClassesAdapter == null) {
+ subClassesAdapter = getAdapterFor(eClass);
+ }
+ final Set<EClass> subclasses = subClassesAdapter.getSubclasses();
+ return Collections.unmodifiableList(new ArrayList<EClass>(subclasses));
+ }
+
+ private static void initAdapters() {
+ if (!initialized) {
+ for (Object object : EPackage.Registry.INSTANCE.values()) {
+ if (object instanceof EPackage) {
+ final EPackage ePackage = (EPackage) object;
+ initAdapters(ePackage);
+ }
+ }
+ initialized = true;
+ }
+ }
+
+ /**
+ * Careful this method must be used wisely! It will add an {@link Adapter}
+ * on each {@link EClass} on your {@link EPackage}. If you call this method
+ * several times, the previous Adapters won't be erased. Just call it when
+ * your EPackage is not in the {@link EPackage.Registry} or if the
+ * initialization is already done (the {@link #getSubClasses(EClass)} has
+ * been already called)
+ */
+ public static void initAdapters(final EPackage ePackage) {
+ for (EClassifier eClassifier : ePackage.getEClassifiers()) {
+ if (eClassifier instanceof EClass) {
+ final EClass eClass = (EClass) eClassifier;
+ initAdapters(eClass);
+ }
+ }
+ for (EPackage subPackage : ePackage.getESubpackages()) {
+ initAdapters(subPackage);
+ }
+ }
+
+ private static void initAdapters(final EClass eClass) {
+ /* Just to init the adapter */
+ getAdapterFor(eClass);
+ /* Populate the subClass link */
+ for (EClass superClass : eClass.getESuperTypes()) {
+ final SubClassesAdapter superAdapter = getAdapterFor(superClass);
+ superAdapter.add(eClass);
+ }
+ }
+
+ private static SubClassesAdapter getAdapterFor(final EClass eClass) {
+ SubClassesAdapter subClassesAdapter = null;
+ for (Adapter adapter : eClass.eAdapters()) {
+ if (adapter instanceof SubClassesAdapter) {
+ subClassesAdapter = (SubClassesAdapter) adapter;
+ break;
+ }
+ }
+ if (subClassesAdapter == null) {
+ subClassesAdapter = new SubClassesAdapter();
+ eClass.eAdapters().add(subClassesAdapter);
+ }
+ return subClassesAdapter;
+ }
+}
diff --git a/org.eclipse.modisco.utils.chart.birt.core.tests/META-INF/MANIFEST.MF b/org.eclipse.modisco.utils.chart.birt.core.tests/META-INF/MANIFEST.MF
index fab7deb..1b005bf 100644
--- a/org.eclipse.modisco.utils.chart.birt.core.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.utils.chart.birt.core.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.modisco.utils.chart.birt.core.tests
-Bundle-Version: 0.13.1.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-Activator: org.eclipse.modisco.utils.chart.birt.core.tests.Activator
Bundle-Vendor: %Bundle-Vendor
Require-Bundle: org.eclipse.core.runtime,
diff --git a/org.eclipse.modisco.utils.chart.birt.core/META-INF/MANIFEST.MF b/org.eclipse.modisco.utils.chart.birt.core/META-INF/MANIFEST.MF
index 9a180d9..c633b22 100644
--- a/org.eclipse.modisco.utils.chart.birt.core/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.utils.chart.birt.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.modisco.utils.chart.birt.core
-Bundle-Version: 0.13.1.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-Activator: org.eclipse.modisco.utils.chart.birt.core.internal.Activator
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.birt.chart.engine;bundle-version="2.6.0",
diff --git a/org.eclipse.modisco.utils.chart.feature/feature.xml b/org.eclipse.modisco.utils.chart.feature/feature.xml
index 613880e..9782a61 100644
--- a/org.eclipse.modisco.utils.chart.feature/feature.xml
+++ b/org.eclipse.modisco.utils.chart.feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.modisco.utils.chart.feature"
label="MoDisco Chart Utilities (Incubation)"
- version="0.13.1.qualifier"
+ version="1.0.0.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.license"
license-feature-version="0.0.0">
diff --git a/org.eclipse.modisco.utils.chart.metamodel/META-INF/MANIFEST.MF b/org.eclipse.modisco.utils.chart.metamodel/META-INF/MANIFEST.MF
index 5b59735..2714a00 100644
--- a/org.eclipse.modisco.utils.chart.metamodel/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.utils.chart.metamodel/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.modisco.utils.chart.metamodel;singleton:=true
-Bundle-Version: 0.13.1.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %Bundle-Vendor
Bundle-Localization: plugin
diff --git a/org.eclipse.modisco.utils.core/META-INF/MANIFEST.MF b/org.eclipse.modisco.utils.core/META-INF/MANIFEST.MF
index 94ae35f..af036de 100644
--- a/org.eclipse.modisco.utils.core/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.utils.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.modisco.utils.core
-Bundle-Version: 0.13.1.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-Activator: org.eclipse.modisco.utils.core.internal.Activator
Require-Bundle: org.eclipse.core.runtime
Bundle-ActivationPolicy: lazy
diff --git a/org.eclipse.modisco.workflow.core/META-INF/MANIFEST.MF b/org.eclipse.modisco.workflow.core/META-INF/MANIFEST.MF
index e54ce62..f293f0a 100644
--- a/org.eclipse.modisco.workflow.core/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.workflow.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.modisco.workflow.core;singleton:=true
-Bundle-Version: 0.13.1.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-Activator: org.eclipse.modisco.workflow.core.internal.Activator
Bundle-Vendor: %Bundle-Vendor
Require-Bundle: org.eclipse.core.runtime,
diff --git a/org.eclipse.modisco.workflow.ui/META-INF/MANIFEST.MF b/org.eclipse.modisco.workflow.ui/META-INF/MANIFEST.MF
index 63fad5f..d5d6184 100644
--- a/org.eclipse.modisco.workflow.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.workflow.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.modisco.workflow.ui;singleton:=true
-Bundle-Version: 0.13.1.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-Activator: org.eclipse.modisco.workflow.ui.internal.Activator
Bundle-Vendor: %Bundle-Vendor
Require-Bundle: org.eclipse.ui,
diff --git a/org.eclipse.modisco.workflow/META-INF/MANIFEST.MF b/org.eclipse.modisco.workflow/META-INF/MANIFEST.MF
index d3289ce..4c3421a 100644
--- a/org.eclipse.modisco.workflow/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.workflow/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.modisco.workflow;singleton:=true
-Bundle-Version: 0.13.1.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %Bundle-Vendor
Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/org.eclipse.modisco.xml.discoverer.tests/META-INF/MANIFEST.MF b/org.eclipse.modisco.xml.discoverer.tests/META-INF/MANIFEST.MF
index 48a037d..bad2000 100644
--- a/org.eclipse.modisco.xml.discoverer.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.xml.discoverer.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.modisco.xml.discoverer.tests
-Bundle-Version: 0.13.1.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-Activator: org.eclipse.modisco.xml.discoverer.tests.Activator
Bundle-Vendor: %Bundle-Vendor
Require-Bundle: org.eclipse.ui,
diff --git a/org.eclipse.modisco.xml.discoverer.ui/META-INF/MANIFEST.MF b/org.eclipse.modisco.xml.discoverer.ui/META-INF/MANIFEST.MF
index 79f22a3..59c2da2 100644
--- a/org.eclipse.modisco.xml.discoverer.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.xml.discoverer.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.modisco.xml.discoverer.ui;singleton:=true
-Bundle-Version: 0.13.1.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-Activator: org.eclipse.modisco.xml.discoverer.ui.Activator
Bundle-Vendor: %Bundle-Vendor
Require-Bundle: org.eclipse.ui,
diff --git a/org.eclipse.modisco.xml.discoverer/META-INF/MANIFEST.MF b/org.eclipse.modisco.xml.discoverer/META-INF/MANIFEST.MF
index dae9b8f..f8b09bf 100644
--- a/org.eclipse.modisco.xml.discoverer/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.xml.discoverer/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.modisco.xml.discoverer;singleton:=true
-Bundle-Version: 0.13.1.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-Activator: org.eclipse.modisco.xml.discoverer.internal.XmlActivator
Bundle-Vendor: %providerName
Require-Bundle: org.eclipse.core.runtime,
diff --git a/org.eclipse.modisco.xml.doc/META-INF/MANIFEST.MF b/org.eclipse.modisco.xml.doc/META-INF/MANIFEST.MF
index ded035a..45bc818 100644
--- a/org.eclipse.modisco.xml.doc/META-INF/MANIFEST.MF
+++ b/org.eclipse.modisco.xml.doc/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.modisco.xml.doc;singleton:=true
-Bundle-Version: 0.13.1.qualifier
+Bundle-Version: 1.0.0.qualifier
Bundle-Vendor: %Bundle-Vendor
Require-Bundle: org.eclipse.core.runtime
Bundle-ActivationPolicy: lazy
diff --git a/org.eclipse.modisco.xml.feature/feature.xml b/org.eclipse.modisco.xml.feature/feature.xml
index 724c172..768d461 100644
--- a/org.eclipse.modisco.xml.feature/feature.xml
+++ b/org.eclipse.modisco.xml.feature/feature.xml
@@ -12,7 +12,7 @@
<feature
id="org.eclipse.modisco.xml.feature"
label="MoDisco Xml Feature (Incubation)"
- version="0.13.1.qualifier"
+ version="1.0.0.qualifier"
provider-name="%providerName"
plugin="org.eclipse.gmt.modisco.xml"
license-feature="org.eclipse.license"
