From: Tuukka Lehtonen Date: Fri, 26 Jun 2020 11:18:47 +0000 (+0300) Subject: Fix sysdyn to build with platform master and JavaSE-11 X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=commitdiff_plain;h=90d647d60778b42fee1282a47d60517cd72b281e;p=simantics%2Fsysdyn.git Fix sysdyn to build with platform master and JavaSE-11 The upgrade to JFreeChart 1.5.0 required some attention detailed at https://github.com/jfree/jfreechart#migration-from-jfreechart-10x Other changes: * Removed deprecated buckminster-build related projects from releng * Switched execution environment and compiler settings to JavaSE-11 * Added /README.md * Switched to Tycho 1.7.0 * Fixed split package problem with org.w3c.dom in org.simantics.jfreechart by removing the Batik 1.7 bundled in there and instead using Batik 1.12.0 from the platform. gitlab simantics/platform#524 gitlab #62 --- diff --git a/.mvn/extensions.xml b/.mvn/extensions.xml index d0555d03..6cd25fca 100644 --- a/.mvn/extensions.xml +++ b/.mvn/extensions.xml @@ -3,6 +3,6 @@ org.eclipse.tycho.extras tycho-pomless - 0.26.0 + 1.7.0 diff --git a/README.md b/README.md new file mode 100644 index 00000000..30b9f191 --- /dev/null +++ b/README.md @@ -0,0 +1,22 @@ +## Headless Builds + +Official builds and testing of the platform are done with Maven. + +To build the system dynamics tool, run: +``` +mvn package +``` + +or to run unit tests as well: +``` +mvn verify +``` + +## Development + +Follow Simantics Platform Development IDE setup instructions at https://gitlab.simantics.org/simantics/platform/-/blob/master/README.md. + +#### Test + +Open [releng/org.simantics.sysdyn.rcp.product/sysdyn.product](releng/org.simantics.sysdyn.rcp.product/sysdyn.product) +and press `Launch an Eclipse application in Debug mode`. The Simantics System Dynamics desktop application should start. diff --git a/bundles/fi.semantum.sysdyn.solver/.classpath b/bundles/fi.semantum.sysdyn.solver/.classpath index b862a296..ca3785c4 100644 --- a/bundles/fi.semantum.sysdyn.solver/.classpath +++ b/bundles/fi.semantum.sysdyn.solver/.classpath @@ -1,6 +1,6 @@ - + diff --git a/bundles/fi.semantum.sysdyn.solver/.settings/org.eclipse.jdt.core.prefs b/bundles/fi.semantum.sysdyn.solver/.settings/org.eclipse.jdt.core.prefs index 295926d9..11265a34 100644 --- a/bundles/fi.semantum.sysdyn.solver/.settings/org.eclipse.jdt.core.prefs +++ b/bundles/fi.semantum.sysdyn.solver/.settings/org.eclipse.jdt.core.prefs @@ -1,7 +1,10 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 -org.eclipse.jdt.core.compiler.compliance=1.8 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.compliance=11 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.8 +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning +org.eclipse.jdt.core.compiler.release=enabled +org.eclipse.jdt.core.compiler.source=11 diff --git a/bundles/fi.semantum.sysdyn.solver/META-INF/MANIFEST.MF b/bundles/fi.semantum.sysdyn.solver/META-INF/MANIFEST.MF index e2865cd9..1ef48af5 100644 --- a/bundles/fi.semantum.sysdyn.solver/META-INF/MANIFEST.MF +++ b/bundles/fi.semantum.sysdyn.solver/META-INF/MANIFEST.MF @@ -10,6 +10,7 @@ Require-Bundle: org.eclipse.core.runtime, org.simantics.databoard;bundle-version="0.6.5", org.simantics.utils.datastructures;bundle-version="1.1.0", gnu.trove3;bundle-version="3.0.3" -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Bundle-ActivationPolicy: lazy Export-Package: fi.semantum.sysdyn.solver +Automatic-Module-Name: fi.semantum.sysdyn.solver diff --git a/bundles/org.simantics.fmu.me.win32/.classpath b/bundles/org.simantics.fmu.me.win32/.classpath index bdaeff6b..dd93d7d8 100644 --- a/bundles/org.simantics.fmu.me.win32/.classpath +++ b/bundles/org.simantics.fmu.me.win32/.classpath @@ -1,5 +1,6 @@ - + + diff --git a/bundles/org.simantics.fmu.me.win32/.settings/org.eclipse.jdt.core.prefs b/bundles/org.simantics.fmu.me.win32/.settings/org.eclipse.jdt.core.prefs index 295926d9..11265a34 100644 --- a/bundles/org.simantics.fmu.me.win32/.settings/org.eclipse.jdt.core.prefs +++ b/bundles/org.simantics.fmu.me.win32/.settings/org.eclipse.jdt.core.prefs @@ -1,7 +1,10 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 -org.eclipse.jdt.core.compiler.compliance=1.8 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.compliance=11 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.8 +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning +org.eclipse.jdt.core.compiler.release=enabled +org.eclipse.jdt.core.compiler.source=11 diff --git a/bundles/org.simantics.fmu.me.win32/META-INF/MANIFEST.MF b/bundles/org.simantics.fmu.me.win32/META-INF/MANIFEST.MF index 417b6df3..54752068 100644 --- a/bundles/org.simantics.fmu.me.win32/META-INF/MANIFEST.MF +++ b/bundles/org.simantics.fmu.me.win32/META-INF/MANIFEST.MF @@ -5,6 +5,7 @@ Bundle-SymbolicName: org.simantics.fmu.me.win32 Bundle-Version: 1.1.0.qualifier Bundle-Vendor: Semantum Oy Fragment-Host: org.simantics.fmu;bundle-version="1.1.0" -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Eclipse-PlatformFilter: (& (osgi.os=win32) (osgi.arch=x86)) Bundle-NativeCode: libraries/FMUSimulator.dll; libraries/miniunz.dll; libraries/zlibwapi.dll; processor=x86 +Automatic-Module-Name: org.simantics.fmu.me.win32 diff --git a/bundles/org.simantics.fmu.me.win64/.classpath b/bundles/org.simantics.fmu.me.win64/.classpath index bdaeff6b..dd93d7d8 100644 --- a/bundles/org.simantics.fmu.me.win64/.classpath +++ b/bundles/org.simantics.fmu.me.win64/.classpath @@ -1,5 +1,6 @@ - + + diff --git a/bundles/org.simantics.fmu.me.win64/.settings/org.eclipse.jdt.core.prefs b/bundles/org.simantics.fmu.me.win64/.settings/org.eclipse.jdt.core.prefs index 295926d9..11265a34 100644 --- a/bundles/org.simantics.fmu.me.win64/.settings/org.eclipse.jdt.core.prefs +++ b/bundles/org.simantics.fmu.me.win64/.settings/org.eclipse.jdt.core.prefs @@ -1,7 +1,10 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 -org.eclipse.jdt.core.compiler.compliance=1.8 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.compliance=11 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.8 +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning +org.eclipse.jdt.core.compiler.release=enabled +org.eclipse.jdt.core.compiler.source=11 diff --git a/bundles/org.simantics.fmu.me.win64/META-INF/MANIFEST.MF b/bundles/org.simantics.fmu.me.win64/META-INF/MANIFEST.MF index bfa0ab4e..1e689914 100644 --- a/bundles/org.simantics.fmu.me.win64/META-INF/MANIFEST.MF +++ b/bundles/org.simantics.fmu.me.win64/META-INF/MANIFEST.MF @@ -5,6 +5,7 @@ Bundle-SymbolicName: org.simantics.fmu.me.win64 Bundle-Version: 1.1.0.qualifier Bundle-Vendor: Semantum Oy Fragment-Host: org.simantics.fmu;bundle-version="1.1.0" -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Eclipse-PlatformFilter: (& (osgi.os=win32) (osgi.arch=x86_64)) Bundle-NativeCode: libraries/FMUSimulator.dll; libraries/libexpat.dll; libraries/miniunz.dll; libraries/zlibwapi.dll; processor=x86_64 +Automatic-Module-Name: org.simantics.fmu.me.win64 diff --git a/bundles/org.simantics.fmu/.classpath b/bundles/org.simantics.fmu/.classpath index b862a296..ca3785c4 100644 --- a/bundles/org.simantics.fmu/.classpath +++ b/bundles/org.simantics.fmu/.classpath @@ -1,6 +1,6 @@ - + diff --git a/bundles/org.simantics.fmu/.settings/org.eclipse.jdt.core.prefs b/bundles/org.simantics.fmu/.settings/org.eclipse.jdt.core.prefs index 295926d9..11265a34 100644 --- a/bundles/org.simantics.fmu/.settings/org.eclipse.jdt.core.prefs +++ b/bundles/org.simantics.fmu/.settings/org.eclipse.jdt.core.prefs @@ -1,7 +1,10 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 -org.eclipse.jdt.core.compiler.compliance=1.8 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.compliance=11 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.8 +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning +org.eclipse.jdt.core.compiler.release=enabled +org.eclipse.jdt.core.compiler.source=11 diff --git a/bundles/org.simantics.fmu/META-INF/MANIFEST.MF b/bundles/org.simantics.fmu/META-INF/MANIFEST.MF index 2c43a992..c1ca40aa 100644 --- a/bundles/org.simantics.fmu/META-INF/MANIFEST.MF +++ b/bundles/org.simantics.fmu/META-INF/MANIFEST.MF @@ -8,6 +8,7 @@ Bundle-Vendor: Semantum Oy Require-Bundle: org.eclipse.core.runtime, org.simantics.utils;bundle-version="1.1.0", org.simantics;bundle-version="1.0.0" -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Bundle-ActivationPolicy: lazy Export-Package: org.simantics.fmu +Automatic-Module-Name: org.simantics.fmu diff --git a/bundles/org.simantics.jfreechart.ontology/.classpath b/bundles/org.simantics.jfreechart.ontology/.classpath index b862a296..ca3785c4 100644 --- a/bundles/org.simantics.jfreechart.ontology/.classpath +++ b/bundles/org.simantics.jfreechart.ontology/.classpath @@ -1,6 +1,6 @@ - + diff --git a/bundles/org.simantics.jfreechart.ontology/.settings/org.eclipse.jdt.core.prefs b/bundles/org.simantics.jfreechart.ontology/.settings/org.eclipse.jdt.core.prefs index 295926d9..11265a34 100644 --- a/bundles/org.simantics.jfreechart.ontology/.settings/org.eclipse.jdt.core.prefs +++ b/bundles/org.simantics.jfreechart.ontology/.settings/org.eclipse.jdt.core.prefs @@ -1,7 +1,10 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 -org.eclipse.jdt.core.compiler.compliance=1.8 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.compliance=11 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.8 +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning +org.eclipse.jdt.core.compiler.release=enabled +org.eclipse.jdt.core.compiler.source=11 diff --git a/bundles/org.simantics.jfreechart.ontology/META-INF/MANIFEST.MF b/bundles/org.simantics.jfreechart.ontology/META-INF/MANIFEST.MF index a4073070..b834606a 100644 --- a/bundles/org.simantics.jfreechart.ontology/META-INF/MANIFEST.MF +++ b/bundles/org.simantics.jfreechart.ontology/META-INF/MANIFEST.MF @@ -14,5 +14,6 @@ Require-Bundle: org.simantics.layer0, org.simantics.action.ontology;bundle-version="1.1.0", org.simantics.viewpoint.ontology;bundle-version="1.2.0", org.simantics.color.ontology;bundle-version="1.1.0" -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Export-Package: org.simantics.sysdyn +Automatic-Module-Name: org.simantics.jfreechart.ontology diff --git a/bundles/org.simantics.jfreechart/.classpath b/bundles/org.simantics.jfreechart/.classpath index afb0b065..ca3785c4 100644 --- a/bundles/org.simantics.jfreechart/.classpath +++ b/bundles/org.simantics.jfreechart/.classpath @@ -1,14 +1,7 @@ - + - - - - - - - diff --git a/bundles/org.simantics.jfreechart/.settings/org.eclipse.jdt.core.prefs b/bundles/org.simantics.jfreechart/.settings/org.eclipse.jdt.core.prefs index 295926d9..11265a34 100644 --- a/bundles/org.simantics.jfreechart/.settings/org.eclipse.jdt.core.prefs +++ b/bundles/org.simantics.jfreechart/.settings/org.eclipse.jdt.core.prefs @@ -1,7 +1,10 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 -org.eclipse.jdt.core.compiler.compliance=1.8 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.compliance=11 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.8 +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning +org.eclipse.jdt.core.compiler.release=enabled +org.eclipse.jdt.core.compiler.source=11 diff --git a/bundles/org.simantics.jfreechart/META-INF/MANIFEST.MF b/bundles/org.simantics.jfreechart/META-INF/MANIFEST.MF index a6e42cdc..9ddf3343 100644 --- a/bundles/org.simantics.jfreechart/META-INF/MANIFEST.MF +++ b/bundles/org.simantics.jfreechart/META-INF/MANIFEST.MF @@ -5,15 +5,14 @@ Bundle-SymbolicName: org.simantics.jfreechart;singleton:=true Bundle-Version: 1.0.0.qualifier Bundle-Activator: org.simantics.jfreechart.internal.Activator Bundle-Vendor: VTT -Require-Bundle: org.jfree.jchart;bundle-version="1.0.13", - org.jfree.jcommon;bundle-version="1.0.16", +Require-Bundle: org.jfree.jchart;bundle-version="1.5.0", org.simantics.jfreechart.ontology;bundle-version="1.0.0", org.simantics.modeling.ui;bundle-version="1.1.1", org.simantics.layer0.utils;bundle-version="1.1.0", org.simantics.scenegraph.swing;bundle-version="1.0.0", org.simantics.browsing.ui.model;bundle-version="1.0.0", org.simantics.selectionview;bundle-version="1.0.0" -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Bundle-ActivationPolicy: lazy Export-Package: org.simantics.jfreechart, org.simantics.jfreechart.chart, @@ -23,11 +22,5 @@ Export-Package: org.simantics.jfreechart, org.simantics.jfreechart.chart.properties.bar, org.simantics.jfreechart.chart.properties.pie, org.simantics.jfreechart.chart.properties.xyline -Bundle-ClassPath: batik/batik-awt-util.jar, - batik/batik-dom.jar, - batik/batik-ext.jar, - batik/batik-svg-dom.jar, - batik/batik-svggen.jar, - batik/batik-util.jar, - batik/batik-xml.jar, - . +Bundle-ClassPath: . +Automatic-Module-Name: org.simantics.jfreechart diff --git a/bundles/org.simantics.jfreechart/batik/batik-1.7.zip b/bundles/org.simantics.jfreechart/batik/batik-1.7.zip deleted file mode 100644 index b1f32e7d..00000000 Binary files a/bundles/org.simantics.jfreechart/batik/batik-1.7.zip and /dev/null differ diff --git a/bundles/org.simantics.jfreechart/batik/batik-awt-util.jar b/bundles/org.simantics.jfreechart/batik/batik-awt-util.jar deleted file mode 100644 index e64605af..00000000 Binary files a/bundles/org.simantics.jfreechart/batik/batik-awt-util.jar and /dev/null differ diff --git a/bundles/org.simantics.jfreechart/batik/batik-dom.jar b/bundles/org.simantics.jfreechart/batik/batik-dom.jar deleted file mode 100644 index 32d5b46d..00000000 Binary files a/bundles/org.simantics.jfreechart/batik/batik-dom.jar and /dev/null differ diff --git a/bundles/org.simantics.jfreechart/batik/batik-ext.jar b/bundles/org.simantics.jfreechart/batik/batik-ext.jar deleted file mode 100644 index 8c904e1f..00000000 Binary files a/bundles/org.simantics.jfreechart/batik/batik-ext.jar and /dev/null differ diff --git a/bundles/org.simantics.jfreechart/batik/batik-src-1.7.zip b/bundles/org.simantics.jfreechart/batik/batik-src-1.7.zip deleted file mode 100644 index 77478cd3..00000000 Binary files a/bundles/org.simantics.jfreechart/batik/batik-src-1.7.zip and /dev/null differ diff --git a/bundles/org.simantics.jfreechart/batik/batik-svg-dom.jar b/bundles/org.simantics.jfreechart/batik/batik-svg-dom.jar deleted file mode 100644 index b4c8a620..00000000 Binary files a/bundles/org.simantics.jfreechart/batik/batik-svg-dom.jar and /dev/null differ diff --git a/bundles/org.simantics.jfreechart/batik/batik-svggen.jar b/bundles/org.simantics.jfreechart/batik/batik-svggen.jar deleted file mode 100644 index 4d6bb144..00000000 Binary files a/bundles/org.simantics.jfreechart/batik/batik-svggen.jar and /dev/null differ diff --git a/bundles/org.simantics.jfreechart/batik/batik-util.jar b/bundles/org.simantics.jfreechart/batik/batik-util.jar deleted file mode 100644 index 86d75e70..00000000 Binary files a/bundles/org.simantics.jfreechart/batik/batik-util.jar and /dev/null differ diff --git a/bundles/org.simantics.jfreechart/batik/batik-xml.jar b/bundles/org.simantics.jfreechart/batik/batik-xml.jar deleted file mode 100644 index d05eb25f..00000000 Binary files a/bundles/org.simantics.jfreechart/batik/batik-xml.jar and /dev/null differ diff --git a/bundles/org.simantics.jfreechart/build.properties b/bundles/org.simantics.jfreechart/build.properties index 3806e2b7..5948409c 100644 --- a/bundles/org.simantics.jfreechart/build.properties +++ b/bundles/org.simantics.jfreechart/build.properties @@ -4,11 +4,4 @@ bin.includes = META-INF/,\ .,\ plugin.xml,\ adapters.xml,\ - icons/,\ - batik/batik-awt-util.jar,\ - batik/batik-dom.jar,\ - batik/batik-ext.jar,\ - batik/batik-svg-dom.jar,\ - batik/batik-svggen.jar,\ - batik/batik-util.jar,\ - batik/batik-xml.jar + icons/ diff --git a/bundles/org.simantics.jfreechart/src/org/simantics/jfreechart/chart/BarRenderer.java b/bundles/org.simantics.jfreechart/src/org/simantics/jfreechart/chart/BarRenderer.java index 30430d3b..b0857055 100644 --- a/bundles/org.simantics.jfreechart/src/org/simantics/jfreechart/chart/BarRenderer.java +++ b/bundles/org.simantics.jfreechart/src/org/simantics/jfreechart/chart/BarRenderer.java @@ -33,7 +33,7 @@ public class BarRenderer extends AbstractRenderer { public org.jfree.chart.renderer.AbstractRenderer getRenderer() { if(renderer == null) { renderer = new org.jfree.chart.renderer.category.BarRenderer(); - renderer.setBaseToolTipGenerator(new StandardCategoryToolTipGenerator()); + renderer.setDefaultToolTipGenerator(new StandardCategoryToolTipGenerator()); } return renderer; } diff --git a/bundles/org.simantics.jfreechart/src/org/simantics/jfreechart/chart/CategoryPlot.java b/bundles/org.simantics.jfreechart/src/org/simantics/jfreechart/chart/CategoryPlot.java index 2bf33309..7cba747e 100644 --- a/bundles/org.simantics.jfreechart/src/org/simantics/jfreechart/chart/CategoryPlot.java +++ b/bundles/org.simantics.jfreechart/src/org/simantics/jfreechart/chart/CategoryPlot.java @@ -16,7 +16,7 @@ import org.jfree.chart.axis.ValueAxis; import org.jfree.chart.plot.Plot; import org.jfree.chart.plot.PlotOrientation; import org.jfree.chart.renderer.category.CategoryItemRenderer; -import org.jfree.ui.RectangleInsets; +import org.jfree.chart.ui.RectangleInsets; import org.simantics.databoard.Bindings; import org.simantics.db.ReadGraph; import org.simantics.db.Resource; diff --git a/bundles/org.simantics.jfreechart/src/org/simantics/jfreechart/chart/DeviationRenderer.java b/bundles/org.simantics.jfreechart/src/org/simantics/jfreechart/chart/DeviationRenderer.java index 716bb682..2a68932c 100644 --- a/bundles/org.simantics.jfreechart/src/org/simantics/jfreechart/chart/DeviationRenderer.java +++ b/bundles/org.simantics.jfreechart/src/org/simantics/jfreechart/chart/DeviationRenderer.java @@ -27,7 +27,7 @@ public class DeviationRenderer extends AbstractRenderer { public org.jfree.chart.renderer.AbstractRenderer getRenderer() { if(renderer == null) { renderer = new org.jfree.chart.renderer.xy.DeviationRenderer(); - renderer.setBaseToolTipGenerator(new StandardXYToolTipGenerator()); + renderer.setDefaultToolTipGenerator(new StandardXYToolTipGenerator()); } return renderer; } diff --git a/bundles/org.simantics.jfreechart/src/org/simantics/jfreechart/chart/JFreeChart.java b/bundles/org.simantics.jfreechart/src/org/simantics/jfreechart/chart/JFreeChart.java index 788df9f8..3d7734c4 100644 --- a/bundles/org.simantics.jfreechart/src/org/simantics/jfreechart/chart/JFreeChart.java +++ b/bundles/org.simantics.jfreechart/src/org/simantics/jfreechart/chart/JFreeChart.java @@ -19,7 +19,7 @@ import javax.swing.SwingUtilities; import org.jfree.chart.title.LegendTitle; import org.jfree.chart.title.TextTitle; -import org.jfree.ui.RectangleInsets; +import org.jfree.chart.ui.RectangleInsets; import org.simantics.Simantics; import org.simantics.databoard.Bindings; import org.simantics.db.ReadGraph; diff --git a/bundles/org.simantics.jfreechart/src/org/simantics/jfreechart/chart/PiePlot.java b/bundles/org.simantics.jfreechart/src/org/simantics/jfreechart/chart/PiePlot.java index f06bdbea..6f79fd89 100644 --- a/bundles/org.simantics.jfreechart/src/org/simantics/jfreechart/chart/PiePlot.java +++ b/bundles/org.simantics.jfreechart/src/org/simantics/jfreechart/chart/PiePlot.java @@ -19,10 +19,10 @@ import org.jfree.chart.labels.StandardPieSectionLabelGenerator; import org.jfree.chart.labels.StandardPieToolTipGenerator; import org.jfree.chart.plot.DefaultDrawingSupplier; import org.jfree.chart.plot.Plot; +import org.jfree.chart.ui.RectangleInsets; import org.jfree.data.general.Dataset; import org.jfree.data.general.DatasetChangeEvent; import org.jfree.data.general.DatasetChangeListener; -import org.jfree.ui.RectangleInsets; import org.simantics.databoard.Bindings; import org.simantics.db.ReadGraph; import org.simantics.db.Resource; diff --git a/bundles/org.simantics.jfreechart/src/org/simantics/jfreechart/chart/StackedBarRenderer.java b/bundles/org.simantics.jfreechart/src/org/simantics/jfreechart/chart/StackedBarRenderer.java index a7da60cc..c1ea70a1 100644 --- a/bundles/org.simantics.jfreechart/src/org/simantics/jfreechart/chart/StackedBarRenderer.java +++ b/bundles/org.simantics.jfreechart/src/org/simantics/jfreechart/chart/StackedBarRenderer.java @@ -32,7 +32,7 @@ public class StackedBarRenderer extends AbstractRenderer { public org.jfree.chart.renderer.AbstractRenderer getRenderer() { if(renderer == null) { renderer = new org.jfree.chart.renderer.category.StackedBarRenderer(); - renderer.setBaseToolTipGenerator(new StandardCategoryToolTipGenerator()); + renderer.setDefaultToolTipGenerator(new StandardCategoryToolTipGenerator()); } return renderer; } diff --git a/bundles/org.simantics.jfreechart/src/org/simantics/jfreechart/chart/TextTitle.java b/bundles/org.simantics.jfreechart/src/org/simantics/jfreechart/chart/TextTitle.java index bdb73de1..b49bc3bf 100644 --- a/bundles/org.simantics.jfreechart/src/org/simantics/jfreechart/chart/TextTitle.java +++ b/bundles/org.simantics.jfreechart/src/org/simantics/jfreechart/chart/TextTitle.java @@ -12,7 +12,7 @@ package org.simantics.jfreechart.chart; import org.jfree.chart.title.Title; -import org.jfree.ui.RectangleEdge; +import org.jfree.chart.ui.RectangleEdge; import org.simantics.databoard.Bindings; import org.simantics.db.ReadGraph; import org.simantics.db.Resource; diff --git a/bundles/org.simantics.jfreechart/src/org/simantics/jfreechart/chart/XYAreaRenderer.java b/bundles/org.simantics.jfreechart/src/org/simantics/jfreechart/chart/XYAreaRenderer.java index 6c680348..cd054121 100644 --- a/bundles/org.simantics.jfreechart/src/org/simantics/jfreechart/chart/XYAreaRenderer.java +++ b/bundles/org.simantics.jfreechart/src/org/simantics/jfreechart/chart/XYAreaRenderer.java @@ -32,7 +32,7 @@ public class XYAreaRenderer extends AbstractRenderer { public org.jfree.chart.renderer.AbstractRenderer getRenderer() { if(renderer == null) { renderer = new org.jfree.chart.renderer.xy.XYAreaRenderer(); - renderer.setBaseToolTipGenerator(new StandardXYToolTipGenerator()); + renderer.setDefaultToolTipGenerator(new StandardXYToolTipGenerator()); } return renderer; } diff --git a/bundles/org.simantics.jfreechart/src/org/simantics/jfreechart/chart/XYLineRenderer.java b/bundles/org.simantics.jfreechart/src/org/simantics/jfreechart/chart/XYLineRenderer.java index 7d5abb22..eb528cb3 100644 --- a/bundles/org.simantics.jfreechart/src/org/simantics/jfreechart/chart/XYLineRenderer.java +++ b/bundles/org.simantics.jfreechart/src/org/simantics/jfreechart/chart/XYLineRenderer.java @@ -33,7 +33,7 @@ public class XYLineRenderer extends AbstractRenderer { public org.jfree.chart.renderer.AbstractRenderer getRenderer() { if(renderer == null) { renderer = new XYLineAndShapeRenderer(true, false); - renderer.setBaseToolTipGenerator(new StandardXYToolTipGenerator()); + renderer.setDefaultToolTipGenerator(new StandardXYToolTipGenerator()); } return renderer; } diff --git a/bundles/org.simantics.jfreechart/src/org/simantics/jfreechart/chart/XYPlot.java b/bundles/org.simantics.jfreechart/src/org/simantics/jfreechart/chart/XYPlot.java index 4ffae630..80fb7ef6 100644 --- a/bundles/org.simantics.jfreechart/src/org/simantics/jfreechart/chart/XYPlot.java +++ b/bundles/org.simantics.jfreechart/src/org/simantics/jfreechart/chart/XYPlot.java @@ -15,8 +15,8 @@ import org.jfree.chart.axis.ValueAxis; import org.jfree.chart.plot.Plot; import org.jfree.chart.plot.PlotOrientation; import org.jfree.chart.renderer.xy.XYItemRenderer; +import org.jfree.chart.ui.RectangleInsets; import org.jfree.data.xy.XYDataset; -import org.jfree.ui.RectangleInsets; import org.simantics.db.ReadGraph; import org.simantics.db.Resource; import org.simantics.db.exception.DatabaseException; diff --git a/bundles/org.simantics.modelica/.classpath b/bundles/org.simantics.modelica/.classpath index b862a296..ca3785c4 100644 --- a/bundles/org.simantics.modelica/.classpath +++ b/bundles/org.simantics.modelica/.classpath @@ -1,6 +1,6 @@ - + diff --git a/bundles/org.simantics.modelica/.settings/org.eclipse.jdt.core.prefs b/bundles/org.simantics.modelica/.settings/org.eclipse.jdt.core.prefs index 295926d9..11265a34 100644 --- a/bundles/org.simantics.modelica/.settings/org.eclipse.jdt.core.prefs +++ b/bundles/org.simantics.modelica/.settings/org.eclipse.jdt.core.prefs @@ -1,7 +1,10 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 -org.eclipse.jdt.core.compiler.compliance=1.8 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.compliance=11 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.8 +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning +org.eclipse.jdt.core.compiler.release=enabled +org.eclipse.jdt.core.compiler.source=11 diff --git a/bundles/org.simantics.modelica/META-INF/MANIFEST.MF b/bundles/org.simantics.modelica/META-INF/MANIFEST.MF index 654067c5..0a2eb509 100644 --- a/bundles/org.simantics.modelica/META-INF/MANIFEST.MF +++ b/bundles/org.simantics.modelica/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: Modelica Bundle-SymbolicName: org.simantics.modelica;singleton:=true Bundle-Version: 1.1.0.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Require-Bundle: org.eclipse.osgi;bundle-version="3.6.0", org.eclipse.core.runtime;bundle-version="3.6.0", org.simantics.utils;bundle-version="1.1.0", @@ -15,3 +15,4 @@ Export-Package: org.simantics.modelica, Bundle-Activator: org.simantics.modelica.Activator Bundle-ActivationPolicy: lazy Bundle-Vendor: VTT Technical Research Centre of Finland +Automatic-Module-Name: org.simantics.modelica diff --git a/bundles/org.simantics.objmap/.classpath b/bundles/org.simantics.objmap/.classpath index 1b10946d..987e6cd8 100644 --- a/bundles/org.simantics.objmap/.classpath +++ b/bundles/org.simantics.objmap/.classpath @@ -1,6 +1,6 @@ - + diff --git a/bundles/org.simantics.objmap/.settings/org.eclipse.jdt.core.prefs b/bundles/org.simantics.objmap/.settings/org.eclipse.jdt.core.prefs index 295926d9..11265a34 100644 --- a/bundles/org.simantics.objmap/.settings/org.eclipse.jdt.core.prefs +++ b/bundles/org.simantics.objmap/.settings/org.eclipse.jdt.core.prefs @@ -1,7 +1,10 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 -org.eclipse.jdt.core.compiler.compliance=1.8 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.compliance=11 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.8 +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning +org.eclipse.jdt.core.compiler.release=enabled +org.eclipse.jdt.core.compiler.source=11 diff --git a/bundles/org.simantics.objmap/META-INF/MANIFEST.MF b/bundles/org.simantics.objmap/META-INF/MANIFEST.MF index 2a1efff4..fb209ef6 100644 --- a/bundles/org.simantics.objmap/META-INF/MANIFEST.MF +++ b/bundles/org.simantics.objmap/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: Objmap Bundle-SymbolicName: org.simantics.objmap Bundle-Version: 0.1.0.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Require-Bundle: gnu.trove3;bundle-version="3.0.3", org.apache.log4j;bundle-version="1.2.15", org.simantics.layer0;bundle-version="1.0.0", @@ -18,3 +18,4 @@ Export-Package: org.simantics.objmap, org.simantics.objmap.rules.range, org.simantics.objmap.schema Bundle-Vendor: VTT Technical Research Centre of Finland +Automatic-Module-Name: org.simantics.objmap diff --git a/bundles/org.simantics.sysdyn.omsolver/.classpath b/bundles/org.simantics.sysdyn.omsolver/.classpath index b862a296..ca3785c4 100644 --- a/bundles/org.simantics.sysdyn.omsolver/.classpath +++ b/bundles/org.simantics.sysdyn.omsolver/.classpath @@ -1,6 +1,6 @@ - + diff --git a/bundles/org.simantics.sysdyn.omsolver/.settings/org.eclipse.jdt.core.prefs b/bundles/org.simantics.sysdyn.omsolver/.settings/org.eclipse.jdt.core.prefs index 295926d9..11265a34 100644 --- a/bundles/org.simantics.sysdyn.omsolver/.settings/org.eclipse.jdt.core.prefs +++ b/bundles/org.simantics.sysdyn.omsolver/.settings/org.eclipse.jdt.core.prefs @@ -1,7 +1,10 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 -org.eclipse.jdt.core.compiler.compliance=1.8 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.compliance=11 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.8 +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning +org.eclipse.jdt.core.compiler.release=enabled +org.eclipse.jdt.core.compiler.source=11 diff --git a/bundles/org.simantics.sysdyn.omsolver/META-INF/MANIFEST.MF b/bundles/org.simantics.sysdyn.omsolver/META-INF/MANIFEST.MF index c0ab4deb..e0bbe5a2 100644 --- a/bundles/org.simantics.sysdyn.omsolver/META-INF/MANIFEST.MF +++ b/bundles/org.simantics.sysdyn.omsolver/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: Open Modelica solver Bundle-SymbolicName: org.simantics.sysdyn.omsolver Bundle-Version: 1.0.0.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Require-Bundle: org.simantics.sysdyn;bundle-version="1.9.0", org.eclipse.osgi;bundle-version="3.10.102", org.simantics.fmu;bundle-version="1.1.0", @@ -13,3 +13,4 @@ Require-Bundle: org.simantics.sysdyn;bundle-version="1.9.0", org.simantics.simulation;bundle-version="1.1.0" Bundle-ActivationPolicy: lazy Bundle-Activator: org.simantics.sysdyn.omsolver.Activator +Automatic-Module-Name: org.simantics.sysdyn.omsolver diff --git a/bundles/org.simantics.sysdyn.ontology/.classpath b/bundles/org.simantics.sysdyn.ontology/.classpath index b862a296..ca3785c4 100644 --- a/bundles/org.simantics.sysdyn.ontology/.classpath +++ b/bundles/org.simantics.sysdyn.ontology/.classpath @@ -1,6 +1,6 @@ - + diff --git a/bundles/org.simantics.sysdyn.ontology/.settings/org.eclipse.jdt.core.prefs b/bundles/org.simantics.sysdyn.ontology/.settings/org.eclipse.jdt.core.prefs index 295926d9..11265a34 100644 --- a/bundles/org.simantics.sysdyn.ontology/.settings/org.eclipse.jdt.core.prefs +++ b/bundles/org.simantics.sysdyn.ontology/.settings/org.eclipse.jdt.core.prefs @@ -1,7 +1,10 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 -org.eclipse.jdt.core.compiler.compliance=1.8 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.compliance=11 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.8 +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning +org.eclipse.jdt.core.compiler.release=enabled +org.eclipse.jdt.core.compiler.source=11 diff --git a/bundles/org.simantics.sysdyn.ontology/META-INF/MANIFEST.MF b/bundles/org.simantics.sysdyn.ontology/META-INF/MANIFEST.MF index 3ab8e5de..bf8efd4a 100644 --- a/bundles/org.simantics.sysdyn.ontology/META-INF/MANIFEST.MF +++ b/bundles/org.simantics.sysdyn.ontology/META-INF/MANIFEST.MF @@ -21,6 +21,7 @@ Require-Bundle: org.simantics.layer0, org.simantics.spreadsheet.ontology;bundle-version="1.1.0", org.simantics.workbench.ontology;bundle-version="1.2.0", org.simantics.selectionview.ontology;bundle-version="1.2.0" -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Export-Package: org.simantics.sysdyn Bundle-Vendor: VTT Technical Reserarch Centre of Finland +Automatic-Module-Name: org.simantics.sysdyn.ontology diff --git a/bundles/org.simantics.sysdyn.ui/.classpath b/bundles/org.simantics.sysdyn.ui/.classpath index b862a296..ca3785c4 100644 --- a/bundles/org.simantics.sysdyn.ui/.classpath +++ b/bundles/org.simantics.sysdyn.ui/.classpath @@ -1,6 +1,6 @@ - + diff --git a/bundles/org.simantics.sysdyn.ui/.settings/org.eclipse.jdt.core.prefs b/bundles/org.simantics.sysdyn.ui/.settings/org.eclipse.jdt.core.prefs index bb35fa0a..e2e9c66d 100644 --- a/bundles/org.simantics.sysdyn.ui/.settings/org.eclipse.jdt.core.prefs +++ b/bundles/org.simantics.sysdyn.ui/.settings/org.eclipse.jdt.core.prefs @@ -1,11 +1,14 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.8 +org.eclipse.jdt.core.compiler.compliance=11 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.8 +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning +org.eclipse.jdt.core.compiler.release=enabled +org.eclipse.jdt.core.compiler.source=11 diff --git a/bundles/org.simantics.sysdyn.ui/META-INF/MANIFEST.MF b/bundles/org.simantics.sysdyn.ui/META-INF/MANIFEST.MF index 537c054d..cb3cfaca 100644 --- a/bundles/org.simantics.sysdyn.ui/META-INF/MANIFEST.MF +++ b/bundles/org.simantics.sysdyn.ui/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: Simantics System Dynamics UI Bundle-SymbolicName: org.simantics.sysdyn.ui;singleton:=true Bundle-Version: 1.9.0.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Require-Bundle: org.simantics.layer0.utils;bundle-version="0.6.2", org.simantics.scenegraph;bundle-version="0.9.0", org.junit;bundle-version="4.12.0";resolution:=optional, @@ -15,8 +15,7 @@ Require-Bundle: org.simantics.layer0.utils;bundle-version="0.6.2", org.simantics.project;bundle-version="1.0.0", org.eclipse.jface.text;bundle-version="3.5.0", org.eclipse.ui.editors;bundle-version="3.5.0", - org.jfree.jcommon;bundle-version="1.0.16", - org.jfree.jchart;bundle-version="1.0.13", + org.jfree.jchart;bundle-version="1.5.0", org.simantics.modelica;bundle-version="1.0.0", org.apache.log4j;bundle-version="1.2.15", org.eclipse.ui.console;bundle-version="3.4.0", @@ -70,3 +69,4 @@ Import-Package: freemarker.template, org.simantics.workbench, org.simantics.workbench.ontology, org.simantics.workbench.search +Automatic-Module-Name: org.simantics.sysdyn.ui diff --git a/bundles/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements/SysdynTextElementHandler.java b/bundles/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements/SysdynTextElementHandler.java index 408ff09b..be022a59 100644 --- a/bundles/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements/SysdynTextElementHandler.java +++ b/bundles/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements/SysdynTextElementHandler.java @@ -48,7 +48,7 @@ public class SysdynTextElementHandler extends SysdynTextElementNoBounds implemen @Override public Rectangle2D getBounds(IElement e, Rectangle2D size) { - Rectangle2D bounds = TextElementHandler.calculateBounds(e, size, horizontalAlignment, SCALE, paddingX, paddingX); + Rectangle2D bounds = TextElementHandler.calculateBounds(e, size, horizontalAlignment, DEFAULT_SCALE, paddingX, paddingX); return bounds; } diff --git a/bundles/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements/connections/RouteFlowConnectionFactory.java b/bundles/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements/connections/RouteFlowConnectionFactory.java index 39f8d127..a2a1aed0 100644 --- a/bundles/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements/connections/RouteFlowConnectionFactory.java +++ b/bundles/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements/connections/RouteFlowConnectionFactory.java @@ -41,7 +41,6 @@ import org.simantics.diagram.G2DUtils; import org.simantics.diagram.adapter.SyncElementFactory; import org.simantics.diagram.connection.ConnectionVisuals; import org.simantics.diagram.connection.RouteGraph; -import org.simantics.diagram.connection.RouteGraphConnectionClass; import org.simantics.diagram.connection.RouteLine; import org.simantics.diagram.connection.RouteNode; import org.simantics.diagram.connection.RouteTerminal; @@ -71,6 +70,7 @@ import org.simantics.g2d.element.IElement; import org.simantics.g2d.element.handler.EdgeVisuals.EdgeEnd; import org.simantics.g2d.element.handler.TerminalTopology; import org.simantics.g2d.element.handler.impl.StaticObjectAdapter; +import org.simantics.g2d.elementclass.RouteGraphConnectionClass; import org.simantics.g2d.routing.algorithm2.Router4; import org.simantics.g2d.utils.TopologicalSelectionExpander; import org.simantics.layer0.Layer0; diff --git a/bundles/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements/connections/RouteFlowEdgeClass.java b/bundles/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements/connections/RouteFlowEdgeClass.java index 5061e738..39489538 100644 --- a/bundles/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements/connections/RouteFlowEdgeClass.java +++ b/bundles/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements/connections/RouteFlowEdgeClass.java @@ -15,13 +15,13 @@ import java.util.ArrayList; import java.util.List; import org.simantics.diagram.connection.RouteGraph; -import org.simantics.diagram.connection.RouteGraphConnectionClass; import org.simantics.diagram.connection.rendering.IRouteGraphRenderer; import org.simantics.g2d.element.ElementClass; import org.simantics.g2d.element.ElementUtils; import org.simantics.g2d.element.IElement; import org.simantics.g2d.element.handler.ElementHandler; import org.simantics.g2d.element.handler.SceneGraph; +import org.simantics.g2d.elementclass.RouteGraphConnectionClass; import org.simantics.scenegraph.g2d.G2DParentNode; import org.simantics.scenegraph.g2d.nodes.connection.IRouteGraphListener; diff --git a/bundles/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/properties/widgets/ChartWidget.java b/bundles/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/properties/widgets/ChartWidget.java index c12ffc6f..aa5b0efc 100644 --- a/bundles/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/properties/widgets/ChartWidget.java +++ b/bundles/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/properties/widgets/ChartWidget.java @@ -157,10 +157,10 @@ public class ChartWidget implements Widget { XYPlot plot = (XYPlot) chart.getPlot(); XYLineAndShapeRenderer renderer = (XYLineAndShapeRenderer) plot.getRenderer(); - renderer.setBaseShapesVisible(true); + renderer.setDefaultShapesVisible(true); renderer.setDrawOutlines(true); renderer.setUseFillPaint(true); - renderer.setBaseFillPaint(Color.white); + renderer.setDefaultFillPaint(Color.white); renderer.setSeriesStroke(0, new BasicStroke(3.0f)); renderer.setSeriesOutlineStroke(0, new BasicStroke(2.0f)); renderer.setSeriesShape(0, new Ellipse2D.Double(-5.0, -5.0, 10.0, 10.0)); diff --git a/bundles/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/TrendToPng.java b/bundles/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/TrendToPng.java index 297d7a95..8b47dd0e 100644 --- a/bundles/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/TrendToPng.java +++ b/bundles/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/TrendToPng.java @@ -25,7 +25,7 @@ import org.eclipse.swt.widgets.FileDialog; import org.eclipse.swt.widgets.Shell; import org.eclipse.ui.IWorkbenchPart; import org.eclipse.ui.handlers.HandlerUtil; -import org.jfree.chart.ChartUtilities; +import org.jfree.chart.ChartUtils; import org.jfree.chart.JFreeChart; import org.simantics.sysdyn.ui.Activator; @@ -69,7 +69,7 @@ public class TrendToPng extends AbstractHandler { JFreeChart chart = trendView.getPanel().getChart(); try { - ChartUtilities.saveChartAsPNG(file, chart, width, height, null, true, compressionLevel); + ChartUtils.saveChartAsPNG(file, chart, width, height, null, true, compressionLevel); } catch (IOException e) { Activator.getDefault().getLog().log(new Status(IStatus.ERROR, Activator.PLUGIN_ID, "Save as PNG failed.", e)); } diff --git a/bundles/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/XYDataset.java b/bundles/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/XYDataset.java index 015d318e..a2892f80 100644 --- a/bundles/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/XYDataset.java +++ b/bundles/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/trend/XYDataset.java @@ -27,9 +27,9 @@ import org.jfree.chart.plot.ValueMarker; import org.jfree.chart.renderer.AbstractRenderer; import org.jfree.chart.renderer.xy.AbstractXYItemRenderer; import org.jfree.chart.renderer.xy.XYLineAndShapeRenderer; +import org.jfree.chart.ui.Layer; import org.jfree.data.general.Dataset; import org.jfree.data.xy.DefaultXYDataset; -import org.jfree.ui.Layer; import org.simantics.Simantics; import org.simantics.databoard.Bindings; import org.simantics.db.ReadGraph; @@ -302,7 +302,7 @@ public class XYDataset extends AbstractDataset implements org.simantics.jfreecha } if(renderer == null) { XYLineAndShapeRenderer renderer = new XYLineAndShapeRenderer(true, false); - renderer.setBaseToolTipGenerator(new StandardXYToolTipGenerator()); + renderer.setDefaultToolTipGenerator(new StandardXYToolTipGenerator()); return renderer; } else { return renderer.getRenderer(); diff --git a/bundles/org.simantics.sysdyn.xmile/.classpath b/bundles/org.simantics.sysdyn.xmile/.classpath index b862a296..ca3785c4 100644 --- a/bundles/org.simantics.sysdyn.xmile/.classpath +++ b/bundles/org.simantics.sysdyn.xmile/.classpath @@ -1,6 +1,6 @@ - + diff --git a/bundles/org.simantics.sysdyn.xmile/.settings/org.eclipse.jdt.core.prefs b/bundles/org.simantics.sysdyn.xmile/.settings/org.eclipse.jdt.core.prefs index 295926d9..11265a34 100644 --- a/bundles/org.simantics.sysdyn.xmile/.settings/org.eclipse.jdt.core.prefs +++ b/bundles/org.simantics.sysdyn.xmile/.settings/org.eclipse.jdt.core.prefs @@ -1,7 +1,10 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 -org.eclipse.jdt.core.compiler.compliance=1.8 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.compliance=11 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.8 +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning +org.eclipse.jdt.core.compiler.release=enabled +org.eclipse.jdt.core.compiler.source=11 diff --git a/bundles/org.simantics.sysdyn.xmile/META-INF/MANIFEST.MF b/bundles/org.simantics.sysdyn.xmile/META-INF/MANIFEST.MF index 7827b325..af0b72fa 100644 --- a/bundles/org.simantics.sysdyn.xmile/META-INF/MANIFEST.MF +++ b/bundles/org.simantics.sysdyn.xmile/META-INF/MANIFEST.MF @@ -13,6 +13,8 @@ Require-Bundle: org.eclipse.ui, org.simantics.sysdyn;bundle-version="1.8.0", org.simantics.sysdyn.ontology;bundle-version="1.1.0", org.simantics.objmap;bundle-version="0.1.0", - org.simantics.modeling;bundle-version="1.1.1" -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 + org.simantics.modeling;bundle-version="1.1.1", + jakarta.xml.bind-api;bundle-version="2.3.2" +Bundle-RequiredExecutionEnvironment: JavaSE-11 Bundle-ActivationPolicy: lazy +Automatic-Module-Name: org.simantics.sysdyn.xmile diff --git a/bundles/org.simantics.sysdyn/.classpath b/bundles/org.simantics.sysdyn/.classpath index b862a296..ca3785c4 100644 --- a/bundles/org.simantics.sysdyn/.classpath +++ b/bundles/org.simantics.sysdyn/.classpath @@ -1,6 +1,6 @@ - + diff --git a/bundles/org.simantics.sysdyn/.settings/org.eclipse.jdt.core.prefs b/bundles/org.simantics.sysdyn/.settings/org.eclipse.jdt.core.prefs index 295926d9..11265a34 100644 --- a/bundles/org.simantics.sysdyn/.settings/org.eclipse.jdt.core.prefs +++ b/bundles/org.simantics.sysdyn/.settings/org.eclipse.jdt.core.prefs @@ -1,7 +1,10 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 -org.eclipse.jdt.core.compiler.compliance=1.8 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.compliance=11 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.8 +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning +org.eclipse.jdt.core.compiler.release=enabled +org.eclipse.jdt.core.compiler.source=11 diff --git a/bundles/org.simantics.sysdyn/META-INF/MANIFEST.MF b/bundles/org.simantics.sysdyn/META-INF/MANIFEST.MF index 0f836451..40c9b599 100644 --- a/bundles/org.simantics.sysdyn/META-INF/MANIFEST.MF +++ b/bundles/org.simantics.sysdyn/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: Simantics System Dynamics Bundle-SymbolicName: org.simantics.sysdyn;singleton:=true Bundle-Version: 1.9.0.qualifier -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Require-Bundle: org.simantics.objmap;bundle-version="0.1.0", org.simantics.db;bundle-version="0.6.2", org.simantics.modelica;bundle-version="1.0.0", @@ -29,8 +29,7 @@ Require-Bundle: org.simantics.objmap;bundle-version="0.1.0", org.simantics.issues;bundle-version="1.1.0", org.simantics.issues.common;bundle-version="1.1.0", org.simantics.jfreechart;bundle-version="1.0.0", - org.jfree.jchart;bundle-version="1.0.13", - org.jfree.jcommon;bundle-version="1.0.16", + org.jfree.jchart;bundle-version="1.5.0", org.simantics.spreadsheet.graph;bundle-version="1.1.0", fi.semantum.sysdyn.solver;bundle-version="0.1.0", org.simantics.fileimport, @@ -64,3 +63,4 @@ Import-Package: org.eclipse.ui, org.simantics.ui Bundle-Vendor: VTT Technical Reserarch Centre of Finland Service-Component: OSGI-INF/org.simantics.sysdyn.SysdynFileImport.xml +Automatic-Module-Name: org.simantics.sysdyn diff --git a/features/org.simantics.sysdyn.build.feature/.credentials.properties b/features/org.simantics.sysdyn.build.feature/.credentials.properties deleted file mode 100644 index 859dca40..00000000 --- a/features/org.simantics.sysdyn.build.feature/.credentials.properties +++ /dev/null @@ -1,2 +0,0 @@ -simantics.user=anonymous -simantics.password= \ No newline at end of file diff --git a/features/org.simantics.sysdyn.build.feature/.project b/features/org.simantics.sysdyn.build.feature/.project deleted file mode 100644 index 120cfba4..00000000 --- a/features/org.simantics.sysdyn.build.feature/.project +++ /dev/null @@ -1,17 +0,0 @@ - - - org.simantics.sysdyn.build.feature - - - - - - org.eclipse.pde.FeatureBuilder - - - - - - org.eclipse.pde.FeatureNature - - diff --git a/features/org.simantics.sysdyn.build.feature/Resources.rmap b/features/org.simantics.sysdyn.build.feature/Resources.rmap deleted file mode 100644 index 78c416fe..00000000 --- a/features/org.simantics.sysdyn.build.feature/Resources.rmap +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/features/org.simantics.sysdyn.build.feature/buckminster.properties b/features/org.simantics.sysdyn.build.feature/buckminster.properties deleted file mode 100644 index d8c588f4..00000000 --- a/features/org.simantics.sysdyn.build.feature/buckminster.properties +++ /dev/null @@ -1,19 +0,0 @@ -# How .qualifier in versions should be replaced -qualifier.replacement.*=generator:buildTimestamp -generator.buildTimestamp.format='v'yyyyMMdd-HHmmss - -# Pack200 compression -#site.pack200=true -#site.retain.unpack=true - -# JAR Signing -#site.signing=true -#signing.type=local -#local.sign=true - -# Generate source bundles -cbi.include.source=false - -target.os=win32 -target.ws=win32 -target.arch=* diff --git a/features/org.simantics.sysdyn.build.feature/build.properties b/features/org.simantics.sysdyn.build.feature/build.properties deleted file mode 100644 index 82ab19c6..00000000 --- a/features/org.simantics.sysdyn.build.feature/build.properties +++ /dev/null @@ -1 +0,0 @@ -bin.includes = feature.xml diff --git a/features/org.simantics.sysdyn.build.feature/feature.xml b/features/org.simantics.sysdyn.build.feature/feature.xml deleted file mode 100644 index ff2425fc..00000000 --- a/features/org.simantics.sysdyn.build.feature/feature.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - Simantics System Dynamics P2 site build feature with custom internal solver only. - This feature is only used for Jenkins and Buckminster builds. - - - - Copyright (c) 2016 Association for Decentralized Information -Management in Industry THTH ry.<br/> -All rights reserved. This program and the accompanying materials -are made available under the terms of the Eclipse Public License -v1.0 which accompanies this distribution, and is available at -<a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a> - - - - Licensed under Eclipse Public License (EPL) 1.0. - - - - - diff --git a/features/org.simantics.sysdyn.build.feature/jenkins.buckminster.script b/features/org.simantics.sysdyn.build.feature/jenkins.buckminster.script deleted file mode 100644 index e53d744a..00000000 --- a/features/org.simantics.sysdyn.build.feature/jenkins.buckminster.script +++ /dev/null @@ -1,4 +0,0 @@ -importtargetdefinition -A 'http://www.simantics.org/download/head/simantics.target' -import 'site.cquery' -build -perform -D target.os=* -D target.ws=* -D target.arch=* org.simantics.sysdyn.build#site.p2 \ No newline at end of file diff --git a/features/org.simantics.sysdyn.build.feature/site.cquery b/features/org.simantics.sysdyn.build.feature/site.cquery deleted file mode 100644 index 1ba37b24..00000000 --- a/features/org.simantics.sysdyn.build.feature/site.cquery +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/features/org.simantics.sysdyn.product.site.feature/.credentials.properties b/features/org.simantics.sysdyn.product.site.feature/.credentials.properties deleted file mode 100644 index 859dca40..00000000 --- a/features/org.simantics.sysdyn.product.site.feature/.credentials.properties +++ /dev/null @@ -1,2 +0,0 @@ -simantics.user=anonymous -simantics.password= \ No newline at end of file diff --git a/features/org.simantics.sysdyn.product.site.feature/.project b/features/org.simantics.sysdyn.product.site.feature/.project deleted file mode 100644 index 83aae40f..00000000 --- a/features/org.simantics.sysdyn.product.site.feature/.project +++ /dev/null @@ -1,17 +0,0 @@ - - - org.simantics.sysdyn.product.site.feature - - - - - - org.eclipse.pde.FeatureBuilder - - - - - - org.eclipse.pde.FeatureNature - - diff --git a/features/org.simantics.sysdyn.product.site.feature/Resources.rmap b/features/org.simantics.sysdyn.product.site.feature/Resources.rmap deleted file mode 100644 index 78c416fe..00000000 --- a/features/org.simantics.sysdyn.product.site.feature/Resources.rmap +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/features/org.simantics.sysdyn.product.site.feature/buckminster.cspex b/features/org.simantics.sysdyn.product.site.feature/buckminster.cspex deleted file mode 100644 index 333686a6..00000000 --- a/features/org.simantics.sysdyn.product.site.feature/buckminster.cspex +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/features/org.simantics.sysdyn.product.site.feature/buckminster.properties b/features/org.simantics.sysdyn.product.site.feature/buckminster.properties deleted file mode 100644 index d8c588f4..00000000 --- a/features/org.simantics.sysdyn.product.site.feature/buckminster.properties +++ /dev/null @@ -1,19 +0,0 @@ -# How .qualifier in versions should be replaced -qualifier.replacement.*=generator:buildTimestamp -generator.buildTimestamp.format='v'yyyyMMdd-HHmmss - -# Pack200 compression -#site.pack200=true -#site.retain.unpack=true - -# JAR Signing -#site.signing=true -#signing.type=local -#local.sign=true - -# Generate source bundles -cbi.include.source=false - -target.os=win32 -target.ws=win32 -target.arch=* diff --git a/features/org.simantics.sysdyn.product.site.feature/build.properties b/features/org.simantics.sysdyn.product.site.feature/build.properties deleted file mode 100644 index 82ab19c6..00000000 --- a/features/org.simantics.sysdyn.product.site.feature/build.properties +++ /dev/null @@ -1 +0,0 @@ -bin.includes = feature.xml diff --git a/features/org.simantics.sysdyn.product.site.feature/build/product.ant b/features/org.simantics.sysdyn.product.site.feature/build/product.ant deleted file mode 100644 index 53fe0cb9..00000000 --- a/features/org.simantics.sysdyn.product.site.feature/build/product.ant +++ /dev/null @@ -1,58 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/features/org.simantics.sysdyn.product.site.feature/feature.xml b/features/org.simantics.sysdyn.product.site.feature/feature.xml deleted file mode 100644 index 95b25100..00000000 --- a/features/org.simantics.sysdyn.product.site.feature/feature.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - - - Sysdyn feature for headless product and feature builds that includes - all the other sysdyn features necessary for making the P2 site - and product builds. - - - - Copyright (c) 2016 Association for Decentralized Information -Management in Industry THTH ry.<br/> -All rights reserved. This program and the accompanying materials -are made available under the terms of the Eclipse Public License -v1.0 which accompanies this distribution, and is available at -<a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a> - - - - Licensed under Eclipse Public License (EPL) 1.0. - - - - - - - - - diff --git a/features/org.simantics.sysdyn.product.site.feature/jenkins.buckminster.script b/features/org.simantics.sysdyn.product.site.feature/jenkins.buckminster.script deleted file mode 100644 index 0a1299b4..00000000 --- a/features/org.simantics.sysdyn.product.site.feature/jenkins.buckminster.script +++ /dev/null @@ -1,8 +0,0 @@ -importtargetdefinition -A 'http://www.simantics.org/download/head/simantics.target' -import 'site.cquery' -build -perform -D target.os=* -D target.ws=* -D target.arch=* org.simantics.sysdyn.product.site#site.p2 -perform -D target.os=win32 -D target.ws=win32 -D target.arch=x86 -D p2.profileName=SysdynProfile -D p2.rootId=org.simantics.sysdyn.product.Sysdyn -D build.label=Sysdyn-b${BUILD_NUMBER} org.simantics.sysdyn.product.site#create.product.zip -perform -D target.os=win32 -D target.ws=win32 -D target.arch=x86_64 -D p2.profileName=SysdynProfile -D p2.rootId=org.simantics.sysdyn.product.Sysdyn -D build.label=Sysdyn-b${BUILD_NUMBER} org.simantics.sysdyn.product.site#create.product.zip -perform -D target.os=win32 -D target.ws=win32 -D target.arch=x86 -D p2.profileName=SysdynProfile -D p2.rootId=org.simantics.sysdyn.product.SysdynWithOpenModelica -D build.label=Sysdyn-with-om-b${BUILD_NUMBER} org.simantics.sysdyn.product.site#create.product.zip -perform -D target.os=win32 -D target.ws=win32 -D target.arch=x86_64 -D p2.profileName=SysdynProfile -D p2.rootId=org.simantics.sysdyn.product.SysdynWithOpenModelica -D build.label=Sysdyn-with-om-b${BUILD_NUMBER} org.simantics.sysdyn.product.site#create.product.zip \ No newline at end of file diff --git a/features/org.simantics.sysdyn.product.site.feature/site.cquery b/features/org.simantics.sysdyn.product.site.feature/site.cquery deleted file mode 100644 index 678b963e..00000000 --- a/features/org.simantics.sysdyn.product.site.feature/site.cquery +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/features/org.simantics.sysdyn.updatesite.feature/.project b/features/org.simantics.sysdyn.updatesite.feature/.project deleted file mode 100644 index 3b0eb9ac..00000000 --- a/features/org.simantics.sysdyn.updatesite.feature/.project +++ /dev/null @@ -1,17 +0,0 @@ - - - org.simantics.sysdyn.updatesite.feature - - - - - - org.eclipse.pde.FeatureBuilder - - - - - - org.eclipse.pde.FeatureNature - - diff --git a/features/org.simantics.sysdyn.updatesite.feature/build.properties b/features/org.simantics.sysdyn.updatesite.feature/build.properties deleted file mode 100644 index 82ab19c6..00000000 --- a/features/org.simantics.sysdyn.updatesite.feature/build.properties +++ /dev/null @@ -1 +0,0 @@ -bin.includes = feature.xml diff --git a/features/org.simantics.sysdyn.updatesite.feature/feature.xml b/features/org.simantics.sysdyn.updatesite.feature/feature.xml deleted file mode 100644 index e8ae051d..00000000 --- a/features/org.simantics.sysdyn.updatesite.feature/feature.xml +++ /dev/null @@ -1,75 +0,0 @@ - - - - - [Enter Feature Description here.] - - - - [Enter Copyright Description here.] - - - - [Enter License Description here.] - - - - - - - - - - - - - - - - - - - diff --git a/features/pom.xml b/features/pom.xml index e2c36c52..ba976dc5 100644 --- a/features/pom.xml +++ b/features/pom.xml @@ -62,11 +62,8 @@ - org.simantics.sysdyn.internal.feature org.simantics.sysdyn.internal.p2.feature - - diff --git a/releng/inno-setup/sysdyn-om.iss b/releng/inno-setup/sysdyn-om.iss index 0edcd963..04f466e4 100644 --- a/releng/inno-setup/sysdyn-om.iss +++ b/releng/inno-setup/sysdyn-om.iss @@ -8,7 +8,7 @@ DefaultGroupName=Simantics Compression=lzma2 SolidCompression=yes OutputBaseFilename=Sysdyn-OM-1.35.0 -AppCopyright=Copyright © 2018 Simantics Team +AppCopyright=Copyright � 2020 Simantics Team DisableDirPage=no WizardSmallImageFile=sysdyn.bmp OutputDir=output-om diff --git a/releng/inno-setup/sysdyn.iss b/releng/inno-setup/sysdyn.iss index 185e012f..d4f88de3 100644 --- a/releng/inno-setup/sysdyn.iss +++ b/releng/inno-setup/sysdyn.iss @@ -8,7 +8,7 @@ DefaultGroupName=Simantics Compression=lzma2 SolidCompression=yes OutputBaseFilename=Sysdyn-1.35.0 -AppCopyright=Copyright © 2018 Simantics Team +AppCopyright=Copyright � 2020 Simantics Team DisableDirPage=no WizardSmallImageFile=sysdyn.bmp OutputDir=output diff --git a/releng/org.simantics.sysdyn.tycho.configuration/pom.xml b/releng/org.simantics.sysdyn.tycho.configuration/pom.xml index 843afbab..5e3fb45d 100644 --- a/releng/org.simantics.sysdyn.tycho.configuration/pom.xml +++ b/releng/org.simantics.sysdyn.tycho.configuration/pom.xml @@ -8,8 +8,8 @@ pom - 1.4.0 - 1.4.0 + 1.7.0 + 1.7.0 UTF-8 master http://www.simantics.org/download @@ -97,36 +97,6 @@ - - org.eclipse.tycho.extras - tycho-pack200b-plugin - ${tycho.extras.version} - - - pack200-pack - - pack - - - - - - org.eclipse.tycho - tycho-p2-plugin - ${tycho.version} - - - attach-p2-metadata - package - - p2-metadata - - - - - false - - diff --git a/tests/org.simantics.sysdyn.tests/.classpath b/tests/org.simantics.sysdyn.tests/.classpath index 8a8f1668..74984163 100644 --- a/tests/org.simantics.sysdyn.tests/.classpath +++ b/tests/org.simantics.sysdyn.tests/.classpath @@ -1,7 +1,11 @@ - + - + + + + + diff --git a/tests/org.simantics.sysdyn.tests/.settings/org.eclipse.jdt.core.prefs b/tests/org.simantics.sysdyn.tests/.settings/org.eclipse.jdt.core.prefs index f287d53c..11265a34 100644 --- a/tests/org.simantics.sysdyn.tests/.settings/org.eclipse.jdt.core.prefs +++ b/tests/org.simantics.sysdyn.tests/.settings/org.eclipse.jdt.core.prefs @@ -1,7 +1,10 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 -org.eclipse.jdt.core.compiler.compliance=1.6 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.compliance=11 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.6 +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning +org.eclipse.jdt.core.compiler.release=enabled +org.eclipse.jdt.core.compiler.source=11 diff --git a/tests/org.simantics.sysdyn.tests/META-INF/MANIFEST.MF b/tests/org.simantics.sysdyn.tests/META-INF/MANIFEST.MF index b9069e23..7a96d06b 100644 --- a/tests/org.simantics.sysdyn.tests/META-INF/MANIFEST.MF +++ b/tests/org.simantics.sysdyn.tests/META-INF/MANIFEST.MF @@ -9,5 +9,5 @@ Require-Bundle: org.simantics.modelica;bundle-version="1.0.0", org.simantics.db.testing;bundle-version="1.0.0", org.simantics.fmu;bundle-version="1.1.0" Bundle-ActivationPolicy: lazy -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Import-Package: org.osgi.framework