Attachment #22119 for bug #97780

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




package org.eclipse.ui.model;

import org.eclipse.core.runtime.IAdaptable;
import org.eclipse.core.runtime.Platform;
import org.eclipse.jface.viewers.ITreeContentProvider;
import org.eclipse.jface.viewers.Viewer;



    /**
     * Returns the implementation of IWorkbenchAdapter for the given
     * object.  Returns null if the adapter is not defined for this
     * type.
     * <p>
     * </p>
     * 
     * @param element the element
     * @return the corresponding workbench adapter object
     */
    protected IWorkbenchAdapter getAdapter(Object element) {
		IWorkbenchAdapter adapter = null;
		if (element instanceof IAdaptable)
			adapter = (IWorkbenchAdapter) ((IAdaptable) element)
					.getAdapter(IWorkbenchAdapter.class);
		if (adapter == null)
			adapter = (IWorkbenchAdapter) Platform.getAdapterManager()
					.loadAdapter(element, IWorkbenchAdapter.class.getName());

		return adapter;
	}

    /*
	 * (non-Javadoc) Method declared on ITreeContentProvider.
	 */
    public Object[] getChildren(Object element) {
        IWorkbenchAdapter adapter = getAdapter(element);
        if (adapter != null) {




package org.eclipse.ui.model;

import org.eclipse.core.runtime.IAdaptable;
import org.eclipse.core.runtime.Platform;
import org.eclipse.jface.resource.ImageDescriptor;
import org.eclipse.jface.viewers.DecoratingLabelProvider;
import org.eclipse.jface.viewers.IColorProvider;

    
    /**
     * Returns the implementation of IWorkbenchAdapter for the given
     * object.  Returns null if the adapter is not defined for this
     * type.
     * 
     * @param element the element
     * @return the corresponding workbench adapter object
     */
    protected Object getAdapter(Object element, Class clazz) {
    	Object adapter = null;
		if (element instanceof IAdaptable)
			adapter = (IWorkbenchAdapter) ((IAdaptable) element)
					.getAdapter(clazz);       
        if(adapter == null) {
        	adapter = Platform.getAdapterManager().loadAdapter(element, clazz.getName());
        }
        return adapter;
    }
    
    /**
     * Returns the implementation of IWorkbenchAdapter for the given
     * object.  
     * @param o the object to look up.
     * @return IWorkbenchAdapter or<code>null</code> if the adapter is not defined or the
     * object is not adaptable. 
     */
    protected final IWorkbenchAdapter getAdapter(Object o) {
        return (IWorkbenchAdapter)getAdapter(o, IWorkbenchAdapter.class);
            return null;
        }
        return (IWorkbenchAdapter) ((IAdaptable) o)
                .getAdapter(IWorkbenchAdapter.class);
    }

    /**

     * object is not adaptable. 
     */
    protected final IWorkbenchAdapter2 getAdapter2(Object o) {
        return (IWorkbenchAdapter2)getAdapter(o, IWorkbenchAdapter2.class);
            return null;
        }
        return (IWorkbenchAdapter2) ((IAdaptable) o)
                .getAdapter(IWorkbenchAdapter2.class);
    }

    /* (non-Javadoc)

Return to bug 97780

Lines 11-16 Link Here

(-)Eclipse UI/org/eclipse/ui/model/BaseWorkbenchContentProvider.java (-14 / +17 lines)
11	package org.eclipse.ui.model;	11	package org.eclipse.ui.model;
12		12
13	import org.eclipse.core.runtime.IAdaptable;	13	import org.eclipse.core.runtime.IAdaptable;
		14	import org.eclipse.core.runtime.Platform;
14	import org.eclipse.jface.viewers.ITreeContentProvider;	15	import org.eclipse.jface.viewers.ITreeContentProvider;
15	import org.eclipse.jface.viewers.Viewer;	16	import org.eclipse.jface.viewers.Viewer;
16		17
Lines 43-67 Link Here
43		44
44	/**	45	/**
45	* Returns the implementation of IWorkbenchAdapter for the given	46	* Returns the implementation of IWorkbenchAdapter for the given
46	* object. Returns null if the adapter is not defined or the	47	* object. Returns null if the adapter is not defined for this
47	* object is not adaptable.	48	* type.
48	* <p>
49	* </p>
50	*	49	*
51	* @param element the element	50	* @param element the element
52	* @return the corresponding workbench adapter object	51	* @return the corresponding workbench adapter object
53	*/	52	*/
54	protected IWorkbenchAdapter getAdapter(Object element) {	53	protected IWorkbenchAdapter getAdapter(Object element) {
55	if (!(element instanceof IAdaptable)) {	54	IWorkbenchAdapter adapter = null;
56	return null;	55	if (element instanceof IAdaptable)
57	}	56	adapter = (IWorkbenchAdapter) ((IAdaptable) element)
58	return (IWorkbenchAdapter) ((IAdaptable) element)	57	.getAdapter(IWorkbenchAdapter.class);
59	.getAdapter(IWorkbenchAdapter.class);	58	if (adapter == null)
60	}	59	adapter = (IWorkbenchAdapter) Platform.getAdapterManager()
61		60	.loadAdapter(element, IWorkbenchAdapter.class.getName());
62	/* (non-Javadoc)	61
63	* Method declared on ITreeContentProvider.	62	return adapter;
64	*/	63	}
		64
		65	/*
		66	* (non-Javadoc) Method declared on ITreeContentProvider.
		67	*/
65	public Object[] getChildren(Object element) {	68	public Object[] getChildren(Object element) {
66	IWorkbenchAdapter adapter = getAdapter(element);	69	IWorkbenchAdapter adapter = getAdapter(element);
67	if (adapter != null) {	70	if (adapter != null) {

Lines 11-16 Link Here

(-)Eclipse UI/org/eclipse/ui/model/WorkbenchLabelProvider.java (-10 / +22 lines)
11	package org.eclipse.ui.model;	11	package org.eclipse.ui.model;
12		12
13	import org.eclipse.core.runtime.IAdaptable;	13	import org.eclipse.core.runtime.IAdaptable;
		14	import org.eclipse.core.runtime.Platform;
14	import org.eclipse.jface.resource.ImageDescriptor;	15	import org.eclipse.jface.resource.ImageDescriptor;
15	import org.eclipse.jface.viewers.DecoratingLabelProvider;	16	import org.eclipse.jface.viewers.DecoratingLabelProvider;
16	import org.eclipse.jface.viewers.IColorProvider;	17	import org.eclipse.jface.viewers.IColorProvider;
Lines 115-131 Link Here
115		116
116	/**	117	/**
117	* Returns the implementation of IWorkbenchAdapter for the given	118	* Returns the implementation of IWorkbenchAdapter for the given
		119	* object. Returns null if the adapter is not defined for this
		120	* type.
		121	*
		122	* @param element the element
		123	* @return the corresponding workbench adapter object
		124	*/
		125	protected Object getAdapter(Object element, Class clazz) {
		126	Object adapter = null;
		127	if (element instanceof IAdaptable)
		128	adapter = (IWorkbenchAdapter) ((IAdaptable) element)
		129	.getAdapter(clazz);
		130	if(adapter == null) {
		131	adapter = Platform.getAdapterManager().loadAdapter(element, clazz.getName());
		132	}
		133	return adapter;
		134	}
		135
		136	/**
		137	* Returns the implementation of IWorkbenchAdapter for the given
118	* object.	138	* object.
119	* @param o the object to look up.	139	* @param o the object to look up.
120	* @return IWorkbenchAdapter or<code>null</code> if the adapter is not defined or the	140	* @return IWorkbenchAdapter or<code>null</code> if the adapter is not defined or the
121	* object is not adaptable.	141	* object is not adaptable.
122	*/	142	*/
123	protected final IWorkbenchAdapter getAdapter(Object o) {	143	protected final IWorkbenchAdapter getAdapter(Object o) {
124	if (!(o instanceof IAdaptable)) {	144	return (IWorkbenchAdapter)getAdapter(o, IWorkbenchAdapter.class);
125	return null;
126	}
127	return (IWorkbenchAdapter) ((IAdaptable) o)
128	.getAdapter(IWorkbenchAdapter.class);
129	}	145	}
130		146
131	/**	147	/**
Lines 136-146 Link Here
136	* object is not adaptable.	152	* object is not adaptable.
137	*/	153	*/
138	protected final IWorkbenchAdapter2 getAdapter2(Object o) {	154	protected final IWorkbenchAdapter2 getAdapter2(Object o) {
139	if (!(o instanceof IAdaptable)) {	155	return (IWorkbenchAdapter2)getAdapter(o, IWorkbenchAdapter2.class);
140	return null;
141	}
142	return (IWorkbenchAdapter2) ((IAdaptable) o)
143	.getAdapter(IWorkbenchAdapter2.class);
144	}	156	}
145		157
146	/* (non-Javadoc)	158	/* (non-Javadoc)