DEBUG: COREDUMP: Modified coredump wizard page.

Modified some description in wizard coredump page and title in file
browse dialog.

Change-Id: I54c387fa846e86756983cefb0806e6c0724cecf8
Signed-off-by: donghyuk.yang <donghyuk.yang@samsung.com>

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
index 2f4a542..2171e7f 100644 (file)
--- 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
@@ -19,7 +19,8 @@ ProcPage.Label.ProcPath = Path:
 ProcPage.Button.Browse = Browse
 
 CorePage.Title = Setting a coredump archive
-CorePage.Desc = Set a coredump archive file(*.tar.gz) for browsing remote or local system.
+CorePage.Desc.SetArchive = Set a coredump archive file(*.tar.gz) for browsing remote or local system.
+CorePage.Desc.SetCorefile = Set a coredump file(*.core) and cs file(*.cs) for browsing remote system.
 CorePage.Group.Swinfo = Platform Information
 CorePage.Group.Crashinfo = Crash Information
 CorePage.Group.Pkginfo = Package Information
@@ -33,10 +34,12 @@ CorePage.Label.Pkgver = Package Version
 CorePage.Label.Pkgtype = Package type
 CorePage.Button.Localbrowse = Local Browse...
 CorePage.Browse.Title = Select coredump archive(*.tar.gz)
-CorePage.Msg.SetCoredump = Setting coredump archive is completed.
-CorePage.ErrorMsg.FailedSetCoredump = Failed to set coredump archive.
-CorePage.ErrorMsg.FailedDownloadCoredump = Failed to download coredump archive.
-CorePage.ErrorMsg.FailedExtractCoredump = Failed to extract coredump archive.
+CorePage.Corefile.Browse.Title = Select coredump file(*.core)
+CorePage.Csfile.Browse.Title = Select cs file(*.cs)
+CorePage.Msg.SetCoredump = Setting coredump file is completed.
+CorePage.ErrorMsg.FailedSetCoredump = Failed to set coredump file.
+CorePage.ErrorMsg.FailedDownloadCoredump = Failed to download coredump file.
+CorePage.ErrorMsg.FailedExtractCoredump = Failed to extract coredump file.
 CorePage.ErrorMsg.FailedReadCsfile = Failed to read .cs file: %s
 
 RtPage.Title = Select a rootstrap

diff --git a/org.tizen.nativeplatform/src/org/tizen/nativeplatform/launch/wizard/pages/PlatformLaunchSettingCorePage.java b/org.tizen.nativeplatform/src/org/tizen/nativeplatform/launch/wizard/pages/PlatformLaunchSettingCorePage.java
index 5097ce8..6a63044 100644 (file)
--- a/org.tizen.nativeplatform/src/org/tizen/nativeplatform/launch/wizard/pages/PlatformLaunchSettingCorePage.java
+++ b/org.tizen.nativeplatform/src/org/tizen/nativeplatform/launch/wizard/pages/PlatformLaunchSettingCorePage.java
@@ -78,6 +78,10 @@ public class PlatformLaunchSettingCorePage extends PlatformLaunchCommonPage {
     private String coredumpPath = "";
     private String csFileContent = "";
 
+    private String DEBUG_COREARCHIVE_PATH = "/opt/usr/share/crash/dump";
+    private String DEBUG_COREFILE_PATH = "/opt/usr/share/crash/core";
+    private String DEBUG_CSILE_PATH = "/opt/usr/share/crash/report";
+
     protected final Logger logger = LoggerFactory.getLogger(PlatformLaunchSettingCorePage.class);
 
     public PlatformLaunchSettingCorePage(PlatformCoredumpLaunchWizard wizard, String pageName,
@@ -87,7 +91,7 @@ public class PlatformLaunchSettingCorePage extends PlatformLaunchCommonPage {
         this.target = target;
 
         setTitle(resources.getString("CorePage.Title"));
-        setDescription(resources.getString("CorePage.Desc"));
+        setDescription(resources.getString("CorePage.Desc.SetArchive"));
         setPageComplete(false);
         setErrorMessage(null);
     }
@@ -106,6 +110,7 @@ public class PlatformLaunchSettingCorePage extends PlatformLaunchCommonPage {
         archiveFileButton.addSelectionListener(new SelectionAdapter() {
             @Override
             public void widgetSelected(SelectionEvent evt) {
+                setMessage(resources.getString("CorePage.Desc.SetArchive"));
                 enableArchivefileGroup(true);
                 enableCorefileGroup(false);
                 resetVariable();
@@ -118,6 +123,7 @@ public class PlatformLaunchSettingCorePage extends PlatformLaunchCommonPage {
         coreFileButton.addSelectionListener(new SelectionAdapter() {
             @Override
             public void widgetSelected(SelectionEvent evt) {
+                setMessage(resources.getString("CorePage.Desc.SetCorefile"));
                 enableArchivefileGroup(false);
                 enableCorefileGroup(true);
                 resetVariable();
@@ -246,7 +252,8 @@ public class PlatformLaunchSettingCorePage extends PlatformLaunchCommonPage {
         coreBrowseButton.addSelectionListener(new SelectionAdapter() {
             @Override
             public void widgetSelected(SelectionEvent evt) {
-                remoteCorefile = handleBrowseButtonSelected();
+                remoteCorefile = handleBrowseButtonSelected(
+                        resources.getString("CorePage.Corefile.Browse.Title"), DEBUG_COREFILE_PATH);
                 if (remoteCorefile != null && remoteCorefile.getDate() != null) {
                     localDumpFile = null;
 
@@ -291,7 +298,8 @@ public class PlatformLaunchSettingCorePage extends PlatformLaunchCommonPage {
         csBrowseButton.addSelectionListener(new SelectionAdapter() {
             @Override
             public void widgetSelected(SelectionEvent evt) {
-                remoteCsfile = handleBrowseButtonSelected();
+                remoteCsfile = handleBrowseButtonSelected(
+                        resources.getString("CorePage.Csfile.Browse.Title"), DEBUG_CSILE_PATH);
                 if (remoteCsfile != null && remoteCsfile.getDate() != null) {
                     localDumpFile = null;
                     csvo = null;
@@ -358,7 +366,8 @@ public class PlatformLaunchSettingCorePage extends PlatformLaunchCommonPage {
         archiveBrowseButton.addSelectionListener(new SelectionAdapter() {
             @Override
             public void widgetSelected(SelectionEvent evt) {
-                remoteDumpFile = handleBrowseButtonSelected();
+                remoteDumpFile = handleBrowseButtonSelected(
+                        resources.getString("CorePage.Browse.Title"), DEBUG_COREARCHIVE_PATH);
                 if (remoteDumpFile != null && remoteDumpFile.getDate() != null) {
                     localDumpFile = null;
                     csvo = null;
@@ -713,11 +722,9 @@ public class PlatformLaunchSettingCorePage extends PlatformLaunchCommonPage {
         return "";
     }
 
-    private FileEntry handleBrowseButtonSelected() {
+    private FileEntry handleBrowseButtonSelected(String title, String defaultPath) {
         final Shell shell = getAvailableShell();
-        FileEntry path = PlatformLaunchUtil.selectRemoteFile(shell,
-                resources.getString("CorePage.Browse.Title"),
-                TizenPlatformConstants.DEBUG_COREFILE_PATH);
+        FileEntry path = PlatformLaunchUtil.selectRemoteFile(shell, title, defaultPath);
         return path;
     }
 

diff --git a/org.tizen.nativeplatform/src/org/tizen/nativeplatform/launch/wizards/PlatformCommonLaunchWizard.java b/org.tizen.nativeplatform/src/org/tizen/nativeplatform/launch/wizards/PlatformCommonLaunchWizard.java
index 582a842..8ab585f 100644 (file)
--- a/org.tizen.nativeplatform/src/org/tizen/nativeplatform/launch/wizards/PlatformCommonLaunchWizard.java
+++ b/org.tizen.nativeplatform/src/org/tizen/nativeplatform/launch/wizards/PlatformCommonLaunchWizard.java
@@ -173,8 +173,12 @@ public class PlatformCommonLaunchWizard extends Wizard implements IPageChangingL
     }
 
     public void openLogTabDialog() {
-        deviceLog = target.getDeviceCommander().getLogs();
-        rootstrapLog = target.getRootstrapCommander().getLogs();
+        if (target.getDeviceCommander() != null) {
+            deviceLog = target.getDeviceCommander().getLogs();
+        }
+        if (target.getRootstrapCommander() != null) {
+            rootstrapLog = target.getRootstrapCommander().getLogs();
+        }
         SWTUtil.syncExec(new Runnable() {
             public void run() {
                 LogTabDialog dialog = new LogTabDialog(shell, deviceLog, rootstrapLog);