Attachment #29821 for bug #108191

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

View | Details | Raw Unified | Return to bug 108191
Collapse All | Expand All




	private String newPath;

	//  for abort
	private List /* of ContentConsumer */
	contentConsumers;
	private List /*of path as String */
	installedFiles;

		ContentConsumer cons;
		if(pluginEntry instanceof PluginEntryModel && !((PluginEntryModel)pluginEntry).isUnpack()){
			// plugin can run from a jar
			cons = new SiteFilePackedPluginContentConsumer(pluginEntry, getSite());
		} else{
			// plugin must be unpacked
			cons = new SiteFilePluginContentConsumer(pluginEntry, getSite());
		}
		addContentConsumer(cons);
		return cons;
	}


		if (contentConsumers != null) {
			Iterator iter = contentConsumers.iterator();
			while (iter.hasNext()) {
				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;

	/*
	 * Adds a SiteFilePluginContentConsumer to the list
	 */
	private void addContentConsumer(ContentConsumer cons) {
		if (contentConsumers == null)
			contentConsumers = new ArrayList();
		contentConsumers.add(cons);

Lines 14-20 Link Here

(-)src/org/eclipse/update/internal/core/ContentConsumer.java (-1 / +1 lines)
14	import org.eclipse.update.core.*;	14	import org.eclipse.update.core.*;
15		15
16	/**	16	/**
17	* A default implementation for IFeatureContentConsumer	17	* A default implementation for IContentConsumer
18	* </p>	18	* </p>
19	* @since 2.0	19	* @since 2.0
20	*/	20	*/

Return to bug 108191

Lines 31-37 Link Here

(-)src/org/eclipse/update/internal/core/SiteFileContentConsumer.java (-6 / +12 lines)
31	private String newPath;	31	private String newPath;
32		32
33	// for abort	33	// for abort
34	private List /* of SiteFilePluginContentConsumer */	34	private List /* of ContentConsumer */
35	contentConsumers;	35	contentConsumers;
36	private List /of path as String /	36	private List /of path as String /
37	installedFiles;	37	installedFiles;
Lines 77-88 Link Here
77	ContentConsumer cons;	77	ContentConsumer cons;
78	if(pluginEntry instanceof PluginEntryModel && !((PluginEntryModel)pluginEntry).isUnpack()){	78	if(pluginEntry instanceof PluginEntryModel && !((PluginEntryModel)pluginEntry).isUnpack()){
79	// plugin can run from a jar	79	// plugin can run from a jar
80	cons = new SiteFilePackedPluginContentConsumer(pluginEntry, getSite());	80	cons = new SiteFilePackedPluginContentConsumer(pluginEntry, getSite());
81	} else{	81	} else{
82	// plugin must be unpacked	82	// plugin must be unpacked
83	cons = new SiteFilePluginContentConsumer(pluginEntry, getSite());	83	cons = new SiteFilePluginContentConsumer(pluginEntry, getSite());
84	}	84	}
85	addContentConsumers(cons);	85	addContentConsumer(cons);
86	return cons;	86	return cons;
87	}	87	}
88		88
Lines 206-213 Link Here
206	if (contentConsumers != null) {	206	if (contentConsumers != null) {
207	Iterator iter = contentConsumers.iterator();	207	Iterator iter = contentConsumers.iterator();
208	while (iter.hasNext()) {	208	while (iter.hasNext()) {
209	SiteFilePluginContentConsumer element = (SiteFilePluginContentConsumer) iter.next();	209	Object element = iter.next();
210	element.abort();	210	if( element instanceof SiteFilePluginContentConsumer ) {
		211	SiteFilePluginContentConsumer cons = (SiteFilePluginContentConsumer) element;
		212	cons.abort();
		213	} else if( element instanceof SiteFilePackedPluginContentConsumer ) {
		214	SiteFilePackedPluginContentConsumer cons = ( SiteFilePackedPluginContentConsumer )element;
		215	cons.abort();
		216	}
211	}	217	}
212	}	218	}
213	contentConsumers = null;	219	contentConsumers = null;
Lines 294-300 Link Here
294	/*	300	/*
295	* Adds a SiteFilePluginContentConsumer to the list	301	* Adds a SiteFilePluginContentConsumer to the list
296	*/	302	*/
297	private void addContentConsumers(ContentConsumer cons) {	303	private void addContentConsumer(ContentConsumer cons) {
298	if (contentConsumers == null)	304	if (contentConsumers == null)
299	contentConsumers = new ArrayList();	305	contentConsumers = new ArrayList();
300	contentConsumers.add(cons);	306	contentConsumers.add(cons);