- BaseSettingsDialog contains code that ensures that RSE plug-in is initialized 
before performing any remote actions
        - this piece of code should be placed in the RSEHelper since it does 
not have any relevance for the GUI class
        - created method in RSEHelper called waitForRSEInitCompletition with 
this functionality
        - replaced code in BaseSettingsDialog with a call to 
waitForRSEInitCompletition
Signed-off-by: Ioana Grigoropol <ioanax.grigoro...@intel.com>
---
 .../src/org/yocto/sdk/remotetools/RSEHelper.java   |    9 +++++++++
 .../sdk/remotetools/actions/BaseSettingDialog.java |    8 +-------
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git 
a/plugins/org.yocto.sdk.remotetools/src/org/yocto/sdk/remotetools/RSEHelper.java
 
b/plugins/org.yocto.sdk.remotetools/src/org/yocto/sdk/remotetools/RSEHelper.java
index bf48464..d1a505d 100644
--- 
a/plugins/org.yocto.sdk.remotetools/src/org/yocto/sdk/remotetools/RSEHelper.java
+++ 
b/plugins/org.yocto.sdk.remotetools/src/org/yocto/sdk/remotetools/RSEHelper.java
@@ -403,4 +403,13 @@ public class RSEHelper {
                        return true;
                return false;
        }
+
+       public static void waitForRSEInitCompletition() {
+               if (!RSECorePlugin.isInitComplete(RSECorePlugin.INIT_MODEL))
+                       try {
+                               
RSECorePlugin.waitForInitCompletion(RSECorePlugin.INIT_MODEL);
+                       } catch (InterruptedException e) {
+                               return;
+                       }
+       }
 }
diff --git 
a/plugins/org.yocto.sdk.remotetools/src/org/yocto/sdk/remotetools/actions/BaseSettingDialog.java
 
b/plugins/org.yocto.sdk.remotetools/src/org/yocto/sdk/remotetools/actions/BaseSettingDialog.java
index 5c76bf9..06eeb00 100644
--- 
a/plugins/org.yocto.sdk.remotetools/src/org/yocto/sdk/remotetools/actions/BaseSettingDialog.java
+++ 
b/plugins/org.yocto.sdk.remotetools/src/org/yocto/sdk/remotetools/actions/BaseSettingDialog.java
@@ -27,7 +27,6 @@ import org.yocto.sdk.remotetools.RSEHelper;
 import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.dialogs.IDialogConstants;
 import org.eclipse.rse.core.IRSESystemType;
-import org.eclipse.rse.core.RSECorePlugin;
 import org.eclipse.rse.core.model.IHost;
 import org.eclipse.rse.ui.actions.SystemNewConnectionAction;
 import org.eclipse.swt.SWT;
@@ -181,12 +180,7 @@ public class BaseSettingDialog extends Dialog {
        
        protected void updateConnectionPulldown() {
                int index=-1;
-               if (!RSECorePlugin.isInitComplete(RSECorePlugin.INIT_MODEL))
-                       try {
-                               
RSECorePlugin.waitForInitCompletion(RSECorePlugin.INIT_MODEL);
-                       } catch (InterruptedException e) {
-                               return;
-                       }
+               RSEHelper.waitForRSEInitCompletition();
                // already initialized
                connectionCombo.removeAll();
                IHost[] connections = RSEHelper.getSuitableConnections();
-- 
1.7.9.5

_______________________________________________
yocto mailing list
yocto@yoctoproject.org
https://lists.yoctoproject.org/listinfo/yocto

Reply via email to