From 08040f20eb4eb84c8d4c28a0b52f8c38cb63ce71 Mon Sep 17 00:00:00 2001 From: "yongsung1.kim" Date: Mon, 5 Aug 2013 20:32:45 +0900 Subject: [PATCH] [Title] InstallManager display test packages on tree optionally. [Desc.] [Issue] redmine #10142 Change-Id: Ia287a90f1bac1c486ac819c15a802a3df8c75883 --- .../src/org/tizen/installmanager/pkg/lib/PackageManager.java | 10 ++++++++-- .../src/org/tizen/installmanager/ui/page/ViewController.java | 6 +----- 2 files changed, 9 insertions(+), 7 deletions(-) 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 458c6e2..13a214d 100644 --- a/InstallManager_java/src/org/tizen/installmanager/pkg/lib/PackageManager.java +++ b/InstallManager_java/src/org/tizen/installmanager/pkg/lib/PackageManager.java @@ -1074,8 +1074,14 @@ public abstract class PackageManager { private PackageSet rootMeta(PackageSet pset) { PackageSet metas = new PackageSet(); for(Package p : pset) { - if(p.isRootMeta() || p.isPartnerMeta() || p.isExtraMeta() || p.isPublicMeta()) { - metas.add(p); + if (!Options.doTest) { + if(p.isRootMeta() || p.isExtraMeta() || p.isPublicMeta()) { + metas.add(p); + } + } else { + if(p.isRootMeta() || p.isExtraMeta() || p.isPublicMeta() || p.isTestMeta()) { + metas.add(p); + } } } return metas; 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 8659c5d..de5417d 100644 --- a/InstallManager_java/src/org/tizen/installmanager/ui/page/ViewController.java +++ b/InstallManager_java/src/org/tizen/installmanager/ui/page/ViewController.java @@ -356,11 +356,7 @@ public class ViewController { PackageSet selectedMetas = packageManager.getPackagesByNames(installList); //add mandatory packages, madatory packages always reinstall. - selectedMetas.addAll( - packageManager.getMandatoryPackages()); - - //get set of packages by purpose. - selectedMetas = getMetaPackagesByPurpose(selectedMetas); + selectedMetas.addAll(packageManager.getMandatoryPackages()); return packageManager.getInstallablePackages(selectedMetas); } -- 2.7.4