Attachment 21298 Details for Bug 87586 – patch2 to org.eclipse.debug.ui

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] patch2 to org.eclipse.debug.ui

ui2.txt (text/plain), 3.43 KB, created by Samantha Chan

on 2005-05-17 17:19:26 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Samantha Chan

Created: 2005-05-17 17:19:26 EDT

Size: 3.43 KB

patch

obsolete

>Index: LaunchViewContextListener.java
>===================================================================
>RCS file: /home/eclipse/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/launch/LaunchViewContextListener.java,v
>retrieving revision 1.52
>diff -u -r1.52 LaunchViewContextListener.java
>--- LaunchViewContextListener.java	17 May 2005 20:49:46 -0000	1.52
>+++ LaunchViewContextListener.java	17 May 2005 21:18:27 -0000
>@@ -116,7 +116,7 @@
> 	 * closed.
> 	 * 
> 	 * Key: perspective id
>-	 * Value: ArrayList of view ids open in a perspective
>+	 * Value: HashSet of view ids open in a perspective
> 	 */
> 	private Map openedViewIds= new HashMap();
> 	
>@@ -376,7 +376,7 @@
> 		Iterator iter= map.keySet().iterator();
> 		while (iter.hasNext()) {
> 			String perspId = (String) iter.next();
>-			ArrayList viewIds = (ArrayList)map.get(perspId);
>+			Set viewIds = (Set)map.get(perspId);
> 			views.append("/"); //$NON-NLS-1$
> 			views.append(perspId);
> 			if (viewIds != null && !viewIds.isEmpty())
>@@ -478,7 +478,7 @@
> 					String perspId = data[0];
> 					
> 					String[] viewIds = data[1].split(","); //$NON-NLS-1$
>-					ArrayList list = new ArrayList();
>+					Set list = new HashSet();
> 					for (int j=0; j<viewIds.length; j++)
> 					{
> 						list.add(viewIds[j]);
>@@ -549,18 +549,17 @@
> 		Iterator iterator= viewsToOpen.iterator();
> 		
> 		String id = page.getPerspective().getId();
>-		ArrayList views = (ArrayList)openedViewIds.get(id);
>+		Set views = (Set)openedViewIds.get(id);
> 		if (views == null)
> 		{
>-			views = new ArrayList();
>+			views = new HashSet();
> 		}
> 		
> 		while (iterator.hasNext()) {
> 			String viewId = (String) iterator.next();
> 			try {
> 				IViewPart view = page.showView(viewId, null, IWorkbenchPage.VIEW_CREATE);
>-				if (!views.contains(viewId))
>-					views.add(viewId);
>+				views.add(viewId);
> 
> 				viewsToShow.add(view);
> 			} catch (PartInitException e) {
>@@ -672,7 +671,7 @@
> 		Iterator iter= viewsToClose.iterator();
> 		
> 		String perspId = page.getPerspective().getId();
>-		ArrayList viewIds = (ArrayList)openedViewIds.get(perspId);
>+		Set viewIds = (Set)openedViewIds.get(perspId);
> 		
> 		while (iter.hasNext()) {
> 			String viewId= (String) iter.next();
>@@ -683,10 +682,13 @@
> 				{
> 					// remove opened view from perspective
> 					viewIds.remove(viewId);
>-					openedViewIds.put(perspId, viewIds);
> 				}
> 			}
> 		}
>+		
>+		if (viewIds != null)
>+			openedViewIds.put(perspId, viewIds);
>+		
> 		saveOpenedViews();
> 		
> 		// reset if this setting is previously changed
>@@ -707,7 +709,7 @@
> 		Set viewIdsToKeepOpen= getViewIdsForEnabledContexts();
> 		Iterator contexts = contextIds.iterator();
> 		String currentPerspId = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().getPerspective().getId();
>-		ArrayList viewIds = (ArrayList)openedViewIds.get(currentPerspId);
>+		Set viewIds = (Set)openedViewIds.get(currentPerspId);
> 		while (contexts.hasNext()) {
> 			String contextId = (String) contexts.next();
> 			List list = getConfigurationElements(contextId);
>@@ -1094,12 +1096,14 @@
> 		{
> 			String perspId = (String)keys.next();
> 			
>-			ArrayList views = (ArrayList)openedViewIds.get(perspId);
>+			Set views = (Set)openedViewIds.get(perspId);
> 			if (views != null && views.contains(viewId))
> 			{
> 				views.remove(viewId);
>-				openedViewIds.put(perspId, views);
> 			}
>+			
>+			if (views != null)
>+				openedViewIds.put(perspId, views);
> 		}
> 	}
>

Actions: View | Diff

Attachments on bug 87586: 21279 | 21298