From c2f4e8f4d59f0573ce51d290d05da882b122c1ea Mon Sep 17 00:00:00 2001 From: Alexis Drogoul Date: Tue, 24 Nov 2020 16:32:29 +0700 Subject: [PATCH] First commit to this branch. Main goals are: - to move to JDK11+, which means at least moving to GeoTools 21.4 - to regain compatibility with macOS Big Sur Can only be run on JDK11+ and Eclipse 2020-09 --- msi.gama.ext/src/msi/gama/ext/Activator.java | 30 +- .../msi.gama.headless.id4.launch | 120 ++++- msi.gama.release/.project | 17 + ummisco.gama.feature.dependencies/feature.xml | 410 ++++++++++++++++++ ummisco.gama.product/gama.runtime.product | 5 - .../lang/gaml/ide/AbstractGamlIdeModule.java | 8 +- .../lang/gaml/ui/editbox/BoxProviderImpl.java | 5 +- 7 files changed, 566 insertions(+), 29 deletions(-) create mode 100644 msi.gama.release/.project diff --git a/msi.gama.ext/src/msi/gama/ext/Activator.java b/msi.gama.ext/src/msi/gama/ext/Activator.java index 1e8617a2b9..38dfe8cd11 100644 --- a/msi.gama.ext/src/msi/gama/ext/Activator.java +++ b/msi.gama.ext/src/msi/gama/ext/Activator.java @@ -45,24 +45,24 @@ public void start(final BundleContext bundleContext) throws Exception { jaiDef.setOperationRegistry(ConcurrentOperationRegistry.initializeRegistry()); } ImageIO.scanForPlugins(); - Hints.putSystemDefault(Hints.FILTER_FACTORY, CommonFactoryFinder.getFilterFactory2(null)); - Hints.putSystemDefault(Hints.STYLE_FACTORY, CommonFactoryFinder.getStyleFactory(null)); - Hints.putSystemDefault(Hints.FEATURE_FACTORY, CommonFactoryFinder.getFeatureFactory(null)); +// Hints.putSystemDefault(Hints.FILTER_FACTORY, CommonFactoryFinder.getFilterFactory2(null)); +// Hints.putSystemDefault(Hints.STYLE_FACTORY, CommonFactoryFinder.getStyleFactory(null)); +// Hints.putSystemDefault(Hints.FEATURE_FACTORY, CommonFactoryFinder.getFeatureFactory(null)); Hints.putSystemDefault(Hints.USE_JAI_IMAGEREAD, true); final Hints defHints = GeoTools.getDefaultHints(); - - // Initialize GridCoverageFactory so that we don't make a lookup every time a factory is - // needed +// +// // Initialize GridCoverageFactory so that we don't make a lookup every time a factory is +// // needed Hints.putSystemDefault(Hints.GRID_COVERAGE_FACTORY, CoverageFactoryFinder.getGridCoverageFactory(defHints)); - // Forces early initialisation of operation registry of JAI. - // It fixes initialisation problems in some third party equinox - // applications such as OpenMOLE. - - // final String os = System.getProperty("os.name"); - // if (!os.startsWith("Mac")) { - - // } - System.out.println("> JAI/ImageIO subsystem activated"); +// // Forces early initialisation of operation registry of JAI. +// // It fixes initialisation problems in some third party equinox +// // applications such as OpenMOLE. +// +// // final String os = System.getProperty("os.name"); +// // if (!os.startsWith("Mac")) { +// +// // } + System.out.println("> JAI/ImageIO subsystem activated"); } /* diff --git a/msi.gama.headless/msi.gama.headless.id4.launch b/msi.gama.headless/msi.gama.headless.id4.launch index 0e91610160..b0ff6488da 100644 --- a/msi.gama.headless/msi.gama.headless.id4.launch +++ b/msi.gama.headless/msi.gama.headless.id4.launch @@ -12,18 +12,132 @@ + + - + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/msi.gama.release/.project b/msi.gama.release/.project new file mode 100644 index 0000000000..2ddf7f380d --- /dev/null +++ b/msi.gama.release/.project @@ -0,0 +1,17 @@ + + + msi.gama.release + + + + + + org.eclipse.m2e.core.maven2Builder + + + + + + org.eclipse.m2e.core.maven2Nature + + diff --git a/ummisco.gama.feature.dependencies/feature.xml b/ummisco.gama.feature.dependencies/feature.xml index 5fe337892a..776594977a 100644 --- a/ummisco.gama.feature.dependencies/feature.xml +++ b/ummisco.gama.feature.dependencies/feature.xml @@ -991,4 +991,414 @@ version="0.0.0" unpack="false"/> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ummisco.gama.product/gama.runtime.product b/ummisco.gama.product/gama.runtime.product index d65e556d7b..2b5ae1d26d 100644 --- a/ummisco.gama.product/gama.runtime.product +++ b/ummisco.gama.product/gama.runtime.product @@ -70,7 +70,6 @@ - org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7 @@ -262,10 +261,6 @@ - - - - diff --git a/ummisco.gama.ui.modeling/src-gen/msi/gama/lang/gaml/ide/AbstractGamlIdeModule.java b/ummisco.gama.ui.modeling/src-gen/msi/gama/lang/gaml/ide/AbstractGamlIdeModule.java index 8eeff2f2ce..42bbeacae2 100644 --- a/ummisco.gama.ui.modeling/src-gen/msi/gama/lang/gaml/ide/AbstractGamlIdeModule.java +++ b/ummisco.gama.ui.modeling/src-gen/msi/gama/lang/gaml/ide/AbstractGamlIdeModule.java @@ -16,8 +16,8 @@ import org.eclipse.xtext.ide.editor.contentassist.antlr.IContentAssistParser; import org.eclipse.xtext.ide.editor.contentassist.antlr.internal.Lexer; import org.eclipse.xtext.ide.refactoring.IRenameStrategy2; -import org.eclipse.xtext.ide.server.rename.IRenameService; -import org.eclipse.xtext.ide.server.rename.RenameService; +import org.eclipse.xtext.ide.server.rename.IRenameService2; +import org.eclipse.xtext.ide.server.rename.RenameService2; /** * Manual modifications go to {@link GamlIdeModule}. @@ -48,8 +48,8 @@ public Class bindIPrefixMatcher() { } // contributed by org.eclipse.xtext.xtext.generator.ui.refactoring.RefactorElementNameFragment2 - public Class bindIRenameService() { - return RenameService.class; + public Class bindIRenameService() { + return RenameService2.class; } // contributed by org.eclipse.xtext.xtext.generator.ui.refactoring.RefactorElementNameFragment2 diff --git a/ummisco.gama.ui.modeling/src/msi/gama/lang/gaml/ui/editbox/BoxProviderImpl.java b/ummisco.gama.ui.modeling/src/msi/gama/lang/gaml/ui/editbox/BoxProviderImpl.java index d07232f869..cb61112137 100644 --- a/ummisco.gama.ui.modeling/src/msi/gama/lang/gaml/ui/editbox/BoxProviderImpl.java +++ b/ummisco.gama.ui.modeling/src/msi/gama/lang/gaml/ui/editbox/BoxProviderImpl.java @@ -18,6 +18,7 @@ import org.eclipse.swt.custom.StyledText; import org.eclipse.swt.widgets.Control; import org.eclipse.ui.IWorkbenchPart; +import org.eclipse.ui.internal.misc.TextMatcher; @SuppressWarnings ({ "rawtypes" }) public class BoxProviderImpl implements IBoxProvider { @@ -164,10 +165,10 @@ public IBoxBuilder createBoxBuilder(final String name) { class Matcher { - org.eclipse.ui.internal.misc.StringMatcher m; + TextMatcher m; Matcher(final String pattern) { - m = new org.eclipse.ui.internal.misc.StringMatcher(pattern, true, false); + m = new TextMatcher(pattern, true, false); } boolean matches(final String text) {