Attachment #156758 for bug #300300

Lines 18-23 Link Here

(-)META-INF/MANIFEST.MF (+1 lines)
18	org.eclipse.jdt.internal.debug.ui.console;x-internal:=true,	18	org.eclipse.jdt.internal.debug.ui.console;x-internal:=true,
19	org.eclipse.jdt.internal.debug.ui.contentassist;x-internal:=true,	19	org.eclipse.jdt.internal.debug.ui.contentassist;x-internal:=true,
20	org.eclipse.jdt.internal.debug.ui.display;x-internal:=true,	20	org.eclipse.jdt.internal.debug.ui.display;x-internal:=true,
		21	org.eclipse.jdt.internal.debug.ui.expressions;x-internal:=true,
21	org.eclipse.jdt.internal.debug.ui.heapwalking;x-internal:=true,	22	org.eclipse.jdt.internal.debug.ui.heapwalking;x-internal:=true,
22	org.eclipse.jdt.internal.debug.ui.jres;x-internal:=true,	23	org.eclipse.jdt.internal.debug.ui.jres;x-internal:=true,
23	org.eclipse.jdt.internal.debug.ui.launcher;x-internal:=true,	24	org.eclipse.jdt.internal.debug.ui.launcher;x-internal:=true,




            <adapter
                  type="org.eclipse.debug.internal.ui.viewers.model.provisional.IElementLabelProvider">
            </adapter>
            <adapter
                  type="org.eclipse.debug.internal.ui.viewers.model.provisional.IViewerInputProvider">
            </adapter>
         </factory>                            
         <factory
               adaptableType="org.eclipse.jdt.debug.core.IJavaThread"
               class="org.eclipse.jdt.internal.debug.ui.variables.JavaDebugElementAdapterFactory">
            <adapter
                  type="org.eclipse.debug.internal.ui.viewers.model.provisional.IViewerInputProvider">
            </adapter>
         </factory>                            
         <factory
               adaptableType="org.eclipse.jdt.debug.core.IJavaThreadGroup"
               class="org.eclipse.jdt.internal.debug.ui.variables.JavaDebugElementAdapterFactory">
            <adapter
                  type="org.eclipse.debug.internal.ui.viewers.model.provisional.IViewerInputProvider">
            </adapter>
         </factory>                            
         <factory
               adaptableType="org.eclipse.jdt.debug.core.IJavaDebugTarget"
               class="org.eclipse.jdt.internal.debug.ui.variables.JavaDebugElementAdapterFactory">
            <adapter
                  type="org.eclipse.debug.internal.ui.viewers.model.provisional.IViewerInputProvider">
            </adapter>
         </factory>                            
      </extension>     	   
   




/*******************************************************************************
 * Copyright (c) 2010 Wind River Systems and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 * 
 * Contributors:
 *     Wind River Systems - initial API and implementation
 *******************************************************************************/
package org.eclipse.jdt.internal.debug.ui.expressions;

import org.eclipse.core.runtime.CoreException;
import org.eclipse.debug.core.DebugPlugin;
import org.eclipse.debug.internal.ui.elements.adapters.DefaultViewerInputProvider;
import org.eclipse.debug.internal.ui.viewers.model.provisional.IPresentationContext;
import org.eclipse.debug.internal.ui.viewers.model.provisional.IViewerUpdate;
import org.eclipse.debug.ui.IDebugUIConstants;

/**
 * @since 3.6
 */
public class JavaDefaultViewerInputProvider extends DefaultViewerInputProvider {

    /* (non-Javadoc)
     * @see org.eclipse.debug.internal.ui.model.elements.ViewerInputProvider#getViewerInput(java.lang.Object, org.eclipse.debug.internal.ui.viewers.model.provisional.IPresentationContext, org.eclipse.debug.internal.ui.viewers.model.provisional.IViewerUpdate)
     */
    protected Object getViewerInput(Object source, IPresentationContext context, IViewerUpdate update) throws CoreException {
        if ( IDebugUIConstants.ID_EXPRESSION_VIEW.equals(context.getId()) ) {
            return new JavaExpressionManagerProxy( DebugPlugin.getDefault().getExpressionManager() );
        } else {
            return super.getViewerInput(source, context, update);
        }
    }

}




/*******************************************************************************
 * Copyright (c) 2010 Wind River Systems and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 * 
 * Contributors:
 *     Wind River Systems - initial API and implementation
 *******************************************************************************/
package org.eclipse.jdt.internal.debug.ui.expressions;

import org.eclipse.core.runtime.PlatformObject;
import org.eclipse.debug.core.IExpressionListener;
import org.eclipse.debug.core.IExpressionManager;
import org.eclipse.debug.core.IExpressionsListener;
import org.eclipse.debug.core.model.IExpression;
import org.eclipse.debug.core.model.IWatchExpression;
import org.eclipse.debug.core.model.IWatchExpressionDelegate;
import org.eclipse.debug.internal.ui.viewers.model.provisional.IColumnPresentationFactory;
import org.eclipse.jdt.internal.debug.ui.variables.JavaVariableColumnPresentationFactory;

/**
 * @since 3.6
 */
class JavaExpressionManagerProxy extends PlatformObject implements IExpressionManager {
    
    private static final IColumnPresentationFactory fgColumnPresentation = new JavaVariableColumnPresentationFactory();
    
    private final IExpressionManager fManager;
    
    JavaExpressionManagerProxy(IExpressionManager manager) {
        fManager = manager;
    }

    public void addExpression(IExpression expression) { fManager.addExpression(expression); }
    public void addExpressions(IExpression[] expressions) { fManager.addExpressions(expressions); }
    public IWatchExpression newWatchExpression(String expressionText) { return fManager.newWatchExpression(expressionText); }
    public IExpression[] getExpressions() { return fManager.getExpressions(); }
    public boolean hasExpressions() { return fManager.hasExpressions(); }
    public IExpression[] getExpressions(String modelIdentifier) { return fManager.getExpressions(); }
    public void removeExpression(IExpression expression) { fManager.removeExpression(expression); }
    public void removeExpressions(IExpression[] expressions) { fManager.removeExpressions(expressions); }
    public void addExpressionListener(IExpressionListener listener) { fManager.addExpressionListener(listener); }
    public void removeExpressionListener(IExpressionListener listener) { fManager.removeExpressionListener(listener); }
    public void addExpressionListener(IExpressionsListener listener) { fManager.addExpressionListener(listener); }
    public void removeExpressionListener(IExpressionsListener listener) { fManager.removeExpressionListener(listener); }
    public IWatchExpressionDelegate newWatchExpressionDelegate(String id) { return fManager.newWatchExpressionDelegate(id); }
    public boolean hasWatchExpressionDelegate(String id) { return fManager.hasWatchExpressionDelegate(id); }
    
    public Object getAdapter(Class adapter) {
        if (IColumnPresentationFactory.class.equals(adapter)) {
            return fgColumnPresentation;
        }
        return super.getAdapter(adapter);
    }
    
    public boolean equals(Object obj) {
        return obj instanceof JavaExpressionManagerProxy && 
            ((JavaExpressionManagerProxy)obj).fManager.equals(fManager);
    }
    
    public int hashCode() {
        return getClass().hashCode() + fManager.hashCode();
    }
}




/*******************************************************************************
 * Copyright (c) 2010 Wind River Systems and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 * 
 * Contributors:
 *     Wind River Systems - initial API and implementation
 *******************************************************************************/
package org.eclipse.jdt.internal.debug.ui.expressions;

import org.eclipse.core.runtime.CoreException;
import org.eclipse.debug.core.DebugPlugin;
import org.eclipse.debug.internal.ui.elements.adapters.StackFrameViewerInputProvider;
import org.eclipse.debug.internal.ui.viewers.model.provisional.IPresentationContext;
import org.eclipse.debug.internal.ui.viewers.model.provisional.IViewerUpdate;
import org.eclipse.debug.ui.IDebugUIConstants;

/**
 * @since 3.6
 */
public class JavaStackFrameViewerInputProvider extends StackFrameViewerInputProvider {

    /* (non-Javadoc)
     * @see org.eclipse.debug.internal.ui.model.elements.ViewerInputProvider#getViewerInput(java.lang.Object, org.eclipse.debug.internal.ui.viewers.model.provisional.IPresentationContext, org.eclipse.debug.internal.ui.viewers.model.provisional.IViewerUpdate)
     */
    protected Object getViewerInput(Object source, IPresentationContext context, IViewerUpdate update) throws CoreException {
        if ( IDebugUIConstants.ID_EXPRESSION_VIEW.equals(context.getId()) ) {
            return new JavaExpressionManagerProxy( DebugPlugin.getDefault().getExpressionManager() );
        } else {
            return super.getViewerInput(source, context, update);
        }
    }

}

Lines 15-25 Link Here

(-)ui/org/eclipse/jdt/internal/debug/ui/variables/JavaDebugElementAdapterFactory.java (-2 / +22 lines)
15	import org.eclipse.debug.internal.ui.viewers.model.provisional.IElementContentProvider;	15	import org.eclipse.debug.internal.ui.viewers.model.provisional.IElementContentProvider;
16	import org.eclipse.debug.internal.ui.viewers.model.provisional.IElementLabelProvider;	16	import org.eclipse.debug.internal.ui.viewers.model.provisional.IElementLabelProvider;
17	import org.eclipse.debug.internal.ui.viewers.model.provisional.IElementMementoProvider;	17	import org.eclipse.debug.internal.ui.viewers.model.provisional.IElementMementoProvider;
		18	import org.eclipse.debug.internal.ui.viewers.model.provisional.IViewerInputProvider;
18	import org.eclipse.debug.ui.actions.IWatchExpressionFactoryAdapter;	19	import org.eclipse.debug.ui.actions.IWatchExpressionFactoryAdapter;
		20	import org.eclipse.jdt.debug.core.IJavaDebugTarget;
19	import org.eclipse.jdt.debug.core.IJavaStackFrame;	21	import org.eclipse.jdt.debug.core.IJavaStackFrame;
		22	import org.eclipse.jdt.debug.core.IJavaThread;
		23	import org.eclipse.jdt.debug.core.IJavaThreadGroup;
20	import org.eclipse.jdt.debug.core.IJavaValue;	24	import org.eclipse.jdt.debug.core.IJavaValue;
21	import org.eclipse.jdt.debug.core.IJavaVariable;	25	import org.eclipse.jdt.debug.core.IJavaVariable;
22	import org.eclipse.jdt.internal.debug.ui.display.JavaInspectExpression;	26	import org.eclipse.jdt.internal.debug.ui.display.JavaInspectExpression;
		27	import org.eclipse.jdt.internal.debug.ui.expressions.JavaDefaultViewerInputProvider;
		28	import org.eclipse.jdt.internal.debug.ui.expressions.JavaStackFrameViewerInputProvider;
23	import org.eclipse.jdt.internal.debug.ui.heapwalking.JavaWatchExpressionFilter;	29	import org.eclipse.jdt.internal.debug.ui.heapwalking.JavaWatchExpressionFilter;
24		30
25	/**	31	/**
Lines 43-49 Link Here
43	private static final IWatchExpressionFactoryAdapter fgWEVariable = new JavaWatchExpressionFilter();	49	private static final IWatchExpressionFactoryAdapter fgWEVariable = new JavaWatchExpressionFilter();
44	private static final IElementMementoProvider fgMPStackFrame = new JavaStackFrameMementoProvider();	50	private static final IElementMementoProvider fgMPStackFrame = new JavaStackFrameMementoProvider();
45	private static final IElementLabelProvider fgLPFrame = new JavaStackFrameLabelProvider();	51	private static final IElementLabelProvider fgLPFrame = new JavaStackFrameLabelProvider();
46		52	private static final IViewerInputProvider fgIPDefault = new JavaDefaultViewerInputProvider();
		53	private static final IViewerInputProvider fgIPFrame = new JavaStackFrameViewerInputProvider();
		54
47	/* (non-Javadoc)	55	/* (non-Javadoc)
48	* @see org.eclipse.core.runtime.IAdapterFactory#getAdapter(java.lang.Object, java.lang.Class)	56	* @see org.eclipse.core.runtime.IAdapterFactory#getAdapter(java.lang.Object, java.lang.Class)
49	*/	57	*/
Lines 83-88 Link Here
83	return fgMPStackFrame;	91	return fgMPStackFrame;
84	}	92	}
85	}	93	}
		94	if (IViewerInputProvider.class.equals(adapterType)) {
		95	if (adaptableObject instanceof IJavaStackFrame) {
		96	return fgIPFrame;
		97	}
		98	if (adaptableObject instanceof IJavaThread \|\|
		99	adaptableObject instanceof IJavaThreadGroup \|\|
		100	adaptableObject instanceof IJavaDebugTarget)
		101	{
		102	return fgIPDefault;
		103	}
		104	}
86	return null;	105	return null;
87	}	106	}
88		107
Lines 90-96 Link Here
90	* @see org.eclipse.core.runtime.IAdapterFactory#getAdapterList()	109	* @see org.eclipse.core.runtime.IAdapterFactory#getAdapterList()
91	*/	110	*/
92	public Class[] getAdapterList() {	111	public Class[] getAdapterList() {
93	return new Class[]{IElementLabelProvider.class,IElementContentProvider.class,IWatchExpressionFactoryAdapter.class};	112	return new Class[]{IElementLabelProvider.class,
		113	IElementContentProvider.class, IWatchExpressionFactoryAdapter.class, IViewerInputProvider.class};
94	}	114	}
95		115
96	}	116	}

Lines 11-16 Link Here

(-)ui/org/eclipse/jdt/internal/debug/ui/variables/JavaVariableColumnPresentationFactory.java (-1 / +5 lines)
11	package org.eclipse.jdt.internal.debug.ui.variables;	11	package org.eclipse.jdt.internal.debug.ui.variables;
12		12
13	import org.eclipse.core.runtime.IAdaptable;	13	import org.eclipse.core.runtime.IAdaptable;
		14	import org.eclipse.debug.core.IExpressionManager;
14	import org.eclipse.debug.internal.ui.viewers.model.provisional.IColumnPresentation;	15	import org.eclipse.debug.internal.ui.viewers.model.provisional.IColumnPresentation;
15	import org.eclipse.debug.internal.ui.viewers.model.provisional.IColumnPresentationFactory;	16	import org.eclipse.debug.internal.ui.viewers.model.provisional.IColumnPresentationFactory;
16	import org.eclipse.debug.internal.ui.viewers.model.provisional.IPresentationContext;	17	import org.eclipse.debug.internal.ui.viewers.model.provisional.IPresentationContext;
Lines 49-57 Link Here
49	if (element instanceof IAdaptable) {	50	if (element instanceof IAdaptable) {
50	IAdaptable adaptable = (IAdaptable)element;	51	IAdaptable adaptable = (IAdaptable)element;
51	frame = (IJavaStackFrame) adaptable.getAdapter(IJavaStackFrame.class);	52	frame = (IJavaStackFrame) adaptable.getAdapter(IJavaStackFrame.class);
		53	return frame != null;
52	}	54	}
		55	} else if (IDebugUIConstants.ID_EXPRESSION_VIEW.equals(context.getId())) {
		56	return element instanceof IExpressionManager;
53	}	57	}
54	return frame != null;	58	return false;
55	}	59	}
56		60
57	}	61	}

Return to bug 300300

Lines 3230-3235 Link Here

(-)plugin.xml (+24 lines)
3230	<adapter	3230	<adapter
3231	type="org.eclipse.debug.internal.ui.viewers.model.provisional.IElementLabelProvider">	3231	type="org.eclipse.debug.internal.ui.viewers.model.provisional.IElementLabelProvider">
3232	</adapter>	3232	</adapter>
		3233	<adapter
		3234	type="org.eclipse.debug.internal.ui.viewers.model.provisional.IViewerInputProvider">
		3235	</adapter>
		3236	</factory>
		3237	<factory
		3238	adaptableType="org.eclipse.jdt.debug.core.IJavaThread"
		3239	class="org.eclipse.jdt.internal.debug.ui.variables.JavaDebugElementAdapterFactory">
		3240	<adapter
		3241	type="org.eclipse.debug.internal.ui.viewers.model.provisional.IViewerInputProvider">
		3242	</adapter>
		3243	</factory>
		3244	<factory
		3245	adaptableType="org.eclipse.jdt.debug.core.IJavaThreadGroup"
		3246	class="org.eclipse.jdt.internal.debug.ui.variables.JavaDebugElementAdapterFactory">
		3247	<adapter
		3248	type="org.eclipse.debug.internal.ui.viewers.model.provisional.IViewerInputProvider">
		3249	</adapter>
		3250	</factory>
		3251	<factory
		3252	adaptableType="org.eclipse.jdt.debug.core.IJavaDebugTarget"
		3253	class="org.eclipse.jdt.internal.debug.ui.variables.JavaDebugElementAdapterFactory">
		3254	<adapter
		3255	type="org.eclipse.debug.internal.ui.viewers.model.provisional.IViewerInputProvider">
		3256	</adapter>
3233	</factory>	3257	</factory>
3234	</extension>	3258	</extension>
3235		3259

Added Link Here

(-)ui/org/eclipse/jdt/internal/debug/ui/expressions/JavaDefaultViewerInputProvider.java (+36 lines)
1	/*******************************************************************************
2	* Copyright (c) 2010 Wind River Systems and others.
3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at
6	* http://www.eclipse.org/legal/epl-v10.html
7	*
8	* Contributors:
9	* Wind River Systems - initial API and implementation
10	*******************************************************************************/
11	package org.eclipse.jdt.internal.debug.ui.expressions;
12
13	import org.eclipse.core.runtime.CoreException;
14	import org.eclipse.debug.core.DebugPlugin;
15	import org.eclipse.debug.internal.ui.elements.adapters.DefaultViewerInputProvider;
16	import org.eclipse.debug.internal.ui.viewers.model.provisional.IPresentationContext;
17	import org.eclipse.debug.internal.ui.viewers.model.provisional.IViewerUpdate;
18	import org.eclipse.debug.ui.IDebugUIConstants;
19
20	/**
21	* @since 3.6
22	*/
23	public class JavaDefaultViewerInputProvider extends DefaultViewerInputProvider {
24
25	/* (non-Javadoc)
26	* @see org.eclipse.debug.internal.ui.model.elements.ViewerInputProvider#getViewerInput(java.lang.Object, org.eclipse.debug.internal.ui.viewers.model.provisional.IPresentationContext, org.eclipse.debug.internal.ui.viewers.model.provisional.IViewerUpdate)
27	*/
28	protected Object getViewerInput(Object source, IPresentationContext context, IViewerUpdate update) throws CoreException {
29	if ( IDebugUIConstants.ID_EXPRESSION_VIEW.equals(context.getId()) ) {
30	return new JavaExpressionManagerProxy( DebugPlugin.getDefault().getExpressionManager() );
31	} else {
32	return super.getViewerInput(source, context, update);
33	}
34	}
35
36	}