mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-06-07 17:56:01 +02:00
Code Issues Wiki Activity

[303370] Creating an event breakpoint leaves you with a disabled element in the Breakpoints views. Also fixed warnings in file

Browse source
This commit is contained in:
John Cortell 2010-02-22 21:30:18 +00:00
parent 657ecd8e53
commit 38e0388107
1 changed files with 15 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/ui/breakpoints/CEventBreakpointsLabelProviderFactory.java
View file

@ -1,5 +1,5 @@
/******************************************************************************* /*******************************************************************************
* Copyright (c) 2008 QNX Software Systems and others. * Copyright (c) 2008, 2010 QNX Software Systems and others.
* *
* All rights reserved. This program and the accompanying materials * All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0 * are made available under the terms of the Eclipse Public License v1.0
@ -12,22 +12,20 @@
*******************************************************************************/ *******************************************************************************/
package org.eclipse.cdt.debug.ui.breakpoints; package org.eclipse.cdt.debug.ui.breakpoints;
import com.ibm.icu.text.MessageFormat;
import org.eclipse.cdt.debug.core.DebugCoreMessages; import org.eclipse.cdt.debug.core.DebugCoreMessages;
import org.eclipse.cdt.debug.core.model.ICBreakpoint; import org.eclipse.cdt.debug.core.model.ICBreakpoint;
import org.eclipse.cdt.debug.core.model.ICEventBreakpoint; import org.eclipse.cdt.debug.core.model.ICEventBreakpoint;
import org.eclipse.cdt.debug.ui.CDebugUIPlugin; import org.eclipse.cdt.debug.ui.CDebugUIPlugin;
import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IAdapterFactory; import org.eclipse.core.runtime.IAdapterFactory;
import org.eclipse.debug.internal.ui.model.elements.DebugElementLabelProvider; import org.eclipse.debug.internal.ui.model.elements.BreakpointLabelProvider;
import org.eclipse.debug.internal.ui.viewers.model.provisional.IElementLabelProvider; import org.eclipse.debug.internal.ui.viewers.model.provisional.IElementLabelProvider;
import org.eclipse.debug.internal.ui.viewers.model.provisional.IPresentationContext;
import org.eclipse.jface.viewers.ILabelProvider; import org.eclipse.jface.viewers.ILabelProvider;
import org.eclipse.jface.viewers.LabelProvider; import org.eclipse.jface.viewers.LabelProvider;
import org.eclipse.jface.viewers.TreePath;
import org.eclipse.swt.graphics.Image; import org.eclipse.swt.graphics.Image;
import com.ibm.icu.text.MessageFormat;
/** /**
* Factory for event breakpoint label provider * Factory for event breakpoint label provider
*/ */
@ -46,7 +44,7 @@ public class CEventBreakpointsLabelProviderFactory implements IAdapterFactory {
if (bscs.length == 0) if (bscs.length == 0)
return null; return null;
StringBuffer buffer = new StringBuffer(""); StringBuffer buffer = new StringBuffer();
for (ICBreakpointsUIContribution con : bscs) { for (ICBreakpointsUIContribution con : bscs) {
Object attValue = breakpoint.getMarker().getAttribute(con.getId()); Object attValue = breakpoint.getMarker().getAttribute(con.getId());
@ -56,14 +54,14 @@ public class CEventBreakpointsLabelProviderFactory implements IAdapterFactory {
continue; continue;
} }
if (attValue != null && attValue.toString().length() > 0) { if (attValue != null && attValue.toString().length() > 0) {
buffer.append(" ["); buffer.append(" ["); //$NON-NLS-1$
buffer.append(con.getLabel()); buffer.append(con.getLabel());
buffer.append(": "); buffer.append(": "); //$NON-NLS-1$
if (attValue instanceof String) if (attValue instanceof String)
buffer.append(con.getLabelForValue((String) attValue)); buffer.append(con.getLabelForValue((String) attValue));
else else
buffer.append(attValue); buffer.append(attValue);
buffer.append("]"); buffer.append(']');
} }
} }
appendIgnoreCount(breakpoint, buffer); appendIgnoreCount(breakpoint, buffer);
@ -113,24 +111,12 @@ public class CEventBreakpointsLabelProviderFactory implements IAdapterFactory {
} }
} }
private static IElementLabelProvider fElementLabelProvider = new DebugElementLabelProvider() { private static IElementLabelProvider fElementLabelProvider = new BreakpointLabelProvider();
protected String getLabel(TreePath elementPath, IPresentationContext context, String columnId) /* (non-Javadoc)
throws CoreException { * @see org.eclipse.core.runtime.IAdapterFactory#getAdapter(java.lang.Object, java.lang.Class)
ICEventBreakpoint cp = (ICEventBreakpoint) elementPath.getLastSegment();
return fLabelProvider.getText(cp);
}
};
/*
* (non-Javadoc)
*
* @see org.eclipse.core.runtime.IAdapterFactory#getAdapter(java.lang.Object,
* java.lang.Class)
*/ */
@SuppressWarnings("rawtypes")
public Object getAdapter(Object adaptableObject, Class adapterType) { public Object getAdapter(Object adaptableObject, Class adapterType) {
if (adapterType.equals(IElementLabelProvider.class)) { if (adapterType.equals(IElementLabelProvider.class)) {
if (adaptableObject instanceof ICEventBreakpoint) { if (adaptableObject instanceof ICEventBreakpoint) {
@ -145,11 +131,10 @@ public class CEventBreakpointsLabelProviderFactory implements IAdapterFactory {
return null; return null;
} }
/* /* (non-Javadoc)
* (non-Javadoc)
*
* @see org.eclipse.core.runtime.IAdapterFactory#getAdapterList() * @see org.eclipse.core.runtime.IAdapterFactory#getAdapterList()
*/ */
@SuppressWarnings("rawtypes")
public Class[] getAdapterList() { public Class[] getAdapterList() {
return new Class[] { IElementLabelProvider.class, ILabelProvider.class }; return new Class[] { IElementLabelProvider.class, ILabelProvider.class };
} }