Attachment 36364 Details for Bug 132029 – update core patch for download size and install size

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] update core patch for download size and install size

org.eclipse.update.core_132029.patch (text/plain), 2.76 KB, created by Doug MacDonald

on 2006-03-15 16:02:23 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Doug MacDonald

Created: 2006-03-15 16:02:23 EST

Size: 2.76 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.update.core
>Index: src/org/eclipse/update/internal/core/SiteFile.java
>===================================================================
>RCS file: /home/eclipse/org.eclipse.update.core/src/org/eclipse/update/internal/core/SiteFile.java,v
>retrieving revision 1.69
>diff -u -r1.69 SiteFile.java
>--- src/org/eclipse/update/internal/core/SiteFile.java	12 Apr 2005 19:14:29 -0000	1.69
>+++ src/org/eclipse/update/internal/core/SiteFile.java	15 Mar 2006 21:01:30 -0000
>@@ -244,14 +244,26 @@
> 	 */
> 	public long getDownloadSizeFor(IFeature feature) {
> 		long result = 0;
>-		IPluginEntry[] entriesToInstall = feature.getPluginEntries();
>-		IPluginEntry[] siteEntries = this.getPluginEntries();
>-		entriesToInstall = UpdateManagerUtils.diff(entriesToInstall, siteEntries);
>-		//[18355]
>-		INonPluginEntry[] nonPluginEntriesToInstall = feature.getNonPluginEntries();
>-
>+		
> 		try {
>-			result = feature.getFeatureContentProvider().getDownloadSizeFor(entriesToInstall, nonPluginEntriesToInstall);
>+			IFeatureReference[] children = feature.getIncludedFeatureReferences();
>+			IFeature currentFeature = null;
>+			for (int i = 0; i < children.length; i++) {
>+				currentFeature = children[i].getFeature(null);
>+				if (currentFeature != null) {
>+					result += getDownloadSizeFor(currentFeature);
>+					if(result == ContentEntryModel.UNKNOWN_SIZE)
>+						return result;
>+				}
>+			}
>+			
>+			IPluginEntry[] entriesToInstall = feature.getPluginEntries();
>+			IPluginEntry[] siteEntries = this.getPluginEntries();
>+			entriesToInstall = UpdateManagerUtils.diff(entriesToInstall, siteEntries);
>+			//[18355]
>+			INonPluginEntry[] nonPluginEntriesToInstall = feature.getNonPluginEntries();
>+
>+			result += feature.getFeatureContentProvider().getDownloadSizeFor(entriesToInstall, nonPluginEntriesToInstall);
> 		} catch (CoreException e) {
> 			UpdateCore.warn(null, e);
> 			result = ContentEntryModel.UNKNOWN_SIZE;
>@@ -283,7 +295,9 @@
> 			for (int i = 0; i < children.length; i++) {
> 				currentFeature = children[i].getFeature(null);
> 				if (currentFeature != null) {
>-					pluginsToInstall.addAll(Arrays.asList(currentFeature.getPluginEntries()));
>+					result += getInstallSizeFor(currentFeature);
>+					if(result == ContentEntryModel.UNKNOWN_SIZE)
>+						return result;
> 				}
> 			}
> 
>@@ -299,7 +313,7 @@
> 			//[18355]
> 			INonPluginEntry[] nonPluginEntriesToInstall = feature.getNonPluginEntries();
> 
>-			result = feature.getFeatureContentProvider().getInstallSizeFor(entriesToInstall, nonPluginEntriesToInstall);
>+			result += feature.getFeatureContentProvider().getInstallSizeFor(entriesToInstall, nonPluginEntriesToInstall);
> 		} catch (CoreException e) {
> 			UpdateCore.warn(null, e);
> 			result = ContentEntryModel.UNKNOWN_SIZE;

Actions: View | Diff

Attachments on bug 132029: 36364 | 36365 | 38848 | 39636 | 39706