From 0107c423a36f9ade05bf6287cb326ecaf62a7519 Mon Sep 17 00:00:00 2001 From: Eyck Jentzsch Date: Sun, 14 Oct 2018 21:29:09 +0200 Subject: [PATCH] Fixed warnings in Java files and MANIFESTS.MF, updated version numbers --- .../META-INF/MANIFEST.MF | 1 + .../META-INF/MANIFEST.MF | 1 + .../META-INF/MANIFEST.MF | 1 + .../META-INF/MANIFEST.MF | 3 ++- com.minres.scviewer.database.ui.swt/pom.xml | 2 +- .../database/swt/internal/SignalPainter.java | 2 -- .../META-INF/MANIFEST.MF | 3 ++- com.minres.scviewer.database.ui/pom.xml | 4 ++-- .../META-INF/MANIFEST.MF | 3 ++- com.minres.scviewer.database.vcd/pom.xml | 5 +++-- .../scviewer/database/vcd/VCDFileParser.java | 1 - .../META-INF/MANIFEST.MF | 1 + .../Application.e4xmi | 2 +- .../META-INF/MANIFEST.MF | 3 ++- com.minres.scviewer.e4.application/pom.xml | 3 +-- .../WaveformPopupMenuContribution.java | 1 - .../e4/application/handlers/AboutHandler.java | 5 +---- .../e4/application/messages.properties | 4 ++-- .../e4/application/options/Options.java | 2 +- .../e4/application/parts/AboutDialog.java | 2 +- .../org/eclipse/wb/swt/ResourceManager.java | 10 +++++----- com.minres.scviewer.e4.product/pom.xml | 3 +-- .../scviewer.product | 3 +-- com.minres.scviewer.parent/pom.xml | 2 +- com.minres.scviewer.ui/META-INF/MANIFEST.MF | 1 + .../com/minres/scviewer/ui/TxEditorPart.java | 18 ++++++++++++------ .../META-INF/MANIFEST.MF | 1 + 27 files changed, 47 insertions(+), 40 deletions(-) diff --git a/com.minres.scviewer.database.sqlite/META-INF/MANIFEST.MF b/com.minres.scviewer.database.sqlite/META-INF/MANIFEST.MF index ced4ce9..7a73230 100644 --- a/com.minres.scviewer.database.sqlite/META-INF/MANIFEST.MF +++ b/com.minres.scviewer.database.sqlite/META-INF/MANIFEST.MF @@ -15,3 +15,4 @@ Bundle-ActivationPolicy: lazy Embed-Dependency: sqlite-jdbc Embedded-Artifacts: sqlite-jdbc-3.8.7.jar;g="org.xerial"; a="sqlite-jdbc";v="3.8.7" +Automatic-Module-Name: com.minres.scviewer.database.sqlite diff --git a/com.minres.scviewer.database.test/META-INF/MANIFEST.MF b/com.minres.scviewer.database.test/META-INF/MANIFEST.MF index 28455ce..229f904 100644 --- a/com.minres.scviewer.database.test/META-INF/MANIFEST.MF +++ b/com.minres.scviewer.database.test/META-INF/MANIFEST.MF @@ -12,3 +12,4 @@ Require-Bundle: org.junit, com.minres.scviewer.database.vcd;bundle-version="1.0.0" Bundle-ActivationPolicy: lazy Service-Component: OSGI-INF/component.xml +Automatic-Module-Name: com.minres.scviewer.database.test diff --git a/com.minres.scviewer.database.text/META-INF/MANIFEST.MF b/com.minres.scviewer.database.text/META-INF/MANIFEST.MF index d2d630f..44292a9 100644 --- a/com.minres.scviewer.database.text/META-INF/MANIFEST.MF +++ b/com.minres.scviewer.database.text/META-INF/MANIFEST.MF @@ -15,3 +15,4 @@ Require-Bundle: com.minres.scviewer.database;bundle-version="1.0.0", com.google.guava;bundle-version="15.0.0" Service-Component: OSGI-INF/component.xml Bundle-ActivationPolicy: lazy +Automatic-Module-Name: com.minres.scviewer.database.text diff --git a/com.minres.scviewer.database.ui.swt/META-INF/MANIFEST.MF b/com.minres.scviewer.database.ui.swt/META-INF/MANIFEST.MF index 4dd40bf..26854e4 100644 --- a/com.minres.scviewer.database.ui.swt/META-INF/MANIFEST.MF +++ b/com.minres.scviewer.database.ui.swt/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: SWT widget Bundle-SymbolicName: com.minres.scviewer.database.ui.swt -Bundle-Version: 1.1.0.qualifier +Bundle-Version: 2.0.0.qualifier Bundle-Vendor: MINRES Technologies GmbH Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Require-Bundle: org.eclipse.swt;bundle-version="3.103.1", @@ -17,3 +17,4 @@ Export-Package: com.minres.scviewer.database.swt Bundle-ClassPath: . Bundle-ActivationPolicy: lazy Bundle-Activator: com.minres.scviewer.database.swt.DatabaseUiPlugin +Automatic-Module-Name: com.minres.scviewer.database.ui.swt diff --git a/com.minres.scviewer.database.ui.swt/pom.xml b/com.minres.scviewer.database.ui.swt/pom.xml index 387a391..6b6a315 100644 --- a/com.minres.scviewer.database.ui.swt/pom.xml +++ b/com.minres.scviewer.database.ui.swt/pom.xml @@ -1,6 +1,7 @@ 4.0.0 com.minres.scviewer.database.ui.swt + 2.0.0-SNAPSHOT eclipse-plugin com.minres.scviewer @@ -8,5 +9,4 @@ 1.0.0-SNAPSHOT ../com.minres.scviewer.parent - 1.1.0-SNAPSHOT \ No newline at end of file diff --git a/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/swt/internal/SignalPainter.java b/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/swt/internal/SignalPainter.java index ce0de77..934109c 100644 --- a/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/swt/internal/SignalPainter.java +++ b/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/swt/internal/SignalPainter.java @@ -242,14 +242,12 @@ public class SignalPainter extends TrackPainter { private class MultiBitStencilAnalog implements SignalStencil { final boolean continous; - final boolean signed; private long minVal; private long range; @SuppressWarnings("unchecked") public MultiBitStencilAnalog(NavigableMap entries, ISignalChange left, boolean continous, boolean signed) { this.continous=continous; - this.signed=signed; Collection values = ((NavigableMap) entries).values(); minVal=((ISignalChangeBitVector) left).getValue().toUnsignedValue(); range=2; diff --git a/com.minres.scviewer.database.ui/META-INF/MANIFEST.MF b/com.minres.scviewer.database.ui/META-INF/MANIFEST.MF index 1b3f7ff..7895eed 100644 --- a/com.minres.scviewer.database.ui/META-INF/MANIFEST.MF +++ b/com.minres.scviewer.database.ui/META-INF/MANIFEST.MF @@ -2,9 +2,10 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Database UI Bundle-SymbolicName: com.minres.scviewer.database.ui -Bundle-Version: 1.0.0.qualifier +Bundle-Version: 2.0.0.qualifier Bundle-Vendor: MINRES Technologies GmbH Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Export-Package: com.minres.scviewer.database.ui Require-Bundle: com.minres.scviewer.database, org.eclipse.jface +Automatic-Module-Name: com.minres.scviewer.database.ui diff --git a/com.minres.scviewer.database.ui/pom.xml b/com.minres.scviewer.database.ui/pom.xml index e7f049f..559e80c 100644 --- a/com.minres.scviewer.database.ui/pom.xml +++ b/com.minres.scviewer.database.ui/pom.xml @@ -1,12 +1,12 @@ 4.0.0 com.minres.scviewer.database.ui - 1.0.0-SNAPSHOT + 2.0.0-SNAPSHOT eclipse-plugin com.minres.scviewer com.minres.scviewer.parent - 1.0.0-SNAPSHOT + 2.0.0-SNAPSHOT ../com.minres.scviewer.parent \ No newline at end of file diff --git a/com.minres.scviewer.database.vcd/META-INF/MANIFEST.MF b/com.minres.scviewer.database.vcd/META-INF/MANIFEST.MF index 035983b..968707f 100644 --- a/com.minres.scviewer.database.vcd/META-INF/MANIFEST.MF +++ b/com.minres.scviewer.database.vcd/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: VCD signal database Bundle-SymbolicName: com.minres.scviewer.database.vcd -Bundle-Version: 1.0.0.qualifier +Bundle-Version: 2.0.0.qualifier Bundle-Vendor: MINRES Technologies GmbH Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Require-Bundle: com.minres.scviewer.database;bundle-version="1.0.0", @@ -13,3 +13,4 @@ Require-Bundle: com.minres.scviewer.database;bundle-version="1.0.0", Service-Component: OSGI-INF/component.xml Bundle-ActivationPolicy: lazy Import-Package: com.google.common.collect +Automatic-Module-Name: com.minres.scviewer.database.vcd diff --git a/com.minres.scviewer.database.vcd/pom.xml b/com.minres.scviewer.database.vcd/pom.xml index f938751..f1a21ec 100644 --- a/com.minres.scviewer.database.vcd/pom.xml +++ b/com.minres.scviewer.database.vcd/pom.xml @@ -4,8 +4,9 @@ com.minres.scviewer com.minres.scviewer.parent - 1.0.0-SNAPSHOT + 2.0.0-SNAPSHOT ../com.minres.scviewer.parent eclipse-plugin - \ No newline at end of file + 2.0.0-SNAPSHOT + \ No newline at end of file diff --git a/com.minres.scviewer.database.vcd/src/com/minres/scviewer/database/vcd/VCDFileParser.java b/com.minres.scviewer.database.vcd/src/com/minres/scviewer/database/vcd/VCDFileParser.java index 06976f8..c714dec 100644 --- a/com.minres.scviewer.database.vcd/src/com/minres/scviewer/database/vcd/VCDFileParser.java +++ b/com.minres.scviewer.database.vcd/src/com/minres/scviewer/database/vcd/VCDFileParser.java @@ -149,7 +149,6 @@ class VCDFileParser { if (tokenizer.sval.charAt(0) == '#') { // If the line begins with a #, this is a timestamp. currentTime = Long.parseLong(tokenizer.sval.substring(1)) * picoSecondsPerIncrement; } else { - boolean isReal=false; if(tokenizer.sval.equals("$comment")){ do { if (!nextToken()) return false; diff --git a/com.minres.scviewer.database/META-INF/MANIFEST.MF b/com.minres.scviewer.database/META-INF/MANIFEST.MF index 7260a67..c1ec1ec 100644 --- a/com.minres.scviewer.database/META-INF/MANIFEST.MF +++ b/com.minres.scviewer.database/META-INF/MANIFEST.MF @@ -11,3 +11,4 @@ Service-Component: OSGI-INF/component.xml,OSGI-INF/component2.xml Require-Bundle: org.eclipse.equinox.ds;bundle-version="1.4.200", org.eclipse.equinox.util;bundle-version="1.0.500", org.eclipse.osgi.services;bundle-version="3.4.0" +Automatic-Module-Name: com.minres.scviewer.database diff --git a/com.minres.scviewer.e4.application/Application.e4xmi b/com.minres.scviewer.e4.application/Application.e4xmi index c596fb4..8b7c1e3 100644 --- a/com.minres.scviewer.e4.application/Application.e4xmi +++ b/com.minres.scviewer.e4.application/Application.e4xmi @@ -142,7 +142,7 @@ - + diff --git a/com.minres.scviewer.e4.application/META-INF/MANIFEST.MF b/com.minres.scviewer.e4.application/META-INF/MANIFEST.MF index ccd278f..96a8505 100644 --- a/com.minres.scviewer.e4.application/META-INF/MANIFEST.MF +++ b/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: 1.1.1.qualifier +Bundle-Version: 2.0.0.qualifier Bundle-Vendor: %Bundle-Vendor Require-Bundle: javax.inject;bundle-version="1.0.0", org.eclipse.core.runtime;bundle-version="3.11.1", @@ -35,3 +35,4 @@ Require-Bundle: javax.inject;bundle-version="1.0.0", Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Import-Package: com.minres.scviewer.database, javax.inject;version="1.0.0" +Automatic-Module-Name: com.minres.scviewer.e4.application diff --git a/com.minres.scviewer.e4.application/pom.xml b/com.minres.scviewer.e4.application/pom.xml index c337711..91d86b7 100644 --- a/com.minres.scviewer.e4.application/pom.xml +++ b/com.minres.scviewer.e4.application/pom.xml @@ -4,9 +4,8 @@ com.minres.scviewer com.minres.scviewer.parent - 1.0.0-SNAPSHOT + 2.0.0-SNAPSHOT ../com.minres.scviewer.parent eclipse-plugin - 1.1.1-SNAPSHOT \ No newline at end of file diff --git a/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/elements/WaveformPopupMenuContribution.java b/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/elements/WaveformPopupMenuContribution.java index a08f31c..89eb25a 100644 --- a/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/elements/WaveformPopupMenuContribution.java +++ b/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/elements/WaveformPopupMenuContribution.java @@ -27,7 +27,6 @@ import com.minres.scviewer.database.ISignalChange; import com.minres.scviewer.database.ISignalChangeBitVector; import com.minres.scviewer.database.ISignalChangeReal; import com.minres.scviewer.database.ui.TrackEntry; -import com.minres.scviewer.database.ui.TrackEntry.ValueDisplay; import com.minres.scviewer.e4.application.parts.WaveformViewer; public class WaveformPopupMenuContribution { diff --git a/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/handlers/AboutHandler.java b/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/handlers/AboutHandler.java index f7f4d7e..6d5db35 100644 --- a/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/handlers/AboutHandler.java +++ b/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/handlers/AboutHandler.java @@ -10,11 +10,8 @@ *******************************************************************************/ package com.minres.scviewer.e4.application.handlers; -import javax.inject.Named; - import org.eclipse.e4.core.di.annotations.Execute; import org.eclipse.e4.ui.model.application.MApplication; -import org.eclipse.e4.ui.model.application.ui.basic.MDialog; import org.eclipse.e4.ui.model.application.ui.basic.MWindow; import org.eclipse.e4.ui.workbench.modeling.EModelService; import org.eclipse.swt.widgets.Shell; @@ -25,7 +22,7 @@ public class AboutHandler { @Execute public void execute(Shell shell, MApplication app, MWindow window, EModelService ms /*@Named("mdialog01.dialog.0") MDialog dialog*/) { - MDialog dialog = (MDialog) ms.find(DIALOG_ID, app); //$NON-NLS-1$ + MWindow dialog = (MWindow) ms.find(DIALOG_ID, app); //$NON-NLS-1$ dialog.setToBeRendered(true); dialog.setToBeRendered(false); } diff --git a/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/messages.properties b/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/messages.properties index 7848715..4a5a274 100644 --- a/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/messages.properties +++ b/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/messages.properties @@ -1,5 +1,5 @@ -AboutDialog_0=\nSCViewer - a SystemC waveform viewer\n\nVersion: 1.2.2\n -AboutDialog_1=\nCopyright (c) 2015,2016,2017 MINRES Technologies GmbH and others.\n\nAll rights reserved. MINRES and the MINRES logo are trademarks of MINRES Technologies GmbH, http://www.minres.com/. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html\n\nParts of the software are governed by the Apache License Version 2.0 available at http://www.apache.org/licenses/. These are namely org.apache.jdbm and org.sqlite JDBC driver\n\nSources code is hosted at GitHub: https://github.com/minres/SCViewer\n +AboutDialog_0=\nSCViewer - a SystemC waveform viewer\n\nVersion: 2.0\n +AboutDialog_1=\nCopyright (c) 2015, 2018 MINRES Technologies GmbH and others.\n\nAll rights reserved. MINRES and the MINRES logo are trademarks of MINRES Technologies GmbH, http://www.minres.com/. This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html\n\nParts of the software are governed by the Apache License Version 2.0 available at http://www.apache.org/licenses/. These are namely org.apache.jdbm and org.sqlite JDBC driver\n\nSources code is hosted at GitHub: https://github.com/minres/SCViewer\n DesignBrowser_12=Append all after DesignBrowser_16=Insert all before DesignBrowser_2=Enter text to filter waveforms diff --git a/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/options/Options.java b/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/options/Options.java index b7e0282..0e66ed0 100644 --- a/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/options/Options.java +++ b/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/options/Options.java @@ -135,7 +135,6 @@ public class Options { private Prefix prefix = null; private Multiplicity defaultMultiplicity = null; private String[] arguments = null; - private boolean ignoreUnmatched = false; private int defaultMinData = 0; private int defaultMaxData = 0; private StringBuffer checkErrors = null; @@ -634,6 +633,7 @@ public class Options { case ONCE: if (optionData.getResultCount() != 1) err = true; break; case ONCE_OR_MORE: if (optionData.getResultCount() == 0) err = true; break; case ZERO_OR_ONE: if (optionData.getResultCount() > 1) err = true; break; + case ZERO_OR_MORE: break; } if (err) { diff --git a/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/parts/AboutDialog.java b/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/parts/AboutDialog.java index e33b483..8b0745c 100644 --- a/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/parts/AboutDialog.java +++ b/com.minres.scviewer.e4.application/src/com/minres/scviewer/e4/application/parts/AboutDialog.java @@ -133,7 +133,7 @@ public class AboutDialog extends Dialog { // links are activated on mouse down when the control key is held down // if ((event.stateMask & SWT.MOD1) != 0) { try { - int offset = ((StyledText)event.widget).getOffsetAtLocation(new Point (event.x, event.y)); + int offset = ((StyledText)event.widget).getOffsetAtPoint(new Point (event.x, event.y)); StyleRange style = ((StyledText)event.widget).getStyleRangeAtOffset(offset); if (style != null && style.underline && style.underlineStyle == SWT.UNDERLINE_LINK) { Desktop.getDesktop().browse(new java.net.URI(style.data.toString())); diff --git a/com.minres.scviewer.e4.application/src/org/eclipse/wb/swt/ResourceManager.java b/com.minres.scviewer.e4.application/src/org/eclipse/wb/swt/ResourceManager.java index ddf492f..98642cf 100644 --- a/com.minres.scviewer.e4.application/src/org/eclipse/wb/swt/ResourceManager.java +++ b/com.minres.scviewer.e4.application/src/org/eclipse/wb/swt/ResourceManager.java @@ -147,15 +147,15 @@ public class ResourceManager extends SWTResourceManager { CompositeImageDescriptor compositImageDesc = new CompositeImageDescriptor() { @Override protected void drawCompositeImage(int width, int height) { - drawImage(baseImage.getImageData(), 0, 0); + drawImage(createCachedImageDataProvider(baseImage), 0, 0); if (corner == TOP_LEFT) { - drawImage(decorator.getImageData(), 0, 0); + drawImage(createCachedImageDataProvider(decorator), 0, 0); } else if (corner == TOP_RIGHT) { - drawImage(decorator.getImageData(), bib.width - dib.width, 0); + drawImage(createCachedImageDataProvider(decorator), bib.width - dib.width, 0); } else if (corner == BOTTOM_LEFT) { - drawImage(decorator.getImageData(), 0, bib.height - dib.height); + drawImage(createCachedImageDataProvider(decorator), 0, bib.height - dib.height); } else if (corner == BOTTOM_RIGHT) { - drawImage(decorator.getImageData(), bib.width - dib.width, bib.height - dib.height); + drawImage(createCachedImageDataProvider(decorator), bib.width - dib.width, bib.height - dib.height); } } @Override diff --git a/com.minres.scviewer.e4.product/pom.xml b/com.minres.scviewer.e4.product/pom.xml index 92a039e..ff56ab9 100644 --- a/com.minres.scviewer.e4.product/pom.xml +++ b/com.minres.scviewer.e4.product/pom.xml @@ -6,11 +6,10 @@ com.minres.scviewer com.minres.scviewer.parent - 1.0.0-SNAPSHOT + 2.0.0-SNAPSHOT ../com.minres.scviewer.parent com.minres.scviewer.e4.product - 1.3.0-SNAPSHOT eclipse-repository com.minres.scviewer diff --git a/com.minres.scviewer.e4.product/scviewer.product b/com.minres.scviewer.e4.product/scviewer.product index d500d8d..615d49f 100644 --- a/com.minres.scviewer.e4.product/scviewer.product +++ b/com.minres.scviewer.e4.product/scviewer.product @@ -1,7 +1,7 @@ - + @@ -33,7 +33,6 @@ - diff --git a/com.minres.scviewer.parent/pom.xml b/com.minres.scviewer.parent/pom.xml index e69be6d..736e844 100644 --- a/com.minres.scviewer.parent/pom.xml +++ b/com.minres.scviewer.parent/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.minres.scviewer com.minres.scviewer.parent - 1.0.0-SNAPSHOT + 2.0.0-SNAPSHOT pom ../com.minres.scviewer.target diff --git a/com.minres.scviewer.ui/META-INF/MANIFEST.MF b/com.minres.scviewer.ui/META-INF/MANIFEST.MF index fc9a3e3..60150bc 100644 --- a/com.minres.scviewer.ui/META-INF/MANIFEST.MF +++ b/com.minres.scviewer.ui/META-INF/MANIFEST.MF @@ -23,3 +23,4 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-ActivationPolicy: lazy Import-Package: com.google.common.collect Service-Component: OSGI-INF/component.xml +Automatic-Module-Name: com.minres.scviewer.ui diff --git a/com.minres.scviewer.ui/src/com/minres/scviewer/ui/TxEditorPart.java b/com.minres.scviewer.ui/src/com/minres/scviewer/ui/TxEditorPart.java index 3663aab..66402d9 100644 --- a/com.minres.scviewer.ui/src/com/minres/scviewer/ui/TxEditorPart.java +++ b/com.minres.scviewer.ui/src/com/minres/scviewer/ui/TxEditorPart.java @@ -347,12 +347,18 @@ public class TxEditorPart extends EditorPart implements ITabbedPropertySheetPage addStreamToList(stream); } - public void removeStreamFromList(IWaveform obj){ - if(getEditorInput() instanceof TxEditorInput && ((TxEditorInput) getEditorInput()).getStreamNames().contains(obj.getFullName())){ - ((TxEditorInput) getEditorInput()).getStreamNames().remove(obj.getFullName()); - txDisplay.getStreamList().remove(obj); - } else - txDisplay.getStreamList().remove(obj); + public void removeStreamFromList(IWaveform waveform){ + if(getEditorInput() instanceof TxEditorInput && ((TxEditorInput) getEditorInput()).getStreamNames().contains(waveform.getFullName())){ + ((TxEditorInput) getEditorInput()).getStreamNames().remove(waveform.getFullName()); + } + TrackEntry entry=null; + for(TrackEntry e:txDisplay.getStreamList()) { + if(e.waveform==waveform) { + entry=e; + break; + } + } + txDisplay.getStreamList().remove(entry); } public void removeStreamsFromList(IWaveform[] iWaveforms){ diff --git a/com.opcoach.e4.preferences/META-INF/MANIFEST.MF b/com.opcoach.e4.preferences/META-INF/MANIFEST.MF index f49535b..5ec77eb 100644 --- a/com.opcoach.e4.preferences/META-INF/MANIFEST.MF +++ b/com.opcoach.e4.preferences/META-INF/MANIFEST.MF @@ -16,3 +16,4 @@ Require-Bundle: javax.inject, Export-Package: com.opcoach.e4.preferences, com.opcoach.e4.preferences.handlers Bundle-ActivationPolicy: lazy +Automatic-Module-Name: com.opcoach.e4.preferences