Target Explorer: rework connection setup

5 files changed, 23 insertions, 10 deletions

diff --git a/target_explorer/plugins/org.eclipse.tcf.te.runtime.services/src/org/eclipse/tcf/te/runtime/services/interfaces/ISimulatorService.java b/target_explorer/plugins/org.eclipse.tcf.te.runtime.services/src/org/eclipse/tcf/te/runtime/services/interfaces/ISimulatorService.java
index c03999ca1..ee0010c37 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.runtime.services/src/org/eclipse/tcf/te/runtime/services/interfaces/ISimulatorService.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.runtime.services/src/org/eclipse/tcf/te/runtime/services/interfaces/ISimulatorService.java
@@ -11,6 +11,7 @@ package org.eclipse.tcf.te.runtime.services.interfaces;
 
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.tcf.te.runtime.interfaces.callback.ICallback;
+import org.eclipse.tcf.te.runtime.interfaces.properties.IPropertiesContainer;
 
 /**
  * Simulator service.
@@ -83,6 +84,15 @@ public interface ISimulatorService extends IService {
 	public String getDefaultConfig();
 
 	/**
+	 * Get the address data for the given simulator config.
+	 * @param context The context. Must not be <code>null</code>.
+	 * @param config The encoded simulator settings or <code>null</code>.
+	 * @param currentAddress The current address data.
+	 * @return The new simulator address data.
+	 */
+	public IPropertiesContainer getSimulatorAddress(Object context, String config, IPropertiesContainer currentAddress);
+
+	/**
 	 * Validate a simulator configuration
 	 * .
 	 * @param context The context. Must not be <code>null</code>.
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/src/org/eclipse/tcf/te/tcf/ui/nls/Messages.java b/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/src/org/eclipse/tcf/te/tcf/ui/nls/Messages.java
index f47414d79..04368ccfa 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/src/org/eclipse/tcf/te/tcf/ui/nls/Messages.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/src/org/eclipse/tcf/te/tcf/ui/nls/Messages.java
@@ -197,10 +197,6 @@ public class Messages extends NLS {
 	public static String TargetSelectorSection_button_configure;
 	public static String TargetSelectorSection_button_enableReal;
 
-	public static String SimulatorTypeSelectionControl_label;
-	public static String SimulatorTypeSelectionControl_button_configure;
-	public static String SimulatorTypeSelectionControl_error_invalidConfiguration;
-
 	public static String AbstractConfigurationEditorPage_error_possibleCause;
 	public static String AbstractConfigurationEditorPage_error_save;
 
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/src/org/eclipse/tcf/te/tcf/ui/nls/Messages.properties b/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/src/org/eclipse/tcf/te/tcf/ui/nls/Messages.properties
index f39dd4d0d..dea3a2821 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/src/org/eclipse/tcf/te/tcf/ui/nls/Messages.properties
+++ b/target_explorer/plugins/org.eclipse.tcf.te.tcf.ui/src/org/eclipse/tcf/te/tcf/ui/nls/Messages.properties
@@ -155,10 +155,6 @@ TargetSelectorSection_button_enableReal=Use Target:
 TargetSelectorSection_button_configure=Configure...
 TargetSelectorSection_button_enableSimulator=Start local Simulator:
 
-SimulatorTypeSelectionControl_label=Simulator Type:
-SimulatorTypeSelectionControl_button_configure=Configure...
-SimulatorTypeSelectionControl_error_invalidConfiguration=The simulator configuration is not valid. Please click on ''Configure...'' to configure the simulator.
-
 AbstractConfigurationEditorPage_error_possibleCause=Possible Cause:\n{0}
 AbstractConfigurationEditorPage_error_save=Failed to save connection: {0}.\n\n{1}
 
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.ui.controls/src/org/eclipse/tcf/te/ui/controls/validator/PortNumberValidator.java b/target_explorer/plugins/org.eclipse.tcf.te.ui.controls/src/org/eclipse/tcf/te/ui/controls/validator/PortNumberValidator.java
index b60593105..fa72c2e34 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.ui.controls/src/org/eclipse/tcf/te/ui/controls/validator/PortNumberValidator.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.ui.controls/src/org/eclipse/tcf/te/ui/controls/validator/PortNumberValidator.java
@@ -18,8 +18,8 @@ package org.eclipse.tcf.te.ui.controls.validator;
 public class PortNumberValidator extends NumberValidator {
 
 	// regular expressions for validator
-	protected static final String PORT_REGEX_DEC = "([0-9]{1,5})"; //$NON-NLS-1$
-	protected static final String PORT_REGEX_HEX = "(0(x|X)[0-9a-fA-F]{1,4})"; //$NON-NLS-1$
+	public static final String PORT_REGEX_DEC = "([0-9]{1,5})"; //$NON-NLS-1$
+	public static final String PORT_REGEX_HEX = "(0(x|X)[0-9a-fA-F]{1,4})"; //$NON-NLS-1$
 
 	public static final int ATTR_HEX = 4;
 	public static final int ATTR_DECIMAL = 8;
diff --git a/target_explorer/plugins/org.eclipse.tcf.te.ui/src/org/eclipse/tcf/te/ui/interfaces/services/ISimulatorServiceUIDelegate.java b/target_explorer/plugins/org.eclipse.tcf.te.ui/src/org/eclipse/tcf/te/ui/interfaces/services/ISimulatorServiceUIDelegate.java
index b4708c6a7..0e4f86a17 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.ui/src/org/eclipse/tcf/te/ui/interfaces/services/ISimulatorServiceUIDelegate.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.ui/src/org/eclipse/tcf/te/ui/interfaces/services/ISimulatorServiceUIDelegate.java
@@ -9,6 +9,7 @@
  *******************************************************************************/
 package org.eclipse.tcf.te.ui.interfaces.services;
 
+import org.eclipse.tcf.te.runtime.interfaces.properties.IPropertiesContainer;
 import org.eclipse.tcf.te.runtime.services.interfaces.ISimulatorService;
 
 /**
@@ -16,6 +17,8 @@ import org.eclipse.tcf.te.runtime.services.interfaces.ISimulatorService;
  */
 public interface ISimulatorServiceUIDelegate {
 
+	public static final String PROPERTY_ADDRESS_READONLY = "addressReadOnly";  //$NON-NLS-1$
+
 	/**
 	 * Get the simulator service the UI delegate is associated with.
 	 *
@@ -50,6 +53,14 @@ public interface ISimulatorServiceUIDelegate {
     public String configure(Object context, String oldConfig);
 
     /**
+     * Get UI configuration properties.
+     * @param context The context.
+     * @param config The configuration or <code>null</code>.
+     * @return The UI configuration properties.
+     */
+    public IPropertiesContainer getUIProperties(Object context, String config);
+
+    /**
      * Returns <code>true</code> if the simulator is configurable.
      * @return <code>true</code> if the simulator is configurable.
      */