From d38016a03fae7b0b76f44283b217fae9570d5a3d Mon Sep 17 00:00:00 2001 From: Eyck Jentzsch Date: Wed, 17 Feb 2021 20:24:25 +0000 Subject: [PATCH 1/5] fix display bug --- .gitignore | 3 ++- .settings/org.eclipse.m2e.core.prefs | 4 ---- .../ui/swt/internal/ArrowPainter.java | 21 ++++++++----------- .../ui/swt/internal/RulerPainter.java | 2 +- .../ui/swt/internal/StreamPainter.java | 10 ++++++++- .../ui/swt/internal/WaveformCanvas.java | 5 ++--- .../application/parts/FileBrowserDialog.java | 4 ++++ 7 files changed, 27 insertions(+), 22 deletions(-) delete mode 100644 .settings/org.eclipse.m2e.core.prefs diff --git a/.gitignore b/.gitignore index 196589c..8beb988 100644 --- a/.gitignore +++ b/.gitignore @@ -8,4 +8,5 @@ SCViewer.xcf SCViewer_1.png copyrightLog.txt /workspace -?*.launch \ No newline at end of file +?*.launch +/.settings/ diff --git a/.settings/org.eclipse.m2e.core.prefs b/.settings/org.eclipse.m2e.core.prefs deleted file mode 100644 index f897a7f..0000000 --- a/.settings/org.eclipse.m2e.core.prefs +++ /dev/null @@ -1,4 +0,0 @@ -activeProfiles= -eclipse.preferences.version=1 -resolveWorkspaceProjects=true -version=1 diff --git a/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/ui/swt/internal/ArrowPainter.java b/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/ui/swt/internal/ArrowPainter.java index e5b6cc7..f867b70 100644 --- a/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/ui/swt/internal/ArrowPainter.java +++ b/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/ui/swt/internal/ArrowPainter.java @@ -38,7 +38,7 @@ public class ArrowPainter implements IPainter { private int yCtrlOffset = 30; - private WaveformCanvas waveCanvas; + private final WaveformCanvas waveCanvas; private ITx tx; @@ -54,8 +54,6 @@ public class ArrowPainter implements IPainter { long scaleFactor; - boolean deferUpdate; - public ArrowPainter(WaveformCanvas waveCanvas, RelationType relationType) { this.waveCanvas = waveCanvas; highlightType=relationType; @@ -90,15 +88,15 @@ public class ArrowPainter implements IPainter { return res.isPresent()? res.get():0; } - protected void calculateGeometries() { - deferUpdate = false; + protected boolean calculateGeometries() { iRect.clear(); oRect.clear(); IWaveformPainter painter = waveCanvas.wave2painterMap.get(tx.getStream()); + if(painter == null) + painter = waveCanvas.wave2painterMap.get(tx.getGenerator()); if (painter == null) { // stream has been added but painter not yet // created - deferUpdate = true; - return; + return true; } int laneHeight = painter.getHeight() / tx.getStream().getRowCount(); txRectangle = new Rectangle((int) (tx.getBeginTime() / scaleFactor), @@ -106,6 +104,7 @@ public class ArrowPainter implements IPainter { (int) ((tx.getEndTime() - tx.getBeginTime()) / scaleFactor), laneHeight); deriveGeom(tx.getIncomingRelations(), iRect, false); deriveGeom(tx.getOutgoingRelations(), oRect, true); + return false; } protected void deriveGeom(Collection relations, List res, boolean useTarget) { @@ -160,11 +159,9 @@ public class ArrowPainter implements IPainter { Color highliteColor = waveCanvas.styleProvider.getColor(WaveformColors.REL_ARROW_HIGHLITE); if(tx==null) return; - if (!deferUpdate) { - scaleFactor = waveCanvas.getScaleFactor(); - calculateGeometries(); - } - if(deferUpdate) return; + scaleFactor = waveCanvas.getScaleFactor(); + if(calculateGeometries()) + return; int correctionValue = (int)(selectionOffset); Rectangle correctedTargetRectangle = new Rectangle(txRectangle.x+correctionValue, txRectangle.y, txRectangle.width, txRectangle.height); for (LinkEntry entry : iRect) { diff --git a/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/ui/swt/internal/RulerPainter.java b/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/ui/swt/internal/RulerPainter.java index 8408294..275ed94 100644 --- a/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/ui/swt/internal/RulerPainter.java +++ b/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/ui/swt/internal/RulerPainter.java @@ -19,7 +19,7 @@ import org.eclipse.swt.graphics.Rectangle; import org.eclipse.wb.swt.SWTResourceManager; public class RulerPainter implements IPainter { - protected WaveformCanvas waveCanvas; + protected final WaveformCanvas waveCanvas; static final int RULER_TICK_MINOR = 10; static final int RULER_TICK_MAJOR = 100; diff --git a/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/ui/swt/internal/StreamPainter.java b/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/ui/swt/internal/StreamPainter.java index ab5274e..1d451fe 100644 --- a/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/ui/swt/internal/StreamPainter.java +++ b/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/ui/swt/internal/StreamPainter.java @@ -46,8 +46,16 @@ public class StreamPainter extends TrackPainter{ } public void paintArea(Projection proj, Rectangle area) { - if(stream.getEvents().size()==0) return; int trackHeight=trackEntry.height/stream.getRowCount(); + if(stream.getEvents().size()==0) { + proj.setFillRule(SWT.FILL_EVEN_ODD); + proj.setLineStyle(SWT.LINE_SOLID); + proj.setLineWidth(1); + proj.setForeground(this.waveCanvas.styleProvider.getColor(WaveformColors.LINE)); + for( int y1=area.y+trackHeight/2; y1>1); if(level%2==1) this.scaleFactor*=3; ITx tx = arrowPainter.getTx(); arrowPainter.setTx(null); @@ -192,7 +192,6 @@ public class WaveformCanvas extends Canvas { * xcn = tc/newScaleFactor * t0n = (xcn-xoffs)*scaleFactor */ - long xc=centerTime/oldScaleFactor; // cursor total x-offset long xoffs=xc+origin.x; // cursor offset relative to left border long xcn=centerTime/scaleFactor; // new total x-offset long originX=xcn-xoffs; diff --git a/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/parts/FileBrowserDialog.java b/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/parts/FileBrowserDialog.java index 24a1074..f3924fc 100644 --- a/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/parts/FileBrowserDialog.java +++ b/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/parts/FileBrowserDialog.java @@ -337,7 +337,11 @@ public class FileBrowserDialog extends TrayDialog { if(f instanceof File) { if(matchers.isEmpty()) return true; for (PathMatcher m : matchers) { + try { if(m.matches(((File)f).toPath())) return true; + } catch (Exception e) { + return false; + } } } return false; From 6d8aa33fc9ed1b635fdd1bc300a4b296e2ba50a3 Mon Sep 17 00:00:00 2001 From: Eyck Jentzsch Date: Thu, 18 Feb 2021 06:26:42 +0000 Subject: [PATCH 2/5] update language level --- .../com.minres.scviewer.database.sqlite/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 10 ++++++---- .../META-INF/MANIFEST.MF | 2 +- .../com.minres.scviewer.database.text/.classpath | 6 +----- .../.settings/org.eclipse.jdt.core.prefs | 10 ++++++---- .../META-INF/MANIFEST.MF | 2 +- .../com.minres.scviewer.database.ui.swt/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 10 ++++++---- .../META-INF/MANIFEST.MF | 2 +- plugins/com.minres.scviewer.database.vcd/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 10 ++++++---- .../META-INF/MANIFEST.MF | 2 +- plugins/com.minres.scviewer.database/.classpath | 8 ++++++-- .../.settings/org.eclipse.jdt.core.prefs | 13 ++++++++++--- .../META-INF/MANIFEST.MF | 2 +- .../com.minres.scviewer.e4.application/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 10 ++++++---- .../META-INF/MANIFEST.MF | 2 +- plugins/com.minres.scviewer.ui/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 10 ++++++---- plugins/com.minres.scviewer.ui/META-INF/MANIFEST.MF | 2 +- .../com.minres.scviewer.e4.product/scviewer.product | 6 +++--- tests/com.minres.scviewer.database.test/.classpath | 2 +- .../.settings/org.eclipse.jdt.core.prefs | 10 ++++++---- .../META-INF/MANIFEST.MF | 2 +- 25 files changed, 76 insertions(+), 55 deletions(-) diff --git a/plugins/com.minres.scviewer.database.sqlite/.classpath b/plugins/com.minres.scviewer.database.sqlite/.classpath index fcfc28f..79ddf81 100644 --- a/plugins/com.minres.scviewer.database.sqlite/.classpath +++ b/plugins/com.minres.scviewer.database.sqlite/.classpath @@ -1,6 +1,6 @@ - + diff --git a/plugins/com.minres.scviewer.database.sqlite/.settings/org.eclipse.jdt.core.prefs b/plugins/com.minres.scviewer.database.sqlite/.settings/org.eclipse.jdt.core.prefs index 9f6ece8..7adc0fb 100644 --- a/plugins/com.minres.scviewer.database.sqlite/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/com.minres.scviewer.database.sqlite/.settings/org.eclipse.jdt.core.prefs @@ -1,8 +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.release=disabled -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/plugins/com.minres.scviewer.database.sqlite/META-INF/MANIFEST.MF b/plugins/com.minres.scviewer.database.sqlite/META-INF/MANIFEST.MF index 52eafa7..90c5dab 100644 --- a/plugins/com.minres.scviewer.database.sqlite/META-INF/MANIFEST.MF +++ b/plugins/com.minres.scviewer.database.sqlite/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: SQLite transaction database Bundle-SymbolicName: com.minres.scviewer.database.sqlite Bundle-Version: 1.1.0.qualifier Bundle-Vendor: MINRES Technologies GmbH -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Require-Bundle: com.minres.scviewer.database;bundle-version="1.0.0" Bundle-ClassPath: .,sqlite-jdbc-3.8.7.jar Service-Component: OSGI-INF/component.xml diff --git a/plugins/com.minres.scviewer.database.text/.classpath b/plugins/com.minres.scviewer.database.text/.classpath index 384de53..3f4be5c 100644 --- a/plugins/com.minres.scviewer.database.text/.classpath +++ b/plugins/com.minres.scviewer.database.text/.classpath @@ -1,10 +1,6 @@ - - - - - + diff --git a/plugins/com.minres.scviewer.database.text/.settings/org.eclipse.jdt.core.prefs b/plugins/com.minres.scviewer.database.text/.settings/org.eclipse.jdt.core.prefs index 4e4a3ad..e8c450c 100644 --- a/plugins/com.minres.scviewer.database.text/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/com.minres.scviewer.database.text/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,11 @@ 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.problem.forbiddenReference=warning -org.eclipse.jdt.core.compiler.release=disabled -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/plugins/com.minres.scviewer.database.text/META-INF/MANIFEST.MF b/plugins/com.minres.scviewer.database.text/META-INF/MANIFEST.MF index 5fe834b..34b35ae 100644 --- a/plugins/com.minres.scviewer.database.text/META-INF/MANIFEST.MF +++ b/plugins/com.minres.scviewer.database.text/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: Textual transaction database Bundle-SymbolicName: com.minres.scviewer.database.text Bundle-Version: 3.0.0.qualifier Bundle-Vendor: MINRES Technologies GmbH -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Import-Package: org.osgi.framework;version="1.3.0" Require-Bundle: com.minres.scviewer.database, org.eclipse.osgi.services;bundle-version="3.4.0", diff --git a/plugins/com.minres.scviewer.database.ui.swt/.classpath b/plugins/com.minres.scviewer.database.ui.swt/.classpath index 43b9862..1db08c6 100644 --- a/plugins/com.minres.scviewer.database.ui.swt/.classpath +++ b/plugins/com.minres.scviewer.database.ui.swt/.classpath @@ -1,6 +1,6 @@ - + diff --git a/plugins/com.minres.scviewer.database.ui.swt/.settings/org.eclipse.jdt.core.prefs b/plugins/com.minres.scviewer.database.ui.swt/.settings/org.eclipse.jdt.core.prefs index ddb046a..0a52588 100644 --- a/plugins/com.minres.scviewer.database.ui.swt/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/com.minres.scviewer.database.ui.swt/.settings/org.eclipse.jdt.core.prefs @@ -9,8 +9,8 @@ org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nul org.eclipse.jdt.core.compiler.annotation.nullable.secondary= org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled 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.annotationSuperInterface=warning org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.autoboxing=ignore @@ -21,6 +21,7 @@ org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled org.eclipse.jdt.core.compiler.problem.discouragedReference=warning org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore +org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore @@ -66,6 +67,7 @@ org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=igno org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled @@ -98,5 +100,5 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning -org.eclipse.jdt.core.compiler.release=disabled -org.eclipse.jdt.core.compiler.source=1.8 +org.eclipse.jdt.core.compiler.release=enabled +org.eclipse.jdt.core.compiler.source=11 diff --git a/plugins/com.minres.scviewer.database.ui.swt/META-INF/MANIFEST.MF b/plugins/com.minres.scviewer.database.ui.swt/META-INF/MANIFEST.MF index af0a021..ab9940b 100644 --- a/plugins/com.minres.scviewer.database.ui.swt/META-INF/MANIFEST.MF +++ b/plugins/com.minres.scviewer.database.ui.swt/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: SWT database widget Bundle-SymbolicName: com.minres.scviewer.database.ui.swt Bundle-Version: 3.0.0.qualifier Bundle-Vendor: MINRES Technologies GmbH -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Require-Bundle: org.eclipse.swt;bundle-version="3.103.1", com.minres.scviewer.database;bundle-version="1.0.0", com.google.guava;bundle-version="15.0.0", diff --git a/plugins/com.minres.scviewer.database.vcd/.classpath b/plugins/com.minres.scviewer.database.vcd/.classpath index 43b9862..1db08c6 100644 --- a/plugins/com.minres.scviewer.database.vcd/.classpath +++ b/plugins/com.minres.scviewer.database.vcd/.classpath @@ -1,6 +1,6 @@ - + diff --git a/plugins/com.minres.scviewer.database.vcd/.settings/org.eclipse.jdt.core.prefs b/plugins/com.minres.scviewer.database.vcd/.settings/org.eclipse.jdt.core.prefs index 9f6ece8..7adc0fb 100644 --- a/plugins/com.minres.scviewer.database.vcd/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/com.minres.scviewer.database.vcd/.settings/org.eclipse.jdt.core.prefs @@ -1,8 +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.release=disabled -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/plugins/com.minres.scviewer.database.vcd/META-INF/MANIFEST.MF b/plugins/com.minres.scviewer.database.vcd/META-INF/MANIFEST.MF index b00d258..d973f97 100644 --- a/plugins/com.minres.scviewer.database.vcd/META-INF/MANIFEST.MF +++ b/plugins/com.minres.scviewer.database.vcd/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: VCD signal database Bundle-SymbolicName: com.minres.scviewer.database.vcd Bundle-Version: 2.2.0.qualifier Bundle-Vendor: MINRES Technologies GmbH -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Require-Bundle: com.minres.scviewer.database;bundle-version="1.0.0", org.eclipse.osgi.services;bundle-version="3.4.0", com.google.guava;bundle-version="15.0.0" diff --git a/plugins/com.minres.scviewer.database/.classpath b/plugins/com.minres.scviewer.database/.classpath index cf36b56..685a699 100644 --- a/plugins/com.minres.scviewer.database/.classpath +++ b/plugins/com.minres.scviewer.database/.classpath @@ -1,7 +1,11 @@ - + + + + + - + diff --git a/plugins/com.minres.scviewer.database/.settings/org.eclipse.jdt.core.prefs b/plugins/com.minres.scviewer.database/.settings/org.eclipse.jdt.core.prefs index 4e4a3ad..2bd4e77 100644 --- a/plugins/com.minres.scviewer.database/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/com.minres.scviewer.database/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,16 @@ 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.methodParameters=do not generate +org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve +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.problem.forbiddenReference=warning +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning org.eclipse.jdt.core.compiler.release=disabled -org.eclipse.jdt.core.compiler.source=1.8 +org.eclipse.jdt.core.compiler.source=11 diff --git a/plugins/com.minres.scviewer.database/META-INF/MANIFEST.MF b/plugins/com.minres.scviewer.database/META-INF/MANIFEST.MF index 24161ba..952a33d 100644 --- a/plugins/com.minres.scviewer.database/META-INF/MANIFEST.MF +++ b/plugins/com.minres.scviewer.database/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: Waveform database Bundle-SymbolicName: com.minres.scviewer.database Bundle-Version: 3.0.0.qualifier Bundle-Vendor: MINRES Technologies GmbH -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Export-Package: com.minres.scviewer.database, com.minres.scviewer.database.tx Bundle-ActivationPolicy: lazy diff --git a/plugins/com.minres.scviewer.e4.application/.classpath b/plugins/com.minres.scviewer.e4.application/.classpath index 43b9862..1db08c6 100644 --- a/plugins/com.minres.scviewer.e4.application/.classpath +++ b/plugins/com.minres.scviewer.e4.application/.classpath @@ -1,6 +1,6 @@ - + diff --git a/plugins/com.minres.scviewer.e4.application/.settings/org.eclipse.jdt.core.prefs b/plugins/com.minres.scviewer.e4.application/.settings/org.eclipse.jdt.core.prefs index 87b7a7a..a58ebdc 100644 --- a/plugins/com.minres.scviewer.e4.application/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/com.minres.scviewer.e4.application/.settings/org.eclipse.jdt.core.prefs @@ -1,13 +1,15 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -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.release=disabled -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/plugins/com.minres.scviewer.e4.application/META-INF/MANIFEST.MF b/plugins/com.minres.scviewer.e4.application/META-INF/MANIFEST.MF index 9132c4a..63d074e 100644 --- a/plugins/com.minres.scviewer.e4.application/META-INF/MANIFEST.MF +++ b/plugins/com.minres.scviewer.e4.application/META-INF/MANIFEST.MF @@ -36,7 +36,7 @@ Require-Bundle: javax.inject;bundle-version="1.0.0", org.eclipse.equinox.p2.engine;bundle-version="2.6.600", org.eclipse.equinox.p2.operations;bundle-version="2.5.700", org.eclipse.equinox.p2.metadata.repository;bundle-version="1.3.400" -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Import-Package: com.minres.scviewer.database, javax.inject;version="1.0.0" Automatic-Module-Name: com.minres.scviewer.e4.application diff --git a/plugins/com.minres.scviewer.ui/.classpath b/plugins/com.minres.scviewer.ui/.classpath index cf36b56..bc57d23 100644 --- a/plugins/com.minres.scviewer.ui/.classpath +++ b/plugins/com.minres.scviewer.ui/.classpath @@ -1,6 +1,6 @@ - + diff --git a/plugins/com.minres.scviewer.ui/.settings/org.eclipse.jdt.core.prefs b/plugins/com.minres.scviewer.ui/.settings/org.eclipse.jdt.core.prefs index 87b7a7a..a58ebdc 100644 --- a/plugins/com.minres.scviewer.ui/.settings/org.eclipse.jdt.core.prefs +++ b/plugins/com.minres.scviewer.ui/.settings/org.eclipse.jdt.core.prefs @@ -1,13 +1,15 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -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.release=disabled -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/plugins/com.minres.scviewer.ui/META-INF/MANIFEST.MF b/plugins/com.minres.scviewer.ui/META-INF/MANIFEST.MF index e823ab3..9e29130 100644 --- a/plugins/com.minres.scviewer.ui/META-INF/MANIFEST.MF +++ b/plugins/com.minres.scviewer.ui/META-INF/MANIFEST.MF @@ -18,7 +18,7 @@ Require-Bundle: com.minres.scviewer.database;bundle-version="1.0.0", org.eclipse.osgi, org.eclipse.core.expressions;bundle-version="3.4.600", org.eclipse.jface -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Bundle-ActivationPolicy: lazy Import-Package: com.google.common.collect Service-Component: OSGI-INF/component.xml diff --git a/products/com.minres.scviewer.e4.product/scviewer.product b/products/com.minres.scviewer.e4.product/scviewer.product index 5c1cc84..caa75a0 100644 --- a/products/com.minres.scviewer.e4.product/scviewer.product +++ b/products/com.minres.scviewer.e4.product/scviewer.product @@ -34,9 +34,9 @@ - org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8 - org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8 - org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8 + 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 + org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11 diff --git a/tests/com.minres.scviewer.database.test/.classpath b/tests/com.minres.scviewer.database.test/.classpath index cc5ee2d..336abe9 100644 --- a/tests/com.minres.scviewer.database.test/.classpath +++ b/tests/com.minres.scviewer.database.test/.classpath @@ -1,6 +1,6 @@ - + diff --git a/tests/com.minres.scviewer.database.test/.settings/org.eclipse.jdt.core.prefs b/tests/com.minres.scviewer.database.test/.settings/org.eclipse.jdt.core.prefs index 4e4a3ad..e8c450c 100644 --- a/tests/com.minres.scviewer.database.test/.settings/org.eclipse.jdt.core.prefs +++ b/tests/com.minres.scviewer.database.test/.settings/org.eclipse.jdt.core.prefs @@ -1,9 +1,11 @@ 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.problem.forbiddenReference=warning -org.eclipse.jdt.core.compiler.release=disabled -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/tests/com.minres.scviewer.database.test/META-INF/MANIFEST.MF b/tests/com.minres.scviewer.database.test/META-INF/MANIFEST.MF index 011837d..e7011d3 100644 --- a/tests/com.minres.scviewer.database.test/META-INF/MANIFEST.MF +++ b/tests/com.minres.scviewer.database.test/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: SCViewer database tests Bundle-SymbolicName: com.minres.scviewer.database.test Bundle-Version: 1.0.1.qualifier Bundle-Vendor: MINRES Technologies GmbH -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Require-Bundle: com.minres.scviewer.database, com.minres.scviewer.database.sqlite;bundle-version="1.0.0", com.minres.scviewer.database.text;bundle-version="1.0.0", From 6be3f378d47b24b19e0f88400fc28da432d131e5 Mon Sep 17 00:00:00 2001 From: Eyck Jentzsch Date: Thu, 18 Feb 2021 06:32:14 +0000 Subject: [PATCH 3/5] renmove deprecated newInstance call --- .../scviewer/database/sqlite/SQLiteDbLoader.java | 6 +++--- .../src/com/minres/scviewer/database/sqlite/Tx.java | 12 ++++++------ .../minres/scviewer/database/sqlite/TxGenerator.java | 2 +- .../minres/scviewer/database/sqlite/TxStream.java | 4 ++-- .../sqlite/db/SQLiteDatabaseSelectHandler.java | 8 +++++--- 5 files changed, 17 insertions(+), 15 deletions(-) diff --git a/plugins/com.minres.scviewer.database.sqlite/src/com/minres/scviewer/database/sqlite/SQLiteDbLoader.java b/plugins/com.minres.scviewer.database.sqlite/src/com/minres/scviewer/database/sqlite/SQLiteDbLoader.java index b7bb167..cb13a1f 100644 --- a/plugins/com.minres.scviewer.database.sqlite/src/com/minres/scviewer/database/sqlite/SQLiteDbLoader.java +++ b/plugins/com.minres.scviewer.database.sqlite/src/com/minres/scviewer/database/sqlite/SQLiteDbLoader.java @@ -56,7 +56,7 @@ public class SQLiteDbLoader implements IWaveformDbLoader { if(!event.isEmpty()) return event.get(0).getTime()*scvSimProps.getTime_resolution(); } catch (SecurityException | IllegalArgumentException | InstantiationException | IllegalAccessException - | InvocationTargetException | SQLException | IntrospectionException e) { + | InvocationTargetException | SQLException | IntrospectionException | NoSuchMethodException e) { e.printStackTrace(); } return 0L; @@ -73,7 +73,7 @@ public class SQLiteDbLoader implements IWaveformDbLoader { streams.add(stream); } } catch (SecurityException | IllegalArgumentException | InstantiationException | IllegalAccessException - | InvocationTargetException | SQLException | IntrospectionException e) { + | InvocationTargetException | SQLException | IntrospectionException | NoSuchMethodException e) { } return streams; } @@ -109,7 +109,7 @@ public class SQLiteDbLoader implements IWaveformDbLoader { } pcs.firePropertyChange(IWaveformDbLoader.LOADING_FINISHED, null, null); } catch (SecurityException | IllegalArgumentException | InstantiationException | IllegalAccessException - | InvocationTargetException | SQLException | IntrospectionException e) { + | InvocationTargetException | SQLException | IntrospectionException | NoSuchMethodException e) { throw new InputFormatException(e.toString()); } } diff --git a/plugins/com.minres.scviewer.database.sqlite/src/com/minres/scviewer/database/sqlite/Tx.java b/plugins/com.minres.scviewer.database.sqlite/src/com/minres/scviewer/database/sqlite/Tx.java index 8b4aae3..d3ed2ec 100644 --- a/plugins/com.minres.scviewer.database.sqlite/src/com/minres/scviewer/database/sqlite/Tx.java +++ b/plugins/com.minres.scviewer.database.sqlite/src/com/minres/scviewer/database/sqlite/Tx.java @@ -78,7 +78,7 @@ public class Tx implements ITx { begin= scvEvent.getTime()*(Long)database.getData("TIMERESOLUTION"); } } catch (SecurityException | IllegalArgumentException | InstantiationException | IllegalAccessException - | InvocationTargetException | SQLException | IntrospectionException e) { + | InvocationTargetException | SQLException | IntrospectionException | NoSuchMethodException e) { } } return begin; @@ -94,7 +94,7 @@ public class Tx implements ITx { end = scvEvent.getTime()*(Long)database.getData("TIMERESOLUTION"); } } catch (SecurityException | IllegalArgumentException | InstantiationException | IllegalAccessException - | InvocationTargetException | SQLException | IntrospectionException e) { + | InvocationTargetException | SQLException | IntrospectionException | NoSuchMethodException e) { } } return end; @@ -112,7 +112,7 @@ public class Tx implements ITx { } } catch (SecurityException | IllegalArgumentException | InstantiationException | IllegalAccessException - | InvocationTargetException | SQLException | IntrospectionException e) { + | InvocationTargetException | SQLException | IntrospectionException | NoSuchMethodException e) { } } return attributes; @@ -129,7 +129,7 @@ public class Tx implements ITx { incoming.add(createRelation(scvRelation, false)); } } catch (SecurityException | IllegalArgumentException | InstantiationException | IllegalAccessException - | InvocationTargetException | SQLException | IntrospectionException e) { + | InvocationTargetException | SQLException | IntrospectionException | NoSuchMethodException e) { } } return incoming; @@ -146,7 +146,7 @@ public class Tx implements ITx { outgoing.add(createRelation(scvRelation, true)); } } catch (SecurityException | IllegalArgumentException | InstantiationException | IllegalAccessException - | InvocationTargetException | SQLException | IntrospectionException e) { + | InvocationTargetException | SQLException | IntrospectionException | NoSuchMethodException e) { } } return outgoing; @@ -169,7 +169,7 @@ public class Tx implements ITx { else return new TxRelation(trStream.getRelationType(rel.getName()), that, this); } catch (SecurityException | IllegalArgumentException | InstantiationException | IllegalAccessException - | InvocationTargetException | SQLException | IntrospectionException e) { + | InvocationTargetException | SQLException | IntrospectionException | NoSuchMethodException e) { e.printStackTrace(); } diff --git a/plugins/com.minres.scviewer.database.sqlite/src/com/minres/scviewer/database/sqlite/TxGenerator.java b/plugins/com.minres.scviewer.database.sqlite/src/com/minres/scviewer/database/sqlite/TxGenerator.java index 1bcaca9..45002a4 100644 --- a/plugins/com.minres.scviewer.database.sqlite/src/com/minres/scviewer/database/sqlite/TxGenerator.java +++ b/plugins/com.minres.scviewer.database.sqlite/src/com/minres/scviewer/database/sqlite/TxGenerator.java @@ -69,7 +69,7 @@ public class TxGenerator extends AbstractTxStream { transactions.put(scvTx.getId(), new Tx(database, (TxStream) stream, this, scvTx)); } } catch (SecurityException | IllegalArgumentException | InstantiationException | IllegalAccessException - | InvocationTargetException | SQLException | IntrospectionException e) { + | InvocationTargetException | SQLException | IntrospectionException | NoSuchMethodException e) { e.printStackTrace(); } } diff --git a/plugins/com.minres.scviewer.database.sqlite/src/com/minres/scviewer/database/sqlite/TxStream.java b/plugins/com.minres.scviewer.database.sqlite/src/com/minres/scviewer/database/sqlite/TxStream.java index 57f2ab4..35da3e4 100644 --- a/plugins/com.minres.scviewer.database.sqlite/src/com/minres/scviewer/database/sqlite/TxStream.java +++ b/plugins/com.minres.scviewer.database.sqlite/src/com/minres/scviewer/database/sqlite/TxStream.java @@ -63,7 +63,7 @@ public class TxStream extends AbstractTxStream { generators.put(scvGenerator.getId(), new TxGenerator(database, this, scvGenerator)); } } catch (SecurityException | IllegalArgumentException | InstantiationException | IllegalAccessException - | InvocationTargetException | SQLException | IntrospectionException e) { + | InvocationTargetException | SQLException | IntrospectionException | NoSuchMethodException e) { e.printStackTrace(); } } @@ -81,7 +81,7 @@ public class TxStream extends AbstractTxStream { transactions.put(scvTx.getId(), new Tx(database, this, generators.get(scvTx.getGenerator()), scvTx)); } } catch (SecurityException | IllegalArgumentException | InstantiationException | IllegalAccessException - | InvocationTargetException | SQLException | IntrospectionException e) { + | InvocationTargetException | SQLException | IntrospectionException | NoSuchMethodException e) { e.printStackTrace(); } } diff --git a/plugins/com.minres.scviewer.database.sqlite/src/com/minres/scviewer/database/sqlite/db/SQLiteDatabaseSelectHandler.java b/plugins/com.minres.scviewer.database.sqlite/src/com/minres/scviewer/database/sqlite/db/SQLiteDatabaseSelectHandler.java index 68b9f2a..7bb578f 100644 --- a/plugins/com.minres.scviewer.database.sqlite/src/com/minres/scviewer/database/sqlite/db/SQLiteDatabaseSelectHandler.java +++ b/plugins/com.minres.scviewer.database.sqlite/src/com/minres/scviewer/database/sqlite/db/SQLiteDatabaseSelectHandler.java @@ -75,10 +75,11 @@ public class SQLiteDatabaseSelectHandler extends AbstractDatabaseHandler { * @throws IllegalAccessException * @throws IntrospectionException * @throws InvocationTargetException + * @throws NoSuchMethodException */ public synchronized List selectObjects() throws SQLException, InstantiationException, IllegalAccessException, - IntrospectionException, InvocationTargetException { + IntrospectionException, InvocationTargetException, IllegalArgumentException, NoSuchMethodException, SecurityException { Connection connection = null; Statement statement = null; @@ -113,17 +114,18 @@ public class SQLiteDatabaseSelectHandler extends AbstractDatabaseHandler { * @throws IllegalAccessException * @throws IntrospectionException * @throws InvocationTargetException + * @throws NoSuchMethodException */ private List createObjects(ResultSet resultSet) throws SQLException, InstantiationException, IllegalAccessException, IntrospectionException, - InvocationTargetException { + InvocationTargetException, IllegalArgumentException, NoSuchMethodException, SecurityException { List list = new ArrayList<>(); while (resultSet.next()) { - T instance = type.newInstance(); + T instance = type.getDeclaredConstructor().newInstance(); for (Field field : type.getDeclaredFields()) { From 049de0ddaf7a30811377d8e31e2db6bcf0c1aa35 Mon Sep 17 00:00:00 2001 From: Eyck Jentzsch Date: Thu, 18 Feb 2021 08:14:12 +0000 Subject: [PATCH 4/5] add VM arguments for Java > 9 --- products/com.minres.scviewer.e4.product/scviewer.product | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/products/com.minres.scviewer.e4.product/scviewer.product b/products/com.minres.scviewer.e4.product/scviewer.product index caa75a0..3b25634 100644 --- a/products/com.minres.scviewer.e4.product/scviewer.product +++ b/products/com.minres.scviewer.e4.product/scviewer.product @@ -9,7 +9,7 @@ -clearPersistedState - -Xmx2G -Dosgi.instance.area=@user.home/.scviewer -Dosgi.instance.area.default=@user.home/.scviewer + -Xms64m -Xmx2G -Dosgi.instance.area=@user.home/.scviewer -Dosgi.instance.area.default=@user.home/.scviewer --add-modules=ALL-SYSTEM -Dfile.encoding=UTF-8 -XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts @@ -34,9 +34,9 @@ - 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 - 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 + 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 From bdcba613d5f54abf0f4fc7e57c220b4730565715 Mon Sep 17 00:00:00 2001 From: Eyck Jentzsch Date: Thu, 18 Feb 2021 08:16:02 +0000 Subject: [PATCH 5/5] fix version numbers --- features/com.minres.scviewer.database.feature/pom.xml | 2 +- features/com.minres.scviewer.e4.feature/pom.xml | 2 +- features/com.minres.scviewer.e4.platform.feature/pom.xml | 2 +- features/com.minres.scviewer.feature/pom.xml | 2 +- features/com.minres.scviewer.ui.feature/pom.xml | 2 +- plugins/com.minres.scviewer.database.sqlite/pom.xml | 2 +- plugins/com.minres.scviewer.database.text/pom.xml | 2 +- plugins/com.minres.scviewer.database.ui.swt/pom.xml | 2 +- plugins/com.minres.scviewer.database.vcd/pom.xml | 2 +- plugins/com.minres.scviewer.database/pom.xml | 2 +- .../com.minres.scviewer.e4.application/META-INF/MANIFEST.MF | 2 +- plugins/com.minres.scviewer.e4.application/pom.xml | 2 +- plugins/com.minres.scviewer.ui/pom.xml | 2 +- pom.xml | 5 ++--- products/com.minres.scviewer.e4.product/pom.xml | 4 ++-- products/com.minres.scviewer.e4.product/scviewer.product | 2 +- releng/com.minres.scviewer.target/pom.xml | 2 +- releng/com.minres.scviewer.updateSite/pom.xml | 2 +- tests/com.minres.scviewer.database.test/pom.xml | 2 +- 19 files changed, 21 insertions(+), 22 deletions(-) diff --git a/features/com.minres.scviewer.database.feature/pom.xml b/features/com.minres.scviewer.database.feature/pom.xml index 0f58de8..11147a9 100644 --- a/features/com.minres.scviewer.database.feature/pom.xml +++ b/features/com.minres.scviewer.database.feature/pom.xml @@ -5,7 +5,7 @@ com.minres.scviewer com.minres.scviewer.parent - 2.12.0-SNAPSHOT + 2.12.1 ../.. 3.0.0-SNAPSHOT diff --git a/features/com.minres.scviewer.e4.feature/pom.xml b/features/com.minres.scviewer.e4.feature/pom.xml index fc19d09..e3824e0 100644 --- a/features/com.minres.scviewer.e4.feature/pom.xml +++ b/features/com.minres.scviewer.e4.feature/pom.xml @@ -5,7 +5,7 @@ com.minres.scviewer com.minres.scviewer.parent - 2.12.0-SNAPSHOT + 2.12.1 ../.. 1.1.0-SNAPSHOT diff --git a/features/com.minres.scviewer.e4.platform.feature/pom.xml b/features/com.minres.scviewer.e4.platform.feature/pom.xml index cb14643..c86d76b 100644 --- a/features/com.minres.scviewer.e4.platform.feature/pom.xml +++ b/features/com.minres.scviewer.e4.platform.feature/pom.xml @@ -5,7 +5,7 @@ com.minres.scviewer com.minres.scviewer.parent - 2.12.0-SNAPSHOT + 2.12.1 ../.. 1.0.0-SNAPSHOT diff --git a/features/com.minres.scviewer.feature/pom.xml b/features/com.minres.scviewer.feature/pom.xml index 218d89b..0dcf3b8 100644 --- a/features/com.minres.scviewer.feature/pom.xml +++ b/features/com.minres.scviewer.feature/pom.xml @@ -5,7 +5,7 @@ com.minres.scviewer com.minres.scviewer.parent - 2.12.0-SNAPSHOT + 2.12.1 ../.. 1.1.0-SNAPSHOT diff --git a/features/com.minres.scviewer.ui.feature/pom.xml b/features/com.minres.scviewer.ui.feature/pom.xml index 3119e8b..b7d72ff 100644 --- a/features/com.minres.scviewer.ui.feature/pom.xml +++ b/features/com.minres.scviewer.ui.feature/pom.xml @@ -5,7 +5,7 @@ com.minres.scviewer com.minres.scviewer.parent - 2.12.0-SNAPSHOT + 2.12.1 ../.. 1.1.0-SNAPSHOT diff --git a/plugins/com.minres.scviewer.database.sqlite/pom.xml b/plugins/com.minres.scviewer.database.sqlite/pom.xml index 8b9b387..680d9a2 100644 --- a/plugins/com.minres.scviewer.database.sqlite/pom.xml +++ b/plugins/com.minres.scviewer.database.sqlite/pom.xml @@ -4,7 +4,7 @@ com.minres.scviewer com.minres.scviewer.parent - 2.12.0-SNAPSHOT + 2.12.1 ../.. eclipse-plugin diff --git a/plugins/com.minres.scviewer.database.text/pom.xml b/plugins/com.minres.scviewer.database.text/pom.xml index 74d6a56..37f9757 100644 --- a/plugins/com.minres.scviewer.database.text/pom.xml +++ b/plugins/com.minres.scviewer.database.text/pom.xml @@ -6,7 +6,7 @@ com.minres.scviewer com.minres.scviewer.parent - 2.12.0-SNAPSHOT + 2.12.1 ../.. eclipse-plugin diff --git a/plugins/com.minres.scviewer.database.ui.swt/pom.xml b/plugins/com.minres.scviewer.database.ui.swt/pom.xml index e398c83..8119423 100644 --- a/plugins/com.minres.scviewer.database.ui.swt/pom.xml +++ b/plugins/com.minres.scviewer.database.ui.swt/pom.xml @@ -5,7 +5,7 @@ com.minres.scviewer com.minres.scviewer.parent - 2.12.0-SNAPSHOT + 2.12.1 ../.. 3.0.0-SNAPSHOT diff --git a/plugins/com.minres.scviewer.database.vcd/pom.xml b/plugins/com.minres.scviewer.database.vcd/pom.xml index bf73cf0..906ed2d 100644 --- a/plugins/com.minres.scviewer.database.vcd/pom.xml +++ b/plugins/com.minres.scviewer.database.vcd/pom.xml @@ -5,7 +5,7 @@ com.minres.scviewer com.minres.scviewer.parent - 2.12.0-SNAPSHOT + 2.12.1 ../.. eclipse-plugin diff --git a/plugins/com.minres.scviewer.database/pom.xml b/plugins/com.minres.scviewer.database/pom.xml index abaa87b..06717aa 100644 --- a/plugins/com.minres.scviewer.database/pom.xml +++ b/plugins/com.minres.scviewer.database/pom.xml @@ -4,7 +4,7 @@ com.minres.scviewer com.minres.scviewer.parent - 2.12.0-SNAPSHOT + 2.12.1 ../.. eclipse-plugin diff --git a/plugins/com.minres.scviewer.e4.application/META-INF/MANIFEST.MF b/plugins/com.minres.scviewer.e4.application/META-INF/MANIFEST.MF index 63d074e..6f2e1b4 100644 --- a/plugins/com.minres.scviewer.e4.application/META-INF/MANIFEST.MF +++ b/plugins/com.minres.scviewer.e4.application/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %Bundle-Name Bundle-SymbolicName: com.minres.scviewer.e4.application;singleton:=true -Bundle-Version: 2.12.0.qualifier +Bundle-Version: 2.12.1 Bundle-Vendor: %Bundle-Vendor Require-Bundle: javax.inject;bundle-version="1.0.0", org.eclipse.core.runtime;bundle-version="3.11.1", diff --git a/plugins/com.minres.scviewer.e4.application/pom.xml b/plugins/com.minres.scviewer.e4.application/pom.xml index 51621b7..44483bc 100644 --- a/plugins/com.minres.scviewer.e4.application/pom.xml +++ b/plugins/com.minres.scviewer.e4.application/pom.xml @@ -6,7 +6,7 @@ com.minres.scviewer com.minres.scviewer.parent - 2.12.0-SNAPSHOT + 2.12.1 ../.. eclipse-plugin diff --git a/plugins/com.minres.scviewer.ui/pom.xml b/plugins/com.minres.scviewer.ui/pom.xml index d00df08..a69cda0 100644 --- a/plugins/com.minres.scviewer.ui/pom.xml +++ b/plugins/com.minres.scviewer.ui/pom.xml @@ -4,7 +4,7 @@ com.minres.scviewer com.minres.scviewer.parent - 2.12.0-SNAPSHOT + 2.12.1 ../.. eclipse-plugin diff --git a/pom.xml b/pom.xml index 20d4ad9..2aecebf 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 com.minres.scviewer com.minres.scviewer.parent - 2.12.0-SNAPSHOT + 2.12.1 pom releng/com.minres.scviewer.target @@ -26,7 +26,6 @@ - 2.11.0-SNAPSHOT 1.5.0 3.6.0-03 3.0.3-01 @@ -68,7 +67,7 @@ com.minres.scviewer com.minres.scviewer.target - 2.12.0-SNAPSHOT + 2.12.1 diff --git a/products/com.minres.scviewer.e4.product/pom.xml b/products/com.minres.scviewer.e4.product/pom.xml index 0e14bcb..5370157 100644 --- a/products/com.minres.scviewer.e4.product/pom.xml +++ b/products/com.minres.scviewer.e4.product/pom.xml @@ -6,11 +6,11 @@ com.minres.scviewer com.minres.scviewer.parent - 2.12.0-SNAPSHOT + 2.12.1 ../.. com.minres.scviewer.e4.product - 2.12.0-SNAPSHOT + 2.12.1 eclipse-repository com.minres.scviewer diff --git a/products/com.minres.scviewer.e4.product/scviewer.product b/products/com.minres.scviewer.e4.product/scviewer.product index 3b25634..e3765dd 100644 --- a/products/com.minres.scviewer.e4.product/scviewer.product +++ b/products/com.minres.scviewer.e4.product/scviewer.product @@ -1,7 +1,7 @@ - + diff --git a/releng/com.minres.scviewer.target/pom.xml b/releng/com.minres.scviewer.target/pom.xml index f370caf..11a00f3 100644 --- a/releng/com.minres.scviewer.target/pom.xml +++ b/releng/com.minres.scviewer.target/pom.xml @@ -12,7 +12,7 @@ com.minres.scviewer com.minres.scviewer.parent - 2.12.0-SNAPSHOT + 2.12.1 ../.. diff --git a/releng/com.minres.scviewer.updateSite/pom.xml b/releng/com.minres.scviewer.updateSite/pom.xml index afcadd7..3113a24 100644 --- a/releng/com.minres.scviewer.updateSite/pom.xml +++ b/releng/com.minres.scviewer.updateSite/pom.xml @@ -7,7 +7,7 @@ com.minres.scviewer com.minres.scviewer.parent - 2.12.0-SNAPSHOT + 2.12.1 ../.. diff --git a/tests/com.minres.scviewer.database.test/pom.xml b/tests/com.minres.scviewer.database.test/pom.xml index 9b902fe..4043f73 100644 --- a/tests/com.minres.scviewer.database.test/pom.xml +++ b/tests/com.minres.scviewer.database.test/pom.xml @@ -6,7 +6,7 @@ com.minres.scviewer com.minres.scviewer.parent - 2.12.0-SNAPSHOT + 2.12.1 ../.. eclipse-test-plugin