diff --git a/bundles/org.eclipse.remote.serial.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.remote.serial.ui/META-INF/MANIFEST.MF index 7f8de82f79c..4a3d04261c0 100644 --- a/bundles/org.eclipse.remote.serial.ui/META-INF/MANIFEST.MF +++ b/bundles/org.eclipse.remote.serial.ui/META-INF/MANIFEST.MF @@ -14,3 +14,4 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.7 Bundle-ActivationPolicy: lazy Bundle-Vendor: %providerName Bundle-Localization: plugin +Export-Package: org.eclipse.remote.serial.ui diff --git a/bundles/org.eclipse.remote.serial.ui/src/org/eclipse/remote/serial/internal/ui/SerialPortConnectionsUI.java b/bundles/org.eclipse.remote.serial.ui/src/org/eclipse/remote/serial/internal/ui/SerialPortConnectionsUI.java index 0ce8185afb4..c8abdd1eb2f 100644 --- a/bundles/org.eclipse.remote.serial.ui/src/org/eclipse/remote/serial/internal/ui/SerialPortConnectionsUI.java +++ b/bundles/org.eclipse.remote.serial.ui/src/org/eclipse/remote/serial/internal/ui/SerialPortConnectionsUI.java @@ -20,6 +20,7 @@ import org.eclipse.remote.core.IRemoteConnection; import org.eclipse.remote.core.IRemoteConnectionType; import org.eclipse.remote.core.IRemoteConnectionType.Service; import org.eclipse.remote.core.exception.RemoteConnectionException; +import org.eclipse.remote.serial.ui.NewSerialPortConnectionWizard; import org.eclipse.remote.ui.AbstractRemoteUIConnectionService; import org.eclipse.remote.ui.IRemoteUIConnectionService; import org.eclipse.remote.ui.IRemoteUIConnectionWizard; diff --git a/bundles/org.eclipse.remote.serial.ui/src/org/eclipse/remote/serial/internal/ui/NewSerialPortConnectionWizard.java b/bundles/org.eclipse.remote.serial.ui/src/org/eclipse/remote/serial/ui/NewSerialPortConnectionWizard.java similarity index 88% rename from bundles/org.eclipse.remote.serial.ui/src/org/eclipse/remote/serial/internal/ui/NewSerialPortConnectionWizard.java rename to bundles/org.eclipse.remote.serial.ui/src/org/eclipse/remote/serial/ui/NewSerialPortConnectionWizard.java index dafff965c77..8f84cf284c2 100644 --- a/bundles/org.eclipse.remote.serial.ui/src/org/eclipse/remote/serial/internal/ui/NewSerialPortConnectionWizard.java +++ b/bundles/org.eclipse.remote.serial.ui/src/org/eclipse/remote/serial/ui/NewSerialPortConnectionWizard.java @@ -8,7 +8,7 @@ * Contributors: * QNX Software Systems - initial contribution *******************************************************************************/ -package org.eclipse.remote.serial.internal.ui; +package org.eclipse.remote.serial.ui; import java.util.Set; @@ -18,6 +18,7 @@ import org.eclipse.remote.core.IRemoteConnectionType; import org.eclipse.remote.core.IRemoteConnectionWorkingCopy; import org.eclipse.remote.core.exception.RemoteConnectionException; import org.eclipse.remote.serial.core.ISerialPortService; +import org.eclipse.remote.serial.internal.ui.Activator; import org.eclipse.remote.ui.IRemoteUIConnectionWizard; import org.eclipse.swt.widgets.Shell; @@ -45,11 +46,11 @@ public class NewSerialPortConnectionWizard extends Wizard implements IRemoteUICo return false; } - workingCopy.setAttribute(ISerialPortService.PORT_NAME_ATTR, page.portName); - workingCopy.setAttribute(ISerialPortService.BAUD_RATE_ATTR, Integer.toString(page.baudRateIndex)); - workingCopy.setAttribute(ISerialPortService.BYTE_SIZE_ATTR, Integer.toString(page.byteSizeIndex)); - workingCopy.setAttribute(ISerialPortService.PARITY_ATTR, Integer.toString(page.parityIndex)); - workingCopy.setAttribute(ISerialPortService.STOP_BITS_ATTR, Integer.toString(page.stopBitsIndex)); + workingCopy.setAttribute(ISerialPortService.PORT_NAME_ATTR, page.getPortName()); + workingCopy.setAttribute(ISerialPortService.BAUD_RATE_ATTR, Integer.toString(page.getBaudRateIndex())); + workingCopy.setAttribute(ISerialPortService.BYTE_SIZE_ATTR, Integer.toString(page.getByteSizeIndex())); + workingCopy.setAttribute(ISerialPortService.PARITY_ATTR, Integer.toString(page.getParityIndex())); + workingCopy.setAttribute(ISerialPortService.STOP_BITS_ATTR, Integer.toString(page.getStopBitsIndex())); return true; } @@ -68,7 +69,7 @@ public class NewSerialPortConnectionWizard extends Wizard implements IRemoteUICo public IRemoteConnectionWorkingCopy getConnection() { if (workingCopy == null) { try { - workingCopy = connectionType.newConnection(page.name); + workingCopy = connectionType.newConnection(page.getName()); } catch (RemoteConnectionException e) { Activator.log(e.getStatus()); } diff --git a/bundles/org.eclipse.remote.serial.ui/src/org/eclipse/remote/serial/internal/ui/NewSerialPortConnectionWizardPage.java b/bundles/org.eclipse.remote.serial.ui/src/org/eclipse/remote/serial/ui/NewSerialPortConnectionWizardPage.java similarity index 89% rename from bundles/org.eclipse.remote.serial.ui/src/org/eclipse/remote/serial/internal/ui/NewSerialPortConnectionWizardPage.java rename to bundles/org.eclipse.remote.serial.ui/src/org/eclipse/remote/serial/ui/NewSerialPortConnectionWizardPage.java index cc25f2ee280..ee80654e19d 100644 --- a/bundles/org.eclipse.remote.serial.ui/src/org/eclipse/remote/serial/internal/ui/NewSerialPortConnectionWizardPage.java +++ b/bundles/org.eclipse.remote.serial.ui/src/org/eclipse/remote/serial/ui/NewSerialPortConnectionWizardPage.java @@ -8,7 +8,7 @@ * Contributors: * QNX Software Systems - initial contribution *******************************************************************************/ -package org.eclipse.remote.serial.internal.ui; +package org.eclipse.remote.serial.ui; import java.io.IOException; @@ -18,6 +18,8 @@ import org.eclipse.cdt.serial.Parity; import org.eclipse.cdt.serial.SerialPort; import org.eclipse.cdt.serial.StopBits; import org.eclipse.jface.wizard.WizardPage; +import org.eclipse.remote.serial.internal.ui.Activator; +import org.eclipse.remote.serial.internal.ui.Messages; import org.eclipse.swt.SWT; import org.eclipse.swt.events.KeyEvent; import org.eclipse.swt.events.KeyListener; @@ -32,12 +34,12 @@ import org.eclipse.swt.widgets.Text; public class NewSerialPortConnectionWizardPage extends WizardPage { - String name; - String portName; - int baudRateIndex; - int byteSizeIndex; - int parityIndex; - int stopBitsIndex; + private String name; + private String portName; + private int baudRateIndex; + private int byteSizeIndex; + private int parityIndex; + private int stopBitsIndex; private String[] portNames; @@ -48,7 +50,7 @@ public class NewSerialPortConnectionWizardPage extends WizardPage { private Combo parityCombo; private Combo stopBitsCombo; - protected NewSerialPortConnectionWizardPage() { + public NewSerialPortConnectionWizardPage() { super(NewSerialPortConnectionWizardPage.class.getName()); setDescription(Messages.NewSerialPortConnectionWizardPage_Description); setTitle(Messages.NewSerialPortConnectionWizardPage_Title); @@ -180,4 +182,28 @@ public class NewSerialPortConnectionWizardPage extends WizardPage { setPageComplete(!name.isEmpty() && portName != null); } + public String getName() { + return name; + } + + public String getPortName() { + return portName; + } + + public int getBaudRateIndex() { + return baudRateIndex; + } + + public int getByteSizeIndex() { + return byteSizeIndex; + } + + public int getParityIndex() { + return parityIndex; + } + + public int getStopBitsIndex() { + return stopBitsIndex; + } + }