From 9a59947e67aa099d4b5afb99b3d75a308fb93779 Mon Sep 17 00:00:00 2001 From: Eyck Jentzsch Date: Thu, 18 Nov 2021 12:55:23 +0100 Subject: [PATCH 1/3] fix handling of key short cuts --- .../ui/swt/internal/WaveformCanvas.java | 5 +- .../ui/swt/internal/WaveformView.java | 79 +++++++++++-------- .../Application.e4xmi | 41 ++++------ .../handlers/SelectAllHandler.java | 18 +---- .../e4/application/messages.properties | 2 +- .../e4/application/parts/DesignBrowser.java | 4 + .../e4/application/parts/WaveformViewer.java | 9 +++ 7 files changed, 86 insertions(+), 72 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 b55e1b9..966651b 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 @@ -179,6 +179,7 @@ public class WaveformCanvas extends Canvas { } public void setZoomLevel(int level, long centerTime) { + int maxLevel = findFitZoomLevel(maxTime); if(level<0) { if(level<-1) { long cTime = getCursorPainters().get(0).getTime(); @@ -186,11 +187,11 @@ public class WaveformCanvas extends Canvas { level = findFitZoomLevel(time_diff); centerTime = (centerTime>cTime?cTime:centerTime)+time_diff/2; } else - level = findFitZoomLevel(maxTime); + level=maxLevel; if(level<0) level = 0; } //FIXME: keep center if zoom-out and cursor is not in view - if(level streams; - private boolean waveformsContainTx=false; - - public boolean isWaveformsContainTx() { - return waveformsContainTx; - } - int selectedMarker = 0; private int tracksVerticalHeight; @@ -166,8 +160,7 @@ public class WaveformView implements IWaveformView { : streams.subList(firstIdx, lastIdx + 1); setSelection(new StructuredSelection(res), (e.stateMask & SWT.CTRL) != 0, false); } else - setSelection(new StructuredSelection(entry.getValue()), (e.stateMask & SWT.CTRL) != 0, - false); + setSelection(new StructuredSelection(entry.getValue()), (e.stateMask & SWT.CTRL) != 0, false); } else { setSelection(new StructuredSelection(entry.getValue()), (e.stateMask & SWT.CTRL) != 0, false); } @@ -295,8 +288,15 @@ public class WaveformView implements IWaveformView { @Override public void handleEvent(Event e) { switch (e.type) { - // case SWT.MouseWheel: - // break; + case SWT.MouseWheel: + if((e.stateMask & SWT.CTRL) != 0) { + int zoom = waveformCanvas.getZoomLevel(); + if(e.count<0) + waveformCanvas.setZoomLevel(zoom+1); + else + waveformCanvas.setZoomLevel(zoom-1); + } + break; case SWT.MouseDown: start = new Point(e.x, e.y); end = new Point(e.x, e.y); @@ -469,6 +469,17 @@ public class WaveformView implements IWaveformView { toolTipHandler = new ToolTipHandler(parent.getShell()); toolTipHandler.activateHoverHelp(waveformCanvas); + // This is the filter that prevents it + getControl().getDisplay().addFilter(SWT.MouseWheel, new Listener() { + @Override + public void handleEvent(Event e) { + // Check if it's the correct widget + if((e.widget.equals(waveformCanvas) || e.widget.equals(this)) && (e.stateMask & SWT.CTRL) != 0) { + waveformMouseListener.handleEvent(e); + e.doit = false; + } + } + }); } private void createTextPane(Composite namePane, String text) { @@ -518,7 +529,6 @@ public class WaveformView implements IWaveformView { boolean even = true; TextLayout tl = new TextLayout(waveformCanvas.getDisplay()); tl.setFont(styleProvider.getNameFont()); - waveformsContainTx=false; for (TrackEntry streamEntry : streams) { streamEntry.height = styleProvider.getTrackHeight(); streamEntry.vOffset = tracksVerticalHeight; @@ -526,7 +536,6 @@ public class WaveformView implements IWaveformView { streamEntry.currentValue = ""; streamEntry.height *= streamEntry.waveform.getRowCount(); painter = new StreamPainter(waveformCanvas, even, streamEntry); - waveformsContainTx=true; } else if (streamEntry.waveform.getType() == WaveformType.SIGNAL) { streamEntry.currentValue = "---"; painter = new SignalPainter(waveformCanvas, even, streamEntry); @@ -762,27 +771,30 @@ public class WaveformView implements IWaveformView { if (!add) currentWaveformSelection.clear(); List selList = sel.toList(); - if (selList.get(0) instanceof ITx) { - ITx txSel = (ITx) selList.get(0); - TrackEntry trackEntry = selList.size() == 2 && selList.get(1) instanceof TrackEntry - ? (TrackEntry) selList.get(1) - : null; - if (trackEntry == null) { - trackEntry = getEntryFor(txSel); - if (trackEntry == null && addIfNeeded) { - trackEntry = new TrackEntry(txSel.getStream(), styleProvider); - streams.add(trackEntry); + for(Object o: selList) { + if (o instanceof ITx) { + ITx txSel = (ITx) o; + TrackEntry trackEntry = selList.size() == 2 && selList.get(1) instanceof TrackEntry + ? (TrackEntry) selList.get(1) + : null; + if (trackEntry == null) { + trackEntry = getEntryFor(txSel); + if (trackEntry == null && addIfNeeded) { + trackEntry = new TrackEntry(txSel.getStream(), styleProvider); + streams.add(trackEntry); + } } + currentTxSelection = txSel; + currentWaveformSelection.clear(); + currentWaveformSelection.add(trackEntry); + selectionChanged = true; + } else if (o instanceof TrackEntry) { + TrackEntry e = (TrackEntry)o; + if(!currentWaveformSelection.contains(e)) + currentWaveformSelection.add(e); + selectionChanged = true; } - currentTxSelection = txSel; - currentWaveformSelection.clear(); - currentWaveformSelection.add(trackEntry); - selectionChanged = true; - } else if (selList.size() == 1 && selList.get(0) instanceof TrackEntry) { - currentWaveformSelection.add((TrackEntry) selList.get(0)); - if (currentTxSelection != null) - currentTxSelection = null; - selectionChanged = true; + } } } else { @@ -1563,4 +1575,9 @@ public class WaveformView implements IWaveformView { getStreamList().add(idx, e); return e; } + + public boolean waveformsContainsTx() { + return streams.stream().filter(e -> e.waveform.getType() == WaveformType.TRANSACTION).findFirst().isPresent(); + } + } diff --git a/plugins/com.minres.scviewer.e4.application/Application.e4xmi b/plugins/com.minres.scviewer.e4.application/Application.e4xmi index c289e0d..17138a9 100644 --- a/plugins/com.minres.scviewer.e4.application/Application.e4xmi +++ b/plugins/com.minres.scviewer.e4.application/Application.e4xmi @@ -12,18 +12,19 @@ - - + + - + - + + @@ -109,10 +110,10 @@ - + - + @@ -157,16 +158,6 @@ type:user - - - type:user - - - - type:user - - - type:user @@ -182,20 +173,22 @@ type:user - - - + + type:user + + + type:user + + + - - - - + - + categoryTag:General diff --git a/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/handlers/SelectAllHandler.java b/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/handlers/SelectAllHandler.java index 3a09ac7..636adff 100644 --- a/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/handlers/SelectAllHandler.java +++ b/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/handlers/SelectAllHandler.java @@ -19,25 +19,15 @@ import org.eclipse.e4.ui.model.application.ui.basic.MPart; import org.eclipse.e4.ui.workbench.modeling.EPartService; import com.minres.scviewer.e4.application.parts.DesignBrowser; +import com.minres.scviewer.e4.application.parts.WaveformViewer; public class SelectAllHandler { - @Inject @Optional DesignBrowser designBrowser; - @Execute public void execute(EPartService partService) { - if(designBrowser==null) designBrowser = getListPart(partService); - if(designBrowser!=null){ - designBrowser.selectAllWaveforms(); - } + MPart part = partService.getActivePart(); + if(part.getObject() instanceof WaveformViewer) + ((WaveformViewer) part.getObject()).selectAll(); } - protected DesignBrowser getListPart(EPartService partService){ - MPart part = partService.getActivePart(); - if(part.getObject() instanceof DesignBrowser) - return (DesignBrowser) part.getObject(); - else - return null; - } - } \ No newline at end of file diff --git a/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/messages.properties b/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/messages.properties index 9651d86..4768167 100644 --- a/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/messages.properties +++ b/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/messages.properties @@ -85,7 +85,7 @@ HelpDialog_2=Stop HelpDialog_3=Refresh HelpDialog_4=Go HelpDialog_5=Address -HelpDialog_6=https://git.minres.com/VP-Tools/SCViewer/src/branch/master/README.md\#key-shortcuts +HelpDialog_6=https://minres.github.io/SCViewer#key-shortcuts HelpDialog_7=Could not instantiate Browser: marker=Marker marker_text=Marker TExt diff --git a/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/parts/DesignBrowser.java b/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/parts/DesignBrowser.java index 22314cd..b01b1da 100644 --- a/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/parts/DesignBrowser.java +++ b/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/parts/DesignBrowser.java @@ -226,6 +226,10 @@ public class DesignBrowser { } }); } + + public Control getControl() { + return top; + } /** * Creates the table composite. diff --git a/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/parts/WaveformViewer.java b/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/parts/WaveformViewer.java index c35fc5b..b31fc01 100644 --- a/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/parts/WaveformViewer.java +++ b/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/parts/WaveformViewer.java @@ -337,6 +337,8 @@ public class WaveformViewer implements IFileChangeListener, IPreferenceChangeLis case SWT.ARROW_DOWN: waveformPane.moveSelectedTrack(1); return; + case 'a': + selectAll(); default: break; } @@ -1269,4 +1271,11 @@ public class WaveformViewer implements IFileChangeListener, IPreferenceChangeLis } catch (BackingStoreException e) {} } } + + public void selectAll() { + List entries = waveformPane.getStreamList(); + ISelection sel = new StructuredSelection(entries); + waveformPane.setSelection(sel); + designBrowser.selectAllWaveforms(); + } } \ No newline at end of file From 3405e90df9faaa180cd5e54f4a8a41bdad3b1992 Mon Sep 17 00:00:00 2001 From: Eyck Jentzsch Date: Thu, 18 Nov 2021 14:24:08 +0100 Subject: [PATCH 2/3] fix behavior of help window --- .../Application.e4xmi | 7 +++--- .../e4/application/handlers/HelpHandler.java | 17 +++++++------- .../handlers/SelectAllHandler.java | 11 +++++---- .../e4/application/messages.properties | 2 +- .../application/parts/help/HelpBrowser.java | 23 +++++++++++++------ 5 files changed, 37 insertions(+), 23 deletions(-) diff --git a/plugins/com.minres.scviewer.e4.application/Application.e4xmi b/plugins/com.minres.scviewer.e4.application/Application.e4xmi index 17138a9..c78895c 100644 --- a/plugins/com.minres.scviewer.e4.application/Application.e4xmi +++ b/plugins/com.minres.scviewer.e4.application/Application.e4xmi @@ -135,9 +135,6 @@ - - - @@ -157,6 +154,7 @@ type:user + @@ -244,6 +242,9 @@ + + + diff --git a/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/handlers/HelpHandler.java b/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/handlers/HelpHandler.java index 55e6a9f..187c7d7 100644 --- a/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/handlers/HelpHandler.java +++ b/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/handlers/HelpHandler.java @@ -10,23 +10,24 @@ *******************************************************************************/ package com.minres.scviewer.e4.application.handlers; +import org.eclipse.e4.core.di.annotations.CanExecute; import org.eclipse.e4.core.di.annotations.Execute; import org.eclipse.e4.ui.model.application.MApplication; -import org.eclipse.e4.ui.model.application.ui.MUIElement; +import org.eclipse.e4.ui.model.application.ui.basic.MWindow; import org.eclipse.e4.ui.workbench.modeling.EModelService; public class HelpHandler { - static final String DIALOG_ID="com.minres.scviewer.e4.application.dialog.onlinehelp"; //$NON-NLS-1$ static final String WINDOW_ID="com.minres.scviewer.e4.application.window.help"; //$NON-NLS-1$ + @CanExecute + public boolean canExecute(MApplication app) { + return !app.getChildren().stream().filter(e -> e.getElementId().equals(WINDOW_ID)).findFirst().isPresent(); + } @Execute - public void execute(MApplication app, /*MWindow window,*/ EModelService ms /*@Named("mdialog01.dialog.0") MDialog dialog*/) { -// MPart mel = (MPart) ms.find(DIALOG_ID, app); //$NON-NLS-1$ -// mel.setToBeRendered(true); -// mel.setToBeRendered(false); - MUIElement w = ms.find(WINDOW_ID, app); - if(w!=null) w.setToBeRendered(true); + public void execute(MApplication app, MWindow window, EModelService modelService /*@Named("mdialog01.dialog.0") MDialog dialog*/) { + MWindow newWin = (MWindow)modelService.cloneSnippet(app, WINDOW_ID, null); + app.getChildren().add(newWin); } } diff --git a/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/handlers/SelectAllHandler.java b/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/handlers/SelectAllHandler.java index 636adff..2c7aa58 100644 --- a/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/handlers/SelectAllHandler.java +++ b/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/handlers/SelectAllHandler.java @@ -11,18 +11,21 @@ package com.minres.scviewer.e4.application.handlers; -import javax.inject.Inject; - +import org.eclipse.e4.core.di.annotations.CanExecute; import org.eclipse.e4.core.di.annotations.Execute; -import org.eclipse.e4.core.di.annotations.Optional; import org.eclipse.e4.ui.model.application.ui.basic.MPart; import org.eclipse.e4.ui.workbench.modeling.EPartService; -import com.minres.scviewer.e4.application.parts.DesignBrowser; import com.minres.scviewer.e4.application.parts.WaveformViewer; public class SelectAllHandler { + @CanExecute + public boolean canExecute(EPartService partService) { + MPart part = partService.getActivePart(); + return part.getObject() instanceof WaveformViewer; + } + @Execute public void execute(EPartService partService) { MPart part = partService.getActivePart(); diff --git a/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/messages.properties b/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/messages.properties index 4768167..6c98d1c 100644 --- a/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/messages.properties +++ b/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/messages.properties @@ -85,7 +85,7 @@ HelpDialog_2=Stop HelpDialog_3=Refresh HelpDialog_4=Go HelpDialog_5=Address -HelpDialog_6=https://minres.github.io/SCViewer#key-shortcuts +HelpDialog_6=https://minres.github.io/SCViewer/#key-shortcuts HelpDialog_7=Could not instantiate Browser: marker=Marker marker_text=Marker TExt diff --git a/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/parts/help/HelpBrowser.java b/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/parts/help/HelpBrowser.java index e965a43..bdd6fa8 100644 --- a/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/parts/help/HelpBrowser.java +++ b/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/parts/help/HelpBrowser.java @@ -3,8 +3,11 @@ package com.minres.scviewer.e4.application.parts.help; import java.io.File; import javax.annotation.PostConstruct; +import javax.annotation.PreDestroy; import javax.inject.Inject; +import org.eclipse.e4.core.contexts.IEclipseContext; +import org.eclipse.e4.ui.model.application.ui.MUIElement; import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jface.resource.ResourceLocator; @@ -21,6 +24,7 @@ import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Listener; import org.eclipse.swt.widgets.ProgressBar; +import org.eclipse.swt.widgets.Shell; import org.eclipse.swt.widgets.Text; import org.eclipse.swt.widgets.ToolBar; import org.eclipse.swt.widgets.ToolItem; @@ -29,6 +33,10 @@ import com.minres.scviewer.e4.application.Messages; public class HelpBrowser { + @Inject IEclipseContext ctx; + + @Inject MUIElement element; + private static void decorateItem(ToolItem item, String label, String imageName) { String fullpath = File.separator+"icons"+File.separator+imageName; //$NON-NLS-1$ ImageDescriptor descr = ResourceLocator.imageDescriptorFromBundle("com.minres.scviewer.e4.application", fullpath).orElse(null); //$NON-NLS-1$ @@ -41,13 +49,12 @@ public class HelpBrowser { item.setData(label); } - @Inject - public HelpBrowser() { - - } - @PostConstruct protected Control createComposite(Composite container) { +// container.getShell().addListener(SWT.Close, e -> { +// e.doit= false; +// element.setVisible(false); +// }); GridLayout gridLayout = new GridLayout(); gridLayout.numColumns = 3; container.setLayout(gridLayout); @@ -141,6 +148,8 @@ public class HelpBrowser { } return container; } - - + + void handleShellCloseEvent(){ + + } } \ No newline at end of file From a2adf66618e5f352a5e905874c1232a9dd75d22e Mon Sep 17 00:00:00 2001 From: Eyck Jentzsch Date: Thu, 18 Nov 2021 14:30:54 +0100 Subject: [PATCH 3/3] 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 +- pom.xml | 4 ++-- 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(+), 21 deletions(-) diff --git a/features/com.minres.scviewer.database.feature/pom.xml b/features/com.minres.scviewer.database.feature/pom.xml index 8617f6f..2e5ffac 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.1 + 2.14.2 ../.. 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 d42b388..450f38d 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.1 + 2.14.2 ../.. 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 a7df574..1b87945 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.1 + 2.14.2 ../.. 1.0.0-SNAPSHOT diff --git a/features/com.minres.scviewer.feature/pom.xml b/features/com.minres.scviewer.feature/pom.xml index 6a0122b..38242c5 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.1 + 2.14.2 ../.. 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 9d6cf34..e39a845 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.1 + 2.14.2 ../.. 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 76ac08c..d1451ec 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.1 + 2.14.2 ../.. eclipse-plugin diff --git a/plugins/com.minres.scviewer.database.text/pom.xml b/plugins/com.minres.scviewer.database.text/pom.xml index 89ba232..013716c 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.1 + 2.14.2 ../.. 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 b76ba19..2222c7b 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.1 + 2.14.2 ../.. 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 5adfbea..c8e296f 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.1 + 2.14.2 ../.. eclipse-plugin diff --git a/plugins/com.minres.scviewer.database/pom.xml b/plugins/com.minres.scviewer.database/pom.xml index 9a5589e..005d021 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.1 + 2.14.2 ../.. 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 605f1e0..9a48b3f 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.1 +Bundle-Version: 2.14.2 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 ec2a374..2667214 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.1 + 2.14.2 ../.. eclipse-plugin diff --git a/plugins/com.minres.scviewer.ui/pom.xml b/plugins/com.minres.scviewer.ui/pom.xml index a69679a..d3d6f7b 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.1 + 2.14.2 ../.. eclipse-plugin diff --git a/pom.xml b/pom.xml index 14583fa..512c01a 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 com.minres.scviewer com.minres.scviewer.parent - 2.14.1 + 2.14.2 pom releng/com.minres.scviewer.target @@ -67,7 +67,7 @@ com.minres.scviewer com.minres.scviewer.target - 2.14.1 + 2.14.2 diff --git a/products/com.minres.scviewer.e4.product/pom.xml b/products/com.minres.scviewer.e4.product/pom.xml index 2ff8b81..ada73c4 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.1 + 2.14.2 ../.. com.minres.scviewer.e4.product - 2.14.1 + 2.14.2 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 c73fa9b..c7685a6 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 84a92d7..4f8f83b 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.1 + 2.14.2 ../.. diff --git a/releng/com.minres.scviewer.updateSite/pom.xml b/releng/com.minres.scviewer.updateSite/pom.xml index fbfae5c..2152a62 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.1 + 2.14.2 ../.. diff --git a/tests/com.minres.scviewer.database.test/pom.xml b/tests/com.minres.scviewer.database.test/pom.xml index fe95bfb..d33f4cc 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.1 + 2.14.2 ../.. eclipse-test-plugin