Upload tizen_2.2 source

Change-Id: Iea71ae2c560a6d3ef347d32b6dd5eb57956c1c8b

diff --git a/org.tizen.nativeplatform/src/org/tizen/nativeplatform/launch/wizards/PlatformLaunchWizard.java b/org.tizen.nativeplatform/src/org/tizen/nativeplatform/launch/wizards/PlatformLaunchWizard.java
index a749d6d..9e49ed6 100644 (file)
--- a/org.tizen.nativeplatform/src/org/tizen/nativeplatform/launch/wizards/PlatformLaunchWizard.java
+++ b/org.tizen.nativeplatform/src/org/tizen/nativeplatform/launch/wizards/PlatformLaunchWizard.java
@@ -40,6 +40,7 @@ import org.eclipse.jface.dialogs.IPageChangedListener;
 import org.eclipse.jface.dialogs.IPageChangingListener;
 import org.eclipse.jface.dialogs.PageChangedEvent;
 import org.eclipse.jface.dialogs.PageChangingEvent;
+import org.eclipse.jface.dialogs.TrayDialog;
 import org.eclipse.jface.operation.IRunnableWithProgress;
 import org.eclipse.jface.window.Window;
 import org.eclipse.jface.wizard.IWizardContainer;
@@ -91,9 +92,9 @@ public class PlatformLaunchWizard extends Wizard implements IPageChangingListene
         this.shell = shell;
         this.target = target;
         this.mode = mode;
-        setHelpAvailable(false);
         setWindowTitle("Launch Configuration");
         setNeedsProgressMonitor(true);
+        TrayDialog.setDialogHelpAvailable(false);
     }
 
     @Override

diff --git a/org.tizen.nativeplatform/src/org/tizen/nativeplatform/launch/wizards/PlatformLaunchWizardDialog.java b/org.tizen.nativeplatform/src/org/tizen/nativeplatform/launch/wizards/PlatformLaunchWizardDialog.java
index 43078d0..bd41648 100644 (file)
--- a/org.tizen.nativeplatform/src/org/tizen/nativeplatform/launch/wizards/PlatformLaunchWizardDialog.java
+++ b/org.tizen.nativeplatform/src/org/tizen/nativeplatform/launch/wizards/PlatformLaunchWizardDialog.java
@@ -41,13 +41,11 @@ public class PlatformLaunchWizardDialog extends WizardDialog {
     public PlatformLaunchWizardDialog(Shell shell, PlatformLaunchWizard wizard) {
         super(shell, wizard);
         this.wizard = wizard;
-        setDialogHelpAvailable(false);
     }
 
     public PlatformLaunchWizardDialog(Shell shell, PlatformAttachLaunchWizard wizard) {
         super(shell, wizard);
         this.attachWizard = wizard;
-        setDialogHelpAvailable(false);
     }
 
     public String getProgramPath() {

diff --git a/package/changelog b/package/changelog
index f34277b..a56a9c3 100644 (file)
--- a/package/changelog
+++ b/package/changelog
@@ -1,3 +1,9 @@
+* 2.1.31
+- Fixed a import problem (TrayDialog)
+== donghyuk yang <donghyuk.yang@samsung.com> 2013-10-24
+* 2.1.30
+- Fixed a problem that Help button is showing in Launch Configuration wizard at the first time
+== donghyuk yang <donghyuk.yang@samsung.com> 2013-10-24
 * 2.1.29
 - Fixed a problem that Platform Project can't be created after closing the Tizen Platform perspective.
 == donghyuk yang <donghyuk.yang@samsung.com> 2013-10-23

diff --git a/package/pkginfo.manifest b/package/pkginfo.manifest
index e0e9eed..236ad2d 100644 (file)
--- a/package/pkginfo.manifest
+++ b/package/pkginfo.manifest
@@ -1,4 +1,4 @@
-Version:2.1.29
+Version:2.1.31
 Source:nativeplatform-eplugin
 Maintainer:Kangho Kim <kh5325.kim@samsung.com>, Yoonki Park<yoonki.park@samsung.com>, Hyunsik Noh<hyunsik.noh@samsung.com>, Gun Kim<gune.kim@samsung.com>, Ho Namkoong<ho.namkoong@samsung.com>, Taeyoung Son<taeyoung2.son@samsung.com>