Merge branch 'master' into master-juno
Conflicts:
pom.xml
releng/org.eclipse.gendoc.target/2018-09/2018-09-papyrus.target
releng/org.eclipse.gendoc.target/2018-09/2018-09-sirius.target
Change-Id: I3cc1e3fd17ed67e33c818bfee0169f51710aa6a4
diff --git a/plugins/org.eclipse.gendoc.bundle.acceleo.gmf/plugin.xml b/plugins/org.eclipse.gendoc.bundle.acceleo.gmf/plugin.xml
index 3b19cea..814a25d 100644
--- a/plugins/org.eclipse.gendoc.bundle.acceleo.gmf/plugin.xml
+++ b/plugins/org.eclipse.gendoc.bundle.acceleo.gmf/plugin.xml
@@ -9,21 +9,5 @@
name="gmf">
</service>
</extension>
- <extension
- point="org.eclipse.gendoc.serviceTypes">
- <serviceType
- id="DiagramRenderer"
- interface="org.eclipse.gendoc.bundle.acceleo.gmf.service.IDiagramRenderer">
- </serviceType>
- </extension>
- <extension
- point="org.eclipse.gendoc.services">
- <service
- class="org.eclipse.gendoc.bundle.acceleo.gmf.service.GMFDiagramRenderer"
- default="true"
- id="GMFDiagramRenderer"
- serviceType="DiagramRenderer">
- </service>
- </extension>
</plugin>
diff --git a/plugins/org.eclipse.gendoc.bundle.acceleo.gmf/src/org/eclipse/gendoc/bundle/acceleo/gmf/impl/GMFDiagramRunnable.java b/plugins/org.eclipse.gendoc.bundle.acceleo.gmf/src/org/eclipse/gendoc/bundle/acceleo/gmf/impl/GMFDiagramRunnable.java
index 8259028..2cdca6a 100644
--- a/plugins/org.eclipse.gendoc.bundle.acceleo.gmf/src/org/eclipse/gendoc/bundle/acceleo/gmf/impl/GMFDiagramRunnable.java
+++ b/plugins/org.eclipse.gendoc.bundle.acceleo.gmf/src/org/eclipse/gendoc/bundle/acceleo/gmf/impl/GMFDiagramRunnable.java
@@ -14,42 +14,78 @@
package org.eclipse.gendoc.bundle.acceleo.gmf.impl;
import java.io.File;
+import java.util.ArrayList;
+import java.util.Collection;
import java.util.Collections;
+import java.util.HashSet;
+import java.util.LinkedList;
import java.util.List;
+import java.util.Stack;
import org.eclipse.core.databinding.observable.Realm;
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.runtime.Assert;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.core.runtime.Path;
+import org.eclipse.core.runtime.Status;
import org.eclipse.emf.common.util.BasicDiagnostic;
import org.eclipse.emf.common.util.Diagnostic;
+import org.eclipse.emf.common.util.TreeIterator;
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.util.EcoreUtil;
import org.eclipse.emf.transaction.TransactionalEditingDomain;
import org.eclipse.emf.transaction.TransactionalEditingDomain.Factory;
import org.eclipse.emf.transaction.util.TransactionUtil;
-import org.eclipse.gendoc.bundle.acceleo.gmf.service.GMFDiagramRenderer;
-import org.eclipse.gendoc.bundle.acceleo.gmf.service.IDiagramRenderer;
-import org.eclipse.gendoc.bundle.acceleo.gmf.service.IDiagramRenderer.FileFormat;
+import org.eclipse.emf.workspace.util.WorkspaceSynchronizer;
+import org.eclipse.gef.ConnectionEditPart;
+import org.eclipse.gef.EditPart;
+import org.eclipse.gef.GraphicalEditPart;
import org.eclipse.gendoc.documents.FileRunnable;
import org.eclipse.gendoc.documents.IImageManipulationService;
import org.eclipse.gendoc.documents.IImageManipulationServiceFactory;
import org.eclipse.gendoc.services.GendocServices;
import org.eclipse.gendoc.services.IGendocDiagnostician;
+import org.eclipse.gendoc.services.ILogger;
import org.eclipse.gendoc.tags.handlers.Activator;
+import org.eclipse.gmf.runtime.common.core.util.Trace;
import org.eclipse.gmf.runtime.diagram.core.preferences.PreferencesHint;
+import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
+import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart;
import org.eclipse.gmf.runtime.diagram.ui.image.ImageFileFormat;
+import org.eclipse.gmf.runtime.diagram.ui.parts.DiagramEditor;
+import org.eclipse.gmf.runtime.diagram.ui.render.clipboard.DiagramGenerator;
+import org.eclipse.gmf.runtime.diagram.ui.render.internal.DiagramUIRenderPlugin;
+import org.eclipse.gmf.runtime.diagram.ui.render.util.CopyToImageUtil;
+import org.eclipse.gmf.runtime.diagram.ui.util.DiagramEditorUtil;
import org.eclipse.gmf.runtime.notation.Diagram;
+import org.eclipse.gmf.runtime.notation.View;
import org.eclipse.jface.databinding.swt.SWTObservables;
import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Shell;
public class GMFDiagramRunnable implements FileRunnable {
private Diagram diagram;
+ private enum FileFormat {
+ PNG, JPEG, GIF, BMP, JPG, SVG, EMF;
+
+ public FileFormat getExtension(){
+ IImageManipulationServiceFactory imageManipulationServiceFactory = GendocServices.getDefault().getService(IImageManipulationServiceFactory.class);
+ IImageManipulationService imageManipulationService = imageManipulationServiceFactory.getService(name().toLowerCase()) ;
+ return transformToFormat(imageManipulationService.renameExtension(name()));
+ }
+
+ public String getFullExtension() {
+ return "." + getExtension().name().toLowerCase();
+ }
+ }
+
/** The extension of diagram. */
private FileFormat extension;
private final List<EObject> visibleElements;
@@ -61,7 +97,7 @@
public GMFDiagramRunnable(Diagram diagram, String extension,
List<EObject> visibleElements) {
this.diagram = diagram;
- this.extension = FileFormat.transformToFormat(extension);
+ this.extension = transformToFormat(extension);
if (visibleElements != null) {
this.visibleElements = visibleElements;
} else {
@@ -70,6 +106,22 @@
}
+ private static FileFormat transformToFormat(String ext) {
+ FileFormat format;
+ try {
+ format = FileFormat.valueOf(ext.toUpperCase());
+ return format;
+ } catch (IllegalArgumentException e) {
+ IGendocDiagnostician diagnostician = GendocServices.getDefault()
+ .getService(IGendocDiagnostician.class);
+ String message = "The format " + ext + " is not supported";
+ diagnostician.addDiagnostic(new BasicDiagnostic(Diagnostic.ERROR,
+ Activator.PLUGIN_ID, 0, message, null));
+ return FileFormat.valueOf(ext);
+ }
+
+ }
+
/**
* Instantiates a new diagram runnable.
*
@@ -92,10 +144,7 @@
protected void doRun(String resourceId, String outputResourceFolder) {
if (extension != null) {
- IDiagramRenderer diagramRenderer = GendocServices.getDefault().getService(IDiagramRenderer.class);
- if (diagramRenderer == null)
- diagramRenderer = new GMFDiagramRenderer();
-
+ MultiElementsCopytoImageUtils c = new MultiElementsCopytoImageUtils();
new File(outputResourceFolder).mkdirs();
IPath path = new Path(outputResourceFolder + "/" + resourceId
+ extension.getFullExtension());
@@ -114,9 +163,16 @@
}
}
}
-
- diagramRenderer.renderDiagram(diagram, visibleElements, path, extension, new NullProgressMonitor());
-
+ if (visibleElements == null || visibleElements.isEmpty()) {
+ c.copyToImage(diagram, path, getImageFileFormat(extension.getExtension()),
+ new NullProgressMonitor(),
+ PreferencesHint.USE_DEFAULTS);
+ } else {
+ c.copyToImage(diagram, path, visibleElements,
+ getImageFileFormat(extension.getExtension()),
+ new NullProgressMonitor(),
+ PreferencesHint.USE_DEFAULTS);
+ }
IImageManipulationServiceFactory imageManipulationServiceFactory = GendocServices.getDefault().getService(IImageManipulationServiceFactory.class);
IImageManipulationService imageManipulationService = imageManipulationServiceFactory.getService(extension.name().toLowerCase()) ;
imageManipulationService.transform(path);
@@ -140,8 +196,314 @@
}
+ private ImageFileFormat getImageFileFormat(FileFormat format) {
+ return ImageFileFormat.resolveImageFormat(format.name());
+ }
+
public String getFileExtension() {
return extension.toString().toLowerCase();
}
+ /**
+ * A subclass to manage list of elements and diagram in parameter
+ *
+ * @author tfaure
+ *
+ */
+ public class MultiElementsCopytoImageUtils extends CopyToImageUtil {
+
+ public List copyToImage(Diagram diagram, IPath destination,
+ ImageFileFormat format, NullProgressMonitor monitor,
+ PreferencesHint preferencesHint)
+ throws CoreException {
+
+ Trace.trace(DiagramUIRenderPlugin.getInstance(),
+ "Copy diagram to Image " + destination + " as " + format); //$NON-NLS-1$ //$NON-NLS-2$
+
+ List partInfo = Collections.EMPTY_LIST;
+
+ DiagramEditor openedDiagramEditor = findOpenedDiagramEditor(diagram);
+ if (openedDiagramEditor != null) {
+ DiagramGenerator generator = copyToImage(openedDiagramEditor.getDiagramEditPart(),
+ destination, format, monitor);
+ partInfo = generator.getDiagramPartInfo(openedDiagramEditor.getDiagramEditPart());
+ } else {
+ Shell shell = new Shell();
+ try {
+ DiagramEditPart diagramEditPart = createDiagramEditPart(diagram,
+ shell, preferencesHint);
+ Assert.isNotNull(diagramEditPart);
+ DiagramGenerator generator = copyToImage(diagramEditPart,
+ destination, format, monitor);
+ partInfo = generator.getDiagramPartInfo(diagramEditPart);
+ } finally {
+ shell.dispose();
+ }
+ }
+
+ return partInfo;
+ }
+
+ private DiagramEditor findOpenedDiagramEditor(Diagram diagram) {
+ DiagramEditor result = DiagramEditorUtil.findOpenedDiagramEditorForID(ViewUtil.getIdStr(diagram));
+ if (result != null){
+ IPath iPathDiagEditor =getIPath(result.getDiagram());
+ IPath iPathDiag = getIPath(diagram) ;
+
+ if (iPathDiagEditor == null || iPathDiag == null || !iPathDiag.equals(iPathDiagEditor)){
+ ((ILogger) GendocServices.getDefault().getService(ILogger.class)).log("Two diagrams in separate files " + iPathDiagEditor + " and " + iPathDiag + " have the same identifier", Status.WARNING);
+ return null ;
+ }
+ }
+ return result ;
+ }
+
+ private IPath getIPath(Diagram diagram) {
+ if (diagram != null){
+ Resource resource = diagram.eResource();
+ if (resource != null){
+ IFile file = WorkspaceSynchronizer.getUnderlyingFile(resource);
+ if (file != null){
+ return file.getFullPath();
+ }
+ }
+ }
+ return null;
+ }
+
+ public List copyToImage(Diagram diagram, IPath destination,
+ List<EObject> visibleElements, ImageFileFormat format,
+ NullProgressMonitor monitor, PreferencesHint preferencesHint)
+ throws CoreException {
+ Shell shell = null ;
+ try {
+ Trace.trace(DiagramUIRenderPlugin.getInstance(),
+ "Copy diagram to Image " + destination + " as " + format); //$NON-NLS-1$ //$NON-NLS-2$
+
+ List partInfo = Collections.EMPTY_LIST;
+
+ DiagramEditor openedDiagramEditor = findOpenedDiagramEditor(diagram);
+ DiagramEditPart diagramEditPart = null ;
+
+ if (openedDiagramEditor != null) {
+ diagramEditPart = openedDiagramEditor.getDiagramEditPart();
+ } else {
+ shell = new Shell();
+ diagramEditPart = createDiagramEditPart(
+ diagram, shell, preferencesHint);
+ }
+ Assert.isNotNull(diagramEditPart);
+ copyToImage(diagramEditPart,
+ getEditParts(visibleElements, diagramEditPart),
+ destination, format, monitor);
+ return partInfo;
+ } finally {
+ if (shell != null && !shell.isDisposed())
+ {
+ shell.dispose();
+ }
+ }
+ }
+
+ }
+
+ public List<?> getEditParts(List<EObject> visibleElements,
+ DiagramEditPart diagramEditPart) {
+ return getEditParts(visibleElements, diagramEditPart, true);
+ }
+
+ public List<?> getEditParts(List<EObject> visibleElements,
+ DiagramEditPart diagramEditPart, boolean includeConnections) {
+ List<GraphicalEditPart> result = new LinkedList<GraphicalEditPart>();
+ for (EObject e : visibleElements) {
+ Object model = diagramEditPart.getModel();
+ if (model instanceof Diagram) {
+ Diagram diagram = (Diagram) model;
+ for (TreeIterator<EObject> i = EcoreUtil.getAllProperContents(
+ diagram, true); i.hasNext();) {
+ EObject current = i.next();
+ if (current instanceof View) {
+ View view = (View) current;
+ if (equals(e, view.getElement())) {
+ Object part = diagramEditPart.getViewer()
+ .getEditPartRegistry().get(view);
+ if (part instanceof GraphicalEditPart) {
+ result.add((GraphicalEditPart) part);
+ }
+ }
+ }
+ }
+ }
+ }
+ if (includeConnections)
+ {
+ // the process is made twice but copying the code
+ // in this case is better than overriding to avoid maintenance problem
+ ArrayList<GraphicalEditPart> tmp = new ArrayList<GraphicalEditPart>(result);
+ for(GraphicalEditPart g : tmp)
+ {
+ result.addAll(findConnectionsToPaint(g, result));
+ }
+ }
+ return result;
+ }
+
+ protected boolean equals(EObject e, EObject fromView) {
+ boolean result = false ;
+ if (fromView == e)
+ {
+ result = true ;
+ }
+ else
+ {
+ // if the diagram editor is the opened one the eobjects are not the same
+ if (e.eResource() != null && fromView.eResource() != null)
+ {
+ Resource eResource = e.eResource();
+ Resource viewResoure = fromView.eResource();
+ if (eResource.getURI() != null && eResource.getURI().equals(viewResoure.getURI()))
+ {
+ result = (eResource.getURIFragment(e) != null && eResource.getURIFragment(e).equals(viewResoure.getURIFragment(fromView)));
+ }
+ }
+ }
+ return result ;
+ }
+
+ /**
+ * Collects all connections contained within the given edit part
+ * Code copy from {@link CopyToImageUtil}
+ * @param editPart
+ * the container editpart
+ * @return connections within it
+ */
+ protected Collection<ConnectionEditPart> findConnectionsToPaint(
+ GraphicalEditPart editPart, List<GraphicalEditPart> relatedEditParts) {
+ /*
+ * Set of node editparts contained within the given editpart
+ */
+ HashSet<GraphicalEditPart> editParts = new HashSet<GraphicalEditPart>();
+
+ /*
+ * All connection editparts that have a source contained within the
+ * given editpart
+ */
+ HashSet<ConnectionEditPart> connectionEPs = new HashSet<ConnectionEditPart>();
+
+ /*
+ * Connections contained within the given editpart (or just the
+ * connections to paint
+ */
+ HashSet<ConnectionEditPart> connectionsToPaint = new HashSet<ConnectionEditPart>();
+
+ /*
+ * Populate the set of node editparts
+ */
+ getNestedEditParts(editPart, editParts);
+
+ /*
+ * Populate the set of connections whose source is within the given
+ * editpart
+ */
+ for (GraphicalEditPart gep : editParts) {
+ connectionEPs.addAll(getAllConnectionsFrom(gep));
+ }
+
+ /*
+ * Populate the set of connections whose source is the given editpart
+ */
+ connectionEPs.addAll(getAllConnectionsFrom(editPart));
+
+ /*
+ * Create a set of connections constained within the given editpart
+ */
+ while (!connectionEPs.isEmpty()) {
+ /*
+ * Take the first connection and check whethe there is a path
+ * through that connection that leads to the target contained within
+ * the given editpart
+ */
+ Stack<ConnectionEditPart> connectionsPath = new Stack<ConnectionEditPart>();
+ ConnectionEditPart conn = connectionEPs.iterator().next();
+ connectionEPs.remove(conn);
+ connectionsPath.add(conn);
+
+ /*
+ * Initialize the target for the current path
+ */
+ EditPart target = conn.getTarget();
+ while (connectionEPs.contains(target)) {
+ /*
+ * If the target end is a connection, check if it's one of the
+ * connection's whose target is a connection and within the
+ * given editpart. Append it to the path if it is. Otherwise
+ * check if the target is within the actual connections or nodes
+ * contained within the given editpart
+ */
+ ConnectionEditPart targetConn = (ConnectionEditPart) target;
+ connectionEPs.remove(targetConn);
+ connectionsPath.add(targetConn);
+
+ /*
+ * Update the target for the new path
+ */
+ target = targetConn.getTarget();
+ }
+
+ /*
+ * The path is built, check if it's target is a node or a connection
+ * contained within the given editpart
+ */
+ if (editParts.contains(target)
+ || connectionsToPaint.contains(target)
+ || relatedEditParts.contains(target)) {
+ connectionsToPaint.addAll(connectionsPath);
+ }
+ }
+ return connectionsToPaint;
+ }
+
+ /**
+ * This method is used to obtain the list of child edit parts for shape
+ * compartments.
+ *
+ * @param childEditPart
+ * base edit part to get the list of children editparts
+ * @param editParts
+ * list of nested shape edit parts
+ */
+ protected void getNestedEditParts(GraphicalEditPart baseEditPart,
+ Collection<GraphicalEditPart> editParts) {
+
+ for (Object child : baseEditPart.getChildren()) {
+ if (child instanceof GraphicalEditPart) {
+ GraphicalEditPart childEP = (GraphicalEditPart) child;
+ editParts.add(childEP);
+ getNestedEditParts(childEP, editParts);
+ }
+ }
+ }
+
+ /**
+ * Returns all connections orginating from a given editpart. All means that
+ * connections originating from connections that have a source given
+ * editpart will be included
+ *
+ * @param ep
+ * the editpart
+ * @return all source connections
+ */
+ protected List<ConnectionEditPart> getAllConnectionsFrom(
+ GraphicalEditPart ep) {
+ LinkedList<ConnectionEditPart> connections = new LinkedList<ConnectionEditPart>();
+ for (Object sourceConnObj : ep.getSourceConnections()) {
+ if (sourceConnObj instanceof ConnectionEditPart) {
+ ConnectionEditPart sourceConn = (ConnectionEditPart) sourceConnObj;
+ connections.add(sourceConn);
+ connections.addAll(getAllConnectionsFrom(sourceConn));
+ }
+ }
+ return connections;
+ }
+
}
diff --git a/plugins/org.eclipse.gendoc.bundle.acceleo.gmf/src/org/eclipse/gendoc/bundle/acceleo/gmf/impl/GMFEditPartUtils.java b/plugins/org.eclipse.gendoc.bundle.acceleo.gmf/src/org/eclipse/gendoc/bundle/acceleo/gmf/impl/GMFEditPartUtils.java
deleted file mode 100644
index b96d8aa..0000000
--- a/plugins/org.eclipse.gendoc.bundle.acceleo.gmf/src/org/eclipse/gendoc/bundle/acceleo/gmf/impl/GMFEditPartUtils.java
+++ /dev/null
@@ -1,223 +0,0 @@
-package org.eclipse.gendoc.bundle.acceleo.gmf.impl;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Stack;
-
-import org.eclipse.emf.common.util.TreeIterator;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.gef.ConnectionEditPart;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.GraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.render.util.CopyToImageUtil;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.gmf.runtime.notation.View;
-
-public class GMFEditPartUtils {
- public static List<?> getEditParts(List<EObject> visibleElements,
- DiagramEditPart diagramEditPart) {
- return getEditParts(visibleElements, diagramEditPart, true);
- }
-
- public static List<?> getEditParts(List<EObject> visibleElements,
- DiagramEditPart diagramEditPart, boolean includeConnections) {
- List<GraphicalEditPart> result = new LinkedList<GraphicalEditPart>();
- for (EObject e : visibleElements) {
- Object model = diagramEditPart.getModel();
- if (model instanceof Diagram) {
- Diagram diagram = (Diagram) model;
- for (TreeIterator<EObject> i = EcoreUtil.getAllProperContents(
- diagram, true); i.hasNext();) {
- EObject current = i.next();
- if (current instanceof View) {
- View view = (View) current;
- if (equals(e, view.getElement())) {
- Object part = diagramEditPart.getViewer()
- .getEditPartRegistry().get(view);
- if (part instanceof GraphicalEditPart) {
- result.add((GraphicalEditPart) part);
- }
- }
- }
- }
- }
- }
- if (includeConnections)
- {
- // the process is made twice but copying the code
- // in this case is better than overriding to avoid maintenance problem
- ArrayList<GraphicalEditPart> tmp = new ArrayList<GraphicalEditPart>(result);
- for(GraphicalEditPart g : tmp)
- {
- result.addAll(findConnectionsToPaint(g, result));
- }
- }
- return result;
- }
-
- protected static boolean equals(EObject e, EObject fromView) {
- boolean result = false ;
- if (fromView == e)
- {
- result = true ;
- }
- else
- {
- // if the diagram editor is the opened one the eobjects are not the same
- if (e.eResource() != null && fromView.eResource() != null)
- {
- Resource eResource = e.eResource();
- Resource viewResoure = fromView.eResource();
- if (eResource.getURI() != null && eResource.getURI().equals(viewResoure.getURI()))
- {
- result = (eResource.getURIFragment(e) != null && eResource.getURIFragment(e).equals(viewResoure.getURIFragment(fromView)));
- }
- }
- }
- return result ;
- }
-
- /**
- * Collects all connections contained within the given edit part
- * Code copy from {@link CopyToImageUtil}
- * @param editPart
- * the container editpart
- * @return connections within it
- */
- protected static Collection<ConnectionEditPart> findConnectionsToPaint(
- GraphicalEditPart editPart, List<GraphicalEditPart> relatedEditParts) {
- /*
- * Set of node editparts contained within the given editpart
- */
- HashSet<GraphicalEditPart> editParts = new HashSet<GraphicalEditPart>();
-
- /*
- * All connection editparts that have a source contained within the
- * given editpart
- */
- HashSet<ConnectionEditPart> connectionEPs = new HashSet<ConnectionEditPart>();
-
- /*
- * Connections contained within the given editpart (or just the
- * connections to paint
- */
- HashSet<ConnectionEditPart> connectionsToPaint = new HashSet<ConnectionEditPart>();
-
- /*
- * Populate the set of node editparts
- */
- getNestedEditParts(editPart, editParts);
-
- /*
- * Populate the set of connections whose source is within the given
- * editpart
- */
- for (GraphicalEditPart gep : editParts) {
- connectionEPs.addAll(getAllConnectionsFrom(gep));
- }
-
- /*
- * Populate the set of connections whose source is the given editpart
- */
- connectionEPs.addAll(getAllConnectionsFrom(editPart));
-
- /*
- * Create a set of connections constained within the given editpart
- */
- while (!connectionEPs.isEmpty()) {
- /*
- * Take the first connection and check whethe there is a path
- * through that connection that leads to the target contained within
- * the given editpart
- */
- Stack<ConnectionEditPart> connectionsPath = new Stack<ConnectionEditPart>();
- ConnectionEditPart conn = connectionEPs.iterator().next();
- connectionEPs.remove(conn);
- connectionsPath.add(conn);
-
- /*
- * Initialize the target for the current path
- */
- EditPart target = conn.getTarget();
- while (connectionEPs.contains(target)) {
- /*
- * If the target end is a connection, check if it's one of the
- * connection's whose target is a connection and within the
- * given editpart. Append it to the path if it is. Otherwise
- * check if the target is within the actual connections or nodes
- * contained within the given editpart
- */
- ConnectionEditPart targetConn = (ConnectionEditPart) target;
- connectionEPs.remove(targetConn);
- connectionsPath.add(targetConn);
-
- /*
- * Update the target for the new path
- */
- target = targetConn.getTarget();
- }
-
- /*
- * The path is built, check if it's target is a node or a connection
- * contained within the given editpart
- */
- if (editParts.contains(target)
- || connectionsToPaint.contains(target)
- || relatedEditParts.contains(target)) {
- connectionsToPaint.addAll(connectionsPath);
- }
- }
- return connectionsToPaint;
- }
-
- /**
- * This method is used to obtain the list of child edit parts for shape
- * compartments.
- *
- * @param childEditPart
- * base edit part to get the list of children editparts
- * @param editParts
- * list of nested shape edit parts
- */
- protected static void getNestedEditParts(GraphicalEditPart baseEditPart,
- Collection<GraphicalEditPart> editParts) {
-
- for (Object child : baseEditPart.getChildren()) {
- if (child instanceof GraphicalEditPart) {
- GraphicalEditPart childEP = (GraphicalEditPart) child;
- editParts.add(childEP);
- getNestedEditParts(childEP, editParts);
- }
- }
- }
-
- /**
- * Returns all connections orginating from a given editpart. All means that
- * connections originating from connections that have a source given
- * editpart will be included
- *
- * @param ep
- * the editpart
- * @return all source connections
- */
- protected static List<ConnectionEditPart> getAllConnectionsFrom(
- GraphicalEditPart ep) {
- LinkedList<ConnectionEditPart> connections = new LinkedList<ConnectionEditPart>();
- for (Object sourceConnObj : ep.getSourceConnections()) {
- if (sourceConnObj instanceof ConnectionEditPart) {
- ConnectionEditPart sourceConn = (ConnectionEditPart) sourceConnObj;
- connections.add(sourceConn);
- connections.addAll(getAllConnectionsFrom(sourceConn));
- }
- }
- return connections;
- }
-
-
-}
diff --git a/plugins/org.eclipse.gendoc.bundle.acceleo.gmf/src/org/eclipse/gendoc/bundle/acceleo/gmf/service/GMFDiagramRenderer.java b/plugins/org.eclipse.gendoc.bundle.acceleo.gmf/src/org/eclipse/gendoc/bundle/acceleo/gmf/service/GMFDiagramRenderer.java
deleted file mode 100644
index dbf4116..0000000
--- a/plugins/org.eclipse.gendoc.bundle.acceleo.gmf/src/org/eclipse/gendoc/bundle/acceleo/gmf/service/GMFDiagramRenderer.java
+++ /dev/null
@@ -1,152 +0,0 @@
-package org.eclipse.gendoc.bundle.acceleo.gmf.service;
-
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.runtime.Assert;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.workspace.util.WorkspaceSynchronizer;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gendoc.bundle.acceleo.gmf.impl.GMFEditPartUtils;
-import org.eclipse.gendoc.services.GendocServices;
-import org.eclipse.gendoc.services.ILogger;
-import org.eclipse.gmf.runtime.diagram.core.preferences.PreferencesHint;
-import org.eclipse.gmf.runtime.diagram.core.util.ViewUtil;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.image.ImageFileFormat;
-import org.eclipse.gmf.runtime.diagram.ui.parts.DiagramEditor;
-import org.eclipse.gmf.runtime.diagram.ui.render.clipboard.DiagramGenerator;
-import org.eclipse.gmf.runtime.diagram.ui.render.util.CopyToImageUtil;
-import org.eclipse.gmf.runtime.diagram.ui.util.DiagramEditorUtil;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.swt.widgets.Shell;
-
-public class GMFDiagramRenderer extends CopyToImageUtil implements IDiagramRenderer {
-
- @Override
- public void clear() {
- }
-
- @Override
- public String getServiceId() {
- return id;
- }
-
- @Override
- public void setServiceId(String serviceId) {
- this.id = serviceId;
- }
-
- @Override
- public List<EditPart> renderDiagram(Diagram diagram, List<EObject> visibleElements, IPath path, FileFormat extension, NullProgressMonitor monitor) throws CoreException {
- if (visibleElements == null || visibleElements.isEmpty()) {
- return copyToImage(diagram, path, getImageFileFormat(extension),
- new NullProgressMonitor(),
- PreferencesHint.USE_DEFAULTS);
- } else {
- return copyToImage(diagram, path, visibleElements,
- getImageFileFormat(extension),
- new NullProgressMonitor(),
- PreferencesHint.USE_DEFAULTS);
- }
- }
-
- public List<EditPart> copyToImage(Diagram diagram, IPath destination,
- ImageFileFormat format, NullProgressMonitor monitor,
- PreferencesHint preferencesHint)
- throws CoreException {
-
- List<?> partInfo = Collections.EMPTY_LIST;
-
- DiagramEditor openedDiagramEditor = findOpenedDiagramEditor(diagram);
- if (openedDiagramEditor != null) {
- DiagramGenerator generator = copyToImage(openedDiagramEditor.getDiagramEditPart(),
- destination, format, monitor);
- partInfo = generator.getDiagramPartInfo(openedDiagramEditor.getDiagramEditPart());
- } else {
- Shell shell = new Shell();
- try {
- DiagramEditPart diagramEditPart = createDiagramEditPart(diagram,
- shell, preferencesHint);
- Assert.isNotNull(diagramEditPart);
- DiagramGenerator generator = super.copyToImage(diagramEditPart,
- destination, format, monitor);
- partInfo = generator.getDiagramPartInfo(diagramEditPart);
- } finally {
- shell.dispose();
- }
- }
-
- return (List)partInfo;
- }
-
- private DiagramEditor findOpenedDiagramEditor(Diagram diagram) {
- DiagramEditor result = DiagramEditorUtil.findOpenedDiagramEditorForID(ViewUtil.getIdStr(diagram));
- if (result != null){
- IPath iPathDiagEditor =getIPath(result.getDiagram());
- IPath iPathDiag = getIPath(diagram) ;
-
- if (iPathDiagEditor == null || iPathDiag == null || !iPathDiag.equals(iPathDiagEditor)){
- ((ILogger) GendocServices.getDefault().getService(ILogger.class)).log("Two diagrams in separate files " + iPathDiagEditor + " and " + iPathDiag + " have the same identifier", Status.WARNING);
- return null ;
- }
- }
- return result ;
- }
-
- private IPath getIPath(Diagram diagram) {
- if (diagram != null){
- Resource resource = diagram.eResource();
- if (resource != null){
- IFile file = WorkspaceSynchronizer.getUnderlyingFile(resource);
- if (file != null){
- return file.getFullPath();
- }
- }
- }
- return null;
- }
-
- public List<EditPart> copyToImage(Diagram diagram, IPath destination,
- List<EObject> visibleElements, ImageFileFormat format,
- NullProgressMonitor monitor, PreferencesHint preferencesHint)
- throws CoreException {
- Shell shell = null ;
- try {
- List partInfo = Collections.EMPTY_LIST;
-
- DiagramEditor openedDiagramEditor = findOpenedDiagramEditor(diagram);
- DiagramEditPart diagramEditPart = null ;
-
- if (openedDiagramEditor != null) {
- diagramEditPart = openedDiagramEditor.getDiagramEditPart();
- } else {
- shell = new Shell();
- diagramEditPart = createDiagramEditPart(
- diagram, shell, preferencesHint);
- }
- Assert.isNotNull(diagramEditPart);
- copyToImage(diagramEditPart,
- GMFEditPartUtils.getEditParts(visibleElements, diagramEditPart),
- destination, format, monitor);
- return partInfo;
- } finally {
- if (shell != null && !shell.isDisposed())
- {
- shell.dispose();
- }
- }
- }
-
- private ImageFileFormat getImageFileFormat(FileFormat format) {
- return ImageFileFormat.resolveImageFormat(format.name());
- }
-
- private String id;
-}
diff --git a/plugins/org.eclipse.gendoc.bundle.acceleo.gmf/src/org/eclipse/gendoc/bundle/acceleo/gmf/service/IDiagramRenderer.java b/plugins/org.eclipse.gendoc.bundle.acceleo.gmf/src/org/eclipse/gendoc/bundle/acceleo/gmf/service/IDiagramRenderer.java
deleted file mode 100644
index ae2485c..0000000
--- a/plugins/org.eclipse.gendoc.bundle.acceleo.gmf/src/org/eclipse/gendoc/bundle/acceleo/gmf/service/IDiagramRenderer.java
+++ /dev/null
@@ -1,64 +0,0 @@
-package org.eclipse.gendoc.bundle.acceleo.gmf.service;
-
-import java.util.List;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.emf.common.util.BasicDiagnostic;
-import org.eclipse.emf.common.util.Diagnostic;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gendoc.documents.IImageManipulationService;
-import org.eclipse.gendoc.documents.IImageManipulationServiceFactory;
-import org.eclipse.gendoc.services.GendocServices;
-import org.eclipse.gendoc.services.IGendocDiagnostician;
-import org.eclipse.gendoc.services.IService;
-import org.eclipse.gendoc.tags.handlers.Activator;
-import org.eclipse.gmf.runtime.notation.Diagram;
-
-public interface IDiagramRenderer extends IService {
- public enum FileFormat {
- PNG, JPEG, GIF, BMP, JPG, SVG, EMF;
-
- public FileFormat getExtension(){
- IImageManipulationServiceFactory imageManipulationServiceFactory = GendocServices.getDefault().getService(IImageManipulationServiceFactory.class);
- IImageManipulationService imageManipulationService = imageManipulationServiceFactory.getService(name().toLowerCase()) ;
- return transformToFormat(imageManipulationService.renameExtension(name()));
- }
-
- public String getFullExtension() {
- return "." + getExtension().name().toLowerCase();
- }
-
- public static FileFormat transformToFormat(String ext) {
- FileFormat format;
- try {
- format = FileFormat.valueOf(ext.toUpperCase());
- return format;
- } catch (IllegalArgumentException e) {
- IGendocDiagnostician diagnostician = GendocServices.getDefault()
- .getService(IGendocDiagnostician.class);
- String message = "The format " + ext + " is not supported";
- diagnostician.addDiagnostic(new BasicDiagnostic(Diagnostic.ERROR,
- Activator.PLUGIN_ID, 0, message, null));
- return FileFormat.valueOf(ext);
- }
-
- }
- }
-
- /**
- * Render the diagram into a image.
- *
- * @param diagram the diagram to render
- * @param visibleElements a list with the visible elements in the diagram
- * @param destination the path where the image will be stored
- * @param imageFormat the format of the image
- * @param monitor the progress monitor
- * @return a list with the top level visible
- * @throws CoreException
- *
- */
- public List<EditPart> renderDiagram(Diagram diagram, List<EObject> visibleElements, IPath destination, FileFormat imageFormat, NullProgressMonitor monitor) throws CoreException;
-}
diff --git a/plugins/org.eclipse.gendoc.bundle.acceleo.papyrus/META-INF/MANIFEST.MF b/plugins/org.eclipse.gendoc.bundle.acceleo.papyrus/META-INF/MANIFEST.MF
index 51797c4..2a9cd0e 100644
--- a/plugins/org.eclipse.gendoc.bundle.acceleo.papyrus/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.gendoc.bundle.acceleo.papyrus/META-INF/MANIFEST.MF
@@ -26,14 +26,9 @@
org.eclipse.papyrus.infra.core.log,
org.eclipse.papyrus.infra.services.resourceloading,
org.eclipse.gendoc.bundle.acceleo.commons,
- org.eclipse.papyrus.infra.nattable,
org.eclipse.gendoc.documents,
org.eclipse.gendoc.table,
- org.eclipse.nebula.widgets.nattable.core,
- org.eclipse.papyrus.infra.nattable.model,
- org.eclipse.papyrus.infra.emf,
- org.eclipse.papyrus.infra.services.labelprovider,
- ca.odell.glazedlists
+ org.eclipse.papyrus.infra.emf
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ActivationPolicy: lazy
Eclipse-LazyStart: true
diff --git a/plugins/org.eclipse.gendoc.bundle.acceleo.papyrus/pom.xml b/plugins/org.eclipse.gendoc.bundle.acceleo.papyrus/pom.xml
index b2a975f..6a189d3 100644
--- a/plugins/org.eclipse.gendoc.bundle.acceleo.papyrus/pom.xml
+++ b/plugins/org.eclipse.gendoc.bundle.acceleo.papyrus/pom.xml
@@ -36,7 +36,6 @@
<packagesToRegister>
<packageToRegister>org.eclipse.emf.ecore.EcorePackage</packageToRegister>
<packageToRegister>org.eclipse.gmf.runtime.notation.NotationPackage</packageToRegister>
- <packageToRegister>org.eclipse.papyrus.infra.nattable.model.nattable.NattablePackage</packageToRegister>
<packageToRegister>org.eclipse.gendoc.table.TablePackage</packageToRegister>
<packageToRegister>org.eclipse.uml2.uml.UMLPackage</packageToRegister>
</packagesToRegister>
diff --git a/plugins/org.eclipse.gendoc.bundle.acceleo.papyrus/src/org/eclipse/gendoc/bundle/acceleo/papyrus/mtl/papyrus.mtl b/plugins/org.eclipse.gendoc.bundle.acceleo.papyrus/src/org/eclipse/gendoc/bundle/acceleo/papyrus/mtl/papyrus.mtl
index 41ef065..18cba90 100644
--- a/plugins/org.eclipse.gendoc.bundle.acceleo.papyrus/src/org/eclipse/gendoc/bundle/acceleo/papyrus/mtl/papyrus.mtl
+++ b/plugins/org.eclipse.gendoc.bundle.acceleo.papyrus/src/org/eclipse/gendoc/bundle/acceleo/papyrus/mtl/papyrus.mtl
@@ -10,7 +10,7 @@
fix bug #506575 : add a getAppliedComments function
Antonio Campesino Robles (Ericsson) - Bug 531275
/]
-[module papyrus('http://www.eclipse.org/gmf/runtime/1.0.2/notation','http://www.eclipse.org/uml2/5.0.0/UML','http://www.eclipse.org/papyrus/nattable/model','http://www.eclipse.org/gendoc/1.0/table')/]
+[module papyrus('http://www.eclipse.org/gmf/runtime/1.0.2/notation','http://www.eclipse.org/uml2/4.0.0/UML','http://www.eclipse.org/gendoc/1.0/table')/]
[comment - get the diagrams of an object /]
[query public getPapyrusDiagrams(arg0 : ecore::EObject) : Sequence(Diagram)
diff --git a/plugins/org.eclipse.gendoc.bundle.acceleo.papyrus/src/org/eclipse/gendoc/bundle/acceleo/papyrus/service/PapyrusModelLoaderService.java b/plugins/org.eclipse.gendoc.bundle.acceleo.papyrus/src/org/eclipse/gendoc/bundle/acceleo/papyrus/service/PapyrusModelLoaderService.java
index d9d5ebc..3159a36 100644
--- a/plugins/org.eclipse.gendoc.bundle.acceleo.papyrus/src/org/eclipse/gendoc/bundle/acceleo/papyrus/service/PapyrusModelLoaderService.java
+++ b/plugins/org.eclipse.gendoc.bundle.acceleo.papyrus/src/org/eclipse/gendoc/bundle/acceleo/papyrus/service/PapyrusModelLoaderService.java
@@ -33,12 +33,12 @@
import org.eclipse.papyrus.infra.core.resource.ModelIdentifiers;
import org.eclipse.papyrus.infra.core.resource.ModelMultiException;
import org.eclipse.papyrus.infra.core.resource.ModelSet;
+import org.eclipse.papyrus.infra.core.resource.notation.NotationModel;
import org.eclipse.papyrus.infra.core.resource.sasheditor.SashModel;
+import org.eclipse.papyrus.infra.core.resource.uml.UmlModel;
import org.eclipse.papyrus.infra.core.services.ExtensionServicesRegistry;
import org.eclipse.papyrus.infra.core.services.ServiceException;
import org.eclipse.papyrus.infra.core.services.ServicesRegistry;
-import org.eclipse.papyrus.infra.gmfdiag.common.model.NotationModel;
-import org.eclipse.papyrus.uml.tools.model.UmlModel;
/**
@@ -189,25 +189,19 @@
ServicesRegistry servicesRegistry = new ExtensionServicesRegistry(
Activator.PLUGIN_ID);
try{
+ String uriStr = modelUri.toString();
+ int index = uriStr.lastIndexOf('.');
+ uriStr = uriStr.substring(0, index);
servicesRegistry.startServices(Collections.singletonList(ModelSet.class
.getName()));
modelSet = servicesRegistry.getService(ModelSet.class);
if (modelSet != null && modelUri != null) {
- // load models
- modelSet.loadModels(modelUri);
+ modelSet.getResource(URI.createURI(uriStr+".notation"), true);
+ modelSet.getResource(URI.createURI(uriStr+".uml"), true);
}
// start remaining services
servicesRegistry.startRegistry();
- } catch (ModelMultiException e) {
- try {
- // with the ModelMultiException it is still possible to open the
- // editors that's why the service registry is still started
- servicesRegistry.startRegistry();
-
- } catch (ServiceException e1) {
- //Do nothing
- }
} catch (ServiceException e) {
//Do nothing
}
diff --git a/plugins/org.eclipse.gendoc.bundle.acceleo.papyrus/src/org/eclipse/gendoc/bundle/acceleo/papyrus/service/PapyrusServices.java b/plugins/org.eclipse.gendoc.bundle.acceleo.papyrus/src/org/eclipse/gendoc/bundle/acceleo/papyrus/service/PapyrusServices.java
index 5f8e6db..13fd690 100644
--- a/plugins/org.eclipse.gendoc.bundle.acceleo.papyrus/src/org/eclipse/gendoc/bundle/acceleo/papyrus/service/PapyrusServices.java
+++ b/plugins/org.eclipse.gendoc.bundle.acceleo.papyrus/src/org/eclipse/gendoc/bundle/acceleo/papyrus/service/PapyrusServices.java
@@ -12,14 +12,12 @@
* Anne Haugommard (Atos) anne.haugommard@atos.net - Remove references to Papyrus Documentation services
* Mohamed Ali Bach Tobji (Atos) mohamed-ali.bachtobji@atos.net - fix bug #515404 : add getPapyrusTables method
* Antonio Campesino Robles (Ericsson) - Support for Tree tables, Bug 531275
- * Anne Haugommard (Atos for PlasticOmnium ) - Fix bug #535656 for table cells containing collections
*****************************************************************************/
package org.eclipse.gendoc.bundle.acceleo.papyrus.service;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
-import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
@@ -46,10 +44,6 @@
import org.eclipse.emf.ecore.EPackage;
import org.eclipse.emf.ecore.EStructuralFeature;
import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-import org.eclipse.emf.edit.domain.EditingDomain;
-import org.eclipse.emf.transaction.impl.TransactionalEditingDomainImpl;
-import org.eclipse.emf.transaction.util.TransactionUtil;
import org.eclipse.gendoc.bundle.acceleo.commons.files.CommonService;
import org.eclipse.gendoc.bundle.acceleo.gmf.service.GMFServices;
import org.eclipse.gendoc.bundle.acceleo.papyrus.Activator;
@@ -60,32 +54,9 @@
import org.eclipse.gendoc.services.exception.ModelNotFoundException;
import org.eclipse.gendoc.services.exception.ServiceException;
import org.eclipse.gendoc.table.Table;
-import org.eclipse.gendoc.table.TableFactory;
-import org.eclipse.gendoc.table.TableHeader;
import org.eclipse.gendoc.tags.handlers.IEMFModelLoaderService;
import org.eclipse.gmf.runtime.notation.Diagram;
import org.eclipse.gmf.runtime.notation.Style;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.nebula.widgets.nattable.config.ConfigRegistry;
-import org.eclipse.nebula.widgets.nattable.grid.GridRegion;
-import org.eclipse.nebula.widgets.nattable.layer.AbstractLayer;
-import org.eclipse.nebula.widgets.nattable.layer.DataLayer;
-import org.eclipse.nebula.widgets.nattable.layer.ILayer;
-import org.eclipse.nebula.widgets.nattable.layer.cell.ColumnOverrideLabelAccumulator;
-import org.eclipse.nebula.widgets.nattable.layer.cell.ILayerCell;
-import org.eclipse.nebula.widgets.nattable.layer.cell.TranslatedLayerCell;
-import org.eclipse.nebula.widgets.nattable.style.DisplayMode;
-import org.eclipse.papyrus.infra.emf.utils.ServiceUtilsForEObject;
-import org.eclipse.papyrus.infra.nattable.dataprovider.BodyDataProvider;
-import org.eclipse.papyrus.infra.nattable.manager.table.ITableAxisElementProvider;
-import org.eclipse.papyrus.infra.nattable.manager.table.ITreeNattableModelManager;
-import org.eclipse.papyrus.infra.nattable.manager.table.NattableModelManager;
-import org.eclipse.papyrus.infra.nattable.selection.ObjectsSelectionExtractor;
-import org.eclipse.papyrus.infra.nattable.utils.Constants;
-import org.eclipse.papyrus.infra.nattable.utils.LabelProviderCellContextElementWrapper;
-import org.eclipse.papyrus.infra.nattable.utils.NattableConfigAttributes;
-import org.eclipse.papyrus.infra.nattable.utils.NattableModelManagerFactory;
-import org.eclipse.papyrus.infra.services.labelprovider.service.LabelProviderService;
import org.eclipse.uml2.uml.Comment;
import org.eclipse.uml2.uml.Element;
import org.eclipse.uml2.uml.NamedElement;
@@ -367,145 +338,7 @@
* @throws org.eclipse.papyrus.infra.core.services.ServiceException
*/
public Collection<Table> getPapyrusTables(EObject modelElement) throws ServiceException, org.eclipse.papyrus.infra.core.services.ServiceException {
- Collection<Table> result = null;
-
- URI uri = modelElement.eResource().getURI();
- Resource diResource = getDiResouce(modelElement, uri.trimFileExtension().appendFileExtension("notation"));
- EditingDomain domain = TransactionUtil.getEditingDomain(diResource.getResourceSet());
- if (domain == null) {
- domain = TransactionalEditingDomainImpl.FactoryImpl.INSTANCE.createEditingDomain(diResource.getResourceSet());
- }
-
-
- for (Iterator<EObject> i = EcoreUtil.getAllProperContents(diResource, true); i.hasNext();) {
- EObject eobject = i.next();
- if (eobject instanceof org.eclipse.papyrus.infra.nattable.model.nattable.Table) {
-
- org.eclipse.papyrus.infra.nattable.model.nattable.Table table = (org.eclipse.papyrus.infra.nattable.model.nattable.Table) eobject;
- if (table.getOwner() != null && table.getOwner().equals(modelElement)) {
- if(result == null)
- {
- result = new LinkedList<org.eclipse.gendoc.table.Table>();
-
- }
- result.add(getGendocTable(table));
- }
-
- }
- }
- return result;
- }
-
- /**
- * Transform a Papyrus Table to a GendocTable
- * @param table Papyrus Nattable table
- * @return the corresponding Gendoc table
- * @throws ServiceException LabelProviderService not accessible
- * @throws org.eclipse.papyrus.infra.core.services.ServiceException
- */
- private Table getGendocTable(org.eclipse.papyrus.infra.nattable.model.nattable.Table table) throws ServiceException, org.eclipse.papyrus.infra.core.services.ServiceException {
- Table gendocTable = TableFactory.eINSTANCE.createTable();
- // Set Papyrus table name
- gendocTable.setName(table.getName());
- // Set Papyrus table type
- gendocTable.setType(table.getTableConfiguration().getType());
- // Initialize useful services accessors
- final NattableModelManager nattableModelManager = (NattableModelManager) NattableModelManagerFactory.INSTANCE
- .createNatTableModelManager(table, new ObjectsSelectionExtractor());
- ITableAxisElementProvider axisElementProvider = nattableModelManager.getTableAxisElementProvider();
- List<Object> horizontalHeader = axisElementProvider.getColumnElementsList();
- LabelProviderService labelProviderService = ServiceUtilsForEObject.getInstance().getServiceRegistry(table.getContext()).getService(LabelProviderService.class);
- ConfigRegistry configRegistry = new ConfigRegistry();
- configRegistry.registerConfigAttribute(NattableConfigAttributes.NATTABLE_MODEL_MANAGER_CONFIG_ATTRIBUTE, nattableModelManager, DisplayMode.NORMAL, NattableConfigAttributes.NATTABLE_MODEL_MANAGER_ID);
- configRegistry.registerConfigAttribute(NattableConfigAttributes.LABEL_PROVIDER_SERVICE_CONFIG_ATTRIBUTE, labelProviderService, DisplayMode.NORMAL, NattableConfigAttributes.LABEL_PROVIDER_SERVICE_ID);
- LabelProviderService serv = configRegistry.getConfigAttribute(NattableConfigAttributes.LABEL_PROVIDER_SERVICE_CONFIG_ATTRIBUTE, DisplayMode.NORMAL, NattableConfigAttributes.LABEL_PROVIDER_SERVICE_ID);
-
- // extracting data from axis
- TableHeader header = TableFactory.eINSTANCE.createTableHeader();
- for (Object axis : horizontalHeader) {
- org.eclipse.gendoc.table.Cell cell = TableFactory.eINSTANCE.createCell();
- cell.setLabel( getColumnLabel(nattableModelManager, configRegistry, serv, axis));
- header.getCells().add(cell);
- }
- gendocTable.setTableheader(header);
-
- // extracting data from body cells
-
- //FIXME remove references to ILayer, ILayerCell
- ILayer dataLayer = new DataLayer(new BodyDataProvider(nattableModelManager));
- ((AbstractLayer) dataLayer).setConfigLabelAccumulator(new ColumnOverrideLabelAccumulator(dataLayer));
- ((AbstractLayer) dataLayer).setRegionName(GridRegion.BODY);
- ILayerCell layer = new TranslatedLayerCell(null, dataLayer,0, 0, 0, 0);
- for (int rowPosition = 0; rowPosition < nattableModelManager.getRowCount(); rowPosition++) {
- boolean isEmpty = (nattableModelManager instanceof ITreeNattableModelManager);
- org.eclipse.gendoc.table.Row row = TableFactory.eINSTANCE.createRow();
- for (int columnPosition = 0; columnPosition < nattableModelManager.getColumnCount(); columnPosition++) {
- org.eclipse.gendoc.table.Cell cell = TableFactory.eINSTANCE.createCell();
- Object value = nattableModelManager.getDataValue(columnPosition, rowPosition);
- String label = getCellLabel(configRegistry, serv, layer, value);
- cell.setLabel(label);
- isEmpty = isEmpty && label.isEmpty();
- row.getCells().add(cell);
- if (nattableModelManager instanceof ITreeNattableModelManager) {
- ((ITreeNattableModelManager)nattableModelManager).getTreeList().setExpanded(rowPosition, true);
- }
- }
- if (!isEmpty)
- gendocTable.getRows().add(row);
- }
- return gendocTable;
- }
-
- // Fix bug #535656 : Display cell label as a collection of labels instead of a label of collections
- private String getCellLabel(ConfigRegistry configRegistry, LabelProviderService serv, ILayerCell layer,
- Object value) {
- String label ="";
- String COLLECTION_SEPARATOR = "\n";
- if (value == null) {
- // Return ""
- }
- else if (value instanceof Collection) {
- /** Compute all labels and separate by <code>COLLECTION_SEPARATOR</code> */
- List<String> labels = new LinkedList<String>();
- for (Object collectionElement : (Collection)value) {
- labels.add(getCellLabel(configRegistry,serv,layer,collectionElement));
- }
- return String.join(COLLECTION_SEPARATOR, labels);
-
- } else {
- LabelProviderCellContextElementWrapper contextElement = new LabelProviderCellContextElementWrapper();
- contextElement.setObject(value);
- contextElement.setConfigRegistry(configRegistry);
- ILabelProvider bodylabelProvider = serv.getLabelProvider(Constants.TABLE_LABEL_PROVIDER_CONTEXT,
- contextElement);
- contextElement.setCell(layer);
- label = bodylabelProvider.getText(value);
- }
- return label;
- }
-
- /**
- * Get a label of Papyrus table axis
- * @param nattableModelManager
- * @param configRegistry
- * @param serv
- * @param axis
- * @return
- */
- private String getColumnLabel(final NattableModelManager nattableModelManager, ConfigRegistry configRegistry,
- LabelProviderService serv, Object axis) {
- LabelProviderCellContextElementWrapper contextElement = new LabelProviderCellContextElementWrapper();
- contextElement.setObject(axis);
- contextElement.setConfigRegistry(configRegistry);
-
- //FIXME remove references to ILayer, ILayerCell
- ILayer dataLayer = new DataLayer(new BodyDataProvider(nattableModelManager));
- ((AbstractLayer) dataLayer).setConfigLabelAccumulator(new ColumnOverrideLabelAccumulator(dataLayer));
- ((AbstractLayer) dataLayer).setRegionName(GridRegion.COLUMN_HEADER);
- ILayerCell layer = new TranslatedLayerCell(null, dataLayer,0, 0, 0, 0);
- contextElement.setCell(layer);
- ILabelProvider headerlabelProvider = serv.getLabelProvider(Constants.HEADER_LABEL_PROVIDER_CONTEXT, contextElement);
- return headerlabelProvider.getText(contextElement);
+ throw new UnsupportedOperationException("Tables are not implemented in Papyrus Juno");
}
/**
diff --git a/plugins/org.eclipse.gendoc.bundle.acceleo.sirius/META-INF/MANIFEST.MF b/plugins/org.eclipse.gendoc.bundle.acceleo.sirius/META-INF/MANIFEST.MF
index c52fa51..5824417 100644
--- a/plugins/org.eclipse.gendoc.bundle.acceleo.sirius/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.gendoc.bundle.acceleo.sirius/META-INF/MANIFEST.MF
@@ -23,11 +23,7 @@
org.eclipse.gendoc.bundle.acceleo.commons,
org.eclipse.sirius.table,
org.eclipse.gendoc.documents,
- org.eclipse.gendoc.table,
- org.eclipse.gef,
- org.eclipse.gmf.runtime.diagram.ui.render,
- org.eclipse.gmf.runtime.diagram.ui,
- org.eclipse.sirius.diagram.ui
+ org.eclipse.gendoc.table
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-ActivationPolicy: lazy
Eclipse-LazyStart: true
diff --git a/plugins/org.eclipse.gendoc.bundle.acceleo.sirius/plugin.xml b/plugins/org.eclipse.gendoc.bundle.acceleo.sirius/plugin.xml
index 7ed18b5..5d288ad 100644
--- a/plugins/org.eclipse.gendoc.bundle.acceleo.sirius/plugin.xml
+++ b/plugins/org.eclipse.gendoc.bundle.acceleo.sirius/plugin.xml
@@ -9,18 +9,5 @@
name="sirius">
</service>
</extension>
- <extension
- point="org.eclipse.gendoc.processes">
- <process
- id="org.eclipse.gendoc.bundle.acceleo.papyrus.factoryassignment"
- label="Override Diagram renderer"
- parallel="false"
- priority="NORMAL"
- processor="org.eclipse.gendoc.bundle.acceleo.sirius.service.SiriusDiagramRendererOverriding">
- <successor
- ref="countSteps">
- </successor>
- </process>
- </extension>
</plugin>
diff --git a/plugins/org.eclipse.gendoc.bundle.acceleo.sirius/src/org/eclipse/gendoc/bundle/acceleo/sirius/service/SiriusDiagramRenderer.java b/plugins/org.eclipse.gendoc.bundle.acceleo.sirius/src/org/eclipse/gendoc/bundle/acceleo/sirius/service/SiriusDiagramRenderer.java
deleted file mode 100644
index 40dd03b..0000000
--- a/plugins/org.eclipse.gendoc.bundle.acceleo.sirius/src/org/eclipse/gendoc/bundle/acceleo/sirius/service/SiriusDiagramRenderer.java
+++ /dev/null
@@ -1,79 +0,0 @@
-package org.eclipse.gendoc.bundle.acceleo.sirius.service;
-
-import org.eclipse.core.runtime.Assert;
-import org.eclipse.emf.transaction.util.TransactionUtil;
-import org.eclipse.gef.RootEditPart;
-import org.eclipse.gendoc.bundle.acceleo.gmf.service.GMFDiagramRenderer;
-import org.eclipse.gmf.runtime.diagram.core.listener.DiagramEventBroker;
-import org.eclipse.gmf.runtime.diagram.core.preferences.PreferencesHint;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.IDiagramPreferenceSupport;
-import org.eclipse.gmf.runtime.diagram.ui.parts.DiagramCommandStack;
-import org.eclipse.gmf.runtime.diagram.ui.parts.DiagramEditDomain;
-import org.eclipse.gmf.runtime.diagram.ui.parts.DiagramGraphicalViewer;
-import org.eclipse.gmf.runtime.diagram.ui.services.editpart.EditPartService;
-import org.eclipse.gmf.runtime.notation.Diagram;
-import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.sirius.diagram.ui.tools.internal.part.SiriusDiagramGraphicalViewer;
-import org.eclipse.swt.widgets.Shell;
-
-public class SiriusDiagramRenderer extends GMFDiagramRenderer {
- public SiriusDiagramRenderer() {
- super();
- }
-
- @Override
- public DiagramEditPart createDiagramEditPart(Diagram diagram, Shell shell, PreferencesHint preferencesHint) {
- if (isSiriusDiagram(diagram)) {
- DiagramGraphicalViewer customViewer = new SiriusDiagramGraphicalViewer();
- customViewer.createControl(shell);
-
- DiagramEditDomain editDomain = new DiagramEditDomain(null);
- editDomain.setCommandStack(
- new DiagramCommandStack(editDomain));
-
- customViewer.setEditDomain(editDomain);
-
- // hook in preferences
- RootEditPart rootEP = EditPartService.getInstance().createRootEditPart(
- diagram);
- if (rootEP instanceof IDiagramPreferenceSupport) {
- if (preferencesHint == null) {
- preferencesHint = ((IDiagramPreferenceSupport) rootEP)
- .getPreferencesHint();
- } else {
- ((IDiagramPreferenceSupport) rootEP)
- .setPreferencesHint(preferencesHint);
- }
- customViewer
- .hookWorkspacePreferenceStore((IPreferenceStore) preferencesHint
- .getPreferenceStore());
- }
-
- customViewer.setRootEditPart(rootEP);
-
- customViewer.setEditPartFactory(EditPartService.getInstance());
-
- DiagramEventBroker.startListening(TransactionUtil.getEditingDomain(diagram));
-
- customViewer.setContents(diagram);
- customViewer.flush();
-
- Assert.isTrue(customViewer.getContents() instanceof DiagramEditPart);
-
- /*
- * We need to flush all the deferred updates.
- */
- while (shell.getDisplay().readAndDispatch()) {
- // nothing
- }
-
- return (DiagramEditPart) customViewer.getContents();
- }
- return super.createDiagramEditPart(diagram, shell, preferencesHint);
- }
-
- private boolean isSiriusDiagram(Diagram diagram) {
- return SiriusServices.isSiriusDiagram(diagram);
- }
-}
diff --git a/plugins/org.eclipse.gendoc.bundle.acceleo.sirius/src/org/eclipse/gendoc/bundle/acceleo/sirius/service/SiriusDiagramRendererOverriding.java b/plugins/org.eclipse.gendoc.bundle.acceleo.sirius/src/org/eclipse/gendoc/bundle/acceleo/sirius/service/SiriusDiagramRendererOverriding.java
deleted file mode 100644
index 83ca168..0000000
--- a/plugins/org.eclipse.gendoc.bundle.acceleo.sirius/src/org/eclipse/gendoc/bundle/acceleo/sirius/service/SiriusDiagramRendererOverriding.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package org.eclipse.gendoc.bundle.acceleo.sirius.service;
-
-import org.eclipse.gendoc.bundle.acceleo.gmf.service.IDiagramRenderer;
-import org.eclipse.gendoc.process.AbstractProcess;
-import org.eclipse.gendoc.services.GendocServices;
-import org.eclipse.gendoc.services.exception.GenDocException;
-
-public class SiriusDiagramRendererOverriding extends AbstractProcess {
-
- @Override
- protected void doRun() throws GenDocException {
- SiriusDiagramRenderer diagramRenderer = new SiriusDiagramRenderer();
- diagramRenderer.setServiceId("DiagramRenderer");//$NON-NLS-1$
- GendocServices.getDefault().setService(IDiagramRenderer.class, diagramRenderer);
- }
-
- @Override
- protected int getTotalWork() {
- return 1;
- }
-
-}
diff --git a/plugins/org.eclipse.gendoc.bundle.acceleo.sirius/src/org/eclipse/gendoc/bundle/acceleo/sirius/service/SiriusServices.java b/plugins/org.eclipse.gendoc.bundle.acceleo.sirius/src/org/eclipse/gendoc/bundle/acceleo/sirius/service/SiriusServices.java
index 238d946..00eeac5 100644
--- a/plugins/org.eclipse.gendoc.bundle.acceleo.sirius/src/org/eclipse/gendoc/bundle/acceleo/sirius/service/SiriusServices.java
+++ b/plugins/org.eclipse.gendoc.bundle.acceleo.sirius/src/org/eclipse/gendoc/bundle/acceleo/sirius/service/SiriusServices.java
@@ -114,12 +114,4 @@
}
return results;
}
-
- static boolean isSiriusDiagram(Diagram diagram) {
- if (!(diagram.eContainer() instanceof AnnotationEntry))
- return false;
-
- AnnotationEntry e = (AnnotationEntry)diagram.eContainer();
- return CustomDataConstants.GMF_DIAGRAMS.equals(e.getSource()) && e.getData() == diagram;
- }
}
diff --git a/pom.xml b/pom.xml
index 0b8ebb9..a0766fd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -59,17 +59,6 @@
<properties>
<tycho.version>1.3.0</tycho.version>
<juno-repo.url>http://download.eclipse.org/releases/juno</juno-repo.url>
- <kepler-repo.url>http://download.eclipse.org/releases/kepler</kepler-repo.url>
- <luna-repo.url>http://download.eclipse.org/releases/luna</luna-repo.url>
- <mars-repo.url>http://download.eclipse.org/releases/mars</mars-repo.url>
- <neon-repo.url>http://download.eclipse.org/releases/neon</neon-repo.url>
- <oxygen-repo.url>http://download.eclipse.org/releases/oxygen</oxygen-repo.url>
- <photon-repo.url>http://download.eclipse.org/releases/photon</photon-repo.url>
- <R2018-09-repo.url>http://download.eclipse.org/releases/2018-09</R2018-09-repo.url>
- <R2018-12-repo.url>http://download.eclipse.org/releases/2018-12</R2018-12-repo.url>
- <R2019-03-repo.url>http://download.eclipse.org/releases/2019-03</R2019-03-repo.url>
- <R2019-06-repo.url>http://download.eclipse.org/releases/2019-06</R2019-06-repo.url>
- <R2019-09-repo.url>http://download.eclipse.org/releases/2019-09</R2019-09-repo.url>
</properties>
<pluginRepositories>
@@ -164,462 +153,6 @@
<profile.id>juno</profile.id>
</properties>
</profile>
- <profile>
- <id>mars</id>
- <!-- This profile is only activated when building in Eclipse with m2e -->
- <activation>
- <property>
- <name>target</name>
- <value>mars</value>
- </property>
- </activation>
- <repositories>
- <repository>
- <id>mars</id>
- <url>${mars-repo.url}</url>
- <layout>p2</layout>
- </repository>
- <repository>
- <id>xmlgraphics</id>
- <url>http://download.eclipse.org/tools/orbit/downloads/drops/R20150519210750/repository/</url>
- <layout>p2</layout>
- </repository>
- <repository>
- <id>sirius</id>
- <url>http://download.eclipse.org/sirius/updates/releases/4.1.8/mars</url>
- <layout>p2</layout>
- </repository>
- </repositories>
- <properties>
- <acceleo.maven.version>3.5.0-SNAPSHOT</acceleo.maven.version>
- <acceleo.maven.id>org.eclipse.acceleo.maven</acceleo.maven.id>
- <profile.id>mars</profile.id>
- </properties>
- </profile>
- <profile>
- <id>neon</id>
- <!-- This profile is only activated when building in Eclipse with m2e -->
- <activation>
- <property>
- <name>target</name>
- <value>neon</value>
- </property>
- </activation>
- <repositories>
- <repository>
- <id>neon</id>
- <url>${neon-repo.url}</url>
- <layout>p2</layout>
- </repository>
- <repository>
- <id>xmlgraphics</id>
- <url>http://download.eclipse.org/tools/orbit/downloads/drops/R20150519210750/repository/</url>
- <layout>p2</layout>
- </repository>
- <repository>
- <id>sirius</id>
- <url>http://download.eclipse.org/sirius/updates/releases/5.1.3/neon</url>
- <layout>p2</layout>
- </repository>
- </repositories>
- <properties>
- <acceleo.maven.version>3.6.4</acceleo.maven.version>
- <acceleo.maven.id>org.eclipse.acceleo.maven</acceleo.maven.id>
- <profile.id>neon</profile.id>
- </properties>
- </profile>
- <profile>
- <id>oxygen</id>
- <!-- This profile is only activated when building in Eclipse with m2e -->
- <activation>
- <property>
- <name>target</name>
- <value>oxygen</value>
- </property>
- </activation>
- <repositories>
- <repository>
- <id>oxygen</id>
- <url>${oxygen-repo.url}</url>
- <layout>p2</layout>
- </repository>
- <repository>
- <id>xmlgraphics</id>
- <url>http://download.eclipse.org/tools/orbit/downloads/drops/R20150519210750/repository/</url>
- <layout>p2</layout>
- </repository>
- <repository>
- <id>sirius</id>
- <url>http://download.eclipse.org/sirius/updates/releases/6.2.0/oxygen</url>
- <layout>p2</layout>
- </repository>
- </repositories>
- <properties>
- <acceleo.maven.version>3.6.4</acceleo.maven.version>
- <acceleo.maven.id>org.eclipse.acceleo.maven</acceleo.maven.id>
- <profile.id>oxygen</profile.id>
- </properties>
- </profile>
- <profile>
- <id>photon</id>
- <!-- This profile is only activated when building in Eclipse with m2e -->
- <activation>
- <property>
- <name>target</name>
- <value>photon</value>
- </property>
- <activeByDefault>false</activeByDefault>
- </activation>
- <repositories>
- <repository>
- <id>photon</id>
- <url>${photon-repo.url}</url>
- <layout>p2</layout>
- </repository>
- <repository>
- <id>xmlgraphics</id>
- <url>http://download.eclipse.org/tools/orbit/downloads/drops/R20150519210750/repository/</url>
- <layout>p2</layout>
- </repository>
- <repository>
- <id>sirius</id>
- <url>http://download.eclipse.org/sirius/updates/releases/6.2.0/photon</url>
- <layout>p2</layout>
- </repository>
- </repositories>
- <properties>
- <acceleo.maven.version>3.6.4</acceleo.maven.version>
- <acceleo.maven.id>org.eclipse.acceleo.maven</acceleo.maven.id>
- <profile.id>photon</profile.id>
- </properties>
- </profile>
- <profile>
- <id>2018-09</id>
- <!-- This profile is only activated when building in Eclipse with m2e -->
- <activation>
- <property>
- <name>target</name>
- <value>2018-09</value>
- </property>
- <activeByDefault>false</activeByDefault>
- </activation>
- <repositories>
- <repository>
- <id>2018-09</id>
- <url>${R2018-09-repo.url}</url>
- <layout>p2</layout>
- </repository>
- <repository>
- <id>xmlgraphics</id>
- <url>http://download.eclipse.org/tools/orbit/downloads/drops/R20150519210750/repository/</url>
- <layout>p2</layout>
- </repository>
- <repository>
- <id>sirius</id>
- <url>http://download.eclipse.org/sirius/updates/releases/6.0.2/photon</url>
- <layout>p2</layout>
- </repository>
- </repositories>
- <properties>
- <acceleo.maven.version>3.6.4</acceleo.maven.version>
- <acceleo.maven.id>org.eclipse.acceleo.maven</acceleo.maven.id>
- <profile.id>2018-09</profile.id>
- </properties>
- </profile>
- <profile>
- <id>2018-12</id>
- <!-- This profile is only activated when building in Eclipse with m2e -->
- <activation>
- <property>
- <name>target</name>
- <value>2018-12</value>
- </property>
- <activeByDefault>false</activeByDefault>
- </activation>
- <repositories>
- <repository>
- <id>2018-12</id>
- <url>${R2018-12-repo.url}</url>
- <layout>p2</layout>
- </repository>
- <repository>
- <id>xmlgraphics</id>
- <url>http://download.eclipse.org/tools/orbit/downloads/drops/R20150519210750/repository/</url>
- <layout>p2</layout>
- </repository>
- <repository>
- <id>sirius</id>
- <url>http://download.eclipse.org/sirius/updates/releases/6.1.1/photon</url>
- <layout>p2</layout>
- </repository>
- <repository>
- <id>Acceleo Patch</id>
- <url>http://download.eclipse.org/acceleo/updates/milestones/3.7/S201902261618</url>
- <layout>p2</layout>
- </repository>
- <repository>
- <id>EMF Patch</id>
- <url>http://download.eclipse.org/modeling/emf/emf/builds/release/2.18</url>
- <!-- url>http://download.eclipse.org/modeling/emf/emf/builds/milestone/S201904050820</url -->
- <layout>p2</layout>
- </repository>
- </repositories>
- <build>
- <plugins>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>target-platform-configuration</artifactId>
- <version>${tycho.version}</version>
- <configuration>
- <environments>
- <environment>
- <os>linux</os>
- <ws>gtk</ws>
- <arch>x86_64</arch>
- </environment>
- <environment>
- <os>win32</os>
- <ws>win32</ws>
- <arch>x86_64</arch>
- </environment>
- <environment>
- <os>macosx</os>
- <ws>cocoa</ws>
- <arch>x86_64</arch>
- </environment>
- </environments>
- <dependency-resolution>
- <extraRequirements>
- <requirement>
- <type>eclipse-feature</type>
- <id>org.eclipse.papyrus.sdk.feature</id>
- <versionRange>0.0.0</versionRange>
- </requirement>
- <requirement>
- <type>eclipse-feature</type>
- <id>org.eclipse.emf.sdk</id>
- <versionRange>2.18.0</versionRange>
- </requirement>
- <requirement>
- <type>eclipse-feature</type>
- <id> org.eclipse.acceleo.sdk</id>
- <versionRange>3.7.8</versionRange>
- </requirement>
- </extraRequirements>
- </dependency-resolution>
- </configuration>
- </plugin>
- </plugins>
- </build>
- <properties>
- <acceleo.maven.version>3.6.4</acceleo.maven.version>
- <acceleo.maven.id>org.eclipse.acceleo.maven</acceleo.maven.id>
- <profile.id>2018-12</profile.id>
- </properties>
- </profile>
- <profile>
- <id>2019-03</id>
- <!-- This profile is only activated when building in Eclipse with m2e -->
- <activation>
- <property>
- <name>target</name>
- <value>2019-03</value>
- </property>
- <activeByDefault>false</activeByDefault>
- </activation>
- <repositories>
- <repository>
- <id>2019-03</id>
- <url>${R2019-03-repo.url}</url>
- <layout>p2</layout>
- </repository>
- <repository>
- <id>xmlgraphics</id>
- <url>http://download.eclipse.org/tools/orbit/downloads/drops/R20150519210750/repository/</url>
- <layout>p2</layout>
- </repository>
- <repository>
- <id>sirius</id>
- <url>http://download.eclipse.org/sirius/updates/releases/6.1.2/photon</url>
- <layout>p2</layout>
- </repository>
- <repository>
- <id>EMF Patch</id>
- <url>http://download.eclipse.org/modeling/emf/emf/builds/release/2.18</url>
- <!-- url>http://download.eclipse.org/modeling/emf/emf/builds/milestone/S201904050820</url -->
- <layout>p2</layout>
- </repository>
- </repositories>
- <build>
- <plugins>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>target-platform-configuration</artifactId>
- <version>${tycho.version}</version>
- <configuration>
- <environments>
- <environment>
- <os>linux</os>
- <ws>gtk</ws>
- <arch>x86_64</arch>
- </environment>
- <environment>
- <os>win32</os>
- <ws>win32</ws>
- <arch>x86_64</arch>
- </environment>
- <environment>
- <os>macosx</os>
- <ws>cocoa</ws>
- <arch>x86_64</arch>
- </environment>
- </environments>
- <dependency-resolution>
- <extraRequirements>
- <requirement>
- <type>eclipse-feature</type>
- <id>org.eclipse.papyrus.sdk.feature</id>
- <versionRange>0.0.0</versionRange>
- </requirement>
- <requirement>
- <type>eclipse-feature</type>
- <id>org.eclipse.emf.sdk</id>
- <versionRange>2.18.0</versionRange>
- </requirement>
- </extraRequirements>
- </dependency-resolution>
- </configuration>
- </plugin>
- </plugins>
- </build>
- <properties>
- <acceleo.maven.version>3.6.4</acceleo.maven.version>
- <acceleo.maven.id>org.eclipse.acceleo.maven</acceleo.maven.id>
- <profile.id>2019-03</profile.id>
- </properties>
- </profile>
- <profile>
- <id>2019-06</id>
- <!-- This profile is only activated when building in Eclipse with m2e -->
- <activation>
- <property>
- <name>target</name>
- <value>2019-06</value>
- </property>
- <activeByDefault>false</activeByDefault>
- </activation>
- <repositories>
- <repository>
- <id>2019-06</id>
- <url>${R2019-06-repo.url}</url>
- <layout>p2</layout>
- </repository>
- <repository>
- <id>xmlgraphics</id>
- <url>http://download.eclipse.org/tools/orbit/downloads/drops/R20150519210750/repository/</url>
- <layout>p2</layout>
- </repository>
- <repository>
- <id>sirius</id>
- <url>http://download.eclipse.org/sirius/updates/releases/6.2.3/2019-06</url>
- <layout>p2</layout>
- </repository>
- </repositories>
- <build>
- <plugins>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>target-platform-configuration</artifactId>
- <version>${tycho.version}</version>
- <configuration>
- <environments>
- <environment>
- <os>linux</os>
- <ws>gtk</ws>
- <arch>x86_64</arch>
- </environment>
- <environment>
- <os>win32</os>
- <ws>win32</ws>
- <arch>x86_64</arch>
- </environment>
- <environment>
- <os>macosx</os>
- <ws>cocoa</ws>
- <arch>x86_64</arch>
- </environment>
- </environments>
- </configuration>
- </plugin>
- </plugins>
- </build>
- <properties>
- <acceleo.maven.version>3.6.4</acceleo.maven.version>
- <acceleo.maven.id>org.eclipse.acceleo.maven</acceleo.maven.id>
- <profile.id>2019-06</profile.id>
- </properties>
- </profile>
- <profile>
- <id>2019-09</id>
- <!-- This profile is only activated when building in Eclipse with m2e -->
- <activation>
- <property>
- <name>target</name>
- <value>2019-09</value>
- </property>
- <activeByDefault>true</activeByDefault>
- </activation>
- <repositories>
- <repository>
- <id>2019-06</id>
- <url>${R2019-09-repo.url}</url>
- <layout>p2</layout>
- </repository>
- <repository>
- <id>xmlgraphics</id>
- <url>http://download.eclipse.org/tools/orbit/downloads/drops/R20150519210750/repository/</url>
- <layout>p2</layout>
- </repository>
- <repository>
- <id>sirius</id>
- <url>http://download.eclipse.org/sirius/updates/releases/6.2.3/2019-06</url>
- <layout>p2</layout>
- </repository>
- </repositories>
- <build>
- <plugins>
- <plugin>
- <groupId>org.eclipse.tycho</groupId>
- <artifactId>target-platform-configuration</artifactId>
- <version>${tycho.version}</version>
- <configuration>
- <environments>
- <environment>
- <os>linux</os>
- <ws>gtk</ws>
- <arch>x86_64</arch>
- </environment>
- <environment>
- <os>win32</os>
- <ws>win32</ws>
- <arch>x86_64</arch>
- </environment>
- <environment>
- <os>macosx</os>
- <ws>cocoa</ws>
- <arch>x86_64</arch>
- </environment>
- </environments>
- </configuration>
- </plugin>
- </plugins>
- </build>
- <properties>
- <acceleo.maven.version>3.6.4</acceleo.maven.version>
- <acceleo.maven.id>org.eclipse.acceleo.maven</acceleo.maven.id>
- <profile.id>2019-09</profile.id>
- </properties>
- </profile>
</profiles>
<build>
<plugins>
diff --git a/releng/org.eclipse.gendoc.target/.project b/releng/org.eclipse.gendoc.target/.project
deleted file mode 100644
index 4ccf54f..0000000
--- a/releng/org.eclipse.gendoc.target/.project
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.gendoc.target</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- </buildSpec>
- <natures>
- </natures>
-</projectDescription>
diff --git a/releng/org.eclipse.gendoc.target/2018-09/2018-09-papyrus.target b/releng/org.eclipse.gendoc.target/2018-09/2018-09-papyrus.target
deleted file mode 100644
index 0b1494b..0000000
--- a/releng/org.eclipse.gendoc.target/2018-09/2018-09-papyrus.target
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><?pde version="3.8"?><target name="2018-09 - Papyrus" sequenceNumber="31">
-<locations>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.acceleo.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.equinox.core.feature.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.gmf.runtime.notation.sdk.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.platform.sdk" version="0.0.0"/>
-<repository location="http://download.eclipse.org/releases/2018-09/"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.apache.commons.io" version="0.0.0"/>
-<unit id="org.apache.log4j" version="0.0.0"/>
-<unit id="org.apache.xmlgraphics" version="0.0.0"/>
-<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20160520211859/repository/"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.platform.sdk" version="0.0.0"/>
-<repository location="http://download.eclipse.org/eclipse/updates/4.9"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.papyrus.sdk.feature.source.feature.group" version="0.0.0"/>
-<repository location="http://download.eclipse.org/modeling/mdt/papyrus/updates/releases/2018-09"/>
-</location>
-</locations>
-</target>
\ No newline at end of file
diff --git a/releng/org.eclipse.gendoc.target/2018-09/2018-09-sirius.target b/releng/org.eclipse.gendoc.target/2018-09/2018-09-sirius.target
deleted file mode 100644
index 9cf03e8..0000000
--- a/releng/org.eclipse.gendoc.target/2018-09/2018-09-sirius.target
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><?pde version="3.8"?><target name="2018-09 - Sirius" sequenceNumber="18">
-<locations>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.apache.commons.io" version="0.0.0"/>
-<unit id="org.apache.log4j" version="0.0.0"/>
-<unit id="org.apache.xmlgraphics" version="0.0.0"/>
-<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20160520211859/repository/"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.acceleo.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.equinox.core.feature.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.gmf.runtime.notation.sdk.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.platform.sdk" version="0.0.0"/>
-<unit id="org.eclipse.sirius.samples.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.sirius.specifier.feature.group" version="0.0.0"/>
-<repository location="http://download.eclipse.org/releases/2018-09/"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.platform.sdk" version="0.0.0"/>
-<repository location="http://download.eclipse.org/eclipse/updates/4.9"/>
-</location>
-</locations>
-</target>
\ No newline at end of file
diff --git a/releng/org.eclipse.gendoc.target/2018-09/2018-09.target b/releng/org.eclipse.gendoc.target/2018-09/2018-09.target
deleted file mode 100644
index 19ccec9..0000000
--- a/releng/org.eclipse.gendoc.target/2018-09/2018-09.target
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><?pde version="3.8"?><target name="2018-09" sequenceNumber="13">
-<locations>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.acceleo.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.equinox.core.feature.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.gmf.runtime.notation.sdk.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.platform.sdk" version="0.0.0"/>
-<repository location="http://download.eclipse.org/releases/2018-09/"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.apache.commons.io" version="0.0.0"/>
-<unit id="org.apache.log4j" version="0.0.0"/>
-<unit id="org.apache.xmlgraphics" version="0.0.0"/>
-<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20160520211859/repository/"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.platform.sdk" version="0.0.0"/>
-<repository location="http://download.eclipse.org/eclipse/updates/4.9"/>
-</location>
-</locations>
-</target>
\ No newline at end of file
diff --git a/releng/org.eclipse.gendoc.target/2018-12/2018-12-papyrus.target b/releng/org.eclipse.gendoc.target/2018-12/2018-12-papyrus.target
deleted file mode 100644
index ce098cb..0000000
--- a/releng/org.eclipse.gendoc.target/2018-12/2018-12-papyrus.target
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><?pde version="3.8"?><target name="2018-12 - Papyrus" sequenceNumber="31">
-<locations>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.acceleo.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.equinox.core.feature.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.gmf.runtime.notation.sdk.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.platform.sdk" version="0.0.0"/>
-<repository location="http://download.eclipse.org/releases/2018-12/"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.apache.commons.io" version="0.0.0"/>
-<unit id="org.apache.log4j" version="0.0.0"/>
-<unit id="org.apache.xmlgraphics" version="0.0.0"/>
-<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20160520211859/repository/"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.platform.sdk" version="0.0.0"/>
-<repository location="http://download.eclipse.org/eclipse/updates/4.10"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.papyrus.sdk.feature.source.feature.group" version="0.0.0"/>
-<repository location="http://download.eclipse.org/modeling/mdt/papyrus/updates/releases/2018-12"/>
-</location>
-</locations>
-</target>
\ No newline at end of file
diff --git a/releng/org.eclipse.gendoc.target/2018-12/2018-12-sirius.target b/releng/org.eclipse.gendoc.target/2018-12/2018-12-sirius.target
deleted file mode 100644
index 576a9f9..0000000
--- a/releng/org.eclipse.gendoc.target/2018-12/2018-12-sirius.target
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><?pde version="3.8"?><target name="2018-12 - Sirius" sequenceNumber="18">
-<locations>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.apache.commons.io" version="0.0.0"/>
-<unit id="org.apache.log4j" version="0.0.0"/>
-<unit id="org.apache.xmlgraphics" version="0.0.0"/>
-<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20160520211859/repository/"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.acceleo.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.equinox.core.feature.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.gmf.runtime.notation.sdk.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.platform.sdk" version="0.0.0"/>
-<unit id="org.eclipse.sirius.samples.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.sirius.specifier.feature.group" version="0.0.0"/>
-<repository location="http://download.eclipse.org/releases/2018-12/"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.platform.sdk" version="0.0.0"/>
-<repository location="http://download.eclipse.org/eclipse/updates/4.10"/>
-</location>
-</locations>
-</target>
\ No newline at end of file
diff --git a/releng/org.eclipse.gendoc.target/2018-12/2018-12.target b/releng/org.eclipse.gendoc.target/2018-12/2018-12.target
deleted file mode 100644
index f375260..0000000
--- a/releng/org.eclipse.gendoc.target/2018-12/2018-12.target
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><?pde version="3.8"?><target name="2018-12" sequenceNumber="13">
-<locations>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.acceleo.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.equinox.core.feature.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.gmf.runtime.notation.sdk.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.platform.sdk" version="0.0.0"/>
-<repository location="http://download.eclipse.org/releases/2018-12/"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.apache.commons.io" version="0.0.0"/>
-<unit id="org.apache.log4j" version="0.0.0"/>
-<unit id="org.apache.xmlgraphics" version="0.0.0"/>
-<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20160520211859/repository/"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.platform.sdk" version="0.0.0"/>
-<repository location="http://download.eclipse.org/eclipse/updates/4.10"/>
-</location>
-</locations>
-</target>
\ No newline at end of file
diff --git a/releng/org.eclipse.gendoc.target/2019-03/2019-03-papyrus.target b/releng/org.eclipse.gendoc.target/2019-03/2019-03-papyrus.target
deleted file mode 100644
index 8c76f34..0000000
--- a/releng/org.eclipse.gendoc.target/2019-03/2019-03-papyrus.target
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><?pde version="3.8"?><target name="2019-03 - Papyrus" sequenceNumber="31">
-<locations>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.acceleo.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.equinox.core.feature.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.gmf.runtime.notation.sdk.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.platform.sdk" version="0.0.0"/>
-<repository location="http://download.eclipse.org/releases/2019-03/"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.apache.commons.io" version="0.0.0"/>
-<unit id="org.apache.log4j" version="0.0.0"/>
-<unit id="org.apache.xmlgraphics" version="0.0.0"/>
-<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20160520211859/repository/"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.platform.sdk" version="0.0.0"/>
-<repository location="http://download.eclipse.org/eclipse/updates/4.11"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.papyrus.sdk.feature.source.feature.group" version="0.0.0"/>
-<repository location="http://download.eclipse.org/modeling/mdt/papyrus/updates/releases/2019-03"/>
-</location>
-</locations>
-</target>
\ No newline at end of file
diff --git a/releng/org.eclipse.gendoc.target/2019-03/2019-03-sirius.target b/releng/org.eclipse.gendoc.target/2019-03/2019-03-sirius.target
deleted file mode 100644
index 4f93730..0000000
--- a/releng/org.eclipse.gendoc.target/2019-03/2019-03-sirius.target
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><?pde version="3.8"?><target name="2019-03 - Sirius" sequenceNumber="18">
-<locations>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.apache.commons.io" version="0.0.0"/>
-<unit id="org.apache.log4j" version="0.0.0"/>
-<unit id="org.apache.xmlgraphics" version="0.0.0"/>
-<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20160520211859/repository/"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.acceleo.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.equinox.core.feature.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.gmf.runtime.notation.sdk.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.platform.sdk" version="0.0.0"/>
-<unit id="org.eclipse.sirius.samples.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.sirius.specifier.feature.group" version="0.0.0"/>
-<repository location="http://download.eclipse.org/releases/2019-03/"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.platform.sdk" version="0.0.0"/>
-<repository location="http://download.eclipse.org/eclipse/updates/4.11"/>
-</location>
-</locations>
-</target>
\ No newline at end of file
diff --git a/releng/org.eclipse.gendoc.target/2019-03/2019-03.target b/releng/org.eclipse.gendoc.target/2019-03/2019-03.target
deleted file mode 100644
index 4f995ef..0000000
--- a/releng/org.eclipse.gendoc.target/2019-03/2019-03.target
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><?pde version="3.8"?><target name="2019-03" sequenceNumber="13">
-<locations>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.acceleo.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.equinox.core.feature.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.gmf.runtime.notation.sdk.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.platform.sdk" version="0.0.0"/>
-<repository location="http://download.eclipse.org/releases/2019-03/"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.apache.commons.io" version="0.0.0"/>
-<unit id="org.apache.log4j" version="0.0.0"/>
-<unit id="org.apache.xmlgraphics" version="0.0.0"/>
-<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20160520211859/repository/"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.platform.sdk" version="0.0.0"/>
-<repository location="http://download.eclipse.org/eclipse/updates/4.11"/>
-</location>
-</locations>
-</target>
\ No newline at end of file
diff --git a/releng/org.eclipse.gendoc.target/2019-06/2019-06-papyrus.target b/releng/org.eclipse.gendoc.target/2019-06/2019-06-papyrus.target
deleted file mode 100644
index c5e21cd..0000000
--- a/releng/org.eclipse.gendoc.target/2019-06/2019-06-papyrus.target
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><?pde version="3.8"?><target name="2019-06 - Papyrus" sequenceNumber="31">
-<locations>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.acceleo.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.equinox.core.feature.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.gmf.runtime.notation.sdk.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.platform.sdk" version="0.0.0"/>
-<repository location="http://download.eclipse.org/releases/2019-06/"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.apache.commons.io" version="0.0.0"/>
-<unit id="org.apache.log4j" version="0.0.0"/>
-<unit id="org.apache.xmlgraphics" version="0.0.0"/>
-<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20160520211859/repository/"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.platform.sdk" version="0.0.0"/>
-<repository location="http://download.eclipse.org/eclipse/updates/4.12"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.papyrus.sdk.feature.source.feature.group" version="0.0.0"/>
-<repository location="http://download.eclipse.org/modeling/mdt/papyrus/updates/releases/2019-06"/>
-</location>
-</locations>
-</target>
\ No newline at end of file
diff --git a/releng/org.eclipse.gendoc.target/2019-06/2019-06-sirius.target b/releng/org.eclipse.gendoc.target/2019-06/2019-06-sirius.target
deleted file mode 100644
index edbf903..0000000
--- a/releng/org.eclipse.gendoc.target/2019-06/2019-06-sirius.target
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><?pde version="3.8"?><target name="2019-06 - Sirius" sequenceNumber="18">
-<locations>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.apache.commons.io" version="0.0.0"/>
-<unit id="org.apache.log4j" version="0.0.0"/>
-<unit id="org.apache.xmlgraphics" version="0.0.0"/>
-<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20160520211859/repository/"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.acceleo.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.equinox.core.feature.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.gmf.runtime.notation.sdk.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.platform.sdk" version="0.0.0"/>
-<unit id="org.eclipse.sirius.samples.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.sirius.specifier.feature.group" version="0.0.0"/>
-<repository location="http://download.eclipse.org/releases/2019-06/"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.platform.sdk" version="0.0.0"/>
-<repository location="http://download.eclipse.org/eclipse/updates/4.12"/>
-</location>
-</locations>
-</target>
\ No newline at end of file
diff --git a/releng/org.eclipse.gendoc.target/2019-06/2019-06.target b/releng/org.eclipse.gendoc.target/2019-06/2019-06.target
deleted file mode 100644
index f6f8e8d..0000000
--- a/releng/org.eclipse.gendoc.target/2019-06/2019-06.target
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><?pde version="3.8"?><target name="2019-06" sequenceNumber="13">
-<locations>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.acceleo.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.equinox.core.feature.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.gmf.runtime.notation.sdk.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.platform.sdk" version="0.0.0"/>
-<repository location="http://download.eclipse.org/releases/2019-06/"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.apache.commons.io" version="0.0.0"/>
-<unit id="org.apache.log4j" version="0.0.0"/>
-<unit id="org.apache.xmlgraphics" version="0.0.0"/>
-<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20160520211859/repository/"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.platform.sdk" version="0.0.0"/>
-<repository location="http://download.eclipse.org/eclipse/updates/4.12"/>
-</location>
-</locations>
-</target>
\ No newline at end of file
diff --git a/releng/org.eclipse.gendoc.target/2019-09/2019-09-papyrus.target b/releng/org.eclipse.gendoc.target/2019-09/2019-09-papyrus.target
deleted file mode 100644
index af97c1d..0000000
--- a/releng/org.eclipse.gendoc.target/2019-09/2019-09-papyrus.target
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><?pde version="3.8"?><target name="2019-06 - Papyrus" sequenceNumber="31">
-<locations>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.acceleo.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.equinox.core.feature.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.gmf.runtime.notation.sdk.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.platform.sdk" version="0.0.0"/>
-<repository location="http://download.eclipse.org/releases/2019-09/"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.apache.commons.io" version="0.0.0"/>
-<unit id="org.apache.log4j" version="0.0.0"/>
-<unit id="org.apache.xmlgraphics" version="0.0.0"/>
-<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20160520211859/repository/"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.platform.sdk" version="0.0.0"/>
-<repository location="http://download.eclipse.org/eclipse/updates/4.13"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.papyrus.sdk.feature.source.feature.group" version="0.0.0"/>
-<repository location="http://download.eclipse.org/modeling/mdt/papyrus/updates/releases/2019-09"/>
-</location>
-</locations>
-</target>
\ No newline at end of file
diff --git a/releng/org.eclipse.gendoc.target/2019-09/2019-09-sirius.target b/releng/org.eclipse.gendoc.target/2019-09/2019-09-sirius.target
deleted file mode 100644
index 45253a8..0000000
--- a/releng/org.eclipse.gendoc.target/2019-09/2019-09-sirius.target
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><?pde version="3.8"?><target name="2019-06 - Sirius" sequenceNumber="18">
-<locations>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.apache.commons.io" version="0.0.0"/>
-<unit id="org.apache.log4j" version="0.0.0"/>
-<unit id="org.apache.xmlgraphics" version="0.0.0"/>
-<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20160520211859/repository/"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.acceleo.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.equinox.core.feature.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.gmf.runtime.notation.sdk.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.platform.sdk" version="0.0.0"/>
-<unit id="org.eclipse.sirius.samples.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.sirius.specifier.feature.group" version="0.0.0"/>
-<repository location="http://download.eclipse.org/releases/2019-09/"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.platform.sdk" version="0.0.0"/>
-<repository location="http://download.eclipse.org/eclipse/updates/4.13"/>
-</location>
-</locations>
-</target>
\ No newline at end of file
diff --git a/releng/org.eclipse.gendoc.target/2019-09/2019-09.target b/releng/org.eclipse.gendoc.target/2019-09/2019-09.target
deleted file mode 100644
index 578b328..0000000
--- a/releng/org.eclipse.gendoc.target/2019-09/2019-09.target
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?><?pde version="3.8"?><target name="2019-06" sequenceNumber="13">
-<locations>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.acceleo.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.equinox.core.feature.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.gmf.runtime.notation.sdk.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.platform.sdk" version="0.0.0"/>
-<repository location="http://download.eclipse.org/releases/2019-09/"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.apache.commons.io" version="0.0.0"/>
-<unit id="org.apache.log4j" version="0.0.0"/>
-<unit id="org.apache.xmlgraphics" version="0.0.0"/>
-<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20160520211859/repository/"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.platform.sdk" version="0.0.0"/>
-<repository location="http://download.eclipse.org/eclipse/updates/4.13"/>
-</location>
-</locations>
-</target>
\ No newline at end of file
diff --git a/releng/org.eclipse.gendoc.target/about.html b/releng/org.eclipse.gendoc.target/about.html
deleted file mode 100644
index c258ef5..0000000
--- a/releng/org.eclipse.gendoc.target/about.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!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 5, 2006</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/releng/org.eclipse.gendoc.target/mars/mars-papyrus.target b/releng/org.eclipse.gendoc.target/mars/mars-papyrus.target
deleted file mode 100644
index 5713b9d..0000000
--- a/releng/org.eclipse.gendoc.target/mars/mars-papyrus.target
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde version="3.8"?><target name="Mars - Papyrus" sequenceNumber="45">
-<locations>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.acceleo.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.gmf.runtime.notation.sdk.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="0.0.0"/>
-<repository location="http://download.eclipse.org/releases/mars/"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.apache.xmlgraphics" version="0.0.0"/>
-<unit id="org.apache.log4j" version="0.0.0"/>
-<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20160221192158/repository/"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.sdk.ide" version="0.0.0"/>
-<unit id="org.eclipse.jdt.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.platform.sdk" version="0.0.0"/>
-<repository location="http://download.eclipse.org/eclipse/updates/4.5"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.papyrus.sdk.feature.source.feature.group" version="0.0.0"/>
-<repository location="http://download.eclipse.org/modeling/mdt/papyrus/updates/releases/mars"/>
-</location>
-</locations>
-</target>
diff --git a/releng/org.eclipse.gendoc.target/mars/mars-sirius.target b/releng/org.eclipse.gendoc.target/mars/mars-sirius.target
deleted file mode 100644
index cc7ca4d..0000000
--- a/releng/org.eclipse.gendoc.target/mars/mars-sirius.target
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde version="3.8"?><target name="Mars - Sirius" sequenceNumber="45">
-<locations>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.apache.xmlgraphics" version="0.0.0"/>
-<unit id="org.apache.log4j" version="0.0.0"/>
-<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20160221192158/repository/"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.sdk.ide" version="0.0.0"/>
-<unit id="org.eclipse.jdt.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.platform.sdk" version="0.0.0"/>
-<repository location="http://download.eclipse.org/eclipse/updates/4.5"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.gmf.runtime.notation.sdk.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.sirius.samples.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.acceleo.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.sirius.specifier.feature.group" version="0.0.0"/>
-<repository location="http://download.eclipse.org/releases/mars/"/>
-</location>
-</locations>
-</target>
diff --git a/releng/org.eclipse.gendoc.target/mars/mars.target b/releng/org.eclipse.gendoc.target/mars/mars.target
deleted file mode 100644
index e076e78..0000000
--- a/releng/org.eclipse.gendoc.target/mars/mars.target
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde version="3.8"?><target name="Mars" sequenceNumber="45">
-<locations>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.apache.xmlgraphics" version="0.0.0"/>
-<unit id="org.apache.log4j" version="0.0.0"/>
-<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20160221192158/repository/"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.sdk.ide" version="0.0.0"/>
-<unit id="org.eclipse.jdt.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.platform.sdk" version="0.0.0"/>
-<repository location="http://download.eclipse.org/eclipse/updates/4.5"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.gmf.runtime.notation.sdk.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.acceleo.feature.group" version="0.0.0"/>
-<repository location="http://download.eclipse.org/releases/mars/"/>
-</location>
-</locations>
-</target>
diff --git a/releng/org.eclipse.gendoc.target/neon/neon-papyrus.target b/releng/org.eclipse.gendoc.target/neon/neon-papyrus.target
deleted file mode 100644
index 506d870..0000000
--- a/releng/org.eclipse.gendoc.target/neon/neon-papyrus.target
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde version="3.8"?><target name="Neon - Papyrus" sequenceNumber="28">
-<locations>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.apache.xmlgraphics" version="0.0.0"/>
-<unit id="org.apache.log4j" version="0.0.0"/>
-<unit id="org.apache.commons.io" version="0.0.0"/>
-<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20160520211859/repository/"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.papyrus.sdk.feature.source.feature.group" version="0.0.0"/>
-<repository location="http://download.eclipse.org/modeling/mdt/papyrus/updates/releases/neon"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="1.10.0.201606071959"/>
-<unit id="org.eclipse.gmf.runtime.notation.sdk.feature.group" version="1.10.0.201606071631"/>
-<unit id="org.eclipse.emf.cdo.sdk.feature.group" version="4.5.0.v20160607-1511"/>
-<unit id="org.eclipse.emf.sdk.feature.group" version="2.12.0.v20160526-0356"/>
-<unit id="org.eclipse.acceleo.feature.group" version="3.6.4.201605040614"/>
-<repository location="http://download.eclipse.org/releases/neon/"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.platform.sdk" version="0.0.0"/>
-<repository location="http://download.eclipse.org/eclipse/updates/4.6"/>
-</location>
-</locations>
-</target>
diff --git a/releng/org.eclipse.gendoc.target/neon/neon-sirius.target b/releng/org.eclipse.gendoc.target/neon/neon-sirius.target
deleted file mode 100644
index 109b8fa..0000000
--- a/releng/org.eclipse.gendoc.target/neon/neon-sirius.target
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde version="3.8"?><target name="Neon - Sirius" sequenceNumber="18">
-<locations>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.apache.xmlgraphics" version="0.0.0"/>
-<unit id="org.apache.log4j" version="0.0.0"/>
-<unit id="org.apache.commons.io" version="0.0.0"/>
-<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20160520211859/repository/"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.sirius.specifier.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.acceleo.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.sirius.samples.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.gmf.runtime.notation.sdk.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.platform.sdk" version="0.0.0"/>
-<unit id="org.eclipse.equinox.core.feature.feature.group" version="0.0.0"/>
-<repository location="http://download.eclipse.org/releases/neon/"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.platform.sdk" version="0.0.0"/>
-<repository location="http://download.eclipse.org/eclipse/updates/4.6"/>
-</location>
-</locations>
-</target>
diff --git a/releng/org.eclipse.gendoc.target/neon/neon.target b/releng/org.eclipse.gendoc.target/neon/neon.target
deleted file mode 100644
index f7fff92..0000000
--- a/releng/org.eclipse.gendoc.target/neon/neon.target
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde version="3.8"?><target name="Neon" sequenceNumber="13">
-<locations>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.gmf.runtime.notation.sdk.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.acceleo.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.platform.sdk" version="0.0.0"/>
-<unit id="org.eclipse.equinox.core.feature.feature.group" version="0.0.0"/>
-<repository location="http://download.eclipse.org/releases/neon/"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.apache.xmlgraphics" version="0.0.0"/>
-<unit id="org.apache.log4j" version="0.0.0"/>
-<unit id="org.apache.commons.io" version="0.0.0"/>
-<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20160520211859/repository/"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.platform.sdk" version="0.0.0"/>
-<repository location="http://download.eclipse.org/eclipse/updates/4.6"/>
-</location>
-</locations>
-</target>
diff --git a/releng/org.eclipse.gendoc.target/oxygen/oxygen-papyrus.target b/releng/org.eclipse.gendoc.target/oxygen/oxygen-papyrus.target
deleted file mode 100644
index 0d1c370..0000000
--- a/releng/org.eclipse.gendoc.target/oxygen/oxygen-papyrus.target
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde version="3.8"?><target name="Oxygen - Papyrus" sequenceNumber="31">
-<locations>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.acceleo.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.equinox.core.feature.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.gmf.runtime.notation.sdk.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.platform.sdk" version="0.0.0"/>
-<repository location="http://download.eclipse.org/releases/oxygen/"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.apache.commons.io" version="0.0.0"/>
-<unit id="org.apache.log4j" version="0.0.0"/>
-<unit id="org.apache.xmlgraphics" version="0.0.0"/>
-<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20160520211859/repository/"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.platform.sdk" version="0.0.0"/>
-<repository location="http://download.eclipse.org/eclipse/updates/4.7"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.papyrus.sdk.feature.source.feature.group" version="0.0.0"/>
-<repository location="http://download.eclipse.org/modeling/mdt/papyrus/updates/releases/oxygen"/>
-</location>
-</locations>
-</target>
diff --git a/releng/org.eclipse.gendoc.target/oxygen/oxygen-sirius.target b/releng/org.eclipse.gendoc.target/oxygen/oxygen-sirius.target
deleted file mode 100644
index d9a6435..0000000
--- a/releng/org.eclipse.gendoc.target/oxygen/oxygen-sirius.target
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde version="3.8"?><target name="Oxygen - Sirius" sequenceNumber="18">
-<locations>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.apache.commons.io" version="0.0.0"/>
-<unit id="org.apache.log4j" version="0.0.0"/>
-<unit id="org.apache.xmlgraphics" version="0.0.0"/>
-<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20160520211859/repository/"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.acceleo.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.equinox.core.feature.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.gmf.runtime.notation.sdk.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.platform.sdk" version="0.0.0"/>
-<unit id="org.eclipse.sirius.samples.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.sirius.specifier.feature.group" version="0.0.0"/>
-<repository location="http://download.eclipse.org/releases/oxygen/"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.platform.sdk" version="0.0.0"/>
-<repository location="http://download.eclipse.org/eclipse/updates/4.7"/>
-</location>
-</locations>
-</target>
diff --git a/releng/org.eclipse.gendoc.target/oxygen/oxygen.target b/releng/org.eclipse.gendoc.target/oxygen/oxygen.target
deleted file mode 100644
index 7fd526a..0000000
--- a/releng/org.eclipse.gendoc.target/oxygen/oxygen.target
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde version="3.8"?><target name="Oxygen" sequenceNumber="13">
-<locations>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.acceleo.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.equinox.core.feature.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.gmf.runtime.notation.sdk.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.platform.sdk" version="0.0.0"/>
-<repository location="http://download.eclipse.org/releases/oxygen/"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.apache.commons.io" version="0.0.0"/>
-<unit id="org.apache.log4j" version="0.0.0"/>
-<unit id="org.apache.xmlgraphics" version="0.0.0"/>
-<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20160520211859/repository/"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.platform.sdk" version="0.0.0"/>
-<repository location="http://download.eclipse.org/eclipse/updates/4.7"/>
-</location>
-</locations>
-</target>
diff --git a/releng/org.eclipse.gendoc.target/photon/photon-papyrus.target b/releng/org.eclipse.gendoc.target/photon/photon-papyrus.target
deleted file mode 100644
index 98f9ccd..0000000
--- a/releng/org.eclipse.gendoc.target/photon/photon-papyrus.target
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde version="3.8"?><target name="Photon - Papyrus" sequenceNumber="31">
-<locations>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.acceleo.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.equinox.core.feature.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.gmf.runtime.notation.sdk.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.platform.sdk" version="0.0.0"/>
-<repository location="http://download.eclipse.org/releases/photon/"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.apache.commons.io" version="0.0.0"/>
-<unit id="org.apache.log4j" version="0.0.0"/>
-<unit id="org.apache.xmlgraphics" version="0.0.0"/>
-<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20160520211859/repository/"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.platform.sdk" version="0.0.0"/>
-<repository location="http://download.eclipse.org/eclipse/updates/4.8"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.papyrus.sdk.feature.source.feature.group" version="0.0.0"/>
-<repository location="http://download.eclipse.org/modeling/mdt/papyrus/updates/releases/photon"/>
-</location>
-</locations>
-</target>
diff --git a/releng/org.eclipse.gendoc.target/photon/photon-sirius.target b/releng/org.eclipse.gendoc.target/photon/photon-sirius.target
deleted file mode 100644
index a595ff9..0000000
--- a/releng/org.eclipse.gendoc.target/photon/photon-sirius.target
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde version="3.8"?><target name="Photon - Sirius" sequenceNumber="18">
-<locations>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.apache.commons.io" version="0.0.0"/>
-<unit id="org.apache.log4j" version="0.0.0"/>
-<unit id="org.apache.xmlgraphics" version="0.0.0"/>
-<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20160520211859/repository/"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.acceleo.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.equinox.core.feature.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.gmf.runtime.notation.sdk.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.platform.sdk" version="0.0.0"/>
-<unit id="org.eclipse.sirius.samples.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.sirius.specifier.feature.group" version="0.0.0"/>
-<repository location="http://download.eclipse.org/releases/photon/"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.platform.sdk" version="0.0.0"/>
-<repository location="http://download.eclipse.org/eclipse/updates/4.8"/>
-</location>
-</locations>
-</target>
diff --git a/releng/org.eclipse.gendoc.target/photon/photon.target b/releng/org.eclipse.gendoc.target/photon/photon.target
deleted file mode 100644
index 5e75cc9..0000000
--- a/releng/org.eclipse.gendoc.target/photon/photon.target
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde version="3.8"?><target name="Photon" sequenceNumber="13">
-<locations>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.acceleo.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.emf.sdk.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.equinox.core.feature.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.gmf.runtime.notation.sdk.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.gmf.runtime.sdk.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.platform.sdk" version="0.0.0"/>
-<repository location="http://download.eclipse.org/releases/photon/"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.apache.commons.io" version="0.0.0"/>
-<unit id="org.apache.log4j" version="0.0.0"/>
-<unit id="org.apache.xmlgraphics" version="0.0.0"/>
-<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20160520211859/repository/"/>
-</location>
-<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.platform.sdk" version="0.0.0"/>
-<repository location="http://download.eclipse.org/eclipse/updates/4.8"/>
-</location>
-</locations>
-</target>
diff --git a/tests/org.eclipse.gendoc.services.openoffice.test/src/org/eclipse/gendoc/services/openoffice/test/OpenOfficeVerifyHelper.java b/tests/org.eclipse.gendoc.services.openoffice.test/src/org/eclipse/gendoc/services/openoffice/test/OpenOfficeVerifyHelper.java
index 69c9dba..f0c40dc 100644
--- a/tests/org.eclipse.gendoc.services.openoffice.test/src/org/eclipse/gendoc/services/openoffice/test/OpenOfficeVerifyHelper.java
+++ b/tests/org.eclipse.gendoc.services.openoffice.test/src/org/eclipse/gendoc/services/openoffice/test/OpenOfficeVerifyHelper.java
@@ -224,7 +224,7 @@
Assert.assertEquals(message,expected,value);
break;
case 1:
- Assert.assertNotEquals(message,expected,value);
+ Assert.assertNotSame(message,expected,value);
break;
case 2:
Assert.assertNull(message,value);
