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

Cleanup.

Browse source
This commit is contained in:
Mikhail Khodjaiants 2004-07-16 22:08:05 +00:00
parent 2295bd9473
commit 99b80a6206
2 changed files with 29 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
debug/org.eclipse.cdt.debug.ui/ChangeLog
View file

@ -1,3 +1,7 @@
2004-07-16 Mikhail Khodjaiants
Cleanup.
* CDTDebugModelPresentation.java
2004-07-15 Mikhail Khodjaiants 2004-07-15 Mikhail Khodjaiants
Fix for bug 70147. TVT3.0: Preferences CDT Editor has non-externalized string. Fix for bug 70147. TVT3.0: Preferences CDT Editor has non-externalized string.
* plugin.properties * plugin.properties

50
debug/org.eclipse.cdt.debug.ui/src/org/eclipse/cdt/debug/internal/ui/CDTDebugModelPresentation.java
View file

@ -22,21 +22,23 @@ import org.eclipse.cdt.debug.core.cdi.ICDISignalReceived;
import org.eclipse.cdt.debug.core.cdi.ICDIWatchpointScope; import org.eclipse.cdt.debug.core.cdi.ICDIWatchpointScope;
import org.eclipse.cdt.debug.core.cdi.ICDIWatchpointTrigger; import org.eclipse.cdt.debug.core.cdi.ICDIWatchpointTrigger;
import org.eclipse.cdt.debug.core.cdi.model.ICDISignal; import org.eclipse.cdt.debug.core.cdi.model.ICDISignal;
import org.eclipse.cdt.debug.core.model.CDebugElementState;
import org.eclipse.cdt.debug.core.model.ICAddressBreakpoint; import org.eclipse.cdt.debug.core.model.ICAddressBreakpoint;
import org.eclipse.cdt.debug.core.model.ICBreakpoint; import org.eclipse.cdt.debug.core.model.ICBreakpoint;
import org.eclipse.cdt.debug.core.model.ICDebugElement;
import org.eclipse.cdt.debug.core.model.ICDebugElementStatus; import org.eclipse.cdt.debug.core.model.ICDebugElementStatus;
import org.eclipse.cdt.debug.core.model.ICDebugTargetType; import org.eclipse.cdt.debug.core.model.ICDebugTarget;
import org.eclipse.cdt.debug.core.model.ICFunctionBreakpoint; import org.eclipse.cdt.debug.core.model.ICFunctionBreakpoint;
import org.eclipse.cdt.debug.core.model.ICGlobalVariable; import org.eclipse.cdt.debug.core.model.ICGlobalVariable;
import org.eclipse.cdt.debug.core.model.ICLineBreakpoint; import org.eclipse.cdt.debug.core.model.ICLineBreakpoint;
import org.eclipse.cdt.debug.core.model.ICSharedLibrary; import org.eclipse.cdt.debug.core.model.ICSharedLibrary;
import org.eclipse.cdt.debug.core.model.ICStackFrame; import org.eclipse.cdt.debug.core.model.ICStackFrame;
import org.eclipse.cdt.debug.core.model.ICThread;
import org.eclipse.cdt.debug.core.model.ICType; import org.eclipse.cdt.debug.core.model.ICType;
import org.eclipse.cdt.debug.core.model.ICValue; import org.eclipse.cdt.debug.core.model.ICValue;
import org.eclipse.cdt.debug.core.model.ICVariable; import org.eclipse.cdt.debug.core.model.ICVariable;
import org.eclipse.cdt.debug.core.model.ICWatchpoint; import org.eclipse.cdt.debug.core.model.ICWatchpoint;
import org.eclipse.cdt.debug.core.model.IDummyStackFrame; import org.eclipse.cdt.debug.core.model.IDummyStackFrame;
import org.eclipse.cdt.debug.core.model.IState;
import org.eclipse.cdt.debug.internal.ui.editors.CDebugEditor; import org.eclipse.cdt.debug.internal.ui.editors.CDebugEditor;
import org.eclipse.cdt.debug.internal.ui.editors.EditorInputDelegate; import org.eclipse.cdt.debug.internal.ui.editors.EditorInputDelegate;
import org.eclipse.cdt.debug.internal.ui.editors.FileNotFoundElement; import org.eclipse.cdt.debug.internal.ui.editors.FileNotFoundElement;
@ -216,25 +218,22 @@ public class CDTDebugModelPresentation extends LabelProvider implements IDebugMo
} }
private Image getBaseImage( Object element ) { private Image getBaseImage( Object element ) {
if ( element instanceof IDebugTarget ) { if ( element instanceof ICDebugTarget ) {
ICDebugTargetType targetType = (ICDebugTargetType)((IDebugTarget)element).getAdapter( ICDebugTargetType.class ); ICDebugTarget target = (ICDebugTarget)element;
int type = (targetType != null) ? targetType.getTargetType() : ICDebugTargetType.TARGET_TYPE_UNKNOWN; if ( target.isPostMortem() ) {
if ( type == ICDebugTargetType.TARGET_TYPE_LOCAL_CORE_DUMP ) {
return fDebugImageRegistry.get( DebugUITools.getImageDescriptor( IDebugUIConstants.IMG_OBJS_DEBUG_TARGET_TERMINATED ) ); return fDebugImageRegistry.get( DebugUITools.getImageDescriptor( IDebugUIConstants.IMG_OBJS_DEBUG_TARGET_TERMINATED ) );
} }
IDebugTarget target = (IDebugTarget)element;
if ( target.isTerminated() || target.isDisconnected() ) { if ( target.isTerminated() || target.isDisconnected() ) {
return fDebugImageRegistry.get( DebugUITools.getImageDescriptor( IDebugUIConstants.IMG_OBJS_DEBUG_TARGET_TERMINATED ) ); return fDebugImageRegistry.get( DebugUITools.getImageDescriptor( IDebugUIConstants.IMG_OBJS_DEBUG_TARGET_TERMINATED ) );
} }
return fDebugImageRegistry.get( DebugUITools.getImageDescriptor( IDebugUIConstants.IMG_OBJS_DEBUG_TARGET ) ); return fDebugImageRegistry.get( DebugUITools.getImageDescriptor( IDebugUIConstants.IMG_OBJS_DEBUG_TARGET ) );
} }
if ( element instanceof IThread ) { if ( element instanceof ICThread ) {
ICDebugTargetType targetType = (ICDebugTargetType)((IThread)element).getDebugTarget().getAdapter( ICDebugTargetType.class ); ICThread thread = (ICThread)element;
int type = (targetType != null) ? targetType.getTargetType() : ICDebugTargetType.TARGET_TYPE_UNKNOWN; ICDebugTarget target = (ICDebugTarget)thread.getDebugTarget();
if ( type == ICDebugTargetType.TARGET_TYPE_LOCAL_CORE_DUMP ) { if ( target.isPostMortem() ) {
return fDebugImageRegistry.get( DebugUITools.getImageDescriptor( IDebugUIConstants.IMG_OBJS_THREAD_TERMINATED ) ); return fDebugImageRegistry.get( DebugUITools.getImageDescriptor( IDebugUIConstants.IMG_OBJS_THREAD_TERMINATED ) );
} }
IThread thread = (IThread)element;
if ( thread.isSuspended() ) { if ( thread.isSuspended() ) {
return fDebugImageRegistry.get( DebugUITools.getImageDescriptor( IDebugUIConstants.IMG_OBJS_THREAD_SUSPENDED ) ); return fDebugImageRegistry.get( DebugUITools.getImageDescriptor( IDebugUIConstants.IMG_OBJS_THREAD_SUSPENDED ) );
} }
@ -364,11 +363,12 @@ public class CDTDebugModelPresentation extends LabelProvider implements IDebugMo
} }
protected String getTargetText( IDebugTarget target, boolean qualified ) throws DebugException { protected String getTargetText( IDebugTarget target, boolean qualified ) throws DebugException {
if ( target instanceof IState ) { ICDebugTarget t = (ICDebugTarget)target.getAdapter( ICDebugTarget.class );
IState state = (IState)target; if ( t != null ) {
switch( state.getCurrentStateId() ) { if ( !t.isPostMortem() ) {
case IState.EXITED: { CDebugElementState state = t.getState();
Object info = state.getCurrentStateInfo(); if ( state.equals( CDebugElementState.EXITED ) ) {
Object info = t.getCurrentStateInfo();
String label = CDebugUIMessages.getString( "CDTDebugModelPresentation.3" ); //$NON-NLS-1$ String label = CDebugUIMessages.getString( "CDTDebugModelPresentation.3" ); //$NON-NLS-1$
String reason = ""; //$NON-NLS-1$ String reason = ""; //$NON-NLS-1$
if ( info != null && info instanceof ICDISignalExitInfo ) { if ( info != null && info instanceof ICDISignalExitInfo ) {
@ -380,17 +380,17 @@ public class CDTDebugModelPresentation extends LabelProvider implements IDebugMo
} }
return MessageFormat.format( label, new String[] { target.getName(), reason } ); return MessageFormat.format( label, new String[] { target.getName(), reason } );
} }
case IState.SUSPENDED: else if ( state.equals( CDebugElementState.SUSPENDED ) ) {
return MessageFormat.format( CDebugUIMessages.getString( "CDTDebugModelPresentation.7" ), new String[] { target.getName() } ); //$NON-NLS-1$ return MessageFormat.format( CDebugUIMessages.getString( "CDTDebugModelPresentation.7" ), new String[] { target.getName() } ); //$NON-NLS-1$
}
} }
} }
return target.getName(); return target.getName();
} }
protected String getThreadText( IThread thread, boolean qualified ) throws DebugException { protected String getThreadText( IThread thread, boolean qualified ) throws DebugException {
ICDebugTargetType targetType = (ICDebugTargetType)thread.getDebugTarget().getAdapter( ICDebugTargetType.class ); ICDebugTarget target = (ICDebugTarget)thread.getDebugTarget().getAdapter( ICDebugTarget.class );
int type = (targetType != null) ? targetType.getTargetType() : ICDebugTargetType.TARGET_TYPE_UNKNOWN; if ( target.isPostMortem() ) {
if ( type == ICDebugTargetType.TARGET_TYPE_LOCAL_CORE_DUMP ) {
return getFormattedString( CDebugUIMessages.getString( "CDTDebugModelPresentation.8" ), thread.getName() ); //$NON-NLS-1$ return getFormattedString( CDebugUIMessages.getString( "CDTDebugModelPresentation.8" ), thread.getName() ); //$NON-NLS-1$
} }
if ( thread.isTerminated() ) { if ( thread.isTerminated() ) {
@ -404,9 +404,9 @@ public class CDTDebugModelPresentation extends LabelProvider implements IDebugMo
} }
if ( thread.isSuspended() ) { if ( thread.isSuspended() ) {
String reason = ""; //$NON-NLS-1$ String reason = ""; //$NON-NLS-1$
IState state = (IState)thread.getAdapter( IState.class ); ICDebugElement element = (ICDebugElement)thread.getAdapter( ICDebugElement.class );
if ( state != null ) { if ( element != null ) {
Object info = state.getCurrentStateInfo(); Object info = element.getCurrentStateInfo();
if ( info != null && info instanceof ICDISignalReceived ) { if ( info != null && info instanceof ICDISignalReceived ) {
ICDISignal signal = ((ICDISignalReceived)info).getSignal(); ICDISignal signal = ((ICDISignalReceived)info).getSignal();
reason = MessageFormat.format( CDebugUIMessages.getString( "CDTDebugModelPresentation.13" ), new String[]{ signal.getName(), signal.getDescription() } ); //$NON-NLS-1$ reason = MessageFormat.format( CDebugUIMessages.getString( "CDTDebugModelPresentation.13" ), new String[]{ signal.getName(), signal.getDescription() } ); //$NON-NLS-1$