Attachment 29821 Details for Bug 108191 – Fixed type problems for internal data structure

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

[patch] Fixed type problems for internal data structure

patch.txt (text/plain), 2.96 KB, created by Leif Frenzel

on 2005-11-12 05:29:19 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Leif Frenzel

Created: 2005-11-12 05:29:19 EST

Size: 2.96 KB

patch

obsolete

>Index: src/org/eclipse/update/internal/core/SiteFileContentConsumer.java
>===================================================================
>RCS file: /home/eclipse/org.eclipse.update.core/src/org/eclipse/update/internal/core/SiteFileContentConsumer.java,v
>retrieving revision 1.48
>diff -u -r1.48 SiteFileContentConsumer.java
>--- src/org/eclipse/update/internal/core/SiteFileContentConsumer.java	3 Aug 2005 19:09:49 -0000	1.48
>+++ src/org/eclipse/update/internal/core/SiteFileContentConsumer.java	12 Nov 2005 10:23:42 -0000
>@@ -31,7 +31,7 @@
> 	private String newPath;
> 
> 	//  for abort
>-	private List /* of SiteFilePluginContentConsumer */
>+	private List /* of ContentConsumer */
> 	contentConsumers;
> 	private List /*of path as String */
> 	installedFiles;
>@@ -77,12 +77,12 @@
> 		ContentConsumer cons;
> 		if(pluginEntry instanceof PluginEntryModel && !((PluginEntryModel)pluginEntry).isUnpack()){
> 			// plugin can run from a jar
>-			 cons = new SiteFilePackedPluginContentConsumer(pluginEntry, getSite());
>+			cons = new SiteFilePackedPluginContentConsumer(pluginEntry, getSite());
> 		} else{
> 			// plugin must be unpacked
> 			cons = new SiteFilePluginContentConsumer(pluginEntry, getSite());
> 		}
>-		addContentConsumers(cons);
>+		addContentConsumer(cons);
> 		return cons;
> 	}
> 
>@@ -206,8 +206,14 @@
> 		if (contentConsumers != null) {
> 			Iterator iter = contentConsumers.iterator();
> 			while (iter.hasNext()) {
>-				SiteFilePluginContentConsumer element = (SiteFilePluginContentConsumer) iter.next();
>-				element.abort();
>+				Object element = iter.next();
>+				if( element instanceof SiteFilePluginContentConsumer ) {
>+					SiteFilePluginContentConsumer cons = (SiteFilePluginContentConsumer) element;
>+					cons.abort();
>+				} else if( element instanceof SiteFilePackedPluginContentConsumer ) {
>+					SiteFilePackedPluginContentConsumer cons = ( SiteFilePackedPluginContentConsumer )element;
>+					cons.abort();
>+                }
> 			}
> 		}
> 		contentConsumers = null;
>@@ -294,7 +300,7 @@
> 	/*
> 	 * Adds a SiteFilePluginContentConsumer to the list
> 	 */
>-	private void addContentConsumers(ContentConsumer cons) {
>+	private void addContentConsumer(ContentConsumer cons) {
> 		if (contentConsumers == null)
> 			contentConsumers = new ArrayList();
> 		contentConsumers.add(cons);
>Index: src/org/eclipse/update/internal/core/ContentConsumer.java
>===================================================================
>RCS file: /home/eclipse/org.eclipse.update.core/src/org/eclipse/update/internal/core/ContentConsumer.java,v
>retrieving revision 1.5
>diff -u -r1.5 ContentConsumer.java
>--- src/org/eclipse/update/internal/core/ContentConsumer.java	1 Mar 2005 20:29:15 -0000	1.5
>+++ src/org/eclipse/update/internal/core/ContentConsumer.java	12 Nov 2005 10:23:38 -0000
>@@ -14,7 +14,7 @@
> import org.eclipse.update.core.*;
> 
> /**
>- * A default implementation for IFeatureContentConsumer
>+ * A default implementation for IContentConsumer
>  * </p>
>  * @since 2.0
>  */

Actions: View | Diff

Attachments on bug 108191: 29821 | 29822