From a7c2c14fad1a158fb4f73548b5c58604368455c0 Mon Sep 17 00:00:00 2001
From: Bon-Yong Lee <bonyong.lee@samsung.com>
Date: Fri, 24 Aug 2012 17:22:49 +0900
Subject: [PATCH] [Title]     Apply signing bugfix to develop [Type]     
 Bugfix [Module]    Sub [Priority]  Minor [CQ#]       // CQ Issue Number
 [Redmine#]  // Redmine Isuue Number [Problem]   // Problem Description
 [Cause]     // Cause Description [Solution]  // Solution Description
 [TestCase]  // Executed the test-target (How to)

---
 org.tizen.common/src/org/tizen/common/Cabinet.java | 10 +++++
 .../common/core/command/prompter/SWTPrompter.java  | 48 ++++++++++++----------
 .../src/org/tizen/common/util/SWTRunner.java       | 44 ++++++++++++++++++++
 .../src/org/tizen/common/util/SWTUtil.java         | 20 +++++++++
 4 files changed, 101 insertions(+), 21 deletions(-)
 create mode 100755 org.tizen.common/src/org/tizen/common/Cabinet.java
 mode change 100644 => 100755 org.tizen.common/src/org/tizen/common/core/command/prompter/SWTPrompter.java
 create mode 100755 org.tizen.common/src/org/tizen/common/util/SWTRunner.java
 mode change 100644 => 100755 org.tizen.common/src/org/tizen/common/util/SWTUtil.java

diff --git a/org.tizen.common/src/org/tizen/common/Cabinet.java b/org.tizen.common/src/org/tizen/common/Cabinet.java
new file mode 100755
index 0000000..5ed46d0
--- /dev/null
+++ b/org.tizen.common/src/org/tizen/common/Cabinet.java
@@ -0,0 +1,10 @@
+package org.tizen.common;
+
+public interface
+Cabinet<T>
+extends Runnable
+{
+    public T getData();
+    
+    public void setData( T data );
+}
diff --git a/org.tizen.common/src/org/tizen/common/core/command/prompter/SWTPrompter.java b/org.tizen.common/src/org/tizen/common/core/command/prompter/SWTPrompter.java
old mode 100644
new mode 100755
index b8e49ba..ca29bff
--- a/org.tizen.common/src/org/tizen/common/core/command/prompter/SWTPrompter.java
+++ b/org.tizen.common/src/org/tizen/common/core/command/prompter/SWTPrompter.java
@@ -25,6 +25,7 @@
 package org.tizen.common.core.command.prompter;
 
 import static org.tizen.common.util.SWTUtil.asyncExec;
+import static org.tizen.common.util.SWTUtil.exec;
 import static org.tizen.common.util.SWTUtil.getActiveShell;
 import static org.tizen.common.util.SWTUtil.syncExec;
 import static org.tizen.common.util.StringUtil.trim;
@@ -40,6 +41,7 @@ import org.tizen.common.core.command.Prompter;
 import org.tizen.common.ui.dialog.PasswordInputDialog;
 import org.tizen.common.util.NotificationType;
 import org.tizen.common.util.NotifierDialog;
+import org.tizen.common.util.SWTRunner;
 
 /**
  * <p>
@@ -128,17 +130,18 @@ implements Prompter
 			}
 		}
 		final int defaultIndex = optionNames.indexOf( defaultOption.getName() );
-		final OptionWrapper optionWrapper = new OptionWrapper();
 		
-		syncExec( new Runnable() {
-			public void run() {
-				final Dialog dialog = createDialog( question, optionNames.toArray( new String[0] ), defaultIndex );
-				dialog.open();
-				optionWrapper.setOption(options[dialog.getReturnCode()]);
-			}
+		return exec( new SWTRunner<Option>()
+        {
+		    /* (non-Javadoc)
+		     * @see org.tizen.common.util.SWTRunner#process()
+		     */
+		    public Option process() {
+		        final Dialog dialog = createDialog( question, optionNames.toArray( new String[0] ), defaultIndex );
+		        dialog.open();
+		        return options[dialog.getReturnCode()];
+		    }
 		} );
-		
-		return optionWrapper.getOption();
 	}
 
 	/* (non-Javadoc)
@@ -178,25 +181,28 @@ implements Prompter
 		final String message
 	)
 	{
-		final PasswordInputDialog dialog =
-			new PasswordInputDialog( "Password Input Dialog", message );
-		
-		syncExec( new Runnable() {
+		return exec( new SWTRunner<char[]>()
+        {
 			/* (non-Javadoc)
 			 * @see java.lang.Runnable#run()
 			 */
 			@Override
-			public void run() {
-				dialog.open(); 
+			public char[] process()
+			{
+			    final PasswordInputDialog dialog =
+			        new PasswordInputDialog( "Password Input Dialog", message );
+			    
+				dialog.open();
+				
+				if ( IDialogConstants.OK_ID != dialog.getReturnCode() )
+				{
+				    return null;
+				}
+				
+				return trim( dialog.getValue() ).toCharArray();
 			}
 		} );
 		
-		if ( IDialogConstants.OK_ID != dialog.getReturnCode() )
-		{
-			return null;
-		}
-		
-		return trim( dialog.getValue() ).toCharArray();
 		
 		
 	}
diff --git a/org.tizen.common/src/org/tizen/common/util/SWTRunner.java b/org.tizen.common/src/org/tizen/common/util/SWTRunner.java
new file mode 100755
index 0000000..ed28682
--- /dev/null
+++ b/org.tizen.common/src/org/tizen/common/util/SWTRunner.java
@@ -0,0 +1,44 @@
+package org.tizen.common.util;
+
+import org.tizen.common.Cabinet;
+
+abstract public class
+SWTRunner<T>
+implements Runnable, Cabinet<T>
+{
+    protected T data;
+
+    /* (non-Javadoc)
+     * @see org.tizen.common.Cabinet#getData()
+     */
+    @Override
+    public
+    T
+    getData()
+    {
+        return data;
+    }
+
+    /* (non-Javadoc)
+     * @see org.tizen.common.Cabinet#setData(java.lang.Object)
+     */
+    @Override
+    public
+    void
+    setData(
+        final T data
+    )
+    {
+        this.data = data;
+    }
+
+    @Override
+    public void run()
+    {
+        setData( process() );
+    }
+    
+    abstract protected T process();
+    
+
+}
diff --git a/org.tizen.common/src/org/tizen/common/util/SWTUtil.java b/org.tizen.common/src/org/tizen/common/util/SWTUtil.java
old mode 100644
new mode 100755
index a641f42..914be8e
--- a/org.tizen.common/src/org/tizen/common/util/SWTUtil.java
+++ b/org.tizen.common/src/org/tizen/common/util/SWTUtil.java
@@ -56,6 +56,7 @@ import org.eclipse.ui.IFileEditorInput;
 import org.eclipse.ui.IWorkbenchPage;
 import org.eclipse.ui.IWorkbenchWindow;
 import org.eclipse.ui.internal.ide.IDEWorkbenchPlugin;
+import org.tizen.common.Cabinet;
 import org.tizen.common.ui.TableToolTipListener;
 
 
@@ -112,6 +113,25 @@ public class SWTUtil {
     }
     
     /**
+     * execute {@link Cabinet#run()} and reeturn the result
+     *  
+     * @param runnable object to execute
+     * 
+     * @return result to execute
+     */
+    public static
+    <T>
+    T
+    exec(
+        final Cabinet<T> runnable
+    )
+    {
+        syncExec( (Runnable) runnable );
+        
+        return runnable.getData();
+    }
+    
+    /**
      * execute {@link Runnable} in SWT thread synchronously
      * 
      * @param runnable object to execute
-- 
2.7.4