From e5503c1ea484b2bc119f9efee64eccc141640aae Mon Sep 17 00:00:00 2001 From: "yongsung1.kim" Date: Mon, 5 Aug 2013 21:26:40 +0900 Subject: [PATCH] [Title] Remove code about partner and public from installmanager source. [Desc.] [Issue] redmine #10145 Change-Id: I1c5ad392590a9b29c0728e9d5adfbe1b283388f6 --- .../src/org/tizen/installmanager/core/Config.java | 15 ------- .../src/org/tizen/installmanager/core/Options.java | 9 ----- .../installmanager/pkg/lib/PackageManager.java | 36 +---------------- .../tizen/installmanager/pkg/model/Package.java | 46 ++-------------------- .../installmanager/ui/InstallManagerWindow.java | 30 ++------------ .../installmanager/ui/page/ViewController.java | 15 ------- 6 files changed, 8 insertions(+), 143 deletions(-) diff --git a/InstallManager_java/src/org/tizen/installmanager/core/Config.java b/InstallManager_java/src/org/tizen/installmanager/core/Config.java index 630a226..2146ec2 100644 --- a/InstallManager_java/src/org/tizen/installmanager/core/Config.java +++ b/InstallManager_java/src/org/tizen/installmanager/core/Config.java @@ -67,8 +67,6 @@ public class Config { public static final String INSTALL_MANAGER_BINARY = "InstallManager.jar"; public static final String INSTALL_MANAGER_UPDATER_BINARY = "InstallManagerUpdater.jar"; public static final String EXECUTE_FILE_NAME_OF_INSTALL_MANAGER = getExecuteFileNameOfInstallManager(); - public static final String EXECUTE_FILE_NAME_OF_INSTALL_MANAGER_PARTNER = - getExecuteFileNameOfInstallManagerPartner(); public static final String EXECUTE_FILE_PATH_OF_INSTALL_MANAGER = PathUtil .get(INSTALL_MANAGER_DIRECTORY, EXECUTE_FILE_NAME_OF_INSTALL_MANAGER); @@ -249,19 +247,6 @@ public class Config { } } - /** - * @return filename of install manager executable for Partner SDK - */ - private static String getExecuteFileNameOfInstallManagerPartner() { - if (Platform.isLinux() || Platform.isMacOS() ) { - return "InstallManagerP"; - } else if ( Platform.isWindows() ) { - return "InstManager.exe"; - } else { - throw new IMFatalException(ErrorCode.UNSUPPORTED_PLATFORM); - } - } - private static String getInstallManagerShortcutPath() { if (Platform.isUbuntu()) { return PathUtil.getFromHome(".local/share/applications/" diff --git a/InstallManager_java/src/org/tizen/installmanager/core/Options.java b/InstallManager_java/src/org/tizen/installmanager/core/Options.java index 355e86e..5e03966 100644 --- a/InstallManager_java/src/org/tizen/installmanager/core/Options.java +++ b/InstallManager_java/src/org/tizen/installmanager/core/Options.java @@ -145,7 +145,6 @@ public class Options { /** * Use only download for making SDK image. */ - public static String boundary = "public"; // all, public, partner public static String platForm = null; public static int platFormBit = 0; @@ -155,12 +154,6 @@ public class Options { public static boolean allSnapshots = false; /** - * Support Partner SDK - */ - public static boolean partnerSdk = false; - public static String purposeOfInstalling = "public"; - - /** * Display InstallManager Version */ public static boolean showVersion = false; @@ -297,10 +290,8 @@ public class Options { } else if (arg.equals("-onlyDownload")) { if(iter.hasNext()) { onlyDownload = true; - boundary = iter.next(); platForm = iter.next().toLowerCase(); platFormBit = Integer.parseInt(iter.next()); - Log.log("Only download boundary : "+ boundary); } else { Log.err("-onlyDownload requires packageList description"); throw new IMFatalException(ErrorCode.REPOSITORY_NOT_PROVIDED); 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 13a214d..9aefb43 100644 --- a/InstallManager_java/src/org/tizen/installmanager/pkg/lib/PackageManager.java +++ b/InstallManager_java/src/org/tizen/installmanager/pkg/lib/PackageManager.java @@ -768,38 +768,6 @@ public abstract class PackageManager { } /** - * @return partner meta packages among all meta packages. - */ - public PackageSet getPartnerMetaPackages() { - PackageSet allMetas = meta(recentPackages); - - PackageSet partnerMeta = new PackageSet(); - for (Package meta : allMetas) { - if (meta.isPartnerMeta()) { - partnerMeta.add(meta); - } - } - - return partnerMeta; - } - - /** - * @return public meta packages among all meta packages. - */ - public PackageSet getPublicMetaPackages() { - PackageSet allMetas = meta(recentPackages); - - PackageSet publicMeta = new PackageSet(); - for (Package meta : allMetas) { - if (meta.isPublicMeta()) { - publicMeta.add(meta); - } - } - - return publicMeta; - } - - /** * Get dependency packages of installable package. * @param pkgs installable packages. * @return @@ -1075,11 +1043,11 @@ public abstract class PackageManager { PackageSet metas = new PackageSet(); for(Package p : pset) { if (!Options.doTest) { - if(p.isRootMeta() || p.isExtraMeta() || p.isPublicMeta()) { + if(p.isRootMeta() || p.isExtraMeta()) { metas.add(p); } } else { - if(p.isRootMeta() || p.isExtraMeta() || p.isPublicMeta() || p.isTestMeta()) { + if(p.isRootMeta() || p.isExtraMeta() || p.isTestMeta()) { metas.add(p); } } diff --git a/InstallManager_java/src/org/tizen/installmanager/pkg/model/Package.java b/InstallManager_java/src/org/tizen/installmanager/pkg/model/Package.java index 069b390..5cb11e2 100644 --- a/InstallManager_java/src/org/tizen/installmanager/pkg/model/Package.java +++ b/InstallManager_java/src/org/tizen/installmanager/pkg/model/Package.java @@ -73,9 +73,6 @@ public class Package { // fields of ordering for UI public static final String FIELD_ORDER = "C-Order"; - // field of Partner SDK - public static final String FIELD_PARTNER = "C-Partner"; - // fields of script public static final String INSTALL_SCRIPT_LINUX = "install.sh"; public static final String REMOVE_SCRIPT_LINUX = "remove.sh"; @@ -94,8 +91,6 @@ public class Package { private static final String ATTRIBUTE_INSTALL_META = "install"; private static final String ATTRIBUTE_TEST_META = "test"; private static final String ATTRIBUTE_MANDATORY = "mandatory"; - private static final String ATTRIBUTE_PARTNER = "partner"; - private static final String ATTRIBUTE_PUBLIC = "public"; //dependency information private static final String START_OF_OS_DEPENDENCY = "["; @@ -208,10 +203,6 @@ public class Package { return url; } - public String getPartner() { - return getValue(FIELD_PARTNER); - } - /** * @return Extension server of this package. */ @@ -335,11 +326,8 @@ public class Package { * @return true if this package is a meta package. */ public boolean isMeta() { - // onlyDownload option, in this case, do not need separate public meta package - // to partner meta package because installmanager should download all meta packages. if (Options.onlyDownload) { - if (isRootMeta() || isInstallMeta() || isExtraMeta() || - isPublicMeta() || isPartnerMeta() || isMandatory()) { + if (isRootMeta() || isInstallMeta() || isExtraMeta() || isMandatory() || isTestMeta()) { return true; } else { return false; @@ -347,13 +335,13 @@ public class Package { } if (Options.doTest) { // include test packages for SDK testing - if (isRootMeta() || isInstallMeta() || isExtraMeta() || isMandatory() || isPublicMeta() || isTestMeta()) { + if (isRootMeta() || isInstallMeta() || isExtraMeta() || isMandatory() || isTestMeta()) { return true; } else { return false; } } else { // except test packages for normal SDK. - if (isRootMeta() || isInstallMeta() || isExtraMeta() || isMandatory() || isPublicMeta()) { + if (isRootMeta() || isInstallMeta() || isExtraMeta() || isMandatory()) { return true; } else { return false; @@ -388,34 +376,6 @@ public class Package { } /** - * Check to belong to partner sdk given package - * @return true if this package is a partner package. - */ - public boolean isPartnerMeta() { - String attributeValue = getAttribute().trim(); - - if (attributeValue.equalsIgnoreCase(ATTRIBUTE_PARTNER)) { - return true; - } else { - return false; - } - } - - /** - * Check to belong to partner sdk given package - * @return true if this package is a partner package. - */ - public boolean isPublicMeta() { - String attributeValue = getAttribute().trim(); - - if (attributeValue.equalsIgnoreCase(ATTRIBUTE_PUBLIC)) { - return true; - } else { - return false; - } - } - - /** * @return true if this meta package is a install meta package. */ public boolean isInstallMeta() { diff --git a/InstallManager_java/src/org/tizen/installmanager/ui/InstallManagerWindow.java b/InstallManager_java/src/org/tizen/installmanager/ui/InstallManagerWindow.java index 08bf95e..025f308 100644 --- a/InstallManager_java/src/org/tizen/installmanager/ui/InstallManagerWindow.java +++ b/InstallManager_java/src/org/tizen/installmanager/ui/InstallManagerWindow.java @@ -463,7 +463,7 @@ public class InstallManagerWindow extends ApplicationWindow { boolean installable = compositeSetInstallDirectoryPage.isInstallablePath(); Config.USER_CONFIG_HOME_PATH = compositeSetInstallDirectoryPage.getSDKWorkSpacePath(); - Registry.sdkWorkSpacePath = controller.getSDKWorkSpacePath(); + Registry.sdkDataPath = controller.getSDKWorkSpacePath(); Registry.targetPath = controller.getInstallPath(); Registry.saveSDKInfo(Registry.targetPath); @@ -729,9 +729,8 @@ public class InstallManagerWindow extends ApplicationWindow { InstallManager installManager = InstallManager.getInstance(); PackageManager packageManager = installManager.getPackageManager(); - // Get all meta packages list by boundary.(eg. public, partner, all....) - PackageSet filteredMeta = filterPackageSet(); - PackageSet downloadablePkgs = packageManager.getDependsPackagesFromRepository(filteredMeta); + PackageSet downloadPackageList = packageManager.getLeafMetaPackages(); + PackageSet downloadablePkgs = packageManager.getDependsPackagesFromRepository(downloadPackageList); // Download all meta packages. boolean filteredPackages = false; @@ -751,29 +750,6 @@ public class InstallManagerWindow extends ApplicationWindow { } } - private static PackageSet filterPackageSet() { - PackageManager pm = PackageManager.getInstance(); - - PackageSet downloadPackageList = pm.getLeafMetaPackages(); - - String boundary = Options.boundary; - if (boundary.equalsIgnoreCase("public")) { - PackageSet partnerMetaPackages = pm.getPartnerMetaPackages(); - - if (!partnerMetaPackages.isEmpty()) { - downloadPackageList.removeAll(partnerMetaPackages); - } - } else if (boundary.equalsIgnoreCase("partner")) { - PackageSet publicMetaPackages = pm.getPublicMetaPackages(); - - if (!publicMetaPackages.isEmpty()) { - downloadPackageList.removeAll(publicMetaPackages); - } - } - - return downloadPackageList; - } - private static void showInstallManagerVersion() { System.out.println("InstallManager Version : " + Config.getInstance().getInstallManagerVersion().toString()); 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 de5417d..967534c 100644 --- a/InstallManager_java/src/org/tizen/installmanager/ui/page/ViewController.java +++ b/InstallManager_java/src/org/tizen/installmanager/ui/page/ViewController.java @@ -361,21 +361,6 @@ public class ViewController { return packageManager.getInstallablePackages(selectedMetas); } - private PackageSet getMetaPackagesByPurpose(PackageSet metaPackages) { - String userAttribute = Options.purposeOfInstalling; - for (Package pkg : metaPackages) { - String attribute = pkg.getAttribute(); - - if (!pkg.isRootMeta() && !pkg.isExtraMeta() && !pkg.isMandatory()) { - if (!attribute.equalsIgnoreCase(userAttribute)) { - metaPackages.remove(pkg); - } - } - } - - return metaPackages; - } - /** * Start to uninstall * @param uninstallList -- 2.7.4