From: yongsung1.kim Date: Thu, 8 May 2014 04:39:36 +0000 (+0900) Subject: [INST] Progressing installmanager 3.0 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F70%2F20470%2F1;p=sdk%2Finstaller%2Finstall-manager.git [INST] Progressing installmanager 3.0 Change-Id: I571e8bc55603686bee41fe3bb9cb97d14c85fc27 Signed-off-by: yongsung1.kim --- 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 055edd3..bdad5c3 100644 --- a/InstallManager_java/src/org/tizen/installmanager/pkg/lib/PackageManager.java +++ b/InstallManager_java/src/org/tizen/installmanager/pkg/lib/PackageManager.java @@ -480,7 +480,11 @@ public abstract class PackageManager { repoPackages = clone; - return rootMeta(repoPackages); + PackageSet pkgForTree = profileMeta(repoPackages); + pkgForTree.addAll(rootMeta(repoPackages)); + + return pkgForTree; +// return rootMeta(repoPackages); } /** @@ -495,10 +499,6 @@ public abstract class PackageManager { return profileMeta(repoPackages); } - public PackageSet getDevmoduleMetaPackagesOfRepository() { - return devmoduleMeta(repoPackages); - } - /** * Get root meta package from extension package server() */ @@ -796,39 +796,7 @@ public abstract class PackageManager { } return dependPackages; } - - public PackageSet getUIDependsPackages(Package pkg) { - PackageSet dependPackages = new PackageSet(); - if (pkg == null) { - return dependPackages; - } - - Collection depends = pkg.getUIDependentPackageNames(); - - try { - dependPackages = recentPackages.getPackagesByNames(depends); - } catch (IMPackageNotFound e) { - Log.ExceptionLog(e); - } - return dependPackages; - } - - public PackageSet getUIDefaultPackages(Package pkg) { - PackageSet dependPackages = new PackageSet(); - if (pkg == null) { - return dependPackages; - } - - Collection depends = pkg.getUIdefaultPackageNames(); - - try { - dependPackages = recentPackages.getPackagesByNames(depends); - } catch (IMPackageNotFound e) { - Log.ExceptionLog(e); - } - return dependPackages; - } - + /** * @return partner meta packages among all meta packages. */ @@ -1173,16 +1141,6 @@ public abstract class PackageManager { return metas; } - private PackageSet devmoduleMeta(PackageSet pset) { - PackageSet metas = new PackageSet(); - for(Package p : pset) { - if(p.isDevmoduleMeta()) { - metas.add(p); - } - } - return metas; - } - /** * Get dependency package list from p. * @param p a package 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 435445c..23523fc 100644 --- a/InstallManager_java/src/org/tizen/installmanager/pkg/model/Package.java +++ b/InstallManager_java/src/org/tizen/installmanager/pkg/model/Package.java @@ -76,12 +76,9 @@ public class Package { // field of Partner SDK public static final String FIELD_PARTNER = "C-Partner"; - // fields of ui control - public static final String FIELD_ORIGIN = "c-origin"; - public static final String FIELD_PROFILE = "c-profile"; - public static final String FIELD_DEFAULT_CHECK = "c-default"; - public static final String FIELD_UI_DEPENDENCY = "c-uidependency"; - + // UI default check + public static final String FIELD_DEFAULT = "C-Default"; + // fields of script public static final String INSTALL_SCRIPT_LINUX = "install.sh"; public static final String REMOVE_SCRIPT_LINUX = "remove.sh"; @@ -101,7 +98,6 @@ public class Package { private static final String ATTRIBUTE_PARTNER = "partner"; private static final String ATTRIBUTE_PUBLIC = "public"; private static final String ATTRIBUTE_PROFILE = "profile"; - private static final String ATTRIBUTE_DEVMODULE = "devmodule"; //dependency information private static final String START_OF_OS_DEPENDENCY = "["; @@ -241,14 +237,6 @@ public class Package { return getValue(FIELD_EXTENSION_SERVER); } - public String getOrigin() { - return getValue(FIELD_ORIGIN); - } - - public String getOriginProfile() { - return getValue(FIELD_PROFILE); - } - /** * Set extension server to package information. * @param extensionServer extension server of this packge @@ -347,7 +335,7 @@ public class Package { */ private String getValue(String propertyName) { for(Property prop : mProperties) { - if(prop.getName().equals(propertyName)) { + if(prop.getName().equalsIgnoreCase(propertyName)) { return prop.getValue(); } } @@ -369,7 +357,7 @@ public class Package { // to partner meta package because installmanager should download all meta packages. if (Options.onlyDownload) { if (isRootMeta() || isInstallMeta() || isExtraMeta() || - isPublicMeta() || isPartnerMeta() || isMandatory()) { + isPublicMeta() || isPartnerMeta() || isMandatory() || isProfileMeta()) { return true; } else { return false; @@ -377,13 +365,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() || isPublicMeta() || isTestMeta() || isProfileMeta()) { return true; } else { return false; } } else { // except test packages for normal SDK. - if (isRootMeta() || isInstallMeta() || isExtraMeta() || isMandatory() || isPublicMeta()) { + if (isRootMeta() || isInstallMeta() || isExtraMeta() || isMandatory() || isPublicMeta() || isProfileMeta()) { return true; } else { return false; @@ -494,11 +482,11 @@ public class Package { } } - public boolean isDevmoduleMeta() { - String attributeValue = getAttribute().trim(); - - if (attributeValue.equalsIgnoreCase(ATTRIBUTE_DEVMODULE)) { + public boolean isDefault() { + if (getValue(FIELD_DEFAULT).equalsIgnoreCase("true")) { return true; + } else if (getValue(FIELD_DEFAULT).equalsIgnoreCase("false")) { + return false; } else { return false; } @@ -531,23 +519,9 @@ public class Package { return depends; } - public Collection getUIDependentPackageNames() { - HashSet depends = new HashSet(); - String dependsStr = getValue(FIELD_UI_DEPENDENCY); - String deps[] = dependsStr.split(","); - for(int i = 0; i < deps.length; i++) { - String dep = removeOSInformationOfDepends(deps[i]); - - if(!dep.isEmpty()) { - depends.add(dep); - } - } - return depends; - } - - public Collection getUIdefaultPackageNames() { + public Collection getDefaultDependentPackageNames() { HashSet depends = new HashSet(); - String dependsStr = getValue(FIELD_DEFAULT_CHECK); + String dependsStr = getValue(FIELD_DEFAULT); String deps[] = dependsStr.split(","); for(int i = 0; i < deps.length; i++) { String dep = removeOSInformationOfDepends(deps[i]); diff --git a/InstallManager_java/src/org/tizen/installmanager/ui/InstallManagerWindow.java b/InstallManager_java/src/org/tizen/installmanager/ui/InstallManagerWindow.java index 67faa8c..88cdf57 100644 --- a/InstallManager_java/src/org/tizen/installmanager/ui/InstallManagerWindow.java +++ b/InstallManager_java/src/org/tizen/installmanager/ui/InstallManagerWindow.java @@ -355,7 +355,7 @@ public class InstallManagerWindow extends ApplicationWindow { if (!controller.isNewInstallation()) {// Update case Config.status = Config.Status.UPDATE; - compositeUpdatableListPage.loadPage(controller); + compositeUpdatableListPage.loadPage(controller, false); btnBack.setVisible(true); btnNext.setVisible(true); showComposite(compositeUpdatableListPage); @@ -364,7 +364,7 @@ public class InstallManagerWindow extends ApplicationWindow { } btnBack.setVisible(true); } else { - boolean hasItem = compositeInstallableListPage.loadPage(controller); + boolean hasItem = compositeInstallableListPage.loadPage(controller, false); if (hasItem) { Config.status = Config.Status.INSTALL; showComposite(compositeInstallableListPage); @@ -384,7 +384,7 @@ public class InstallManagerWindow extends ApplicationWindow { btnNext.setEnabled(true); PackageManager.dispose(); initInstallManager(); - compositeUpdatableListPage.loadPage(controller); + compositeUpdatableListPage.loadPage(controller, false); btnBack.setVisible(true); showComposite(compositeUpdatableListPage); if (controller.existRemovablePackage()) { @@ -437,7 +437,7 @@ public class InstallManagerWindow extends ApplicationWindow { btnBack.setVisible(true); } else { if (!controller.isNewInstallation()) {// Update case - compositeUpdatableListPage.loadPage(controller); + compositeUpdatableListPage.loadPage(controller, false); btnBack.setVisible(true); showComposite(compositeUpdatableListPage); if (controller.existRemovablePackage()) { @@ -485,8 +485,8 @@ public class InstallManagerWindow extends ApplicationWindow { compositeSetInstallDirectoryPage.loadPage( controller, compositeInstallableListPage.getCheckedPackageSize(false)); btnNext.setText("Install"); -// btnNext.setVisible(false); -// btnBack.setBounds(447, 10, 78, 29); + btnNext.setVisible(false); + btnBack.setBounds(447, 10, 78, 29); } } } else if (sl_composite.topControl == compositeUpdatableListPage) { @@ -515,7 +515,6 @@ public class InstallManagerWindow extends ApplicationWindow { Registry.saveSDKInfo(Registry.targetPath); InstallManager.getInstance().initPackageList(); - if (!installable) { MessageBoxDlg.showDlg( Display.getCurrent().getShells()[0], @@ -537,7 +536,7 @@ public class InstallManagerWindow extends ApplicationWindow { } btnBack.setVisible(false); - btnNext.setVisible(false); + btnNext.setVisible(false); List items = compositeInstallableListPage.getCustomTreeItems(); showComposite(compositeInstallingPage); boolean result = compositeInstallingPage.loadPage(getSelectedPackageNames(items), @@ -604,7 +603,9 @@ public class InstallManagerWindow extends ApplicationWindow { } else if (sl_composite.topControl == compositeSetInstallDirectoryPage) { showComposite(compositeLicensePage); btnNext.setText("I agree"); + btnNext.setVisible(true); btnNext.setEnabled(true); + btnBack.setBounds(363, 10, 78, 29); } else if (sl_composite.topControl == compositeUninstallableListPage) { showComposite(compositeWelcomePage); btnNext.setVisible(false); 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 37356fb..b278058 100644 --- a/InstallManager_java/src/org/tizen/installmanager/ui/page/InstallableListPage.java +++ b/InstallManager_java/src/org/tizen/installmanager/ui/page/InstallableListPage.java @@ -123,7 +123,6 @@ public class InstallableListPage extends PackageListPage { typicalButton.addSelectionListener(new SelectionAdapter() { @Override public void widgetSelected(SelectionEvent e) { - refreshByType(InstallType.TYPICAL); changeTableVisibleStatus(InstallType.TYPICAL); addExtraButton.setVisible(false); } @@ -173,7 +172,7 @@ public class InstallableListPage extends PackageListPage { public void widgetSelected(SelectionEvent e) { extraDialog = new AddExtraRepositoryDialog(buttonComposite.getShell(), viewController); extraDialog.open(); - loadPage(InstallManagerWindow.getInstallManagerWindow().getViewController()); + loadPage(InstallManagerWindow.getInstallManagerWindow().getViewController(), true); } }); @@ -184,66 +183,58 @@ public class InstallableListPage extends PackageListPage { * When a install type is changed, components size and tree checked status are should be changed. * @param installType */ - private void refreshByType(InstallType instType) { - String iType = null; - - if (instType == InstallType.TYPICAL) { - iType = TYPICAL_PACKAGE_NAME; - } else { - throw new IMFatalException("Not supported install type."); - } - - setCheckedByType(iType); - - checkboxTreeViewer.getTree().setEnabled(false); - checkboxTreeViewer.refresh(); - - lblRequiredSize.setText("Download size : " - + convertToVolumeSize(getCheckedPackageSize(false))); - lblUncompressedSize.setText("Install size : " - + convertToVolumeSize(getCheckedPackageSize(true))); - setNextBtnEnabledAboutCheckedPackageCount(); - } +// private void refreshByType(String profile) { +// setCheckedByProfile(profile); +// +// checkboxTreeViewer.getTree().setEnabled(false); +// checkboxTreeViewer.refresh(); +// +// lblRequiredSize.setText("Download size : " +// + convertToVolumeSize(getCheckedPackageSize(false))); +// lblUncompressedSize.setText("Install size : " +// + convertToVolumeSize(getCheckedPackageSize(true))); +// setNextBtnEnabledAboutCheckedPackageCount(); +// } /** * Check tree item by each install type. */ - private void setCheckedByType(String installType) { - if (installType == null || installType.isEmpty()) { - Log.err("Install type is empty. check install type or package server is old."); - } - - Package pkg = InstallManager.getInstance().getPackageManager().getPackageByName(installType); - - if (pkg == null) { - Log.err(installType + " do not exist in package list."); - return; - } - - Collection checkedItems = new ArrayList(); - - for (String pkgName : pkg.getDependentPackageNames()) { - Item item = findItem(pkgName, customTreeItems); - - if (item != null) { - checkedItems.add(item); - } - } - - setCheckedItem(checkedItems); - } - - private void setCheckedItem(Collection itemList) { - checkboxTreeViewer.setCheckedElements(itemList.toArray()); - - // refresh tree item. All of items are unchecked. - setAllChecked(false); - - // check selected item. - for (Item item : itemList) { - setCheckbox(item, true); - } - } +// private void setCheckedByProfile(String profile) { +// if (profile == null || profile.isEmpty()) { +// Log.err("Install type is empty. check install type or package server is old."); +// } +// +// Package pkg = InstallManager.getInstance().getPackageManager().getPackageByName(profile); +// +// if (pkg == null) { +// Log.err(profile + " do not exist in package list."); +// return; +// } +// +// Collection checkedItems = new ArrayList(); +// +// for (String pkgName : pkg.getDependentPackageNames()) { +// Item item = findItem(pkgName, customTreeItems); +// +// if (item != null) { +// checkedItems.add(item); +// } +// } +// +// setCheckedItem(checkedItems); +// } + +// private void setCheckedItem(Collection itemList) { +// checkboxTreeViewer.setCheckedElements(itemList.toArray()); +// +// // refresh tree item. All of items are unchecked. +// setAllChecked(false); +// +// // check selected item. +// for (Item item : itemList) { +// setCheckbox(item, true); +// } +// } @@ -257,12 +248,16 @@ public class InstallableListPage extends PackageListPage { /** * Display installable package list from view controller. */ - public boolean loadPage(ViewController controller) { + public boolean loadPage(ViewController controller, boolean extra) { this.viewController = controller; getCustomTreeItems().clear(); - tree.setVisible(false); - mDescriptionText.setVisible(false); + if (extra) { + changeTableVisibleStatus(InstallType.CUSTOM); + } else { + tree.setVisible(false); + mDescriptionText.setVisible(false); + } // back to next on component selection page case. // in this case, page status should be typical selection case. @@ -293,7 +288,7 @@ public class InstallableListPage extends PackageListPage { return false; } - refreshByType(InstallType.TYPICAL); + refreshByType(defaultSelectionProfile.getPackageName()); // initDescriptionToInstallType(); @@ -329,25 +324,25 @@ public class InstallableListPage extends PackageListPage { * @param itemList * @return item which should be checked in component tree. */ - private Item findItem(String name, Collection itemList) { - Item retItem = null; - for (Item item : itemList) { - if (name.equalsIgnoreCase(item.getPackageName())) { - return item; - } else { - Collection childItemList = item.getChildren(); - - if (childItemList.size() > 0) { - retItem = findItem(name, childItemList); - - if (retItem != null) { - break; - } - } - } - } - return retItem; - } +// private Item findItem(String name, Collection itemList) { +// Item retItem = null; +// for (Item item : itemList) { +// if (name.equalsIgnoreCase(item.getPackageName())) { +// return item; +// } else { +// Collection childItemList = item.getChildren(); +// +// if (childItemList.size() > 0) { +// retItem = findItem(name, childItemList); +// +// if (retItem != null) { +// break; +// } +// } +// } +// } +// return retItem; +// } public CheckboxTreeViewer getCheckboxTreeViewer() { return checkboxTreeViewer; 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 7c75bb4..d12fe14 100644 --- a/InstallManager_java/src/org/tizen/installmanager/ui/page/PackageListPage.java +++ b/InstallManager_java/src/org/tizen/installmanager/ui/page/PackageListPage.java @@ -65,6 +65,7 @@ import org.eclipse.swt.widgets.TreeColumn; import org.eclipse.swt.widgets.TreeItem; import org.tizen.installmanager.core.Config; import org.tizen.installmanager.core.InstallManager; +import org.tizen.installmanager.lib.Log; import org.tizen.installmanager.lib.Platform; import org.tizen.installmanager.pkg.lib.PackageManager; import org.tizen.installmanager.pkg.model.Package; @@ -107,18 +108,12 @@ public abstract class PackageListPage extends PageTemplate { private Composite profileComposite; protected Button profileButton; - private String selectedProfile = null; + private Package selectedProfile = null; ViewController viewController = InstallManagerWindow.getInstallManagerWindow().getViewController();; - private PackageSet profilePackageSet = null; private ArrayList profileLabelList = null; - - private PackageSet defaultSelectionProfiles = null; - private PackageSet devModulePackageSet = null; - - private List devModuleLabelList = new ArrayList(); - private PackageSet defaultSelectionDevModules = null; + protected Package defaultSelectionProfile = null; // Web, Native minimal packages name. protected static final String TYPICAL_PACKAGE_NAME = "TYPICAL"; @@ -152,11 +147,11 @@ public abstract class PackageListPage extends PageTemplate { profileLabelList = new ArrayList(); customTreeItems = new ArrayList(); - setProfileList(); + setProfileList(InstallType.TYPICAL.name()); setTitleLabel(getCustomComposite()); setDescriptionText(getCustomComposite()); setProfileLabel(getCustomComposite()); - setProfileButton(getCustomComposite()); + setProfileButton(getCustomComposite(), InstallType.TYPICAL.name()); // setProfileTable(getCustomComposite()); // setDevModuleLabel(getCustomComposite()); @@ -192,7 +187,7 @@ public abstract class PackageListPage extends PageTemplate { profileLabel.setBackground(InstallManagerWindow.getBackgroundColor()); } - private void setProfileButton(Composite composite) { + private void setProfileButton(Composite composite, String installType) { // contain default license int height = 25; int width = 250; @@ -205,20 +200,29 @@ public abstract class PackageListPage extends PageTemplate { profileComposite = new Composite(composite, SWT.NONE); profileComposite.setBounds(150, defaultHeight, 468, 280); -// profileComposite.setBackground(InstallManagerWindow.getBackgroundColor()); + profileComposite.setBackground(InstallManagerWindow.getBackgroundColor()); + + PackageSet profilePkgs = viewController.getProfileMetaPackages(); // add license of items int yCoordinate = 0; - for (String profile : profileLabelList) { +// for (Package profile : profilePkgs) { + for (String profileName : profileLabelList) { Button profileButton = new Button(profileComposite, SWT.RADIO); profileButton.setBounds(0, yCoordinate, width, height); - profileButton.setText(profile); + profileButton.setText(profileName); + profileButton.setBackground(InstallManagerWindow.getBackgroundColor()); + if (profileName.equalsIgnoreCase(defaultSelectionProfile.getPackageName())) { + profileButton.setSelection(true); + } + profileButton.addSelectionListener(new SelectionAdapter() { @Override public void widgetSelected(SelectionEvent e) { Button button = (Button) e.widget; setSelectedProfile(button.getText()); + refreshByType(button.getText()); } }); @@ -227,31 +231,29 @@ public abstract class PackageListPage extends PageTemplate { } private void setSelectedProfile(String profile) { - selectedProfile = profile; + PackageSet profilePkgs = viewController.getProfileMetaPackages(); + for (Package pkg : profilePkgs) { + if (pkg.getPackageName().equalsIgnoreCase(profile)) { + selectedProfile = pkg; + } + } } - public String getSelectedProfile() { + public Package getSelectedProfile() { return selectedProfile; } - private void setProfileList() { - PackageSet profilePkgs = viewController.getProfileMetaPackages(); - -// for (Package pkg : profilePkgs) { -// profilePackageSet = viewController.getUIDependsPackages(pkg); -// defaultSelectionProfiles = viewController.getUIDefaultPackages(pkg); -// } + public List getSelectedPackagesFromProfile() { - for (Package profile : profilePkgs) { - profileLabelList.add(profile.getLabel()); - } + return null; } - private void setDefaultSelection(PackageSet pkgs, Table whichTable) { - for (Package defaultPkg : pkgs) { - for (TableItem item : whichTable.getItems()) { - if (defaultPkg.getLabel().equalsIgnoreCase(item.getText())) { - item.setChecked(true); + private void setProfileList(String pkgName) { + for (Package pkg : viewController.getInstallTypeMetaPackages()) { + if (pkgName.equalsIgnoreCase(pkg.getPackageName())) { + profileLabelList.addAll(pkg.getDependentPackageNames()); + for (String defaultPkg : pkg.getDefaultDependentPackageNames()) { + defaultSelectionProfile = InstallManager.getInstance().getPackageManager().getPackageByName(defaultPkg); } } } @@ -664,10 +666,6 @@ public abstract class PackageListPage extends PageTemplate { } } } - - public List getSelectedPackagesFromProfile() { - return null; - } /** * Get items list. @@ -689,7 +687,7 @@ public abstract class PackageListPage extends PageTemplate { return selectedList; } - abstract public boolean loadPage(ViewController controller); + abstract public boolean loadPage(ViewController controller, boolean extra); protected void loadPackagesToTreeViewer(PackageSet packageSet, Type type) { //make tree items from package set. @@ -826,6 +824,7 @@ public abstract class PackageListPage extends PageTemplate { treeItems.addAll(addedItems); Collections.sort(treeItems); + System.out.println("asdfasdf"); } private void makeState() { @@ -1017,4 +1016,89 @@ public abstract class PackageListPage extends PageTemplate { // not support install type } } + + /** + * When a install type is changed, components size and tree checked status are should be changed. + * @param installType + */ + protected void refreshByType(String profile) { + setCheckedByProfile(profile); + + checkboxTreeViewer.getTree().setEnabled(false); + checkboxTreeViewer.refresh(); + + lblRequiredSize.setText("Download size : " + + convertToVolumeSize(getCheckedPackageSize(false))); + lblUncompressedSize.setText("Install size : " + + convertToVolumeSize(getCheckedPackageSize(true))); + setNextBtnEnabledAboutCheckedPackageCount(); + } + + /** + * Check tree item by each install type. + */ + private void setCheckedByProfile(String profile) { + if (profile == null || profile.isEmpty()) { + Log.err("Install type is empty. check install type or package server is old."); + } + + Package pkg = InstallManager.getInstance().getPackageManager().getPackageByName(profile); + + if (pkg == null) { + Log.err(profile + " do not exist in package list."); + return; + } + + Collection checkedItems = new ArrayList(); + + for (String pkgName : pkg.getDefaultDependentPackageNames()) { + Item item = findItem(pkgName, customTreeItems); + + if (item != null) { + checkedItems.add(item); + } + } + + setCheckedItem(checkedItems); + } + + private void setCheckedItem(Collection itemList) { + checkboxTreeViewer.setCheckedElements(itemList.toArray()); + + // refresh tree item. All of items are unchecked. + setAllChecked(false); + + // check selected item. + for (Item item : itemList) { + setCheckbox(item, true); + } + } + + /** + * Find item which should be checked in component tree. + * + * @param name + * the name of item which should be checked. + * @param itemList + * @return item which should be checked in component tree. + */ + private Item findItem(String name, Collection itemList) { + Item retItem = null; + for (Item item : itemList) { + if (name.equalsIgnoreCase(item.getPackageName())) { + return item; + } else { + Collection childItemList = item.getChildren(); + + if (childItemList.size() > 0) { + retItem = findItem(name, childItemList); + + if (retItem != null) { + break; + } + } + } + } + return retItem; + } } diff --git a/InstallManager_java/src/org/tizen/installmanager/ui/page/UninstallableListPage.java b/InstallManager_java/src/org/tizen/installmanager/ui/page/UninstallableListPage.java index fe69c58..8849316 100644 --- a/InstallManager_java/src/org/tizen/installmanager/ui/page/UninstallableListPage.java +++ b/InstallManager_java/src/org/tizen/installmanager/ui/page/UninstallableListPage.java @@ -129,7 +129,7 @@ public class UninstallableListPage extends PackageListPage { /** * Display uninstallable list page. */ - public boolean loadPage(ViewController controller) { + public boolean loadPage(ViewController controller, boolean extra) { this.viewController = controller; getCustomTreeItems().clear(); diff --git a/InstallManager_java/src/org/tizen/installmanager/ui/page/UpdatableListPage.java b/InstallManager_java/src/org/tizen/installmanager/ui/page/UpdatableListPage.java index 03f2100..26eb522 100644 --- a/InstallManager_java/src/org/tizen/installmanager/ui/page/UpdatableListPage.java +++ b/InstallManager_java/src/org/tizen/installmanager/ui/page/UpdatableListPage.java @@ -154,7 +154,7 @@ public class UpdatableListPage extends PackageListPage { public void widgetSelected(SelectionEvent e) { extraDialog = new AddExtraRepositoryDialog(buttonComposite.getShell(), viewController); extraDialog.open(); - loadPage(InstallManagerWindow.getInstallManagerWindow().getViewController()); + loadPage(InstallManagerWindow.getInstallManagerWindow().getViewController(), false); } }); } @@ -162,12 +162,18 @@ public class UpdatableListPage extends PackageListPage { /** * Display installable package list from view controller. */ - public boolean loadPage(ViewController controller) { + public boolean loadPage(ViewController controller, boolean extra) { this.viewController = controller; getCustomTreeItems().clear(); - tree.setVisible(false); - mDescriptionText.setVisible(false); + if (extra) { + tree.setVisible(true); + tree.setEnabled(true); + mDescriptionText.setVisible(true); + } else { + tree.setVisible(false); + mDescriptionText.setVisible(false); + } try { loadPackagesToTreeViewer(viewController.getInstallableMetaPackageList(), Type.UPDATE); 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 adbe06a..801b62f 100644 --- a/InstallManager_java/src/org/tizen/installmanager/ui/page/ViewController.java +++ b/InstallManager_java/src/org/tizen/installmanager/ui/page/ViewController.java @@ -232,14 +232,6 @@ public class ViewController { } } - public PackageSet getDevModuleMetaPackages() { - if (packageManager == null) { - return null; - } else { - return packageManager.getDevmoduleMetaPackagesOfRepository(); - } - } - public PackageSet getInstallablePackageListInSnapshot() { if (packageManager == null) { return null; @@ -762,16 +754,6 @@ public class ViewController { return causePackages; } - public PackageSet getUIDependsPackages(Package pkg) { - PackageSet pkgSet = packageManager.getUIDependsPackages(pkg); - return pkgSet; - } - - public PackageSet getUIDefaultPackages(Package pkg) { - PackageSet pkgSet = packageManager.getUIDefaultPackages(pkg); - return pkgSet; - } - public void showChangeLog() { if (Documents.isChecked()) { Documents.showChangeLog(); // show the change log(history)