From 4a315722b12ab709334590f4f613f597a7dfb5d9 Mon Sep 17 00:00:00 2001 From: Eyck Jentzsch Date: Tue, 16 Nov 2021 09:33:09 +0100 Subject: [PATCH 1/5] add help browser window instead of dialog --- .../Application.e4xmi | 5 +- .../META-INF/MANIFEST.MF | 1 + .../icons/accept.png | Bin 0 -> 781 bytes .../icons/arrow_redo.png | Bin 0 -> 625 bytes .../icons/arrow_refresh.png | Bin 0 -> 685 bytes .../icons/arrow_undo.png | Bin 0 -> 631 bytes .../scviewer/e4/application/Messages.java | 2 + .../e4/application/handlers/HelpHandler.java | 17 +- .../e4/application/messages.properties | 2 + .../application/parts/help/HelpBrowser.java | 152 ++++++++++++++++++ 10 files changed, 170 insertions(+), 9 deletions(-) create mode 100644 plugins/com.minres.scviewer.e4.application/icons/accept.png create mode 100644 plugins/com.minres.scviewer.e4.application/icons/arrow_redo.png create mode 100644 plugins/com.minres.scviewer.e4.application/icons/arrow_refresh.png create mode 100644 plugins/com.minres.scviewer.e4.application/icons/arrow_undo.png create mode 100644 plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/parts/help/HelpBrowser.java diff --git a/plugins/com.minres.scviewer.e4.application/Application.e4xmi b/plugins/com.minres.scviewer.e4.application/Application.e4xmi index 90b71f5..c289e0d 100644 --- a/plugins/com.minres.scviewer.e4.application/Application.e4xmi +++ b/plugins/com.minres.scviewer.e4.application/Application.e4xmi @@ -1,6 +1,6 @@ - + @@ -134,6 +134,9 @@ + + + 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 aa8d0d8..66f49b5 100644 --- a/plugins/com.minres.scviewer.e4.application/META-INF/MANIFEST.MF +++ b/plugins/com.minres.scviewer.e4.application/META-INF/MANIFEST.MF @@ -38,5 +38,6 @@ Require-Bundle: javax.inject;bundle-version="1.0.0", org.eclipse.equinox.p2.metadata.repository;bundle-version="1.3.400" Bundle-RequiredExecutionEnvironment: JavaSE-11 Import-Package: com.minres.scviewer.database, + javax.annotation;version="1.0.0";resolution:=optional, javax.inject;version="1.0.0" Automatic-Module-Name: com.minres.scviewer.e4.application diff --git a/plugins/com.minres.scviewer.e4.application/icons/accept.png b/plugins/com.minres.scviewer.e4.application/icons/accept.png new file mode 100644 index 0000000000000000000000000000000000000000..89c8129a490b329f3165f32fa0781701aab417ea GIT binary patch literal 781 zcmV+o1M>WdP)4-QibtN)VXQDpczE`xXAkUjh%RI>;okxb7K@0kpyQ1k_Y(|Oe7$m(^ zNYX>mI||sUbmn+c3<&FnE=4u#()KBS^SH8e)Qs5i!#lY=$-1gbH6VluzU=m=EP78&5vQ z-?+fFP-G2l&l_QzYealK$;1Rl?FkzXR&Jv@fBPNjCr#AYRyJ7UJQ0v#?)7Ott=>3`#-pV!7>9}>Q1jL)H6h&gkP@3nI=+F3nA~M>u#(n* z8T!#8oEw&-mED4!h4s!N@Jo3S7N&Q6%6l3}nlcd~X@>;uelvPsSkXIgg~e+^T1zSf z3SNj(5%jK~i8@b;CFZj9*=u@@4&g|7erBn|Ebu&JU%m$={t4j zMA?=F80s{QH%n(hsfF%mohhehBz1^t6ID+NGJzBtYm#sZbA{ZEu?vrT)(Lb!?K~){ zH(Aw`uB}Xq9=*Zczi=_)|A3QuQ}znM~D7~ zjUb95oVKv23l4|e@$lZ*dJFeEA1zqO!B_8JKbXnR;M>>lDE=(2>_dXN zph(~`!iy8(2_#ButL^3%VaH2WCpD^U)OZxp@C)2#hU)y+@T%ZNzJigNk%37 zz-WYJwT%teVfiEI+B*@v4ey@58(ld4VY_&5-ox`e@AKg+0U-I`y79bmuw_~y6+4rZ zBG5EdFDS+@M0OSE`>d7SUDOzKZ&h*4eB1iX7tOd9RiYtW2mQ--bUahxr1`i{RG@dM zL#}_X=DDO1{;UI$pFu=dLYT_=5d8WC-sLfjr7UO-HKMAwa=!>)kEhvuwre zuW3yF@ZxFCkI*+ad|5kOX%5zu8IQjhan)UqgSrFGA_0nQFn@Z08DSEUToCSz4Z1ls z&fDbq$T&7|6iq$_uDI$@q1_kQ@dfqk*0>{SDL6V)94@)ete)j++*>bIc9sj}Y;R1o z#OpH+Yt-^4wfv{nern^iVag8`NY~_X_4^RN+9OmbDu*=G*+_}E z3jR}&gbG0=R0#?Z-=09KI|YP8=#E5@+>uO|=1VUCOole%Li*0J2^Gy8+;b?&km6gg zf;aDGp1r#I_V|We$e$~WifFF9R7MCMwsmwsME9<<@yx?a+v)qKuKbNe>k1{IrVt}k zbbSs~bXr8Se}V_b4opa0GhLA`RHceaP=N}IElbSa8@d(ij1Q|4CvOirm9 { + ToolItem item = (ToolItem) event.widget; + String string = (String) item.getData(); + if (string.equals(Messages.HelpDialog_0)) + browser.back(); + else if (string.equals(Messages.HelpDialog_1)) + browser.forward(); + else if (string.equals(Messages.HelpDialog_2)) + browser.stop(); + else if (string.equals(Messages.HelpDialog_3)) + browser.refresh(); + else if (string.equals(Messages.HelpDialog_4)) + browser.setUrl(location.getText()); + }; + browser.addProgressListener(new ProgressListener() { + @Override + public void changed(ProgressEvent event) { + if (event.total == 0) return; + int ratio = event.current * 100 / event.total; + progressBar.setSelection(ratio); + } + @Override + public void completed(ProgressEvent event) { + progressBar.setSelection(0); + } + }); + browser.addStatusTextListener(event -> status.setText(event.text)); + browser.addLocationListener(LocationListener.changedAdapter(event -> { if (event.top) location.setText(event.location); })); + itemBack.addListener(SWT.Selection, listener); + itemForward.addListener(SWT.Selection, listener); + itemStop.addListener(SWT.Selection, listener); + itemRefresh.addListener(SWT.Selection, listener); + itemGo.addListener(SWT.Selection, listener); + location.addListener(SWT.DefaultSelection, e -> browser.setUrl(location.getText())); + browser.setUrl(Messages.HelpDialog_6); + } catch (SWTError e) { + MessageDialog.openWarning(container.getDisplay().getActiveShell(), Messages.HelpBrowser_7,Messages.HelpBrowser_8+e.getMessage()); + } + return container; + } + + +} \ No newline at end of file From 52cf9daeec7b5e5d044ab2b488dcf9d0145fb9d9 Mon Sep 17 00:00:00 2001 From: Eyck Jentzsch Date: Tue, 16 Nov 2021 09:37:50 +0100 Subject: [PATCH 2/5] unify time printing (#69) --- .../scviewer/database/ui/swt/Constants.java | 16 ++++++++++++++++ .../ui/swt/internal/CursorPainter.java | 3 ++- .../ui/swt/internal/RulerPainter.java | 19 ++++++++++++++----- .../ui/swt/internal/WaveformView.java | 4 +--- 4 files changed, 33 insertions(+), 9 deletions(-) diff --git a/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/ui/swt/Constants.java b/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/ui/swt/Constants.java index 7e8563f..38cd838 100644 --- a/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/ui/swt/Constants.java +++ b/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/ui/swt/Constants.java @@ -1,5 +1,7 @@ package com.minres.scviewer.database.ui.swt; +import java.text.DecimalFormat; + public class Constants { public static final String[] UNIT_STRING={"fs", "ps", "ns", "us", "ms"};//, "s"}; @@ -9,6 +11,20 @@ public class Constants { public static final String CONTENT_PROVIDER_TAG = "TOOLTIP_CONTENT_PROVIDER"; public static final String HELP_PROVIDER_TAG = "TOOLTIP_HELP_PROVIDER"; + public static final DecimalFormat TIME_FORMAT_FS = new DecimalFormat("#"); + public static final DecimalFormat TIME_FORMAT_PS = new DecimalFormat("#"); + public static final DecimalFormat TIME_FORMAT_NS = new DecimalFormat("#.0##"); + public static final DecimalFormat TIME_FORMAT_US = new DecimalFormat("#.0#####"); + public static final DecimalFormat TIME_FORMAT_MS = new DecimalFormat("#.0#####"); + + public static final DecimalFormat[] TIME_FORMAT = { + TIME_FORMAT_FS, TIME_FORMAT_FS, TIME_FORMAT_FS, TIME_FORMAT_FS, TIME_FORMAT_FS, TIME_FORMAT_FS, + TIME_FORMAT_PS, TIME_FORMAT_PS, TIME_FORMAT_PS, TIME_FORMAT_PS, TIME_FORMAT_PS, TIME_FORMAT_PS, + TIME_FORMAT_NS, TIME_FORMAT_NS, TIME_FORMAT_NS, TIME_FORMAT_NS, TIME_FORMAT_NS, TIME_FORMAT_NS, + TIME_FORMAT_US, TIME_FORMAT_US, TIME_FORMAT_US, TIME_FORMAT_US, TIME_FORMAT_US, TIME_FORMAT_US, + TIME_FORMAT_MS, TIME_FORMAT_MS, TIME_FORMAT_MS, TIME_FORMAT_MS, TIME_FORMAT_MS, TIME_FORMAT_MS, + }; + private Constants() {} } diff --git a/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/ui/swt/internal/CursorPainter.java b/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/ui/swt/internal/CursorPainter.java index 09e0777..9ae501a 100644 --- a/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/ui/swt/internal/CursorPainter.java +++ b/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/ui/swt/internal/CursorPainter.java @@ -15,6 +15,7 @@ import org.eclipse.swt.graphics.Rectangle; import com.minres.scviewer.database.ui.ICursor; import com.minres.scviewer.database.ui.WaveformColors; +import com.minres.scviewer.database.ui.swt.Constants; public class CursorPainter implements IPainter, ICursor { @@ -84,7 +85,7 @@ public class CursorPainter implements IPainter, ICursor { proj.setBackground(drawColor); proj.setForeground(textColor); double dTime=time; - proj.drawText((dTime/waveCanvas.getScaleFactorPow10())+waveCanvas.getUnitStr(), x+1, top); + proj.drawText(Constants.TIME_FORMAT[waveCanvas.getZoomLevel()].format(dTime/waveCanvas.getScaleFactorPow10())+waveCanvas.getUnitStr(), x+1, top); } } } 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 275ed94..98a11b6 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 @@ -18,14 +18,14 @@ import org.eclipse.swt.graphics.GC; import org.eclipse.swt.graphics.Rectangle; import org.eclipse.wb.swt.SWTResourceManager; +import com.minres.scviewer.database.ui.swt.Constants; + public class RulerPainter implements IPainter { protected final WaveformCanvas waveCanvas; static final int RULER_TICK_MINOR = 10; static final int RULER_TICK_MAJOR = 100; - static final DecimalFormat df = new DecimalFormat("#.00####"); - public RulerPainter(WaveformCanvas waveCanvas) { this.waveCanvas=waveCanvas; } @@ -52,7 +52,7 @@ public class RulerPainter implements IPainter { int minorTickY = waveCanvas.rulerHeight-5; int majorTickY = waveCanvas.rulerHeight-15; - int textY=waveCanvas.rulerHeight-20; + int textY=waveCanvas.rulerHeight-30; int baselineY=waveCanvas.rulerHeight - 1; int bottom=waveCanvas.rulerHeight - 2; @@ -66,13 +66,22 @@ public class RulerPainter implements IPainter { gc.fillRectangle(new Rectangle(area.x, area.y, area.width, baselineY)); gc.setForeground(headerFgColor); gc.drawLine(area.x, area.y+bottom, area.x+area.width, area.y+bottom); - + boolean allMarker=true; + for (long pos = startMinorIncrPos, tick = startMinorIncrVal; pos < endPos; pos+= rulerTickMinor, tick += rulerTickMinor) { + if ((tick % rulerTickMajor) == 0) { + String text = Constants.TIME_FORMAT[waveCanvas.getZoomLevel()].format(tick/scaleFactor*unitMultiplier); + if(text.length()>8) allMarker=false; + } + } + boolean drawText = true; for (long pos = startMinorIncrPos, tick = startMinorIncrVal; pos < endPos; pos+= rulerTickMinor, tick += rulerTickMinor) { int x0Pos = (int) (pos/scaleFactor); long x0Val = tick/scaleFactor; if ((tick % rulerTickMajor) == 0) { - gc.drawText(df.format(x0Val*unitMultiplier)+unit, x0Pos, area.y+textY); + if(allMarker || drawText) + gc.drawText(Constants.TIME_FORMAT[waveCanvas.getZoomLevel()].format(x0Val*unitMultiplier)+unit, x0Pos, area.y+textY); gc.drawLine(x0Pos, area.y+majorTickY, x0Pos,area.y+ bottom); + drawText=!drawText; } else { gc.drawLine(x0Pos, area.y+minorTickY, x0Pos, area.y+bottom); } diff --git a/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/ui/swt/internal/WaveformView.java b/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/ui/swt/internal/WaveformView.java index d4cf7cd..e9d563f 100644 --- a/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/ui/swt/internal/WaveformView.java +++ b/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/ui/swt/internal/WaveformView.java @@ -99,8 +99,6 @@ public class WaveformView implements IWaveformView { private PropertyChangeSupport pcs; - static final DecimalFormat df = new DecimalFormat("#0.00####"); - private ITx currentTxSelection; private ArrayList currentWaveformSelection = new ArrayList<>(); @@ -1477,7 +1475,7 @@ public class WaveformView implements IWaveformView { StringBuilder sb = new StringBuilder(); double dTime = time; double scaledTime = dTime / waveformCanvas.getScaleFactorPow10(); - return sb.append(df.format(scaledTime)).append(waveformCanvas.getUnitStr()).toString(); + return sb.append(Constants.TIME_FORMAT[waveformCanvas.getZoomLevel()].format(scaledTime)).append(waveformCanvas.getUnitStr()).toString(); } /* From efa654462370d7a5ee2a99d2eb85e04b942a40d9 Mon Sep 17 00:00:00 2001 From: Eyck Jentzsch Date: Tue, 16 Nov 2021 11:27:47 +0100 Subject: [PATCH 3/5] cleanup --- features/com.minres.scviewer.database.feature/feature.xml | 2 +- .../minres/scviewer/e4/application/parts/WaveformViewer.java | 3 +-- tests/com.minres.scviewer.database.test/inputs/.gitignore | 1 + 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/features/com.minres.scviewer.database.feature/feature.xml b/features/com.minres.scviewer.database.feature/feature.xml index 0220ea3..2f9f01a 100644 --- a/features/com.minres.scviewer.database.feature/feature.xml +++ b/features/com.minres.scviewer.database.feature/feature.xml @@ -27,12 +27,12 @@ http://www.eclipse.org/legal/epl-v10.html - + Date: Tue, 16 Nov 2021 11:28:32 +0100 Subject: [PATCH 4/5] fix zoom level calculation --- .../ui/swt/internal/WaveformCanvas.java | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/ui/swt/internal/WaveformCanvas.java b/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/ui/swt/internal/WaveformCanvas.java index 05bf89e..1149019 100644 --- a/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/ui/swt/internal/WaveformCanvas.java +++ b/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/ui/swt/internal/WaveformCanvas.java @@ -190,7 +190,6 @@ public class WaveformCanvas extends Canvas { if(level<0) level = 0; } //FIXME: keep center if zoom-out and cursor is not in view - long xc=centerTime/this.scaleFactor; // cursor total x-offset if(level>1); if(level%2==1) this.scaleFactor*=3; @@ -202,7 +201,9 @@ public class WaveformCanvas extends Canvas { * xcn = tc/newScaleFactor * t0n = (xcn-xoffs)*scaleFactor */ - long xoffs=xc+origin.x; // cursor offset relative to left border + Rectangle clientArea = getClientArea(); + long clientAreaWidth = clientArea.width; + long xoffs = clientAreaWidth/2; long xcn=centerTime/scaleFactor; // new total x-offset long originX=xcn-xoffs; if(originX>0) { @@ -217,20 +218,20 @@ public class WaveformCanvas extends Canvas { } } - private int findFitZoomLevel(long timeRange) { + private int findFitZoomLevel(long duration) { //get area actually capable of displaying data, i.e. area of the receiver which is capable of displaying data Rectangle clientArea = getClientArea(); long clientAreaWidth = clientArea.width; //try to find existing zoomlevel where scaleFactor*clientAreaWidth >= maxTime, if one is found set it as new zoomlevel - int magnitude_factor=1; + final long[] UNIT_STRING_MULT={1, 1000, 1000*1000, 1000*1000*1000, 1000*1000*1000*1000, 1000*1000*1000*1000*1000 }; for(int magnitude=0; magnitude= timeRange) - return tempLevel; + long scaleFactor = magnitudeMultiplier * Constants.UNIT_MULTIPLIER[multiplier]; + long range = scaleFactor*clientAreaWidth; + if( range >= duration) + return magnitude*Constants.UNIT_MULTIPLIER.length+multiplier; } - magnitude_factor*=1000; } return -1; } From 2f9bd29dc833dcf8df6339004a9d20fd1489516b Mon Sep 17 00:00:00 2001 From: Eyck Jentzsch Date: Tue, 16 Nov 2021 11:32:34 +0100 Subject: [PATCH 5/5] update 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 +- 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 +- 18 files changed, 19 insertions(+), 19 deletions(-) diff --git a/features/com.minres.scviewer.database.feature/pom.xml b/features/com.minres.scviewer.database.feature/pom.xml index 7b9aad3..29ea509 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.14.0 + 2.14.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 0d5d210..e6e6e5c 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.14.0 + 2.14.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 a58ba0a..7e87863 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.14.0 + 2.14.1 ../../.. 1.0.0-SNAPSHOT diff --git a/features/com.minres.scviewer.feature/pom.xml b/features/com.minres.scviewer.feature/pom.xml index 06aabf5..ecd2f69 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.14.0 + 2.14.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 a15a59f..d1c2f79 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.14.0 + 2.14.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 87129d8..a7e1e06 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.14.0 + 2.14.1 ../../.. eclipse-plugin diff --git a/plugins/com.minres.scviewer.database.text/pom.xml b/plugins/com.minres.scviewer.database.text/pom.xml index 98547d3..82270ef 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.14.0 + 2.14.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 62d3e25..6196778 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.14.0 + 2.14.1 ../../.. 4.0.0-SNAPSHOT diff --git a/plugins/com.minres.scviewer.database.vcd/pom.xml b/plugins/com.minres.scviewer.database.vcd/pom.xml index 36e05fb..d010037 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.14.0 + 2.14.1 ../../.. eclipse-plugin diff --git a/plugins/com.minres.scviewer.database/pom.xml b/plugins/com.minres.scviewer.database/pom.xml index ea264f2..9324a69 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.14.0 + 2.14.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 66f49b5..605f1e0 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.14.0 +Bundle-Version: 2.14.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 c6aa376..98524f3 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.14.0 + 2.14.1 ../../.. eclipse-plugin diff --git a/plugins/com.minres.scviewer.ui/pom.xml b/plugins/com.minres.scviewer.ui/pom.xml index bc45599..b382c0d 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.14.0 + 2.14.1 ../../.. eclipse-plugin diff --git a/products/com.minres.scviewer.e4.product/pom.xml b/products/com.minres.scviewer.e4.product/pom.xml index 9f9a4ed..bce6d5b 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.14.0 + 2.14.1 ../../.. com.minres.scviewer.e4.product - 2.14.0 + 2.14.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 66261a3..c73fa9b 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 83cbad8..5248446 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.14.0 + 2.14.1 ../../.. diff --git a/releng/com.minres.scviewer.updateSite/pom.xml b/releng/com.minres.scviewer.updateSite/pom.xml index 5a5c991..0fc8abd 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.14.0 + 2.14.1 ../../.. diff --git a/tests/com.minres.scviewer.database.test/pom.xml b/tests/com.minres.scviewer.database.test/pom.xml index 268b568..ffa4f34 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.14.0 + 2.14.1 ../../.. eclipse-test-plugin