tr(eclipse) update tp to 4.10 (#1537)

Closes BST-10

all-in-one/bonitastudio-features.product

@@ -9,11 +9,9 @@
    <launcherArgs>
       <vmArgs>-Xmx512m -Xms512m  -Dosgi.requiredJavaVersion=1.8 -Dfile.encoding=UTF8
       </vmArgs>
-      <vmArgsLin>-Djava.endorsed.dirs=endorsed
-      </vmArgsLin>
-      <vmArgsMac>-XstartOnFirstThread -Djava.endorsed.dirs=./endorsed
+      <vmArgsMac>-XstartOnFirstThread
       </vmArgsMac>
-      <vmArgsWin>-Dgreclipse.nonlocking=true -Djava.endorsed.dirs=endorsed
+      <vmArgsWin>-Dgreclipse.nonlocking=true
       </vmArgsWin>
    </launcherArgs>
 
@@ -41,7 +39,7 @@
    <license>
         <url>http://www.gnu.org/licenses/gpl-2.0.html</url>
         <text>
-   Copyright (C) 2018 BonitaSoft S.A.
+   Copyright (C) 2019 BonitaSoft S.A.
 BonitaSoft, 32 rue Gustave Eiffel - 38000 Grenoble
 
 This program is free software: you can redistribute it and/or modify

bundles/features/platform-specific-feature/feature.xml

@@ -46,7 +46,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
    </license>
 
    <requires>
-      <import feature="org.eclipse.rcp" version="3.7.1.r37x_v20110729-9DB5FmNFnFLSFCtLxnRfMqt15A4A" match="greaterOrEqual"/>
+      <import feature="org.eclipse.rcp" version="4.10.0.v20181206-0815" match="greaterOrEqual"/>
    </requires>
 
    <plugin
@@ -59,16 +59,6 @@ along with this program. If not, see &lt;http://www.gnu.org/licenses/&gt;.
          fragment="true"
          unpack="false"/>
 
-   <plugin
-         id="org.eclipse.core.filesystem.linux.x86"
-         os="linux"
-         arch="x86"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         fragment="true"
-         unpack="false"/>
-
    <plugin
          id="org.eclipse.core.filesystem.win32.x86_64"
          os="win32"
@@ -79,16 +69,6 @@ along with this program. If not, see &lt;http://www.gnu.org/licenses/&gt;.
          fragment="true"
          unpack="false"/>
 
-   <plugin
-         id="org.eclipse.core.filesystem.win32.x86"
-         os="win32"
-         arch="x86"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         fragment="true"
-         unpack="false"/>
-
    <plugin
          id="org.eclipse.core.filesystem.macosx"
          os="macosx"

bundles/features/studio-feature/feature.xml

@@ -63,7 +63,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 
    <includes
          id="org.eclipse.emf.edapt.runtime.feature"
-         version="1.2.2.201705070604"/>
+         version="1.3.1.201812130816"/>
 
    <includes
          id="org.eclipse.equinox.p2.extras.feature"
@@ -114,19 +114,39 @@ along with this program. If not, see &lt;http://www.gnu.org/licenses/&gt;.
          version="0.0.0"/>
 
    <includes
-         id="org.eclipse.emf.compare.rcp.ui"
+         id="org.eclipse.babel.nls_eclipse_pt_BR"
+         version="0.0.0"/>
+
+   <includes
+         id="org.eclipse.babel.nls_technology.egit_pt_BR"
+         version="0.0.0"/>
+
+   <includes
+         id="org.eclipse.babel.nls_technology.jgit_pt_BR"
+         version="0.0.0"/>
+
+   <includes
+         id="org.eclipse.babel.nls_technology.recommenders_pt_BR"
+         version="0.0.0"/>
+
+   <includes
+         id="org.eclipse.babel.nls_webtools_pt_BR"
          version="0.0.0"/>
 
    <requires>
-      <import feature="org.eclipse.rcp" version="4.7.0.v20170612-1255" match="greaterOrEqual"/>
+      <import feature="org.eclipse.rcp" version="4.10.0.v20181206-0815" match="greaterOrEqual"/>
       <import feature="platform-specific-feature" version="7.9.0" match="equivalent"/>
-      <import feature="org.eclipse.m2m.qvt.oml" version="3.7.0.v20170604-1316"/>
-      <import feature="org.eclipse.m2m.qvt.oml.runtime" version="3.7.0.v20170604-1316"/>
-      <import feature="org.eclipse.wst.web_ui.feature" version="3.9.0.v201706011953"/>
-      <import feature="org.eclipse.e4.rcp" version="1.6.0.v20170612-1255"/>
-      <import feature="org.eclipse.gmf" version="1.11.0.201706061437"/>
+      <import feature="org.eclipse.wst.web_ui.feature" version="3.11.0.v201811192212" match="greaterOrEqual"/>
+      <import feature="org.eclipse.gmf" version="1.12.0.201806010809" match="greaterOrEqual"/>
    </requires>
 
+   <plugin
+         id="org.eclipse.equinox.ds"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
    <plugin
          id="org.bonitasoft.studio"
          download-size="0"
@@ -536,7 +556,21 @@ along with this program. If not, see &lt;http://www.gnu.org/licenses/&gt;.
          unpack="false"/>
 
    <plugin
-         id="org.eclipse.ui.views.properties.tabbed"
+         id="javax.activation"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="javax.xml.bind"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="javax.annotation"
          download-size="0"
          install-size="0"
          version="0.0.0"

bundles/plugins/org.bonitasoft.studio.actors/.classpath

@@ -2,7 +2,7 @@
 <classpath>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="src" path="src-test/java"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

bundles/plugins/org.bonitasoft.studio.actors/.settings/org.eclipse.jdt.core.prefs

@@ -4,4 +4,5 @@ org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
 org.eclipse.jdt.core.compiler.compliance=1.8
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.release=enabled
 org.eclipse.jdt.core.compiler.source=1.8

bundles/plugins/org.bonitasoft.studio.application/.classpath

 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="src" path="src-test/java"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/org.bonitasoft.studio.preferences"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

bundles/plugins/org.bonitasoft.studio.application/.settings/org.eclipse.jdt.core.prefs

@@ -4,4 +4,5 @@ org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
 org.eclipse.jdt.core.compiler.compliance=1.8
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.release=enabled
 org.eclipse.jdt.core.compiler.source=1.8

bundles/plugins/org.bonitasoft.studio.application/META-INF/MANIFEST.MF

@@ -66,7 +66,8 @@ Require-Bundle: org.bonitasoft.studio.diagram,
  org.bonitasoft.studio.ui;bundle-version="7.9.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
-Import-Package: javax.inject;version="1.0.0",
+Import-Package: javax.annotation;version="1.2.0",
+ javax.inject;version="1.0.0",
  org.bonitasoft.engine.api,
  org.bonitasoft.engine.bpm.bar,
  org.bonitasoft.engine.exception,

bundles/plugins/org.bonitasoft.studio.application/plugin.xml

@@ -1231,9 +1231,12 @@
       <viewerContentBinding
             viewerId="org.bonitasoft.studio.application.project.explorer">
          <includes>
-            <contentExtension
+        	 <contentExtension
                   pattern="org.bonitasoft.studio.application.navigatorContent">
             </contentExtension>
+            <contentExtension
+                  pattern="org.eclipse.ui.navigator.resources.nested.nestedProjectContentProvider">
+            </contentExtension>
             <contentExtension
                   pattern="org.eclipse.ui.navigator.resources.linkHelper">
             </contentExtension>
@@ -1249,9 +1252,6 @@
             <contentExtension
                   pattern="org.bonitasoft.studio.application.project.explorer.filters.*">
             </contentExtension>
-            <contentExtension
-                  pattern="org.eclipse.ui.navigator.resources.nested.nestedProjectContentProvider">
-            </contentExtension>
             <contentExtension
                   pattern="org.eclipse.ui.navigator.resources.nested.HideFolderWhenProjectIsShownAsNested">
             </contentExtension>
@@ -1279,7 +1279,8 @@
             contentProvider="org.bonitasoft.studio.application.views.provider.BonitaExplorerContentProvider"
             id="org.bonitasoft.studio.application.navigatorContent"
             labelProvider="org.bonitasoft.studio.application.views.provider.BonitaExplorerLabelProvider"
-            name="Bonita Project Explorer Content">
+            name="Bonita Project Explorer Content"
+            priority="highest">
          <triggerPoints>
                 <or>
                     <adapt type="org.eclipse.core.resources.IProject" >

bundles/plugins/org.bonitasoft.studio.application/src/org/bonitasoft/studio/application/BonitaStudioWorkbenchAdvisor.java

@@ -42,6 +42,7 @@ import org.bonitasoft.studio.model.process.impl.ContractInputImpl;
 import org.codehaus.groovy.eclipse.dsl.DSLPreferences;
 import org.codehaus.groovy.eclipse.dsl.DSLPreferencesInitializer;
 import org.codehaus.groovy.eclipse.dsl.GroovyDSLCoreActivator;
+import org.codehaus.groovy.eclipse.launchers.GroovyConsoleLineTracker;
 import org.eclipse.core.internal.databinding.beans.BeanPropertyHelper;
 import org.eclipse.core.internal.resources.Workspace;
 import org.eclipse.core.resources.ResourcesPlugin;
@@ -407,6 +408,8 @@ public class BonitaStudioWorkbenchAdvisor extends WorkbenchAdvisor implements IS
         disableInternalWebBrowser();
         disableGroovyDSL();
         initXMLandHTMLValidationPreferences();
+        //Avoid deadlock and thread timeout at startup
+        new GroovyConsoleLineTracker();
         repositoryAccessor.start(monitor);
 
         executeContributions();

bundles/plugins/org.bonitasoft.studio.application/src/org/bonitasoft/studio/application/views/provider/BonitaExplorerContentProvider.java

@@ -57,5 +57,10 @@ public class BonitaExplorerContentProvider extends JavaNavigatorContentProvider
     private boolean isEnvironmentsFolder(IFolder parentElement) {
         return Objects.equals(parentElement.getName(), "environements");
     }
+    
+    @Override
+    public Object[] getElements(Object inputElement) {
+    	return super.getElements(inputElement);
+    }
 
 }

bundles/plugins/org.bonitasoft.studio.businessobject/META-INF/MANIFEST.MF

@@ -70,7 +70,9 @@ Require-Bundle: org.bonitasoft.studio.engine;bundle-version="1.0.0",
  org.eclipse.e4.ui.services
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
-Import-Package: org.bonitasoft.engine.api,
+Import-Package: javax.activation;version="1.1.0",
+ javax.xml.bind;version="2.2.0",
+ org.bonitasoft.engine.api,
  org.bonitasoft.engine.api.result,
  org.bonitasoft.engine.bdm,
  org.bonitasoft.engine.bdm.dao,

bundles/plugins/org.bonitasoft.studio.businessobject/src/org/bonitasoft/studio/businessobject/ui/wizard/control/QueryStatusLabelProvider.java

@@ -23,8 +23,6 @@ import org.bonitasoft.engine.bdm.BDMQueryUtil;
 import org.bonitasoft.engine.bdm.model.BusinessObject;
 import org.bonitasoft.engine.bdm.model.Query;
 import org.bonitasoft.studio.businessobject.i18n.Messages;
-import org.bonitasoft.studio.common.widgets.GTKStyleHandler;
-import org.bonitasoft.studio.common.widgets.GTKStyleHandler;
 import org.bonitasoft.studio.pics.Pics;
 import org.bonitasoft.studio.pics.PicsConstants;
 import org.eclipse.core.databinding.observable.value.IObservableValue;
@@ -34,11 +32,8 @@ import org.eclipse.swt.SWT;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.graphics.Rectangle;
 import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Table;
 import org.eclipse.swt.widgets.TableItem;
-import org.eclipse.swt.widgets.Tree;
 import org.eclipse.swt.widgets.TreeItem;
-import org.eclipse.swt.widgets.Widget;
 
 import com.google.common.base.Optional;
 import com.google.common.base.Predicate;
@@ -66,31 +61,15 @@ public class QueryStatusLabelProvider extends StyledCellLabelProvider {
         if (img != null) {
             final Rectangle bounds = event.item instanceof TableItem ? ((TableItem) event.item).getBounds(event.index)
                     : ((TreeItem) event.item).getBounds(event.index);
-            Widget widget = event.widget;
-            int headerHeight = 0;
-            if (widget instanceof Table) {
-                Table table = (Table) widget;
-                if (table.getHeaderVisible()) {
-                    headerHeight = table.getHeaderHeight();
-                }
-            }
-            if (widget instanceof Tree) {
-                Tree tree = (Tree) widget;
-                if (tree.getHeaderVisible()) {
-                    headerHeight = tree.getHeaderHeight();
-                }
-            }
             final Rectangle imgBounds = img.getBounds();
             bounds.width /= 2;
             bounds.width -= imgBounds.width / 2;
             bounds.height /= 2;
             bounds.height -= imgBounds.height / 2;
 
-            int x = bounds.width > 0 ? bounds.x + bounds.width : bounds.x;
-            int y = bounds.height > 0 ? bounds.y + bounds.height : bounds.y;
-            if (GTKStyleHandler.isGTK3()) {
-                y = y - headerHeight;
-            }
+            final int x = bounds.width > 0 ? bounds.x + bounds.width : bounds.x;
+            final int y = bounds.height > 0 ? bounds.y + bounds.height : bounds.y;
+
             if (SWT.getPlatform().equals("carbon")) {
                 event.gc.drawImage(img, x + 2, y - 1);
             } else {

bundles/plugins/org.bonitasoft.studio.businessobject/src/org/bonitasoft/studio/businessobject/ui/wizard/editingsupport/BusinessObjectNameEditingSupport.java

@@ -21,6 +21,7 @@ import org.bonitasoft.studio.businessobject.core.difflog.IDiffLogger;
 import org.bonitasoft.studio.businessobject.ui.wizard.validator.BusinessObjectNameCellEditorValidator;
 import org.bonitasoft.studio.common.NamingUtils;
 import org.bonitasoft.studio.common.jface.ColumnViewerUpdateListener;
+import org.bonitasoft.studio.common.jface.SWTBotConstants;
 import org.eclipse.core.databinding.Binding;
 import org.eclipse.core.databinding.DataBindingContext;
 import org.eclipse.core.databinding.UpdateValueStrategy;
@@ -83,6 +84,7 @@ public class BusinessObjectNameEditingSupport extends ObservableValueEditingSupp
     private CellEditor createCellEditor() {