AlfrescoArchive · jjakub · Dec 29, 2016 · Dec 29, 2016
diff --git a/...ner.eclipse/src/main/java/org/activiti/designer/eclipse/editor/ActivitiDiagramEditor.java b/...ner.eclipse/src/main/java/org/activiti/designer/eclipse/editor/ActivitiDiagramEditor.java
@@ -181,7 +181,8 @@ public void doSave(IProgressMonitor monitor) {
 
     try {
       final IFile dataFile = adei.getDataFile();
-      final String diagramFileString = dataFile.getLocationURI().getPath();
+//    final String diagramFileString = dataFile.getLocationURI().getPath(); // Does not work when the project is in Jazz SCM
+      final String diagramFileString = dataFile.getLocation().toOSString();
       BpmnMemoryModel model = ModelHandler.getModel(EcoreUtil.getURI(getDiagramTypeProvider().getDiagram()));
 
       // Save the bpmn diagram file
@@ -305,8 +306,8 @@ protected void fillContainerWithLanguage(FlowElementsContainer container, String
 
   private void marshallImage(BpmnMemoryModel model, String modelFileName) {
     try {
-      final GraphicalViewer graphicalViewer = (GraphicalViewer) ((DiagramEditor) model.getFeatureProvider().getDiagramTypeProvider().getDiagramEditor())
-              .getAdapter(GraphicalViewer.class);
+      final GraphicalViewer graphicalViewer = (GraphicalViewer) model.getFeatureProvider().getDiagramTypeProvider()
+			.getCurrentToolBehaviorProvider().getAdapter( GraphicalViewer.class );
 
       if (graphicalViewer == null || graphicalViewer.getEditPartRegistry() == null) {
         return;
@@ -414,7 +415,7 @@ protected void setInput(IEditorInput input) {
     final BpmnMemoryModel model = new BpmnMemoryModel(getDiagramTypeProvider().getFeatureProvider(), dataFile);
     ModelHandler.addModel(EcoreUtil.getURI(getDiagramTypeProvider().getDiagram()), model);
 
-    String filePath = dataFile.getLocationURI().getPath();
+    String filePath = dataFile.getLocation().toOSString();
     File bpmnFile = new File(filePath);
     try {
       if (bpmnFile.exists() == false) {

diff --git a/...ipse/src/main/java/org/activiti/designer/eclipse/editor/ActivitiEditorUpdateBehavior.java b/...ipse/src/main/java/org/activiti/designer/eclipse/editor/ActivitiEditorUpdateBehavior.java
@@ -33,7 +33,7 @@ public ActivitiEditorUpdateBehavior(final DiagramBehavior diagramBehavior) {
   @Override
   public TransactionalEditingDomain getEditingDomain() {
     if (super.getEditingDomain() == null) {
-      createEditingDomain();
+      createEditingDomain(null);
     }
 
     return super.getEditingDomain();

diff --git a/...se/src/main/java/org/activiti/designer/eclipse/navigator/diagram/FileDiagramTreeNode.java b/...se/src/main/java/org/activiti/designer/eclipse/navigator/diagram/FileDiagramTreeNode.java
@@ -113,7 +113,7 @@ private void extractPools(final List<Pool> pools) {
   private BpmnMemoryModel buildModel(final IFile modelFile) {
     final BpmnMemoryModel result = new BpmnMemoryModel(null, modelFile);
 
-    String filePath = modelFile.getLocationURI().getPath();
+    String filePath = modelFile.getLocation().toOSString();
     File bpmnFile = new File(filePath);
     try {
       if (bpmnFile.exists()) {

diff --git a/org.activiti.designer.feature/feature.xml b/org.activiti.designer.feature/feature.xml
@@ -62,13 +62,13 @@ This Agreement is governed by the laws of the State of New York and the intellec
 
    <includes
          id="org.eclipse.graphiti.feature"
-         version="0.11.4"/>
+         version="0.13.2"/>
 
    <requires>
       <import plugin="org.eclipse.ui"/>
       <import plugin="org.eclipse.core.runtime" version="3.7.0.v20110110" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.graphiti" version="0.11.3" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.graphiti.ui" version="0.11.3" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.graphiti" version="0.13.2" match="greaterOrEqual"/>
+      <import plugin="org.eclipse.graphiti.ui" version="0.13.2" match="greaterOrEqual"/>
       <import plugin="org.eclipse.core.resources" version="3.7.0" match="greaterOrEqual"/>
       <import plugin="org.eclipse.ui.views.properties.tabbed" version="3.5.100" match="greaterOrEqual"/>
       <import plugin="org.eclipse.emf" version="2.6.0" match="greaterOrEqual"/>

diff --git a/...ner.gui/src/main/java/org/activiti/designer/features/ExpandCollapseSubProcessFeature.java b/...ner.gui/src/main/java/org/activiti/designer/features/ExpandCollapseSubProcessFeature.java
@@ -127,8 +127,8 @@ private Diagram getNewDiagram(final IProject project, final IFile targetFile) {
 		boolean createContent = PreferencesUtil.getBooleanPreference(
 		    Preferences.EDITOR_ADD_DEFAULT_CONTENT_TO_DIAGRAMS, ActivitiPlugin.getDefault());
 
-		final ActivitiDiagramEditor diagramEditor
-		  = (ActivitiDiagramEditor) getFeatureProvider().getDiagramTypeProvider().getDiagramEditor();
+		ActivitiDiagramEditor diagramEditor
+			= (ActivitiDiagramEditor) getFeatureProvider().getDiagramTypeProvider().getDiagramBehavior();
 
 		if (createContent) {
 			final InputStream contentStream = Util.getContentStream(Util.Content.NEW_SUBPROCESS_CONTENT);

diff --git a/...r.gui/src/main/java/org/activiti/designer/property/AbstractPropertyCustomTaskSection.java b/...r.gui/src/main/java/org/activiti/designer/property/AbstractPropertyCustomTaskSection.java
@@ -27,8 +27,8 @@ public void runModelChange(final Runnable runnable) {
     if (pe != null) {
       Object bo = getBusinessObject(pe);
       if (bo instanceof ServiceTask || bo instanceof UserTask) {
-        DiagramEditor diagramEditor = (DiagramEditor) getDiagramEditor();
-        TransactionalEditingDomain editingDomain = diagramEditor.getEditingDomain();
+		DiagramEditor diagramEditor = (DiagramEditor) getDiagramContainer();
+		TransactionalEditingDomain editingDomain = diagramEditor.getEditingDomain();
         ActivitiUiUtil.runModelChange(runnable, editingDomain, "Model Update");
       }
     }

diff --git a/...pse/src/main/java/org/activiti/designer/kickstart/eclipse/editor/KickstartFormEditor.java b/...pse/src/main/java/org/activiti/designer/kickstart/eclipse/editor/KickstartFormEditor.java
@@ -69,7 +69,7 @@ public void doSave(IProgressMonitor monitor) {
 
     try {
       final IFile dataFile = adei.getDataFile();
-      final String diagramFileString = dataFile.getLocationURI().getPath();
+      final String diagramFileString = dataFile.getLocation().toOSString();
 
       File objectsFile = new File(diagramFileString);
       FileWriter writer = new FileWriter(objectsFile);
@@ -138,7 +138,7 @@ protected void setInput(IEditorInput input) {
         dataFile);
     ModelHandler.addModel(EcoreUtil.getURI(getDiagramTypeProvider().getDiagram()), model);
 
-    String filePath = dataFile.getLocationURI().getPath();
+    String filePath = dataFile.getLocation().toOSString();
     File formDefinitionFile = new File(filePath);
     try {
       if (formDefinitionFile.exists() == false) {

diff --git a/...in/java/org/activiti/designer/kickstart/eclipse/editor/KickstartProcessDiagramEditor.java b/...in/java/org/activiti/designer/kickstart/eclipse/editor/KickstartProcessDiagramEditor.java
@@ -113,7 +113,7 @@ public void doSave(IProgressMonitor monitor) {
 
     try {
       final IFile dataFile = adei.getDataFile();
-      final String diagramFileString = dataFile.getLocationURI().getPath();
+      final String diagramFileString = dataFile.getLocation().toOSString();
 
       KickstartProcessMemoryModel model = ModelHandler.getKickstartProcessModel(EcoreUtil
           .getURI(getDiagramTypeProvider().getDiagram()));
@@ -156,7 +156,7 @@ protected void setInput(IEditorInput input) {
         .getFeatureProvider(), dataFile);
     ModelHandler.addModel(EcoreUtil.getURI(getDiagramTypeProvider().getDiagram()), model);
 
-    String filePath = dataFile.getLocationURI().getPath();
+    String filePath = dataFile.getLocation().toOSString();
     File kickstartProcessFile = new File(filePath);
     try {
       if (kickstartProcessFile.exists() == false) {

diff --git a/.../org/activiti/designer/kickstart/eclipse/editor/KickstartProcessEditorUpdateBehavior.java b/.../org/activiti/designer/kickstart/eclipse/editor/KickstartProcessEditorUpdateBehavior.java
@@ -33,7 +33,7 @@ public KickstartProcessEditorUpdateBehavior(DiagramBehavior diagramBehavior) {
   @Override
   public TransactionalEditingDomain getEditingDomain() {
     if (super.getEditingDomain() == null) {
-      createEditingDomain();
+      createEditingDomain(null);
     }
 
     return super.getEditingDomain();

diff --git a/...tiviti/designer/kickstart/eclipse/navigator/dialog/DownloadCurrentlySelectedFilesJob.java b/...tiviti/designer/kickstart/eclipse/navigator/dialog/DownloadCurrentlySelectedFilesJob.java
@@ -115,7 +115,7 @@ protected IStatus run(IProgressMonitor monitor) {
 		            if ("kickproc".equalsIgnoreCase(unzippedFile.getFileExtension())) {
 		              processFile = unzippedFile;
 		            }
-		            String filePath = unzippedFile.getLocationURI().getPath();
+		            String filePath = unzippedFile.getLocation().toOSString();
 		            File extractFile = new File(filePath);
 		            FileOutputStream fos = new FileOutputStream(extractFile);
 		            int len;
@@ -170,7 +170,7 @@ protected IFile processWorkflowDefinition(IFile sourceFile, IFolder unzippedFold
     unzippedFolder.getFile(sourceFile.getName()).copy(sourceFile.getProject().getFullPath().append(sourceFile.getName()), true, new NullProgressMonitor());
     IFile newProcessFile = sourceFile.getProject().getFile(sourceFile.getName());
 
-	  String filePath = newProcessFile.getLocationURI().getPath();
+	  String filePath = newProcessFile.getLocation().toOSString();
     File processFile = new File(filePath);
     FileInputStream fileStream = new FileInputStream(processFile);
     AlfrescoSimpleWorkflowJsonConverter converter = new AlfrescoSimpleWorkflowJsonConverter();
@@ -212,7 +212,7 @@ public void run() {
     definition.getParameters().put(SyncConstants.VERSION, document.getVersionLabel());
 
     // Write
-    FileWriter writer = new FileWriter(new File(newProcessFile.getLocationURI().getPath()));
+    FileWriter writer = new FileWriter(new File(newProcessFile.getLocation().toOSString()));
     converter.writeWorkflowDefinition(definition, writer);
     newProcessFile.getProject().refreshLocal(IResource.DEPTH_INFINITE, null);
 

diff --git a/...ickstart.eclipse/src/main/java/org/activiti/designer/kickstart/eclipse/sync/SyncUtil.java b/...ickstart.eclipse/src/main/java/org/activiti/designer/kickstart/eclipse/sync/SyncUtil.java
@@ -192,7 +192,7 @@ private static void updateKickstartProcessJson(IFile sourceFile, Document docume
 		workflowDefinition.getParameters().put(SyncConstants.VERSION, document.getVersionLabel());
 
 		// Write
-		FileWriter writer = new FileWriter(new File(sourceFile.getLocationURI().getPath()));
+		FileWriter writer = new FileWriter(new File(sourceFile.getLocation().toOSString()));
 		simpleWorkflowJsonConverter.writeWorkflowDefinition(workflowDefinition, writer);
 		sourceFile.getProject().refreshLocal(IResource.DEPTH_INFINITE, null);
 	}
@@ -290,7 +290,7 @@ protected static IFile downloadZipFile(IProject project, Document document, fina
           if ("kickproc".equalsIgnoreCase(unzippedFile.getFileExtension())) {
             processFile = unzippedFile;
           }
-          String filePath = unzippedFile.getLocationURI().getPath();
+          String filePath = unzippedFile.getLocation().toOSString();
           File extractFile = new File(filePath);
           FileOutputStream fos = new FileOutputStream(extractFile);
           int len;
@@ -324,7 +324,7 @@ protected static IFile processWorkflowDefinition(IFile sourceFile, IFolder unzip
     unzippedFolder.getFile(sourceFile.getName()).copy(sourceFile.getProject().getFullPath().append(sourceFile.getName()), true, monitor);
     IFile newProcessFile = sourceFile.getProject().getFile(sourceFile.getName());
 
-    String filePath = newProcessFile.getLocationURI().getPath();
+    String filePath = newProcessFile.getLocation().toOSString();
     File processFile = new File(filePath);
     FileInputStream fileStream = new FileInputStream(processFile);
     AlfrescoSimpleWorkflowJsonConverter converter = new AlfrescoSimpleWorkflowJsonConverter();
@@ -366,7 +366,7 @@ public void run() {
     definition.getParameters().put(SyncConstants.VERSION, document.getVersionLabel());
 
     // Write
-    FileWriter writer = new FileWriter(new File(newProcessFile.getLocationURI().getPath()));
+    FileWriter writer = new FileWriter(new File(newProcessFile.getLocation().toOSString()));
     converter.writeWorkflowDefinition(definition, writer);
     newProcessFile.getProject().refreshLocal(IResource.DEPTH_INFINITE, null);
 
@@ -429,7 +429,7 @@ protected static IContainer makeDirs(String filePath, IProject project, IProgres
   }
 
 	protected static IFile createZipFile(final IFile sourceFile, final Shell shell) throws IOException, CoreException {
-	  String filePath = sourceFile.getLocationURI().getPath();
+	  String filePath = sourceFile.getLocation().toOSString();
     File processFile = new File(filePath);
     FileInputStream fileStream = new FileInputStream(processFile);
     AlfrescoSimpleWorkflowJsonConverter converter = new AlfrescoSimpleWorkflowJsonConverter();

diff --git a/.../org/activiti/designer/kickstart/form/property/AbstractKickstartFormComponentSection.java b/.../org/activiti/designer/kickstart/form/property/AbstractKickstartFormComponentSection.java
@@ -241,8 +241,8 @@ protected void flushControlValue(final Control control) {
   protected void executeModelUpdater() {
     // Make sure the update of the model is done in the transactional editing domain
     // to allow for "undoing" changes
-    DiagramEditor diagramEditor = (DiagramEditor) getDiagramEditor();
-    TransactionalEditingDomain editingDomain = diagramEditor.getEditingDomain();
+	DiagramEditor diagramEditor = (DiagramEditor) getDiagramContainer();
+	TransactionalEditingDomain editingDomain = diagramEditor.getEditingDomain();
 
     if(currentUpdater != null) {
       // Do the actual changes to the business-object in a command

diff --git a/...activiti/designer/kickstart/process/property/AbstractKickstartProcessPropertySection.java b/...activiti/designer/kickstart/process/property/AbstractKickstartProcessPropertySection.java
@@ -281,8 +281,8 @@ protected void flushControlValue(final Control control) {
   protected void executeModelUpdater() {
     // Make sure the update of the model is done in the transactional editing domain
     // to allow for "undoing" changes
-    DiagramEditor diagramEditor = (DiagramEditor) getDiagramEditor();
-    TransactionalEditingDomain editingDomain = diagramEditor.getEditingDomain();
+	DiagramEditor diagramEditor = (DiagramEditor) getDiagramContainer();
+	TransactionalEditingDomain editingDomain = diagramEditor.getEditingDomain();
 
     if(currentUpdater != null) {
       // Do the actual changes to the business-object in a command

diff --git a/org.activiti.designer.parent/pom.xml b/org.activiti.designer.parent/pom.xml
@@ -49,7 +49,6 @@
 		<profile>
 			<id>platform-luna</id>
 			<activation>
-				<activeByDefault>true</activeByDefault>
 				<property>
 					<name>platform-version-name</name>
 					<value>luna</value>
@@ -62,6 +61,22 @@
 				<graphiti-site>http://download.eclipse.org/graphiti/updates/0.11.4</graphiti-site>
 			</properties>
 		</profile>
+		<profile>
+			<id>platform-neon</id>
+			<activation>
+				<activeByDefault>true</activeByDefault>
+				<property>
+					<name>platform-version-name</name>
+					<value>neon</value>
+				</property>
+			</activation>
+			<properties>
+				<eclipse-site>http://download.eclipse.org/releases/neon</eclipse-site>
+				<platform-version>[4.6)</platform-version>
+				<platform-version-name>neon</platform-version-name>
+				<graphiti-site>http://download.eclipse.org/graphiti/updates/0.13.2</graphiti-site>
+			</properties>
+		</profile>
 	</profiles>
 
 	<modules>