From db640808f2d06e2301fbbaf20babf653687f5ca9 Mon Sep 17 00:00:00 2001 From: Eyck Jentzsch Date: Thu, 14 Sep 2023 16:29:02 +0200 Subject: [PATCH] updates packaged java version --- .../com/minres/scviewer/database/internal/WaveformDb.java | 8 ++++---- pom.xml | 4 ++-- products/com.minres.scviewer.e4.product/scviewer.product | 2 +- .../com.minres.scviewer.target.target | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/plugins/com.minres.scviewer.database/src/com/minres/scviewer/database/internal/WaveformDb.java b/plugins/com.minres.scviewer.database/src/com/minres/scviewer/database/internal/WaveformDb.java index 023c713..c7f30d2 100644 --- a/plugins/com.minres.scviewer.database/src/com/minres/scviewer/database/internal/WaveformDb.java +++ b/plugins/com.minres.scviewer.database/src/com/minres/scviewer/database/internal/WaveformDb.java @@ -143,15 +143,15 @@ public class WaveformDb extends HierNode implements IWaveformDb, PropertyChangeL retval=false; } loader.removePropertyChangeListener(this); - for (IWaveform w : loader.getAllWaves()) { - waveforms.put(w.getFullName(), w); - } +// for (IWaveform w : loader.getAllWaves()) { +// waveforms.put(w.getFullName(), w); +// } if (loader.getMaxTime() > maxTime) { maxTime = loader.getMaxTime(); } if (name == null) name = getFileBasename(inp.getName()); - buildHierarchyNodes(); + //buildHierarchyNodes(); relationTypes.addAll(loader.getAllRelationTypes()); } } diff --git a/pom.xml b/pom.xml index 8754121..fc8fa1c 100644 --- a/pom.xml +++ b/pom.xml @@ -75,9 +75,9 @@ - org.eclipse.justj.openjdk.hotspot.jre.minimal-15 + org.eclipse.justj.openjdk.hotspot.jre.minimal-17 - org.eclipse.justj.openjdk.hotspot.jre.minimal-15 + org.eclipse.justj.openjdk.hotspot.jre.minimal-17 true diff --git a/products/com.minres.scviewer.e4.product/scviewer.product b/products/com.minres.scviewer.e4.product/scviewer.product index 839590f..2b8bfc5 100644 --- a/products/com.minres.scviewer.e4.product/scviewer.product +++ b/products/com.minres.scviewer.e4.product/scviewer.product @@ -34,7 +34,7 @@ - org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11 + org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17 org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11 org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11 diff --git a/releng/com.minres.scviewer.target/com.minres.scviewer.target.target b/releng/com.minres.scviewer.target/com.minres.scviewer.target.target index a8e4b18..101cb67 100644 --- a/releng/com.minres.scviewer.target/com.minres.scviewer.target.target +++ b/releng/com.minres.scviewer.target/com.minres.scviewer.target.target @@ -36,7 +36,7 @@ - +