rollback the conflict of mw merge: check platform package and hide the dialog

Change-Id: Iac90273f2f4336de4a7e8d3f7bb79e007942bbe2
Signed-off-by: JuYoung Kim <j0.kim@samsung.com>

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/communicator/DACommunicator.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/communicator/DACommunicator.java
index 73931df..3213645 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/communicator/DACommunicator.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/communicator/DACommunicator.java
@@ -273,36 +273,36 @@ public class DACommunicator {
                                });
                pkginfoLines.add("");
 
-//             // add lines for running process
-//             pkginfoLines.add(PackageInfo.PKGTYPE + "[unknown]" + PackageInfo.PKGID + "["
-//                             + AnalyzerConstants.RUNNING_PROCESS + "]");
-//             pkginfoLines.add(AppInfo.PROPERTY.APPID.name + ":" + AnalyzerConstants.RUNNING_PROCESS);
-//             pkginfoLines.add(AppInfo.PROPERTY.PACKAGE.name + ":" + AnalyzerConstants.RUNNING_PROCESS);
-//             pkginfoLines.add(AppInfo.PROPERTY.LABEL.name + ":"
-//                             + AnalyzerConstants.RUNNING_PROCESS_LABEL);
-//             pkginfoLines.add(AppInfo.PROPERTY.APPTYPE.name + ":" + AppInfo.APPTYPE_RUNNING);
-//             pkginfoLines.add("");
-//
-//             // add lines for without-executable
-//             pkginfoLines.add(PackageInfo.PKGTYPE + "[unknown]" + PackageInfo.PKGID + "["
-//                             + AnalyzerConstants.COMMON_EXECUTABLE + "]");
-//             pkginfoLines.add(AppInfo.PROPERTY.APPID.name + ":" + AnalyzerConstants.COMMON_EXECUTABLE);
-//             pkginfoLines.add(AppInfo.PROPERTY.PACKAGE.name + ":" + AnalyzerConstants.COMMON_EXECUTABLE);
-//             pkginfoLines.add(AppInfo.PROPERTY.LABEL.name + ":"
-//                             + AnalyzerConstants.COMMON_EXECUTABLE_LABEL);
-//             pkginfoLines.add(AppInfo.PROPERTY.APPTYPE.name + ":" + AppInfo.APPTYPE_EXEC);
-//             pkginfoLines.add("");
-//
-//             // add lines for without-executable
-//             pkginfoLines.add(PackageInfo.PKGTYPE + "[unknown]" + PackageInfo.PKGID + "["
-//                             + AnalyzerConstants.WITHOUT_EXECUTABLE + "]");
-//             pkginfoLines.add(AppInfo.PROPERTY.APPID.name + ":" + AnalyzerConstants.WITHOUT_EXECUTABLE);
-//             pkginfoLines
-//                             .add(AppInfo.PROPERTY.PACKAGE.name + ":" + AnalyzerConstants.WITHOUT_EXECUTABLE);
-//             pkginfoLines.add(AppInfo.PROPERTY.LABEL.name + ":"
-//                             + AnalyzerConstants.WITHOUT_EXECUTABLE_LABEL);
-//             pkginfoLines.add(AppInfo.PROPERTY.APPTYPE.name + ":" + AppInfo.APPTYPE_NONE);
-//             pkginfoLines.add("");
+               // add lines for running process
+               pkginfoLines.add(PackageInfo.PKGTYPE + "[unknown]" + PackageInfo.PKGID + "["
+                               + AnalyzerConstants.RUNNING_PROCESS + "]" + PackageInfo.PRELOAD + "[1]");
+               pkginfoLines.add(AppInfo.PROPERTY.APPID.name + ":" + AnalyzerConstants.RUNNING_PROCESS);
+               pkginfoLines.add(AppInfo.PROPERTY.PACKAGE.name + ":" + AnalyzerConstants.RUNNING_PROCESS);
+               pkginfoLines.add(AppInfo.PROPERTY.LABEL.name + ":"
+                               + AnalyzerConstants.RUNNING_PROCESS_LABEL);
+               pkginfoLines.add(AppInfo.PROPERTY.APPTYPE.name + ":" + AppInfo.APPTYPE_RUNNING);
+               pkginfoLines.add("");
+
+               // add lines for common-executable
+               pkginfoLines.add(PackageInfo.PKGTYPE + "[unknown]" + PackageInfo.PKGID + "["
+                               + AnalyzerConstants.COMMON_EXECUTABLE + "]" + PackageInfo.PRELOAD + "[1]");
+               pkginfoLines.add(AppInfo.PROPERTY.APPID.name + ":" + AnalyzerConstants.COMMON_EXECUTABLE);
+               pkginfoLines.add(AppInfo.PROPERTY.PACKAGE.name + ":" + AnalyzerConstants.COMMON_EXECUTABLE);
+               pkginfoLines.add(AppInfo.PROPERTY.LABEL.name + ":"
+                               + AnalyzerConstants.COMMON_EXECUTABLE_LABEL);
+               pkginfoLines.add(AppInfo.PROPERTY.APPTYPE.name + ":" + AppInfo.APPTYPE_EXEC);
+               pkginfoLines.add("");
+
+               // add lines for without-executable
+               pkginfoLines.add(PackageInfo.PKGTYPE + "[unknown]" + PackageInfo.PKGID + "["
+                               + AnalyzerConstants.WITHOUT_EXECUTABLE + "]" + PackageInfo.PRELOAD + "[1]");
+               pkginfoLines.add(AppInfo.PROPERTY.APPID.name + ":" + AnalyzerConstants.WITHOUT_EXECUTABLE);
+               pkginfoLines
+                               .add(AppInfo.PROPERTY.PACKAGE.name + ":" + AnalyzerConstants.WITHOUT_EXECUTABLE);
+               pkginfoLines.add(AppInfo.PROPERTY.LABEL.name + ":"
+                               + AnalyzerConstants.WITHOUT_EXECUTABLE_LABEL);
+               pkginfoLines.add(AppInfo.PROPERTY.APPTYPE.name + ":" + AppInfo.APPTYPE_NONE);
+               pkginfoLines.add("");
 
                curDev.updatePackageList(ApplistManager.parseTizenPkginfo(pkginfoLines, unittestLines,
                                imeLines, curDev.getIDevice().getAppInstallPath()));

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/setting/SettingDialog.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/setting/SettingDialog.java
index b39590e..f55a61a 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/setting/SettingDialog.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/setting/SettingDialog.java
@@ -219,10 +219,10 @@ public class SettingDialog extends DAMessageBox {
                                tabView.getContentComposite(), SWT.NONE);
                tabView.addView(optionPage, false);
 
-//             comment : HIDDEN BINARY SETTING PAGE            
-//             DABaseComposite binarySettings = new SettingDialogBinarySettingsPage(
-//                             tabView.getContentComposite(), SWT.NONE);
-//             tabView.addView(binarySettings, false);
+               // check platform SDK (show binary setting page)
+               if (Global.isPlatformSDK()) {
+                       createBinarySettingPage();
+               }
                
                // button composite
                buttonContentsComp = new Composite(shell, SWT.NONE);
@@ -260,35 +260,7 @@ public class SettingDialog extends DAMessageBox {
                        }
                });
                
-//comment : HIDDEN BINARY SETTING PAGE
-//             // binarySettings tab is selected, the close button will be shown.
-//             // ok and cancel button is hidden
-//             binarySettings.addListener(SWT.Show, new Listener() {
-//
-//                     @Override
-//                     public void handleEvent(Event event) {
-//                             Logger.debug("binary settings show");
-//                             cancelButton.setText(WidgetLabels.CLOSE);
-//                             FormData data = (FormData) okButton.getLayoutData();
-//                             data.width = 0;
-//
-//                             buttonContentsComp.layout();
-//                     }
-//             });
-//
-//             binarySettings.addListener(SWT.Hide, new Listener() {
-//
-//                     @Override
-//                     public void handleEvent(Event event) {
-//                             Logger.debug("binary settings hide");
-//                             cancelButton.setText(WidgetLabels.CANCEL);
-//                             FormData data = (FormData) okButton.getLayoutData();
-//                             data.width = 100;
-//
-//                             buttonContentsComp.layout();
-//                     }
-//             });
-               
+       
                cancelButton = new DAButton(buttonContentsComp, SWT.NONE);
                cancelButton.addClickListener(cancelButtonListener);
                cancelButton.setText(WidgetLabels.CANCEL);