Merge pull request #20 from nlepine/master

move genconf model into separate plugins

features/org.obeonetwork.m2doc.feature/feature.xml

@@ -245,21 +245,28 @@ litigation.
          unpack="false"/>
 
    <plugin
-         id="org.obeonetwork.m2doc.ui.edit"
+         id="org.obeonetwork.m2doc.doc"
          download-size="0"
          install-size="0"
          version="0.0.0"
          unpack="false"/>
 
    <plugin
-         id="org.obeonetwork.m2doc.ui.editor"
+         id="org.obeonetwork.m2doc.genconf"
          download-size="0"
          install-size="0"
          version="0.0.0"
          unpack="false"/>
 
    <plugin
-         id="org.obeonetwork.m2doc.doc"
+         id="org.obeonetwork.m2doc.genconf.edit"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.obeonetwork.m2doc.genconf.editor"
          download-size="0"
          install-size="0"
          version="0.0.0"

plugins/org.obeonetwork.m2doc.genconf.edit/.checkstyle

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<fileset-config file-format-version="1.2.0" simple-config="true" sync-formatter="false">
+  <local-check-config name="M2Doc" location="/org.obeonetwork.m2doc.feature/codestyle/m2docCheckstyleConfiguration.xml" type="project" description="">
+    <additional-data name="protect-config-file" value="false"/>
+  </local-check-config>
+  <fileset name="all" enabled="true" check-config-name="M2Doc" local="true">
+    <file-match-pattern match-pattern="." include-pattern="true"/>
+  </fileset>
+</fileset-config>

plugins/org.obeonetwork.m2doc.genconf.edit/.classpath

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src-gen"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>

plugins/org.obeonetwork.m2doc.genconf.edit/.gitignore

@@ -0,0 +1 @@
+/bin/

plugins/org.obeonetwork.m2doc.genconf.edit/.project

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.obeonetwork.m2doc.genconf.edit</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.pde.PluginNature</nature>
+	</natures>
+</projectDescription>

plugins/org.obeonetwork.m2doc.genconf.edit/META-INF/MANIFEST.MF

@@ -0,0 +1,15 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %pluginName
+Bundle-SymbolicName: org.obeonetwork.m2doc.genconf.edit;singleton:=true
+Bundle-Version: 0.7.1.qualifier
+Bundle-ClassPath: .
+Bundle-Activator: org.obeonetwork.m2doc.genconf.provider.M2docconfEditPlugin$Implementation
+Bundle-Vendor: %providerName
+Bundle-Localization: plugin
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Export-Package: org.obeonetwork.m2doc.genconf.provider
+Require-Bundle: org.eclipse.core.runtime,
+ org.obeonetwork.m2doc.genconf;visibility:=reexport,
+ org.eclipse.emf.edit;visibility:=reexport
+Bundle-ActivationPolicy: lazy

plugins/org.obeonetwork.m2doc.genconf.edit/build.properties

@@ -0,0 +1,21 @@
+###############################################################################
+#  Copyright (c) 2016 Obeo. 
+#  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:
+#       Obeo - initial API and implementation
+#  
+###############################################################################
+#
+
+bin.includes = .,\
+               icons/,\
+               META-INF/,\
+               plugin.xml,\
+               plugin.properties
+jars.compile.order = .
+source.. = src-gen/
+output.. = bin/

plugins/org.obeonetwork.m2doc.genconf.edit/plugin.properties

@@ -0,0 +1,45 @@
+###############################################################################
+#  Copyright (c) 2016 Obeo. 
+#  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:
+#       Obeo - initial API and implementation
+#  
+###############################################################################
+#
+
+pluginName = M2docconf Edit Support
+providerName = www.obeo.fr
+
+_UI_CreateChild_text = {0}
+_UI_CreateChild_text2 = {1} {0}
+_UI_CreateChild_text3 = {1}
+_UI_CreateChild_tooltip = Create New {0} Under {1} Feature
+_UI_CreateChild_description = Create a new child of type {0} for the {1} feature of the selected {2}.
+_UI_CreateSibling_description = Create a new sibling of type {0} for the selected {2}, under the {1} feature of their parent.
+
+_UI_PropertyDescriptor_description = The {0} of the {1}
+
+_UI_Generation_type = Generation
+_UI_Definition_type = Definition
+_UI_ModelDefinition_type = Model Definition
+_UI_StringDefinition_type = String Definition
+_UI_Unknown_type = Object
+
+_UI_Unknown_datatype= Value
+
+_UI_Generation_name_feature = Name
+_UI_Generation_templateFileName_feature = Template File Name
+_UI_Generation_resultFileName_feature = Result File Name
+_UI_Generation_timeStamped_feature = Time Stamped
+_UI_Generation_definitions_feature = Definitions
+_UI_Generation_packagesNSURI_feature = Packages NSURI
+_UI_Generation_servicesTokens_feature = Services Tokens
+_UI_Definition_key_feature = Key
+_UI_ModelDefinition_value_feature = Value
+_UI_StringDefinition_value_feature = Value
+_UI_Unknown_feature = Unspecified
+

plugins/org.obeonetwork.m2doc.genconf.edit/plugin.xml

@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.0"?>
+
+<!--
+     Copyright (c) 2016 Obeo. 
+     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:
+          Obeo - initial API and implementation
+     
+ -->
+
+<plugin>
+
+   <extension point="org.eclipse.emf.edit.itemProviderAdapterFactories">
+      <!-- @generated m2docconf -->
+      <factory
+            uri="http://www.obeonetwork.org/m2doc/genconf/1.0"
+            class="org.obeonetwork.m2doc.genconf.provider.GenconfItemProviderAdapterFactory"
+            supportedTypes=
+              "org.eclipse.emf.edit.provider.IEditingDomainItemProvider
+               org.eclipse.emf.edit.provider.IStructuredItemContentProvider
+               org.eclipse.emf.edit.provider.ITreeItemContentProvider
+               org.eclipse.emf.edit.provider.IItemLabelProvider
+               org.eclipse.emf.edit.provider.IItemPropertySource"/>
+   </extension>
+
+</plugin>

plugins/org.obeonetwork.m2doc.genconf.edit/pom.xml

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Copyright (c) 2016 Obeo. 
+       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:
+            Obeo - initial API and implementation
+ -->
+
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+	<parent>
+		<groupId>org.obeonetwork.m2doc</groupId>
+		<artifactId>org.obeonetwork.m2doc.parent</artifactId>
+		<relativePath>../../releng/org.obeonetwork.m2doc.parent</relativePath>
+		<version>0.7.0-SNAPSHOT</version>
+	</parent>
+  <groupId>org.obeonetwork.m2doc</groupId>
+  <artifactId>org.obeonetwork.m2doc.genconf.edit</artifactId>
+  <version>0.7.1-SNAPSHOT</version>
+  <packaging>eclipse-plugin</packaging>
+</project>

plugins/org.obeonetwork.m2doc.genconf.edit/src-gen/org/obeonetwork/m2doc/genconf/provider/DefinitionItemProvider.java

@@ -0,0 +1,147 @@
+/**
+ */
+package org.obeonetwork.m2doc.genconf.provider;
+
+
+import java.util.Collection;
+import java.util.List;
+
+import org.eclipse.emf.common.notify.AdapterFactory;
+import org.eclipse.emf.common.notify.Notification;
+
+import org.eclipse.emf.common.util.ResourceLocator;
+
+import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;
+import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;
+import org.eclipse.emf.edit.provider.IItemLabelProvider;
+import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
+import org.eclipse.emf.edit.provider.IItemPropertySource;
+import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
+import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
+import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
+import org.eclipse.emf.edit.provider.ItemProviderAdapter;
+import org.eclipse.emf.edit.provider.ViewerNotification;
+
+import org.obeonetwork.m2doc.genconf.Definition;
+import org.obeonetwork.m2doc.genconf.GenconfPackage;
+
+/**
+ * This is the item provider adapter for a {@link org.obeonetwork.m2doc.genconf.Definition} object.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+public class DefinitionItemProvider 
+	extends ItemProviderAdapter
+	implements
+		IEditingDomainItemProvider,
+		IStructuredItemContentProvider,
+		ITreeItemContentProvider,
+		IItemLabelProvider,
+		IItemPropertySource {
+	/**
+     * This constructs an instance from a factory and a notifier.
+     * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+     * @generated
+     */
+	public DefinitionItemProvider(AdapterFactory adapterFactory) {
+        super(adapterFactory);
+    }
+
+	/**
+     * This returns the property descriptors for the adapted class.
+     * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+     * @generated
+     */
+	@Override
+	public List<IItemPropertyDescriptor> getPropertyDescriptors(Object object) {
+        if (itemPropertyDescriptors == null) {
+            super.getPropertyDescriptors(object);
+
+            addKeyPropertyDescriptor(object);
+        }
+        return itemPropertyDescriptors;
+    }
+
+	/**
+     * This adds a property descriptor for the Key feature.
+     * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+     * @generated
+     */
+	protected void addKeyPropertyDescriptor(Object object) {
+        itemPropertyDescriptors.add
+            (createItemPropertyDescriptor
+                (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+                 getResourceLocator(),
+                 getString("_UI_Definition_key_feature"),
+                 getString("_UI_PropertyDescriptor_description", "_UI_Definition_key_feature", "_UI_Definition_type"),
+                 GenconfPackage.Literals.DEFINITION__KEY,
+                 true,
+                 false,
+                 false,
+                 ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+                 null,
+                 null));
+    }
+
+	/**
+     * This returns the label text for the adapted class.
+     * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+     * @generated
+     */
+	@Override
+	public String getText(Object object) {
+        String label = ((Definition)object).getKey();
+        return label == null || label.length() == 0 ?
+            getString("_UI_Definition_type") :
+            getString("_UI_Definition_type") + " " + label;
+    }
+
+
+	/**
+     * This handles model notifications by calling {@link #updateChildren} to update any cached
+     * children and by creating a viewer notification, which it passes to {@link #fireNotifyChanged}.
+     * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+     * @generated
+     */
+	@Override
+	public void notifyChanged(Notification notification) {
+        updateChildren(notification);
+
+        switch (notification.getFeatureID(Definition.class)) {
+            case GenconfPackage.DEFINITION__KEY:
+                fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
+                return;
+        }
+        super.notifyChanged(notification);
+    }
+
+	/**
+     * This adds {@link org.eclipse.emf.edit.command.CommandParameter}s describing the children
+     * that can be created under this object.
+     * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+     * @generated
+     */
+	@Override
+	protected void collectNewChildDescriptors(Collection<Object> newChildDescriptors, Object object) {
+        super.collectNewChildDescriptors(newChildDescriptors, object);
+    }
+
+	/**
+     * Return the resource locator for this item provider's resources.
+     * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+     * @generated
+     */
+	@Override
+	public ResourceLocator getResourceLocator() {
+        return M2docconfEditPlugin.INSTANCE;
+    }
+
+}