Attachment 158361 Details for Bug 301123 – patch

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

[patch] patch

redux-sizing.patch (text/plain), 3.55 KB, created by Darin Wright

on 2010-02-05 17:16:58 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Darin Wright

Created: 2010-02-05 17:16:58 EST

Size: 3.55 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.debug.ui
>Index: ui/org/eclipse/debug/internal/ui/views/variables/VariablesView.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.debug.ui/ui/org/eclipse/debug/internal/ui/views/variables/VariablesView.java,v
>retrieving revision 1.185
>diff -u -r1.185 VariablesView.java
>--- ui/org/eclipse/debug/internal/ui/views/variables/VariablesView.java	3 Feb 2010 15:29:52 -0000	1.185
>+++ ui/org/eclipse/debug/internal/ui/views/variables/VariablesView.java	5 Feb 2010 22:12:42 -0000
>@@ -22,10 +22,6 @@
> import java.io.IOException;
> import java.io.InputStreamReader;
> import java.io.OutputStreamWriter;
>-import java.util.HashMap;
>-import java.util.Iterator;
>-import java.util.Map;
>-import java.util.Map.Entry;
> 
> import org.eclipse.core.runtime.IProgressMonitor;
> import org.eclipse.core.runtime.IStatus;
>@@ -267,7 +263,6 @@
> 	 */
> 	private static final int[] DEFAULT_SASH_WEIGHTS = {13, 6};
> 	private int[] fLastSashWeights;
>-	private Map fPaneWeights = new HashMap();
> 	private boolean fToggledDetailOnce;
> 	private String fCurrentDetailPaneOrientation = IDebugPreferenceConstants.VARIABLES_DETAIL_PANE_HIDDEN;
> 	private ToggleDetailPaneAction[] fToggleDetailPaneActions;
>@@ -541,19 +536,6 @@
> 			if (weights != null) {
> 				setLastSashWeights(weights);
> 			}
>-			IMemento[] children = mem.getChildren(DETAIL_PANE_TYPE);
>-			if (children != null && children.length > 0) {
>-				for (int i = 0; i < children.length; i++) {
>-					IMemento child = children[i];
>-					String id = child.getString(IMemento.TAG_ID);
>-					if (id != null) {
>-						weights = getWeights(child);
>-						if (weights != null) {
>-							fPaneWeights.put(id, weights);
>-						}
>-					}
>-				}
>-			}
> 		}
> 		site.getWorkbenchWindow().addPerspectiveListener(this);
>     }
>@@ -618,15 +600,6 @@
> 			memento.putInteger(SASH_VIEW_PART, weights[0]);
> 			memento.putInteger(SASH_DETAILS_PART, weights[1]);
> 		}
>-		Iterator iterator = fPaneWeights.entrySet().iterator();
>-		while (iterator.hasNext()) {
>-			Entry entry = (Entry) iterator.next();
>-			String paneId = (String) entry.getKey();
>-			int[] weights = (int[]) entry.getValue();
>-			IMemento child = memento.createChild(DETAIL_PANE_TYPE, paneId);
>-			child.putInteger(SASH_VIEW_PART, weights[0]);
>-			child.putInteger(SASH_DETAILS_PART, weights[1]);
>-		}
> 		getVariablesViewer().saveState(memento);
> 	}
> 
>@@ -991,7 +964,7 @@
> 	public void refreshDetailPaneContents() {
> 		String currentPaneID = getCurrentPaneID();
> 		if (currentPaneID != null) {
>-			fPaneWeights.put(currentPaneID, fSashForm.getWeights());
>+			fLastSashWeights = fSashForm.getWeights();
> 		}
> 		fDetailPane.display(getCurrentSelection());
> 	}
>@@ -1009,9 +982,8 @@
> 		}
> 		fDetailPane.getCurrentControl().addListener(SWT.Activate, fDetailPaneActivatedListener);
> 		if (newPaneID != null) {
>-			int[] weights = (int[])fPaneWeights.get(newPaneID);
>-			if (weights != null) {
>-				fSashForm.setWeights(weights);
>+			if (fLastSashWeights != null) {
>+				fSashForm.setWeights(fLastSashWeights);
> 			}
> 		}
> 	}
>@@ -1200,7 +1172,6 @@
> 	public void perspectiveChanged(IWorkbenchPage page, IPerspectiveDescriptor perspective, String changeId) {
> 		if(changeId.equals(IWorkbenchPage.CHANGE_RESET)) {
> 			setLastSashWeights(DEFAULT_SASH_WEIGHTS);
>-			fPaneWeights.clear();
> 			fSashForm.setWeights(DEFAULT_SASH_WEIGHTS);
> 			fDetailPane.display(new StructuredSelection(new Object[]{this})); // bogus selection to force detail pane / sash reset
> 			fSashForm.layout(true);

Actions: View | Diff

Attachments on bug 301123: 158361 | 158518