Merge branch '2024-06' into fixes-214

gama-platform · Jun 14, 2024 · b69ec89 · b69ec89
2 parents 6fa979f + 6352522
commit b69ec89
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 21 deletions.
diff --git a/gama.feature.dependencies/feature.xml b/gama.feature.dependencies/feature.xml
@@ -151,17 +151,6 @@
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
-         id="org.eclipse.equinox.security.win32.x86_64"
-         os="win32"
-         ws="win32"
-         arch="x86_64"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         fragment="true"
-         unpack="false"/>
-
    <plugin
          id="org.eclipse.core.filebuffers"
          download-size="0"

diff --git a/gama.processor/gama.processor.jar b/gama.processor/gama.processor.jar
diff --git a/gama.processor/processor/Generate Processor.jardesc b/gama.processor/processor/Generate Processor.jardesc
@@ -12,11 +12,11 @@
     </manifest>
     <selectedElements exportClassFiles="false" exportJavaFiles="true" exportOutputFolder="true">
         <folder path="/gama.processor/META-INF"/>
-        <file path="/gama.processor/pom.xml"/>
+        <file path="/gama.processor/.classpath"/>
         <file path="/gama.processor/.project"/>
-        <javaElement handleIdentifier="=gama.annotations/src"/>
         <file path="/gama.processor/build.properties"/>
-        <file path="/gama.processor/.classpath"/>
         <file path="/gama.processor/plugin.xml"/>
+        <file path="/gama.processor/pom.xml"/>
+        <javaElement handleIdentifier="=gama.annotations/src"/>
     </selectedElements>
 </jardesc>
diff --git a/gama.product/extraresources/headless/osx/gama-headless.sh b/gama.product/extraresources/headless/osx/gama-headless.sh
@@ -72,7 +72,7 @@ fi
 
 ini_arguments=$(read_from_ini)
 
-if ! $java -cp "$( dirname "${BASH_SOURCE[0]}" )"/../Eclipse/plugins/org.eclipse.equinox.launcher*.jar -Xms512m $memory ${ini_arguments[@]} -Djava.awt.headless=true org.eclipse.core.launcher.Main -configuration "$( dirname "${BASH_SOURCE[0]}" )"/configuration -application gama.headless.product -data $passWork "$@"; then
+if ! $java -cp "$( dirname "${BASH_SOURCE[0]}" )"/../Eclipse/plugins/org.eclipse.equinox.launcher*.jar -Xms512m $memory ${ini_arguments[@]} -Djava.awt.headless=true org.eclipse.equinox.launcher.Main -configuration "$( dirname "${BASH_SOURCE[0]}" )"/configuration -application gama.headless.product -data $passWork "$@"; then
     echo "Error in you command, here's the log :"
     cat $passWork/.metadata/.log
     exit 1

diff --git a/gama.product/extraresources/headless/unix/gama-headless.sh b/gama.product/extraresources/headless/unix/gama-headless.sh
@@ -73,7 +73,7 @@ fi
 
 ini_arguments=$(read_from_ini)
 
-if ! $java -cp "${headless_path}"/../plugins/org.eclipse.equinox.launcher*.jar -Xms512m $memory ${ini_arguments[@]} org.eclipse.core.launcher.Main -configuration "${headless_path}"/configuration -application gama.headless.product -data $passWork "$@"; then
+if ! $java -cp "${headless_path}"/../plugins/org.eclipse.equinox.launcher*.jar -Xms512m $memory ${ini_arguments[@]} org.eclipse.equinox.launcher.Main -configuration "${headless_path}"/configuration -application gama.headless.product -data $passWork "$@"; then
     echo "Error in you command, here's the log :"
     cat $passWork/.metadata/.log
     exit 1

diff --git a/gama.product/extraresources/headless/windows/gama-headless.bat b/gama.product/extraresources/headless/windows/gama-headless.bat
@@ -82,8 +82,8 @@ for /f "usebackq delims=" %%a in (..\GAMA.ini) do (
 
 if exist ..\jdk\ (
 	echo "JDK"
-	call ..\jdk\bin\java -cp !result! -Xms512m -Xmx%memory% !ini_arguments! -Djava.awt.headless=true org.eclipse.core.launcher.Main -configuration ./configuration -application gama.headless.product -data "%workDir%" !param! 
+	call ..\jdk\bin\java -cp !result! -Xms512m -Xmx%memory% !ini_arguments! -Djava.awt.headless=true org.eclipse.equinox.launcher.Main -configuration ./configuration -application gama.headless.product -data "%workDir%" !param! 
 ) else (
 	echo "JAVA_HOME"
-  	call "%JAVA_HOME%\bin\java.exe" -cp !result! -Xms512m -Xmx%memory% !ini_arguments! -Djava.awt.headless=true org.eclipse.core.launcher.Main -configuration ./configuration -application gama.headless.product -data "%workDir%" !param! 
+  	call "%JAVA_HOME%\bin\java.exe" -cp !result! -Xms512m -Xmx%memory% !ini_arguments! -Djava.awt.headless=true org.eclipse.equinox.launcher.Main -configuration ./configuration -application gama.headless.product -data "%workDir%" !param! 
 )
diff --git a/gama.ui.application/META-INF/MANIFEST.MF b/gama.ui.application/META-INF/MANIFEST.MF
@@ -17,14 +17,14 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.core.expressions,
  org.eclipse.ui.workbench,
  org.eclipse.e4.core.services,
- org.eclipse.osgi.services,
  org.eclipse.e4.core.contexts,
  org.eclipse.e4.ui.css.swt.theme,
  org.eclipse.e4.ui.css.swt,
  org.eclipse.e4.ui.workbench.addons.swt,
  org.eclipse.e4.ui.workbench.renderers.swt,
  org.eclipse.e4.ui.workbench.swt,
- org.eclipse.e4.ui.css.core
+ org.eclipse.e4.ui.css.core,
+ org.osgi.service.event
 Bundle-Vendor: UMMISCO
 Bundle-Version: 0.0.0.qualifier
 Bundle-ManifestVersion: 2

diff --git a/gama.ui.shared/src/gama/ui/shared/utils/CleanupHelper.java b/gama.ui.shared/src/gama/ui/shared/utils/CleanupHelper.java
@@ -221,7 +221,7 @@ public void perspectiveActivated(final IWorkbenchPage page, final IPerspectiveDe
 					}
 					w.getMenuManager().update(true);
 					w.getMenuBarManager().update(true);
-					cm.updateAll(true);
+					cm.resetItemOrder();
 					// WorkaroundForIssue3210.run(cm);
 				} catch (final Exception e) {}
 			});