From 20fcf4b7de05315ddf378f8e95068f97a8c20ab0 Mon Sep 17 00:00:00 2001 From: "donghyuk.yang" Date: Fri, 16 Nov 2012 17:04:30 +0900 Subject: [PATCH] [Title] Separated wizard page packages --- .../pages/LaunchWizardPageUIMessages.properties | 22 ++++++++++++++++++++++ .../pages}/PlatformLaunchSettingAppPage.java | 7 ++++--- .../pages}/PlatformLaunchSettingBinPage.java | 6 +++--- .../pages}/PlatformLaunchSettingProcPage.java | 7 ++++--- .../wizards/LaunchWizardUIMessages.properties | 18 ------------------ .../launch/wizards/PlatformAttachLaunchWizard.java | 4 +--- .../launch/wizards/PlatformLaunchWizard.java | 2 ++ 7 files changed, 36 insertions(+), 30 deletions(-) create mode 100644 org.tizen.nativeplatform/src/org/tizen/nativeplatform/launch/wizard/pages/LaunchWizardPageUIMessages.properties rename org.tizen.nativeplatform/src/org/tizen/nativeplatform/launch/{wizards => wizard/pages}/PlatformLaunchSettingAppPage.java (98%) rename org.tizen.nativeplatform/src/org/tizen/nativeplatform/launch/{wizards => wizard/pages}/PlatformLaunchSettingBinPage.java (94%) rename org.tizen.nativeplatform/src/org/tizen/nativeplatform/launch/{wizards => wizard/pages}/PlatformLaunchSettingProcPage.java (96%) diff --git a/org.tizen.nativeplatform/src/org/tizen/nativeplatform/launch/wizard/pages/LaunchWizardPageUIMessages.properties b/org.tizen.nativeplatform/src/org/tizen/nativeplatform/launch/wizard/pages/LaunchWizardPageUIMessages.properties new file mode 100644 index 0000000..875d2b3 --- /dev/null +++ b/org.tizen.nativeplatform/src/org/tizen/nativeplatform/launch/wizard/pages/LaunchWizardPageUIMessages.properties @@ -0,0 +1,22 @@ +AppPage.Title = Setting Tizen Application +AppPage.Desc = Please select a tizen application or add RPM files for testing +AppPage.Label.AdditionPkgs = Additional Packages: +AppPage.Label.Project = Tizen Application Project: +AppPage.Dialog.Title.File = Select RPM files + +BinPage.Title = Setting binary path +BinPage.Desc = Please set a path for test binary +BinPage.Button.Browse = Remote Browse... +BinPage.Remote.Dialog.Title = Select an Application + +ProcPage.Title = Select Process +ProcPage.Desc = Please select a process for attach debugging + +PkgDialog.Title = Select packages to be installed +PkgDialog.Desc = Checked packages will be installed to buildsystem and device +PkgDialog.Label.Buildsystem = To Buildsystem: +PkgDialog.Label.Device = To Device: + + +Button.Reinstall.Op = Reinstall if the package is already present +Button.SelectPkg.Op = Select packages to be installed manually \ No newline at end of file diff --git a/org.tizen.nativeplatform/src/org/tizen/nativeplatform/launch/wizards/PlatformLaunchSettingAppPage.java b/org.tizen.nativeplatform/src/org/tizen/nativeplatform/launch/wizard/pages/PlatformLaunchSettingAppPage.java similarity index 98% rename from org.tizen.nativeplatform/src/org/tizen/nativeplatform/launch/wizards/PlatformLaunchSettingAppPage.java rename to org.tizen.nativeplatform/src/org/tizen/nativeplatform/launch/wizard/pages/PlatformLaunchSettingAppPage.java index 55800c2..698e9d7 100644 --- a/org.tizen.nativeplatform/src/org/tizen/nativeplatform/launch/wizards/PlatformLaunchSettingAppPage.java +++ b/org.tizen.nativeplatform/src/org/tizen/nativeplatform/launch/wizard/pages/PlatformLaunchSettingAppPage.java @@ -1,4 +1,4 @@ -package org.tizen.nativeplatform.launch.wizards; +package org.tizen.nativeplatform.launch.wizard.pages; import java.lang.reflect.InvocationTargetException; import java.util.ArrayList; @@ -56,13 +56,14 @@ import org.tizen.nativeplatform.views.ui.AddRootstrapDialog; import org.tizen.nativeplatform.build.PlatformConfigurationManager; import org.tizen.nativeplatform.build.PlatformProjectPackaging; import org.tizen.nativeplatform.launch.TizenDebianLaunchMessages; +import org.tizen.nativeplatform.launch.wizards.PlatformLaunchUtils; import org.tizen.nativeplatform.pkgmgr.RPMPackageCommander; import org.tizen.nativeplatform.pkgmgr.model.LocalPackage; import org.tizen.nativeplatform.rootstrap.RootstrapManager; public class PlatformLaunchSettingAppPage extends WizardPage { - private final String BUNDLE_NAME = PlatformLaunchSettingAppPage.class.getPackage().getName() + ".LaunchWizardUIMessages";//$NON-NLS-1$ + private final String BUNDLE_NAME = PlatformLaunchSettingAppPage.class.getPackage().getName() + ".LaunchWizardPageUIMessages";//$NON-NLS-1$ private ResourceBundle resources = ResourceBundle.getBundle(BUNDLE_NAME); private TableViewer tableViewer; @@ -87,7 +88,7 @@ public class PlatformLaunchSettingAppPage extends WizardPage { private static final String APP_PROJ_DEFAULT_SELECTION = "[Not required]"; - protected PlatformLaunchSettingAppPage(Shell shell, String pageName, IProject project, IConfiguration config) { + public PlatformLaunchSettingAppPage(Shell shell, String pageName, IProject project, IConfiguration config) { super(pageName); setTitle(resources.getString("AppPage.Title")); diff --git a/org.tizen.nativeplatform/src/org/tizen/nativeplatform/launch/wizards/PlatformLaunchSettingBinPage.java b/org.tizen.nativeplatform/src/org/tizen/nativeplatform/launch/wizard/pages/PlatformLaunchSettingBinPage.java similarity index 94% rename from org.tizen.nativeplatform/src/org/tizen/nativeplatform/launch/wizards/PlatformLaunchSettingBinPage.java rename to org.tizen.nativeplatform/src/org/tizen/nativeplatform/launch/wizard/pages/PlatformLaunchSettingBinPage.java index f32f580..721866b 100644 --- a/org.tizen.nativeplatform/src/org/tizen/nativeplatform/launch/wizards/PlatformLaunchSettingBinPage.java +++ b/org.tizen.nativeplatform/src/org/tizen/nativeplatform/launch/wizard/pages/PlatformLaunchSettingBinPage.java @@ -1,4 +1,4 @@ -package org.tizen.nativeplatform.launch.wizards; +package org.tizen.nativeplatform.launch.wizard.pages; import java.util.ResourceBundle; @@ -25,14 +25,14 @@ import org.tizen.sdblib.FileListingService.FileEntry; public class PlatformLaunchSettingBinPage extends WizardPage { - private final String BUNDLE_NAME = PlatformLaunchSettingBinPage.class.getPackage().getName() + ".LaunchWizardUIMessages";//$NON-NLS-1$ + private final String BUNDLE_NAME = PlatformLaunchSettingBinPage.class.getPackage().getName() + ".LaunchWizardPageUIMessages";//$NON-NLS-1$ private ResourceBundle resources = ResourceBundle.getBundle(BUNDLE_NAME); private Text text; private String filePath = ""; private static final String DEFAULT_APP_PATH = "/opt/apps/"; - protected PlatformLaunchSettingBinPage(String pageName) { + public PlatformLaunchSettingBinPage(String pageName) { super(pageName); setTitle(resources.getString("BinPage.Title")); setDescription(resources.getString("BinPage.Desc")); diff --git a/org.tizen.nativeplatform/src/org/tizen/nativeplatform/launch/wizards/PlatformLaunchSettingProcPage.java b/org.tizen.nativeplatform/src/org/tizen/nativeplatform/launch/wizard/pages/PlatformLaunchSettingProcPage.java similarity index 96% rename from org.tizen.nativeplatform/src/org/tizen/nativeplatform/launch/wizards/PlatformLaunchSettingProcPage.java rename to org.tizen.nativeplatform/src/org/tizen/nativeplatform/launch/wizard/pages/PlatformLaunchSettingProcPage.java index 263b8af..75d068c 100644 --- a/org.tizen.nativeplatform/src/org/tizen/nativeplatform/launch/wizards/PlatformLaunchSettingProcPage.java +++ b/org.tizen.nativeplatform/src/org/tizen/nativeplatform/launch/wizard/pages/PlatformLaunchSettingProcPage.java @@ -1,4 +1,4 @@ -package org.tizen.nativeplatform.launch.wizards; +package org.tizen.nativeplatform.launch.wizard.pages; import java.lang.reflect.InvocationTargetException; import java.util.ArrayList; @@ -34,6 +34,7 @@ import org.tizen.nativeplatform.views.model.PlatformRootstrap; import org.tizen.nativeplatform.build.PlatformConfigurationManager; import org.tizen.nativeplatform.build.PlatformProjectPackaging; import org.tizen.nativeplatform.launch.TizenDebianLaunchMessages; +import org.tizen.nativeplatform.launch.wizards.PlatformLaunchUtils; import org.tizen.nativeplatform.pkgmgr.model.LocalPackage; import org.tizen.nativeplatform.rootstrap.RootstrapManager; @@ -41,7 +42,7 @@ import org.tizen.sdblib.IDevice; public class PlatformLaunchSettingProcPage extends WizardPage { - private final String BUNDLE_NAME = PlatformLaunchSettingProcPage.class.getPackage().getName() + ".LaunchWizardUIMessages";//$NON-NLS-1$ + private final String BUNDLE_NAME = PlatformLaunchSettingProcPage.class.getPackage().getName() + ".LaunchWizardPageUIMessages";//$NON-NLS-1$ private ResourceBundle resources = ResourceBundle.getBundle(BUNDLE_NAME); private Button reinstallOp; @@ -63,7 +64,7 @@ public class PlatformLaunchSettingProcPage extends WizardPage { private ArrayList platformPackages = new ArrayList(); private ArrayList packages = new ArrayList(); - protected PlatformLaunchSettingProcPage(Shell shell, String pageName, IProject project, IConfiguration config) { + public PlatformLaunchSettingProcPage(Shell shell, String pageName, IProject project, IConfiguration config) { super(pageName); setTitle(resources.getString("ProcPage.Title")); diff --git a/org.tizen.nativeplatform/src/org/tizen/nativeplatform/launch/wizards/LaunchWizardUIMessages.properties b/org.tizen.nativeplatform/src/org/tizen/nativeplatform/launch/wizards/LaunchWizardUIMessages.properties index 875d2b3..2b4cdcb 100644 --- a/org.tizen.nativeplatform/src/org/tizen/nativeplatform/launch/wizards/LaunchWizardUIMessages.properties +++ b/org.tizen.nativeplatform/src/org/tizen/nativeplatform/launch/wizards/LaunchWizardUIMessages.properties @@ -1,22 +1,4 @@ -AppPage.Title = Setting Tizen Application -AppPage.Desc = Please select a tizen application or add RPM files for testing -AppPage.Label.AdditionPkgs = Additional Packages: -AppPage.Label.Project = Tizen Application Project: -AppPage.Dialog.Title.File = Select RPM files - -BinPage.Title = Setting binary path -BinPage.Desc = Please set a path for test binary -BinPage.Button.Browse = Remote Browse... -BinPage.Remote.Dialog.Title = Select an Application - -ProcPage.Title = Select Process -ProcPage.Desc = Please select a process for attach debugging - PkgDialog.Title = Select packages to be installed PkgDialog.Desc = Checked packages will be installed to buildsystem and device PkgDialog.Label.Buildsystem = To Buildsystem: PkgDialog.Label.Device = To Device: - - -Button.Reinstall.Op = Reinstall if the package is already present -Button.SelectPkg.Op = Select packages to be installed manually \ No newline at end of file diff --git a/org.tizen.nativeplatform/src/org/tizen/nativeplatform/launch/wizards/PlatformAttachLaunchWizard.java b/org.tizen.nativeplatform/src/org/tizen/nativeplatform/launch/wizards/PlatformAttachLaunchWizard.java index bf3cc44..b50521c 100644 --- a/org.tizen.nativeplatform/src/org/tizen/nativeplatform/launch/wizards/PlatformAttachLaunchWizard.java +++ b/org.tizen.nativeplatform/src/org/tizen/nativeplatform/launch/wizards/PlatformAttachLaunchWizard.java @@ -13,15 +13,13 @@ import org.eclipse.jface.wizard.IWizardContainer; import org.eclipse.jface.wizard.WizardDialog; import org.eclipse.swt.widgets.Shell; import org.tizen.nativeplatform.launch.TizenDebianLaunchMessages; +import org.tizen.nativeplatform.launch.wizard.pages.PlatformLaunchSettingProcPage; import org.tizen.nativeplatform.pkgmgr.model.LocalPackage; import org.tizen.nativeplatform.views.ui.AddRootstrapDialog; public class PlatformAttachLaunchWizard extends PlatformLaunchWizard { - private final String BUNDLE_NAME = PlatformAttachLaunchWizard.class.getPackage().getName() + ".LaunchWizardUIMessages";//$NON-NLS-1$ - private ResourceBundle resources = ResourceBundle.getBundle(BUNDLE_NAME); - private int pid; private String procName; 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 19e1daa..7847966 100644 --- a/org.tizen.nativeplatform/src/org/tizen/nativeplatform/launch/wizards/PlatformLaunchWizard.java +++ b/org.tizen.nativeplatform/src/org/tizen/nativeplatform/launch/wizards/PlatformLaunchWizard.java @@ -22,6 +22,8 @@ import org.eclipse.swt.widgets.Shell; import org.tizen.common.connection.ConnectionPlugin; import org.tizen.common.util.SWTUtil; import org.tizen.nativeplatform.launch.TizenDebianLaunchMessages; +import org.tizen.nativeplatform.launch.wizard.pages.PlatformLaunchSettingAppPage; +import org.tizen.nativeplatform.launch.wizard.pages.PlatformLaunchSettingBinPage; import org.tizen.nativeplatform.pkgmgr.model.LocalPackage; import org.tizen.sdblib.IDevice; -- 2.7.4