[INST] Installmanager can support backward compatibility of old package

server.
Fix UI bug that is page displaying.

Change-Id: I0d09ebab22cafc65baabc637886818244591b1f4
Signed-off-by: yongsung1.kim <yongsung1.kim@samsung.com>

diff --git a/InstallManager_java/src/org/tizen/installmanager/core/Config.java b/InstallManager_java/src/org/tizen/installmanager/core/Config.java
index fccd868..24e7861 100644 (file)
--- a/InstallManager_java/src/org/tizen/installmanager/core/Config.java
+++ b/InstallManager_java/src/org/tizen/installmanager/core/Config.java
@@ -177,6 +177,7 @@ public class Config {
        
        public static Status status = Status.INSTALL;
        public static boolean isSupportMultiSDK = false;
+       public static boolean isOldPackageServer = false;
        
        // If SDK package server is new(multi SDK support), value is true, not false.
        public static boolean isNewPackageServer = true;

diff --git a/InstallManager_java/src/org/tizen/installmanager/pkg/lib/PackageManager.java b/InstallManager_java/src/org/tizen/installmanager/pkg/lib/PackageManager.java
index 6fd4b26..fdd707a 100644 (file)
--- a/InstallManager_java/src/org/tizen/installmanager/pkg/lib/PackageManager.java
+++ b/InstallManager_java/src/org/tizen/installmanager/pkg/lib/PackageManager.java
@@ -408,13 +408,24 @@ public abstract class PackageManager {
         * Set packages of repository\r
         * @param sections\r
         */\r
-       protected void setRepoPackages( Map<String,List<PropertySection>> repoToSectionsMap) {\r
+       protected void setRepoPackages(Map<String,List<PropertySection>> repoToSectionsMap) {\r
                repoPackages = new PackageSet();\r
                boolean result = setPackages(repoPackages, repoToSectionsMap, false);\r
                if (!result) {\r
                        Log.err("Cannot find repository. Please check your repository.");\r
                        ErrorController.setError(ErrorCode.CANNOT_FIND_REPOSITORY);\r
                }\r
+               \r
+               for (Package pkg : repoPackages) {\r
+                       if (pkg.isInstallMeta()) {\r
+                               if (pkg.getDefaultDependentPackageNames().isEmpty()) {\r
+                                       Log.log("Cannot support package server because it is old package server.");\r
+                                       Config.isOldPackageServer = true;\r
+                               } else {\r
+                                       Config.isOldPackageServer = false;\r
+                               }\r
+                       }\r
+               }\r
        }\r
        \r
        /**\r

diff --git a/InstallManager_java/src/org/tizen/installmanager/ui/InstallManagerWindow.java b/InstallManager_java/src/org/tizen/installmanager/ui/InstallManagerWindow.java
index 3c56d37..0af7b5e 100644 (file)
--- a/InstallManager_java/src/org/tizen/installmanager/ui/InstallManagerWindow.java
+++ b/InstallManager_java/src/org/tizen/installmanager/ui/InstallManagerWindow.java
@@ -56,6 +56,8 @@ import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;\r
 import org.eclipse.swt.widgets.Control;\r
 import org.eclipse.swt.widgets.Display;\r
+import org.eclipse.swt.widgets.Menu;\r
+import org.eclipse.swt.widgets.MenuItem;\r
 import org.eclipse.swt.widgets.Shell;\r
 import org.tizen.installmanager.cli.InstallManagerNoUI;\r
 import org.tizen.installmanager.core.Config;\r
@@ -135,8 +137,9 @@ public class InstallManagerWindow extends ApplicationWindow {
         */\r
        public InstallManagerWindow() {\r
                super(null);\r
+               setShellStyle(SWT.TITLE);\r
+               setShellStyle(SWT.BORDER);\r
                setShellStyle(SWT.SHELL_TRIM);\r
-               setShellStyle(SWT.BORDER | SWT.TITLE);\r
        }\r
 \r
        /**\r
@@ -231,7 +234,7 @@ public class InstallManagerWindow extends ApplicationWindow {
 \r
                parent.setSize(630, 490);\r
                IMError.setComposite(parent);\r
-               Composite container = new Composite(parent, SWT.NONE);\r
+               Composite container = new Composite(parent, SWT.CLOSE);\r
                \r
                // Set layout attributes.\r
                RowLayout rl_container = new RowLayout(SWT.VERTICAL);\r
@@ -241,7 +244,7 @@ public class InstallManagerWindow extends ApplicationWindow {
                rl_container.marginLeft = 0;\r
                rl_container.marginBottom = 0;\r
                container.setLayout(rl_container);\r
-\r
+               \r
                // Set page composite size. (image, label, etc.)\r
                pageComposite = new Composite(container, SWT.NONE);\r
                pageComposite.setLayoutData(new RowData(628, 405));\r
@@ -259,7 +262,7 @@ public class InstallManagerWindow extends ApplicationWindow {
                compositeLicensePage = new LicensePage(pageComposite, SWT.NONE);\r
                compositeCompletePage = new CompletePage(pageComposite, SWT.NONE);\r
                compositeInstallingPage = new InstallingPage(pageComposite, SWT.NONE);\r
-               compositeInstallableListPage = new InstallableListPage(pageComposite, SWT.NONE);\r
+//             compositeInstallableListPage = new InstallableListPage(pageComposite, SWT.NONE);\r
                compositeUninstallingPage = new UninstallingPage(pageComposite, SWT.NONE);\r
                compositeUninstallableListPage = new UninstallableListPage(pageComposite, SWT.NONE);\r
                compositeSetInstallDirectoryPage = new SetInstallDirectoryPage(pageComposite, SWT.NONE);\r
@@ -612,10 +615,12 @@ public class InstallManagerWindow extends ApplicationWindow {
                        btnClose.removeSelectionListener(closeBtnSelectionAdapter);\r
                        btnClose.removeSelectionListener(cancelBtnSelectionAdapter);\r
                        btnClose.addSelectionListener(cancelBtnSelectionAdapter);\r
+                       btnNext.removeSelectionListener(nextBtnSelectionAdapter); // for avoiding duplicated listener.\r
                        btnNext.addSelectionListener(nextBtnSelectionAdapter);\r
 \r
                        compositeWelcomePage.setWelcomeNormalMsg();\r
                        compositeWelcomePage.setButtonStatus();\r
+                       compositeInstallableListPage = new InstallableListPage(pageComposite, SWT.NONE);\r
                } else {\r
                        btnNext.setVisible(false);\r
                        String errMsg = ErrorController.getErrorMessage();\r
@@ -628,6 +633,7 @@ public class InstallManagerWindow extends ApplicationWindow {
                        btnClose.removeSelectionListener(cancelBtnSelectionAdapter);\r
                        btnClose.addSelectionListener(closeBtnSelectionAdapter);\r
                        btnNext.removeSelectionListener(nextBtnSelectionAdapter);\r
+\r
                        compositeWelcomePage.setWelcomeErrorMsg("Initializing error", errMsg);\r
                }\r
                btnNext.setFocus();\r
@@ -977,11 +983,12 @@ public class InstallManagerWindow extends ApplicationWindow {
         */\r
        @Override\r
        protected Point getInitialSize() {\r
-               if (Platform.isWindows()) {\r
-                       POINT_MAIN_WINDOW = new Point(644, 499);\r
-               } else {\r
-                       POINT_MAIN_WINDOW = new Point(628, 478);\r
-               }\r
+//             if (Platform.isWindows()) {\r
+//                     POINT_MAIN_WINDOW = new Point(644, 499);\r
+//             } else {\r
+//                     POINT_MAIN_WINDOW = new Point(628, 478);\r
+//             }\r
+               POINT_MAIN_WINDOW = new Point(628, 478);\r
                return POINT_MAIN_WINDOW;\r
        }\r
 \r

diff --git a/InstallManager_java/src/org/tizen/installmanager/ui/page/InstallableListPage.java b/InstallManager_java/src/org/tizen/installmanager/ui/page/InstallableListPage.java
index 15dff5e..cbfe13c 100644 (file)
--- a/InstallManager_java/src/org/tizen/installmanager/ui/page/InstallableListPage.java
+++ b/InstallManager_java/src/org/tizen/installmanager/ui/page/InstallableListPage.java
@@ -120,6 +120,10 @@ public class InstallableListPage extends PackageListPage {
                typicalButton.setText(TYPICAL_BUTTON_NAME);\r
                typicalButton.setBackground(InstallManagerWindow.getBackgroundColor());\r
                typicalButton.setBackgroundImage(PathUtil.getImageFromResource(RSC_PATH_BUTTON_NORMAL));\r
+               \r
+               if (Config.isOldPackageServer) {\r
+                       typicalButton.setVisible(false);\r
+               }\r
        }\r
 \r
        /**\r
@@ -130,7 +134,12 @@ public class InstallableListPage extends PackageListPage {
                        customButton = new Button(buttonComposite, SWT.PUSH | SWT.LEFT);\r
                }\r
 \r
-               customButton.setBounds(0, 38, 134, 34);\r
+               if (Config.isOldPackageServer) {\r
+                       customButton.setBounds(0, 0, 134, 34);\r
+               } else {\r
+                       customButton.setBounds(0, 38, 134, 34);                 \r
+               }\r
+                       \r
                customButton.setText(CUSTOM_BUTTON_NAME);\r
                customButton.setBackground(InstallManagerWindow.getBackgroundColor());\r
 \r
@@ -138,7 +147,9 @@ public class InstallableListPage extends PackageListPage {
                        @Override\r
                        public void widgetSelected(SelectionEvent e) {\r
                                changeTableVisibleStatus(InstallType.CUSTOM);\r
-                               addExtraButton.setVisible(true);\r
+                               if (!Config.isOldPackageServer) {\r
+                                       addExtraButton.setVisible(true);                                        \r
+                               }\r
                        }\r
                });\r
        }\r
@@ -151,7 +162,14 @@ public class InstallableListPage extends PackageListPage {
                        addExtraButton = new Button(buttonComposite ,SWT.NONE | SWT.LEFT);                      \r
                }\r
 \r
-               addExtraButton.setBounds(0, 76, 134, 34);\r
+               if (!Config.isOldPackageServer) {\r
+                       addExtraButton.setBounds(0, 76, 134, 34);\r
+                       addExtraButton.setVisible(false);\r
+               } else {\r
+                       addExtraButton.setBounds(0, 38, 134, 34);\r
+                       addExtraButton.setVisible(true);\r
+               }\r
+\r
                addExtraButton.setText(EXTRA_BUTTON_NAME);\r
                addExtraButton.setBackground(InstallManagerWindow.getBackgroundColor());\r
                \r
@@ -163,7 +181,7 @@ public class InstallableListPage extends PackageListPage {
                        }\r
                });\r
                \r
-               addExtraButton.setVisible(false);\r
+               \r
        }\r
 \r
        /**\r
@@ -180,7 +198,7 @@ public class InstallableListPage extends PackageListPage {
                this.viewController = controller;\r
                getCustomTreeItems().clear();\r
                \r
-               if (extra) {\r
+               if (extra || Config.isOldPackageServer) {\r
                        changeTableVisibleStatus(InstallType.CUSTOM);\r
                } else {\r
                        changeTableVisibleStatus(InstallType.TYPICAL);\r
@@ -216,13 +234,15 @@ public class InstallableListPage extends PackageListPage {
                        return false;\r
                }\r
                \r
-               setProfileList(InstallType.TYPICAL.name());\r
-               setProfileButton(getCustomComposite(), InstallType.TYPICAL.name());\r
-               \r
-               if (getSelectedProfile() == null) { // The first displaying component selection page.\r
-                       refreshByType(defaultSelectionProfile.getPackageName());\r
-               } else {\r
-                       refreshByType(getSelectedProfile().getPackageName());                   \r
+               if (!Config.isOldPackageServer) {\r
+                       setProfileList(InstallType.TYPICAL.name());\r
+                       setProfileButton(getCustomComposite(), InstallType.TYPICAL.name());\r
+                       \r
+                       if (getSelectedProfile() == null) { // The first displaying component selection page.\r
+                               refreshByType(defaultSelectionProfile.getPackageName());\r
+                       } else {\r
+                               refreshByType(getSelectedProfile().getPackageName());                   \r
+                       }\r
                }\r
 \r
                return true;\r

diff --git a/InstallManager_java/src/org/tizen/installmanager/ui/page/LicensePage.java b/InstallManager_java/src/org/tizen/installmanager/ui/page/LicensePage.java
index 5fc1fbf..9d1431d 100644 (file)
--- a/InstallManager_java/src/org/tizen/installmanager/ui/page/LicensePage.java
+++ b/InstallManager_java/src/org/tizen/installmanager/ui/page/LicensePage.java
@@ -107,6 +107,7 @@ public class LicensePage extends PageTemplate {
                // add default license\r
                addSDKLicense(height, width);\r
 \r
+               /*\r
                // add license of items\r
                int yCoordinate = height;\r
                for (Item i : items) {\r
@@ -131,6 +132,7 @@ public class LicensePage extends PageTemplate {
 \r
                        yCoordinate += height;\r
                }\r
+               */\r
 \r
                sc.setContent(leftComposite);\r
                sc.setExpandVertical(true);\r

diff --git a/InstallManager_java/src/org/tizen/installmanager/ui/page/PackageListPage.java b/InstallManager_java/src/org/tizen/installmanager/ui/page/PackageListPage.java
index afd2699..92d353c 100644 (file)
--- a/InstallManager_java/src/org/tizen/installmanager/ui/page/PackageListPage.java
+++ b/InstallManager_java/src/org/tizen/installmanager/ui/page/PackageListPage.java
@@ -155,8 +155,10 @@ public abstract class PackageListPage extends PageTemplate {
                \r
                setTitleLabel(getCustomComposite());\r
                setDescriptionText(getCustomComposite());\r
-               setProfileLabel(getCustomComposite());\r
-               setProfileButton(getCustomComposite(), InstallType.TYPICAL.name());\r
+               if (!Config.isOldPackageServer) {\r
+                       setProfileLabel(getCustomComposite());\r
+                       setProfileButton(getCustomComposite(), InstallType.TYPICAL.name());\r
+               }\r
                \r
                setTree(getCustomComposite(), type);\r
                setCheckboxTreeViewer(type);\r
@@ -211,8 +213,14 @@ public abstract class PackageListPage extends PageTemplate {
                        profileButton.setText(label);\r
                        profileButton.setBackground(InstallManagerWindow.getBackgroundColor());\r
 \r
-                       if (profileName.equalsIgnoreCase(defaultSelectionProfile.getPackageName())) {\r
-                               profileButton.setSelection(true);\r
+                       if (selectedProfile == null) {\r
+                               if (profileName.equalsIgnoreCase(defaultSelectionProfile.getPackageName())) {\r
+                                       profileButton.setSelection(true);\r
+                               }\r
+                       } else {\r
+                               if (profileName.equalsIgnoreCase(selectedProfile.getPackageName())) {\r
+                                       profileButton.setSelection(true);\r
+                               }\r
                        }\r
                        \r
                        profileButton.addSelectionListener(new SelectionAdapter() {\r
@@ -1022,8 +1030,10 @@ public abstract class PackageListPage extends PageTemplate {
                        tree.setEnabled(false);\r
                        mDescriptionText.setVisible(false);\r
                } else if (type == InstallType.CUSTOM) {\r
-                       profileLabel.setVisible(false);\r
-                       profileComposite.setVisible(false);\r
+                       if (!Config.isOldPackageServer) {\r
+                               profileLabel.setVisible(false);\r
+                               profileComposite.setVisible(false);\r
+                       }\r
                        tree.setVisible(true);\r
                        tree.setEnabled(true);\r
                        mDescriptionText.setVisible(true);\r

diff --git a/InstallManager_java/src/org/tizen/installmanager/ui/page/ViewController.java b/InstallManager_java/src/org/tizen/installmanager/ui/page/ViewController.java
index 801b62f..05ceb8f 100644 (file)
--- a/InstallManager_java/src/org/tizen/installmanager/ui/page/ViewController.java
+++ b/InstallManager_java/src/org/tizen/installmanager/ui/page/ViewController.java
@@ -101,8 +101,7 @@ public class ViewController {
                        } else {\r
                                if (existInstallableOrRemovablePackages()) {\r
                                        sdkExtensionInfo = packageManager.getSdkExtensionInfo();\r
-                                       \r
-                                       \r
+\r
                                        // InstallManager maintains the newest extension package list always.\r
                                        sdkExtensionInfo.refreshCache();\r
                                        \r

diff --git a/InstallManager_java/src/org/tizen/installmanager/ui/page/WelcomePage.java b/InstallManager_java/src/org/tizen/installmanager/ui/page/WelcomePage.java
index 8b0ad25..7c2fb25 100644 (file)
--- a/InstallManager_java/src/org/tizen/installmanager/ui/page/WelcomePage.java
+++ b/InstallManager_java/src/org/tizen/installmanager/ui/page/WelcomePage.java
@@ -259,7 +259,6 @@ public class WelcomePage extends PageTemplate {
                \r
                @Override\r
                public void mouseDown(MouseEvent e) {\r
-                       System.out.println("button is pushed.");\r
                        buttonInstall.setSelection(true);\r
                                selectedButton = INSTALLMANAGER_ACTION.INSTALL;\r
                                Config.status = Config.Status.INSTALL;\r