Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlain Magloire2004-10-29 11:13:35 -0400
committerAlain Magloire2004-10-29 11:13:35 -0400
commita4c551bbd784c9b3f66de0c63dd7a699ea6c6084 (patch)
tree6ae94c8df4cb93850a811900c44e33c269ce31b2
parent35a28e136d38016dc2f2f4071f45c4e423b8fc85 (diff)
downloadorg.eclipse.cdt-a4c551bbd784c9b3f66de0c63dd7a699ea6c6084.tar.gz
org.eclipse.cdt-a4c551bbd784c9b3f66de0c63dd7a699ea6c6084.tar.xz
org.eclipse.cdt-a4c551bbd784c9b3f66de0c63dd7a699ea6c6084.zip
2004-10-29 Alain Magloire
Remove of ICDISharedLibraryManager * cdi/org/eclipse/cdt/debug/core/cdi/ICDISession.java * cdi/org/eclipse/cdt/debug/core/cdi/ICDISharedLibraryManager.java * cdi/org/eclipse/cdt/debug/core/cdi/model/ICDITarget.java * cdi/org/eclipse/cdt/debug/core/cdi/model/ICDISharedLibraryManagement.java
-rw-r--r--debug/org.eclipse.cdt.debug.core/ChangeLog9
-rw-r--r--debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/ICDISession.java7
-rw-r--r--debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/ICDISharedLibraryManager.java63
-rw-r--r--debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/model/ICDISharedLibraryManagement.java29
-rw-r--r--debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/model/ICDITarget.java2
-rw-r--r--debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/CSharedLibraryManager.java42
6 files changed, 58 insertions, 94 deletions
diff --git a/debug/org.eclipse.cdt.debug.core/ChangeLog b/debug/org.eclipse.cdt.debug.core/ChangeLog
index 538648d4121..7104432ce04 100644
--- a/debug/org.eclipse.cdt.debug.core/ChangeLog
+++ b/debug/org.eclipse.cdt.debug.core/ChangeLog
@@ -1,3 +1,12 @@
+2004-10-29 Alain Magloire
+ Remove of ICDISharedLibraryManager
+ * cdi/org/eclipse/cdt/debug/core/cdi/ICDISession.java
+ * cdi/org/eclipse/cdt/debug/core/cdi/ICDISharedLibraryManager.java
+ * cdi/org/eclipse/cdt/debug/core/cdi/model/ICDITarget.java
+ * cdi/org/eclipse/cdt/debug/core/cdi/model/ICDISharedLibraryManagement.java
+
+ * CSharedLibraryManager.java
+
2004-10-28 Alain Magloire
Add getType() method.
* cdi/org/eclipse/cdt/debug/core/cdi/model/ICDIExpression.java
diff --git a/debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/ICDISession.java b/debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/ICDISession.java
index 1eade172a63..7f69ee58685 100644
--- a/debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/ICDISession.java
+++ b/debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/ICDISession.java
@@ -67,13 +67,6 @@ public interface ICDISession {
ICDIEventManager getEventManager();
/**
- * Returns the shared library manager of this debug session.
- *
- * @return the shared library manager
- */
- ICDISharedLibraryManager getSharedLibraryManager();
-
- /**
* Returns the configuration description of this debug session.
*
* @return the configuration description
diff --git a/debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/ICDISharedLibraryManager.java b/debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/ICDISharedLibraryManager.java
deleted file mode 100644
index 9b02e559fc5..00000000000
--- a/debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/ICDISharedLibraryManager.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 QNX Software Systems and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * QNX Software Systems - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.cdt.debug.core.cdi;
-
-import org.eclipse.cdt.debug.core.cdi.model.ICDISharedLibrary;
-
-/**
- *
- * Manages the collection of shared libraries in the debug session.
- * Auto update is on by default.
- *
- * @since: Jan 15, 2003
- */
-public interface ICDISharedLibraryManager extends ICDIManager {
-
- /**
- * Returns the array of loaded shared libraries.
- *
- * @return the array of loaded shared libraries
- * @throws CDIException on failure. Reasons include:
- */
- ICDISharedLibrary[] getSharedLibraries() throws CDIException;
-
- /**
- * Loads symbols for the specified shared libraries.
- *
- * @return the array of loaded shared libraries
- * @throws CDIException on failure. Reasons include:
- */
- void loadSymbols(ICDISharedLibrary[] libs) throws CDIException;
-
- /**
- * Loads symbols of all shared libraries.
- *
- * @return the array of loaded shared libraries
- * @throws CDIException on failure. Reasons include:
- */
- void loadSymbols() throws CDIException;
-
- /**
- * Returns the search paths for shared libraries.
- *
- * @return the array of the search paths
- * @throws CDIException
- */
- String[] getSharedLibraryPaths() throws CDIException;
-
- /**
- * Sets the shared libs paths to libpaths.
- *
- * @param array of search paths
- * @throws CDIException
- */
- void setSharedLibraryPaths(String[] libpaths) throws CDIException;
-}
diff --git a/debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/model/ICDISharedLibraryManagement.java b/debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/model/ICDISharedLibraryManagement.java
new file mode 100644
index 00000000000..7ea43b152f1
--- /dev/null
+++ b/debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/model/ICDISharedLibraryManagement.java
@@ -0,0 +1,29 @@
+/*******************************************************************************
+ * Copyright (c) 2000, 2004 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Common Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/cpl-v10.html
+ *
+ * Contributors:
+ * QNX Software Systems - Initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.cdt.debug.core.cdi.model;
+
+import org.eclipse.cdt.debug.core.cdi.CDIException;
+
+/**
+ * Manages the sharedLibraries in the target.
+ */
+public interface ICDISharedLibraryManagement {
+
+ /**
+ * Returns the array of shared libraries for this target.
+ *
+ * @return ICDISharedLibrary[] array
+ * @throws CDIException on failure.
+ */
+ ICDISharedLibrary[] getSharedLibraries() throws CDIException;
+
+}
diff --git a/debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/model/ICDITarget.java b/debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/model/ICDITarget.java
index 4e69bf460d2..8c84c361661 100644
--- a/debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/model/ICDITarget.java
+++ b/debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/model/ICDITarget.java
@@ -26,7 +26,7 @@ import org.eclipse.cdt.debug.core.cdi.ICDISessionObject;
* @since Jul 8, 2002
*/
public interface ICDITarget extends ICDIThreadGroup, ICDIExpressionManagement,
- ICDISourceManagement, ICDIMemoryBlockManagement, ICDISessionObject {
+ ICDISourceManagement, ICDISharedLibraryManagement, ICDIMemoryBlockManagement, ICDISessionObject {
/**
* Gets the target process.
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/CSharedLibraryManager.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/CSharedLibraryManager.java
index 5b5b3a843c3..9318c5d2a96 100644
--- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/CSharedLibraryManager.java
+++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/CSharedLibraryManager.java
@@ -18,8 +18,8 @@ import org.eclipse.cdt.debug.core.ICDebugConstants;
import org.eclipse.cdt.debug.core.ICSharedLibraryManager;
import org.eclipse.cdt.debug.core.cdi.CDIException;
import org.eclipse.cdt.debug.core.cdi.ICDIManager;
-import org.eclipse.cdt.debug.core.cdi.ICDISharedLibraryManager;
import org.eclipse.cdt.debug.core.cdi.model.ICDISharedLibrary;
+import org.eclipse.cdt.debug.core.cdi.model.ICDITarget;
import org.eclipse.cdt.debug.core.model.ICSharedLibrary;
import org.eclipse.cdt.debug.internal.core.model.CDebugElement;
import org.eclipse.cdt.debug.internal.core.model.CDebugTarget;
@@ -143,10 +143,10 @@ public class CSharedLibraryManager extends CUpdateManager implements ICSharedLib
protected ICDIManager getCDIManager()
{
- if ( getDebugTarget() != null )
- {
- return getDebugTarget().getCDISession().getSharedLibraryManager();
- }
+// if ( getDebugTarget() != null )
+// {
+// return getDebugTarget().getCDISession().getSharedLibraryManager();
+// }
return null;
}
@@ -155,19 +155,14 @@ public class CSharedLibraryManager extends CUpdateManager implements ICSharedLib
*/
public void loadSymbols( ICSharedLibrary[] libraries ) throws DebugException
{
- ICDISharedLibraryManager slm = (ICDISharedLibraryManager)getCDIManager();
- if ( slm != null )
+ ICDITarget target = getDebugTarget().getCDITarget();
+ for (int i = 0; i < libraries.length; ++i)
{
- ArrayList cdiLibs = new ArrayList( libraries.length );
- for ( int i = 0; i < libraries.length; ++i )
+ try
{
- cdiLibs.add( ((CSharedLibrary)libraries[i]).getCDISharedLibrary() );
+ ((CSharedLibrary)libraries[i]).getCDISharedLibrary().loadSymbols();
}
- try
- {
- slm.loadSymbols( (ICDISharedLibrary[])cdiLibs.toArray( new ICDISharedLibrary[cdiLibs.size()] ) );
- }
- catch( CDIException e )
+ catch ( CDIException e )
{
CDebugElement.targetRequestFailed( e.getMessage(), null );
}
@@ -179,18 +174,19 @@ public class CSharedLibraryManager extends CUpdateManager implements ICSharedLib
*/
public void loadSymbolsForAll() throws DebugException
{
- ICDISharedLibraryManager slm = (ICDISharedLibraryManager)getCDIManager();
- if ( slm != null )
+ ICDITarget target = getDebugTarget().getCDITarget();
+ try
{
- try
+ ICDISharedLibrary[] libraries = target.getSharedLibraries();
+ for (int i = 0; i < libraries.length; ++i)
{
- slm.loadSymbols();
- }
- catch( CDIException e )
- {
- CDebugElement.targetRequestFailed( e.getMessage(), null );
+ libraries[i].loadSymbols();
}
}
+ catch ( CDIException e )
+ {
+ CDebugElement.targetRequestFailed( e.getMessage(), null );
+ }
}
private void setBreakpoints()

Back to the top