diff --git a/doc/com.minres.scviewer.doc/pom.xml b/doc/com.minres.scviewer.doc/pom.xml index 0a4520b..1c0a680 100644 --- a/doc/com.minres.scviewer.doc/pom.xml +++ b/doc/com.minres.scviewer.doc/pom.xml @@ -7,7 +7,7 @@ com.minres.scviewer com.minres.scviewer.parent - 2.19.4 + 2.19.5 ../.. diff --git a/features/com.minres.scviewer.database.feature/pom.xml b/features/com.minres.scviewer.database.feature/pom.xml index f624642..895f6e2 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.19.4 + 2.19.5 ../.. 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 2408add..60f8cf3 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.19.4 + 2.19.5 ../.. 1.1.0-SNAPSHOT diff --git a/features/com.minres.scviewer.e4.help.feature/pom.xml b/features/com.minres.scviewer.e4.help.feature/pom.xml index de5a578..7e946a4 100644 --- a/features/com.minres.scviewer.e4.help.feature/pom.xml +++ b/features/com.minres.scviewer.e4.help.feature/pom.xml @@ -5,7 +5,7 @@ com.minres.scviewer com.minres.scviewer.parent - 2.19.4 + 2.19.5 ../.. 1.0.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 f19d57c..70250a1 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.19.4 + 2.19.5 ../.. 1.0.0-SNAPSHOT diff --git a/features/com.minres.scviewer.feature/feature.xml b/features/com.minres.scviewer.feature/feature.xml index 2e0a4ed..d16b5aa 100644 --- a/features/com.minres.scviewer.feature/feature.xml +++ b/features/com.minres.scviewer.feature/feature.xml @@ -2,7 +2,7 @@ diff --git a/features/com.minres.scviewer.feature/pom.xml b/features/com.minres.scviewer.feature/pom.xml index 69166c1..092b58c 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.19.4 + 2.19.5 ../.. diff --git a/features/com.minres.scviewer.ui.feature/pom.xml b/features/com.minres.scviewer.ui.feature/pom.xml index c2acec0..d82f99b 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.19.4 + 2.19.5 ../.. 1.1.0-SNAPSHOT diff --git a/plugins/com.minres.scviewer.database.fst/pom.xml b/plugins/com.minres.scviewer.database.fst/pom.xml index c6f615e..a505f4d 100644 --- a/plugins/com.minres.scviewer.database.fst/pom.xml +++ b/plugins/com.minres.scviewer.database.fst/pom.xml @@ -6,7 +6,7 @@ com.minres.scviewer com.minres.scviewer.parent - 2.19.4 + 2.19.5 ../.. eclipse-plugin diff --git a/plugins/com.minres.scviewer.database.ftr/pom.xml b/plugins/com.minres.scviewer.database.ftr/pom.xml index 415052c..d4c6610 100644 --- a/plugins/com.minres.scviewer.database.ftr/pom.xml +++ b/plugins/com.minres.scviewer.database.ftr/pom.xml @@ -6,7 +6,7 @@ com.minres.scviewer com.minres.scviewer.parent - 2.19.4 + 2.19.5 ../.. eclipse-plugin diff --git a/plugins/com.minres.scviewer.database.ftr/src/com/minres/scviewer/database/ftr/AbstractTxStream.java b/plugins/com.minres.scviewer.database.ftr/src/com/minres/scviewer/database/ftr/AbstractTxStream.java index 2ae238a..310407b 100644 --- a/plugins/com.minres.scviewer.database.ftr/src/com/minres/scviewer/database/ftr/AbstractTxStream.java +++ b/plugins/com.minres.scviewer.database.ftr/src/com/minres/scviewer/database/ftr/AbstractTxStream.java @@ -153,8 +153,11 @@ abstract class AbstractTxStream extends HierNode implements IWaveform { switch(evt.getKind()) { case END: //TODO: might throw NPE in concurrent execution Long txId = txEvt.getTransaction().getId(); - txEvt.setConcurrencyIndex(rowByTxId.get(txId)); - rowByTxId.remove(txId); + Integer row = rowByTxId.get(txId); + if(row!=null) { + txEvt.setConcurrencyIndex(row); + rowByTxId.remove(txId); + } break; case SINGLE: for (; rowIdx < rowEndTime.size() && rowEndTime.get(rowIdx)>tx.getBeginTime(); rowIdx++); diff --git a/plugins/com.minres.scviewer.database.ftr/src/com/minres/scviewer/database/ftr/FtrDbLoader.java b/plugins/com.minres.scviewer.database.ftr/src/com/minres/scviewer/database/ftr/FtrDbLoader.java index a257df0..85ab7c7 100644 --- a/plugins/com.minres.scviewer.database.ftr/src/com/minres/scviewer/database/ftr/FtrDbLoader.java +++ b/plugins/com.minres.scviewer.database.ftr/src/com/minres/scviewer/database/ftr/FtrDbLoader.java @@ -238,6 +238,8 @@ public class FtrDbLoader implements IWaveformDbLoader { genId = cborDecoder.readInt(); long startTime = cborDecoder.readInt()*time_scale_factor; long endTime = cborDecoder.readInt()*time_scale_factor; + if(endTime0) return; try { List chunks = getChunks(); int blockid = 0; diff --git a/plugins/com.minres.scviewer.database.sqlite/pom.xml b/plugins/com.minres.scviewer.database.sqlite/pom.xml index b6b71ce..b502299 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.19.4 + 2.19.5 ../.. eclipse-plugin diff --git a/plugins/com.minres.scviewer.database.text/pom.xml b/plugins/com.minres.scviewer.database.text/pom.xml index 4a07ab0..b20a2e5 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.19.4 + 2.19.5 ../.. 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 6842b01..09e9dcd 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.19.4 + 2.19.5 ../.. 4.0.0-SNAPSHOT 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 64743bf..851d610 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 @@ -124,7 +124,8 @@ public class StreamPainter extends TrackPainter{ protected void drawTx(Projection proj, Rectangle area, ITx tx, int concurrencyIndex, boolean highlighted ) { // compute colors - Color[] transColor = waveCanvas.styleProvider.computeColor( tx.getGenerator().getName()); + IWaveform generator = tx.getGenerator(); + Color[] transColor = waveCanvas.styleProvider.computeColor( generator!=null?generator.getName():"unknown"); proj.setBackground(transColor[highlighted?1:0]); 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 1be52b1..0637cd9 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 @@ -842,7 +842,7 @@ public class WaveformView implements IWaveformView { public void setSelection(ISelection selection, boolean add, boolean addIfNeeded) { boolean selectionChanged = false; - currentWaveformSelection.forEach(e -> e.selected = false); + currentWaveformSelection.forEach(e -> {if(e!=null) e.selected = false;}); if (selection instanceof IStructuredSelection) { IStructuredSelection sel = (IStructuredSelection) selection; if (sel.size() == 0) { @@ -862,8 +862,12 @@ public class WaveformView implements IWaveformView { if (trackEntry == null) { trackEntry = getEntryFor(txSel); if (trackEntry == null && addIfNeeded) { - trackEntry = new TrackEntry(txSel.getStream(), styleProvider); - streams.add(trackEntry); + IWaveform stream = txSel.getStream(); + Optional te = streams.stream().filter(e -> stream.equals(e.waveform)).findFirst(); + if (te.isEmpty()) { // add stream only if really needed + trackEntry = new TrackEntry(txSel.getStream(), styleProvider); + streams.add(trackEntry); + } } } currentTxSelection = txSel; @@ -885,7 +889,7 @@ public class WaveformView implements IWaveformView { currentTxSelection = null; currentWaveformSelection.clear(); } - currentWaveformSelection.forEach(e -> e.selected = true); + currentWaveformSelection.forEach(e -> {if(e!=null)e.selected = true;}); if (selectionChanged) { currentWaveformSelection.forEach(e -> waveformCanvas.reveal(e.waveform)); waveformCanvas.setSelected(currentTxSelection); @@ -1376,10 +1380,13 @@ public class WaveformView implements IWaveformView { } public TrackEntry getEntryFor(ITx source) { - Optional optGen = streams.stream().filter(e -> source.getGenerator().equals(e.waveform)) + if(source.getGenerator()==null) return null; + Optional optGen = streams.stream() + .filter(e -> source.getGenerator().equals(e.waveform)) .findFirst(); if (optGen.isPresent()) return optGen.get(); + if(source.getStream()==null) return null; Optional optStr = streams.stream().filter(e -> source.getStream().equals(e.waveform)).findFirst(); if (optStr.isPresent()) return optStr.get(); diff --git a/plugins/com.minres.scviewer.database.vcd/pom.xml b/plugins/com.minres.scviewer.database.vcd/pom.xml index 45a44e4..5c8f975 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.19.4 + 2.19.5 ../.. eclipse-plugin diff --git a/plugins/com.minres.scviewer.database/pom.xml b/plugins/com.minres.scviewer.database/pom.xml index 6ae7c1e..7ebb741 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.19.4 + 2.19.5 ../.. eclipse-plugin diff --git a/plugins/com.minres.scviewer.e4.application.help/META-INF/MANIFEST.MF b/plugins/com.minres.scviewer.e4.application.help/META-INF/MANIFEST.MF index 039a171..80e1b5d 100644 --- a/plugins/com.minres.scviewer.e4.application.help/META-INF/MANIFEST.MF +++ b/plugins/com.minres.scviewer.e4.application.help/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: SCViewer Help Bundle-SymbolicName: com.minres.scviewer.e4.application.help;singleton:=true -Bundle-Version: 2.19.4 +Bundle-Version: 2.19.5 Bundle-Vendor: MINRES Technologies GmbH Automatic-Module-Name: com.minres.scviewer.e4.application.help Bundle-RequiredExecutionEnvironment: JavaSE-17 diff --git a/plugins/com.minres.scviewer.e4.application.help/pom.xml b/plugins/com.minres.scviewer.e4.application.help/pom.xml index 5a7fd79..c7a27d6 100644 --- a/plugins/com.minres.scviewer.e4.application.help/pom.xml +++ b/plugins/com.minres.scviewer.e4.application.help/pom.xml @@ -6,7 +6,7 @@ com.minres.scviewer com.minres.scviewer.parent - 2.19.4 + 2.19.5 ../.. 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 7b16270..fbd2e98 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.19.4 +Bundle-Version: 2.19.5 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 18f2b25..d325716 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.19.4 + 2.19.5 ../.. eclipse-plugin 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 7c6ee2c..42ce78e 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 @@ -653,7 +653,9 @@ public class WaveformViewer implements IFileChangeListener, IPreferenceChangeLis public void reloadDatabase() { Map state = new HashMap<>(); saveWaveformViewerState(state); + setSelection(null); waveformPane.getStreamList().clear(); + waveformPane.update(); if(database.isLoaded()) database.close(); database = dbFactory.getDatabase(); diff --git a/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/parts/txTableTree/AbstractTransactionTreeContentProvider.java b/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/parts/txTableTree/AbstractTransactionTreeContentProvider.java index 6b7d13e..df34739 100644 --- a/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/parts/txTableTree/AbstractTransactionTreeContentProvider.java +++ b/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/parts/txTableTree/AbstractTransactionTreeContentProvider.java @@ -5,6 +5,7 @@ import java.util.Vector; import org.eclipse.jface.viewers.ITreeContentProvider; import org.eclipse.jface.viewers.Viewer; +import com.minres.scviewer.database.IWaveform; import com.minres.scviewer.database.tx.ITx; import com.minres.scviewer.database.tx.ITxRelation; import com.minres.scviewer.e4.application.Messages; @@ -51,9 +52,11 @@ public abstract class AbstractTransactionTreeContentProvider implements ITreeCon TransactionTreeNode node=(TransactionTreeNode) element; switch(node.type) { case PROPS: + IWaveform stream = node.element.getStream(); + IWaveform generator = node.element.getGenerator(); return new Object[][]{ - {Messages.TransactionDetails_1, Messages.TransactionDetails_16, node.element.getStream().getFullName()}, - {Messages.TransactionDetails_2, Messages.TransactionDetails_16, node.element.getGenerator().getName()}, + {Messages.TransactionDetails_1, Messages.TransactionDetails_16, stream!=null?stream.getFullName():"[unknown]"}, + {Messages.TransactionDetails_2, Messages.TransactionDetails_16, generator!=null?generator.getName():"[unknown]"}, {Messages.TransactionDetails_19, Messages.TransactionDetails_20, waveformViewerPart.getScaledTime(node.element.getBeginTime())}, {Messages.TransactionDetails_21, Messages.TransactionDetails_20, waveformViewerPart.getScaledTime(node.element.getEndTime())} }; diff --git a/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/parts/txTableTree/TransactionTreeNode.java b/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/parts/txTableTree/TransactionTreeNode.java index 539d2d9..8613c77 100644 --- a/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/parts/txTableTree/TransactionTreeNode.java +++ b/plugins/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/parts/txTableTree/TransactionTreeNode.java @@ -16,12 +16,12 @@ import com.minres.scviewer.e4.application.Messages; public class TransactionTreeNode implements Comparable{ /** The type. */ - public TransactionTreeNodeType type; + public final TransactionTreeNodeType type; /** The element. */ - public ITx element; + public final ITx element; - private String hier_path; + private final String hier_path; /** * Instantiates a new tree node. * diff --git a/plugins/com.minres.scviewer.ui/META-INF/MANIFEST.MF b/plugins/com.minres.scviewer.ui/META-INF/MANIFEST.MF index 9eb8658..7b118c2 100644 --- a/plugins/com.minres.scviewer.ui/META-INF/MANIFEST.MF +++ b/plugins/com.minres.scviewer.ui/META-INF/MANIFEST.MF @@ -17,7 +17,9 @@ Require-Bundle: com.minres.scviewer.database;bundle-version="1.0.0", org.eclipse.swt, org.eclipse.osgi, org.eclipse.core.expressions;bundle-version="3.4.600", - org.eclipse.jface + org.eclipse.jface, + org.eclipse.ui.console, + org.eclipse.jdt.ui Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-ActivationPolicy: lazy Import-Package: com.google.common.collect diff --git a/plugins/com.minres.scviewer.ui/plugin.xml b/plugins/com.minres.scviewer.ui/plugin.xml index b94bcc1..008697e 100644 --- a/plugins/com.minres.scviewer.ui/plugin.xml +++ b/plugins/com.minres.scviewer.ui/plugin.xml @@ -20,10 +20,11 @@ @@ -372,5 +373,14 @@ icon="res/images/cross.png"> + + + + diff --git a/plugins/com.minres.scviewer.ui/pom.xml b/plugins/com.minres.scviewer.ui/pom.xml index 2fd8c2c..81a6017 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.19.4 + 2.19.5 ../.. eclipse-plugin diff --git a/plugins/com.minres.scviewer.ui/src/SCViewerMatchingStrategy.java b/plugins/com.minres.scviewer.ui/src/SCViewerMatchingStrategy.java new file mode 100644 index 0000000..fa7ee13 --- /dev/null +++ b/plugins/com.minres.scviewer.ui/src/SCViewerMatchingStrategy.java @@ -0,0 +1,14 @@ +import org.eclipse.ui.IEditorInput; +import org.eclipse.ui.IEditorMatchingStrategy; +import org.eclipse.ui.IEditorReference; + +public class SCViewerMatchingStrategy implements IEditorMatchingStrategy { + + @Override + public boolean matches(IEditorReference editorRef, IEditorInput input) { + return input.getName().endsWith(".ftr") || input.getName().endsWith(".fst") + || input.getName().endsWith(".vcd") || input.getName().endsWith(".txlog") + || input.getName().endsWith(".txlog.gz") || input.getName().endsWith(".txdb"); + } + +} diff --git a/plugins/com.minres.scviewer.ui/src/com/minres/scviewer/ui/perspectives/WaveformPerspective.java b/plugins/com.minres.scviewer.ui/src/com/minres/scviewer/ui/perspectives/WaveformPerspective.java new file mode 100644 index 0000000..7e5c424 --- /dev/null +++ b/plugins/com.minres.scviewer.ui/src/com/minres/scviewer/ui/perspectives/WaveformPerspective.java @@ -0,0 +1,90 @@ +package com.minres.scviewer.ui.perspectives; + +import org.eclipse.ui.IFolderLayout; +import org.eclipse.ui.IPageLayout; +import org.eclipse.ui.IPerspectiveFactory; +import org.eclipse.ui.console.IConsoleConstants; +import org.eclipse.jdt.ui.JavaUI; + + +/** + * This class is meant to serve as an example for how various contributions + * are made to a perspective. Note that some of the extension point id's are + * referred to as API constants while others are hardcoded and may be subject + * to change. + */ +public class WaveformPerspective implements IPerspectiveFactory { + + private IPageLayout factory; + + public WaveformPerspective() { + super(); + } + + public void createInitialLayout(IPageLayout factory) { + this.factory = factory; + addViews(); + addActionSets(); + addNewWizardShortcuts(); + addPerspectiveShortcuts(); + addViewShortcuts(); + } + + private void addViews() { + // Creates the overall folder layout. + // Note that each new Folder uses a percentage of the remaining EditorArea. + IFolderLayout topLeft = + factory.createFolder( + "topLeft", //NON-NLS-1 + IPageLayout.LEFT, + 0.25f, + factory.getEditorArea()); + topLeft.addView(IPageLayout.ID_PROJECT_EXPLORER); + + IFolderLayout bottomLeft = + factory.createFolder( + "bottomLeft", //NON-NLS-1 + IPageLayout.BOTTOM, + 0.25f, + "topLeft"); + bottomLeft.addView(IPageLayout.ID_OUTLINE); + + IFolderLayout bottom = + factory.createFolder( + "bottomRight", //NON-NLS-1 + IPageLayout.BOTTOM, + 0.75f, + factory.getEditorArea()); + bottom.addView(IPageLayout.ID_PROP_SHEET); + bottom.addPlaceholder(IConsoleConstants.ID_CONSOLE_VIEW); + } + + private void addActionSets() { + factory.addActionSet(JavaUI.ID_ACTION_SET); + factory.addActionSet(JavaUI.ID_ELEMENT_CREATION_ACTION_SET); + factory.addActionSet(IPageLayout.ID_NAVIGATE_ACTION_SET); //NON-NLS-1 + } + + private void addPerspectiveShortcuts() { + factory.addPerspectiveShortcut("org.eclipse.team.ui.TeamSynchronizingPerspective"); //NON-NLS-1 + factory.addPerspectiveShortcut("org.eclipse.ui.resourcePerspective"); //NON-NLS-1 + } + + private void addNewWizardShortcuts() { + factory.addNewWizardShortcut("org.eclipse.ui.wizards.new.folder");//NON-NLS-1 + factory.addNewWizardShortcut("org.eclipse.ui.wizards.new.file");//NON-NLS-1 + } + + private void addViewShortcuts() { + factory.addShowViewShortcut("org.eclipse.ant.ui.views.AntView"); //NON-NLS-1 + factory.addShowViewShortcut("org.eclipse.pde.ui.DependenciesView"); //NON-NLS-1 + factory.addShowViewShortcut("org.eclipse.jdt.junit.ResultView"); //NON-NLS-1 + factory.addShowViewShortcut("org.eclipse.team.ui.GenericHistoryView"); //NON-NLS-1 + factory.addShowViewShortcut(IConsoleConstants.ID_CONSOLE_VIEW); + factory.addShowViewShortcut(JavaUI.ID_PACKAGES); + factory.addShowViewShortcut(IPageLayout.ID_PROJECT_EXPLORER); + factory.addShowViewShortcut(IPageLayout.ID_PROBLEM_VIEW); + factory.addShowViewShortcut(IPageLayout.ID_OUTLINE); + } + +} diff --git a/plugins/com.minres.scviewer.ui/src/com/minres/scviewer/ui/views/provider/TxDbTreeLabelProvider.java b/plugins/com.minres.scviewer.ui/src/com/minres/scviewer/ui/views/provider/TxDbTreeLabelProvider.java index 53f3dbc..f18ee14 100644 --- a/plugins/com.minres.scviewer.ui/src/com/minres/scviewer/ui/views/provider/TxDbTreeLabelProvider.java +++ b/plugins/com.minres.scviewer.ui/src/com/minres/scviewer/ui/views/provider/TxDbTreeLabelProvider.java @@ -26,23 +26,13 @@ public class TxDbTreeLabelProvider implements ILabelProvider { private List listeners = new ArrayList(); - private Image database; - private Image stream; - private Image signal; - private Image folder; - private Image wave; + private static Image database=TxEditorPlugin.createImage("database"); + private static Image stream=TxEditorPlugin.createImage("stream"); + private static Image signal=TxEditorPlugin.createImage("signal"); + private static Image folder=TxEditorPlugin.createImage("folder"); + private static Image wave=TxEditorPlugin.createImage("wave"); - public TxDbTreeLabelProvider() { - super(); - database=TxEditorPlugin.createImage("database"); - stream=TxEditorPlugin.createImage("stream"); - folder=TxEditorPlugin.createImage("folder"); - signal=TxEditorPlugin.createImage("signal"); - wave=TxEditorPlugin.createImage("wave"); - - } - @Override public void addListener(ILabelProviderListener listener) { listeners.add(listener); diff --git a/pom.xml b/pom.xml index c3f054c..ba602f9 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 com.minres.scviewer com.minres.scviewer.parent - 2.19.4 + 2.19.5 pom releng/com.minres.scviewer.target @@ -71,7 +71,7 @@ com.minres.scviewer com.minres.scviewer.target - 2.19.4 + 2.19.5 diff --git a/products/com.minres.scviewer.e4.product/pom.xml b/products/com.minres.scviewer.e4.product/pom.xml index d3d0048..a026a3e 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.19.4 + 2.19.5 ../.. com.minres.scviewer.e4.product - 2.19.4 + 2.19.5 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 19f4040..74530d7 100644 --- a/products/com.minres.scviewer.e4.product/scviewer.product +++ b/products/com.minres.scviewer.e4.product/scviewer.product @@ -1,7 +1,7 @@ - + @@ -22,14 +22,6 @@ - diff --git a/releng/com.minres.scviewer.target/pom.xml b/releng/com.minres.scviewer.target/pom.xml index 5606f26..1deb299 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.19.4 + 2.19.5 ../.. diff --git a/releng/com.minres.scviewer.updateSite/pom.xml b/releng/com.minres.scviewer.updateSite/pom.xml index 436eb6f..40a47c5 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.19.4 + 2.19.5 ../.. diff --git a/tests/com.minres.scviewer.database.test/pom.xml b/tests/com.minres.scviewer.database.test/pom.xml index ddba859..cc7c4d0 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.19.4 + 2.19.5 ../.. eclipse-test-plugin