diff options
author | Uwe Stieber | 2012-05-02 09:15:39 +0000 |
---|---|---|
committer | Uwe Stieber | 2012-05-02 09:16:21 +0000 |
commit | dfbd704469e3be2c7deb5b76be7cf842c6e68138 (patch) | |
tree | fb43be2c574e2166add6a3b3601c94b5b25da039 /target_explorer/plugins/org.eclipse.tcf.te.ui.controls | |
parent | 8084d73b4627b9ddc59a43305e98b6ebda13cad6 (diff) | |
download | org.eclipse.tcf-dfbd704469e3be2c7deb5b76be7cf842c6e68138.tar.gz org.eclipse.tcf-dfbd704469e3be2c7deb5b76be7cf842c6e68138.tar.xz org.eclipse.tcf-dfbd704469e3be2c7deb5b76be7cf842c6e68138.zip |
Target Explorer: Avoid hard dependency on "gnu.io.rxtx"
Diffstat (limited to 'target_explorer/plugins/org.eclipse.tcf.te.ui.controls')
2 files changed, 9 insertions, 1 deletions
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.ui.controls/META-INF/MANIFEST.MF b/target_explorer/plugins/org.eclipse.tcf.te.ui.controls/META-INF/MANIFEST.MF index 64de71d0e..eb2231893 100644 --- a/target_explorer/plugins/org.eclipse.tcf.te.ui.controls/META-INF/MANIFEST.MF +++ b/target_explorer/plugins/org.eclipse.tcf.te.ui.controls/META-INF/MANIFEST.MF @@ -31,4 +31,4 @@ Export-Package: org.eclipse.tcf.te.ui.controls, org.eclipse.tcf.te.ui.controls.wire, org.eclipse.tcf.te.ui.controls.wire.network, org.eclipse.tcf.te.ui.controls.wire.serial -Import-Package: gnu.io +Import-Package: gnu.io;resolution:=optional diff --git a/target_explorer/plugins/org.eclipse.tcf.te.ui.controls/src/org/eclipse/tcf/te/ui/controls/wire/serial/SerialLinePanel.java b/target_explorer/plugins/org.eclipse.tcf.te.ui.controls/src/org/eclipse/tcf/te/ui/controls/wire/serial/SerialLinePanel.java index 0be3aaf50..c3c48c57c 100644 --- a/target_explorer/plugins/org.eclipse.tcf.te.ui.controls/src/org/eclipse/tcf/te/ui/controls/wire/serial/SerialLinePanel.java +++ b/target_explorer/plugins/org.eclipse.tcf.te.ui.controls/src/org/eclipse/tcf/te/ui/controls/wire/serial/SerialLinePanel.java @@ -22,6 +22,7 @@ import java.util.Map; import org.eclipse.core.runtime.Assert; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; +import org.eclipse.core.runtime.Platform; import org.eclipse.core.runtime.Status; import org.eclipse.jface.dialogs.IDialogSettings; import org.eclipse.jface.dialogs.IInputValidator; @@ -510,6 +511,13 @@ public class SerialLinePanel extends AbstractWizardConfigurationPanel implements * Query the list of serial devices via RXTX. */ protected void queryAvailableSerialDevices() { + // Avoid printing the library version output to stdout if the platform + // is not in debug mode. + String prop = System.getProperty("gnu.io.rxtx.NoVersionOutput"); //$NON-NLS-1$ + if (prop == null && !Platform.inDebugMode()) { + System.setProperty("gnu.io.rxtx.NoVersionOutput", "true"); //$NON-NLS-1$ //$NON-NLS-2$ + } + // java.lang.UnsatisfiedLinkError: ../plugins/gnu.io.rxtx.solaris.sparc_2.1.7.200702281917/os/solaris/sparc/librxtxSerial.so: // Can't load Sparc 32-bit .so on a Sparc 32-bit platform // May happen in CommPortIdentifier static constructor! |