[cdt-patch] shared libs

["Alain Magloire" <alain@xxxxxxx>]

===================================================================
RCS file: /home/tools/org.eclipse.cdt.debug.mi.core/ChangeLog,v
retrieving revision 1.68
diff -u -r1.68 ChangeLog
--- ChangeLog	17 Jan 2003 19:56:23 -0000	1.68
+++ ChangeLog	17 Jan 2003 21:27:47 -0000
@@ -1,6 +1,13 @@
 2003-01-17 Alain Magloire
 
 	* src/.../mi/core/cdi/SharedLibraryManager.java (loadSymbols):
+	New method takes and array of ICDISharedLibrary.
+	* src/.../mi/core/cdi/SharedLibrary.java (loadSymbols):
+	Call the share manager to load.
+
+2003-01-17 Alain Magloire
+
+	* src/.../mi/core/cdi/SharedLibraryManager.java (loadSymbols):
 	Call "shared libraryname".
 
 2003-01-17 Alain Magloire
Index: src/org/eclipse/cdt/debug/mi/core/cdi/SharedLibraryManager.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/SharedLibraryManager.java,v
retrieving revision 1.3
diff -u -r1.3 SharedLibraryManager.java
--- src/org/eclipse/cdt/debug/mi/core/cdi/SharedLibraryManager.java	17 Jan 2003 19:56:36 -0000	1.3
+++ src/org/eclipse/cdt/debug/mi/core/cdi/SharedLibraryManager.java	17 Jan 2003 21:27:47 -0000
@@ -40,25 +40,6 @@
 		delList = new ArrayList(1);
 	}
 
-	public void loadSymbols(ICDISharedLibrary slib) throws CDIException {
-		// FIXME: use the command factory for this so we can overload.
-		if (slib.areSymbolsLoaded()) {
-			return;
-		}
-		CSession s = getCSession();
-		CLICommand cmd = new CLICommand("shared " + slib.getFileName());
-		try {
-			s.getMISession().postCommand(cmd);
-			MIInfo info = cmd.getMIInfo();
-			if (info == null) {
-				throw new CDIException("No answer");
-			}
-		} catch (MIException e) {
-			throw new MI2CDIException(e);
-		}
-		update();
-	}
-
 	public void update() throws CDIException {
 		MIShared[] miLibs = new MIShared[0];
 		CSession s = getCSession();
@@ -149,6 +130,48 @@
 	public ICDISharedLibrary[] getSharedLibraries() throws CDIException {
 		update();
 		return (ICDISharedLibrary[])sharedList.toArray(new ICDISharedLibrary[0]);
+	}
+
+	/**
+	 * @see org.eclipse.cdt.debug.core.cdi.ICDISharedLibraryManager#loadSymbols()
+	 */
+	public void loadSymbols() throws CDIException {
+		CSession s = getCSession();
+		CLICommand cmd = new CLICommand("shared");
+		try {
+			s.getMISession().postCommand(cmd);
+			MIInfo info = cmd.getMIInfo();
+			if (info == null) {
+				throw new CDIException("No answer");
+			}
+		} catch (MIException e) {
+			throw new MI2CDIException(e);
+		}
+		update();
+	}
+
+	/**
+	 * @see org.eclipse.cdt.debug.core.cdi.ICDISharedLibraryManager#loadSymbols(ICDISharedLibrary[])
+	 */
+	public void loadSymbols(ICDISharedLibrary[] libs) throws CDIException {
+		// FIXME: use the command factory for this so we can overload.
+		for (int i = 0; i < libs.length; i++) {
+			if (libs[i].areSymbolsLoaded()) {
+				continue;
+			}
+			CSession s = getCSession();
+			CLICommand cmd = new CLICommand("shared " + libs[i].getFileName());
+			try {
+				s.getMISession().postCommand(cmd);
+				MIInfo info = cmd.getMIInfo();
+				if (info == null) {
+					throw new CDIException("No answer");
+				}
+			} catch (MIException e) {
+				throw new MI2CDIException(e);
+			}
+		}
+		update();
 	}
 
 }
Index: src/org/eclipse/cdt/debug/mi/core/cdi/model/SharedLibrary.java
===================================================================
RCS file: /home/tools/org.eclipse.cdt.debug.mi.core/src/org/eclipse/cdt/debug/mi/core/cdi/model/SharedLibrary.java,v
retrieving revision 1.2
diff -u -r1.2 SharedLibrary.java
--- src/org/eclipse/cdt/debug/mi/core/cdi/model/SharedLibrary.java	17 Jan 2003 16:29:01 -0000	1.2
+++ src/org/eclipse/cdt/debug/mi/core/cdi/model/SharedLibrary.java	17 Jan 2003 21:27:47 -0000
@@ -61,7 +61,7 @@
 	 * @see org.eclipse.cdt.debug.core.cdi.model.ICDISharedLibrary#loadSymbols()
 	 */
 	public void loadSymbols() throws CDIException {
-		mgr.loadSymbols(this);
+		mgr.loadSymbols(new ICDISharedLibrary[] { this });
 	}
 
 }