diff --git a/debug/org.eclipse.cdt.debug.core/ChangeLog b/debug/org.eclipse.cdt.debug.core/ChangeLog index 6bfc0df1064..5f48f93694b 100644 --- a/debug/org.eclipse.cdt.debug.core/ChangeLog +++ b/debug/org.eclipse.cdt.debug.core/ChangeLog @@ -1,3 +1,9 @@ +2005-02-15 Mikhail Khodjaiants + Bug 82264: Enhance the Shared Libraries view. + Support for the symbols loading operations. + * CModule.java + * CoreModelMessages.properties + 2005-02-14 Mikhail Khodjaiants Bug 82264: Enhance the Shared Libraries view. Support for the symbols loading operations. diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CModule.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CModule.java index ed0d3ececd4..a9c023dc56f 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CModule.java +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CModule.java @@ -10,14 +10,13 @@ ***********************************************************************/ package org.eclipse.cdt.debug.internal.core.model; -import java.io.File; import java.math.BigInteger; -import java.text.MessageFormat; import org.eclipse.cdt.core.IAddress; import org.eclipse.cdt.core.IAddressFactory; import org.eclipse.cdt.core.model.CoreModel; import org.eclipse.cdt.core.model.IBinary; import org.eclipse.cdt.core.model.ICElement; +import org.eclipse.cdt.debug.core.cdi.CDIException; import org.eclipse.cdt.debug.core.cdi.model.ICDIObject; import org.eclipse.cdt.debug.core.cdi.model.ICDISharedLibrary; import org.eclipse.cdt.debug.core.model.ICModule; @@ -223,10 +222,16 @@ public class CModule extends CDebugElement implements ICModule { if ( path == null || path.isEmpty() ) { requestFailed( CoreModelMessages.getString( "CModule.2" ), null ); //$NON-NLS-1$ } - File file = new File( path.toOSString() ); - if ( !file.exists() ) { - requestFailed( MessageFormat.format( CoreModelMessages.getString( "CModule.3" ), new String[] { path.toOSString() } ), null ); //$NON-NLS-1$ + String message = CoreModelMessages.getString( "CModule.4" ); //$NON-NLS-1$ + if ( fCDIObject instanceof ICDISharedLibrary ) { + try { + ((ICDISharedLibrary)fCDIObject).loadSymbols(); + return; + } + catch( CDIException e ) { + message = e.getMessage(); + } } - targetRequestFailed( CoreModelMessages.getString( "CModule.4" ), null ); //$NON-NLS-1$ + targetRequestFailed( message, null ); } } diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CoreModelMessages.properties b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CoreModelMessages.properties index 2d7c2159db4..1c3eec6c940 100644 --- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CoreModelMessages.properties +++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CoreModelMessages.properties @@ -30,7 +30,6 @@ CIndexedValue.2=Specified range out of bounds. CModule.0=Unknown CModule.1=Unknown CModule.2=Invalid symbols file. -CModule.3=Symbols file ''{0}'' not found. CModule.4=Not supported CModuleManager.0=Error loading symbols. CModuleManager.1=Error loading symbols.