Attachment 9339 Details for Bug 56431 – updated preview patch, fixes all known bugs

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

[patch] updated preview patch, fixes all known bugs

updated-preview-patch.txt (text/plain), 10.99 KB, created by Matthew Hatem

on 2004-04-08 14:55:22 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Matthew Hatem

Created: 2004-04-08 14:55:22 EDT

Size: 10.99 KB

patch

obsolete

>Index: Eclipse UI/org/eclipse/ui/internal/PartSashContainer.java
>===================================================================
>RCS file: /home/eclipse/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/PartSashContainer.java,v
>retrieving revision 1.15
>diff -u -r1.15 PartSashContainer.java
>--- Eclipse UI/org/eclipse/ui/internal/PartSashContainer.java	30 Mar 2004 02:52:05 -0000	1.15
>+++ Eclipse UI/org/eclipse/ui/internal/PartSashContainer.java	8 Apr 2004 18:43:24 -0000
>@@ -223,6 +223,16 @@
> 
> }
> /**
>+ * Adds the child using ratio and position attributes
>+ * from the specified placeholder without replacing
>+ * the placeholder
>+ */
>+void addChildForPlaceholder(LayoutPart part, LayoutPart placeholder) {
>+	add(part, SWT.RIGHT, 0.5f, placeholder);
>+	root.updateSashes(parent);
>+	resizeSashes(parent.getClientArea());
>+}
>+/**
>  * See ILayoutContainer#allowBorder
>  */
> public boolean allowsBorder() {
>Index: Eclipse UI/org/eclipse/ui/internal/PerspectivePresentation.java
>===================================================================
>RCS file: /home/eclipse/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/PerspectivePresentation.java,v
>retrieving revision 1.28
>diff -u -r1.28 PerspectivePresentation.java
>--- Eclipse UI/org/eclipse/ui/internal/PerspectivePresentation.java	25 Mar 2004 21:41:29 -0000	1.28
>+++ Eclipse UI/org/eclipse/ui/internal/PerspectivePresentation.java	8 Apr 2004 18:43:25 -0000
>@@ -14,6 +14,7 @@
> import java.util.ArrayList;
> import java.util.Enumeration;
> import java.util.List;
>+import java.util.StringTokenizer;
> import java.util.Vector;
> 
> import org.eclipse.core.runtime.IStatus;
>@@ -31,6 +32,7 @@
> import org.eclipse.ui.internal.dnd.DragUtil;
> import org.eclipse.ui.internal.dnd.IDragOverListener;
> import org.eclipse.ui.internal.dnd.IDropTarget;
>+import org.eclipse.ui.internal.misc.StringMatcher;
> 
> /**
>  * A perspective presentation is a collection of parts with a layout. Each part
>@@ -51,13 +53,15 @@
> 	private ArrayList detachedWindowList = new ArrayList(1);
> 	private ArrayList detachedPlaceHolderList = new ArrayList(1);
> 	private boolean detachable = false;
>-
>+	
> 	private boolean active = false;
> 	// key is the LayoutPart object, value is the PartDragDrop object
> 	//private IPartDropListener partDropListener;
> 
> 	private static final int MIN_DETACH_WIDTH = 150;
> 	private static final int MIN_DETACH_HEIGHT = 250;
>+	private static final String WILD_CARD= new String(new char[] {'*'});
>+	
> 	private IDragOverListener dragTarget = new IDragOverListener() {
> 
> 		public IDropTarget drag(Control currentControl, Object draggedObject, Point position, final Rectangle dragRectangle) {
>@@ -171,13 +175,31 @@
> 		// If part added / removed always zoom out.
> 		if (isZoomed())
> 			zoomOut();
>-
>+		
> 		// Look for a placeholder.
> 		PartPlaceholder placeholder = null;
>-		LayoutPart testPart = findPart(part.getID());
>+		LayoutPart testPart = null;
>+		String primaryId = part.getID();
>+		String secondaryId = null;
>+		
>+		// @issue - do we need this check
>+		if (part instanceof ViewPane) {
>+			ViewPane pane = (ViewPane) part;
>+			IViewReference ref = (IViewReference)pane.getPartReference();
>+			secondaryId = ref.getSecondaryId();
>+			if (secondaryId != null)
>+				testPart = findPart(ref.getId(), secondaryId);
>+			else
>+				testPart = findPart(part.getID());
>+		}
>+		else {
>+			testPart = findPart(part.getID());
>+		}
>+		
>+		// validate the testPart
> 		if (testPart != null && testPart instanceof PartPlaceholder)
> 			placeholder = (PartPlaceholder) testPart;
>-
>+		
> 		// If there is no placeholder do a simple add. Otherwise, replace the
> 		// placeholder.
> 		if (placeholder == null) {
>@@ -240,8 +262,22 @@
> 						part.reparent(mainLayout.getParent());
> 					}
> 
>-					// replace placeholder with real part
>-					container.replace(placeholder, part);
>+					// see if we should replace the placeholder
>+					// TODO: need to restore placeholders with secondaryIDs
>+					if (placeholder != null) {
>+						System.out.println("found placeholder - "+placeholder.getID());
>+						if (placeholder.getID().indexOf(WILD_CARD)!=-1) {
>+							if (container instanceof PartSashContainer)
>+								((PartSashContainer)container).addChildForPlaceholder(part, placeholder);
>+							else
>+								container.add(part);
>+						}
>+						else
>+							container.replace(placeholder, part);
>+					}
>+					else 
>+						container.add(part);
>+					
> 				}
> 			}
> 		}
>@@ -710,6 +746,7 @@
> //	}
> 	/**
> 	 * Find the first part with a given ID in the presentation.
>+	 * Wild cards now supported.
> 	 */
> 	private LayoutPart findPart(String id) {
> 		// Check main window.
>@@ -731,26 +768,147 @@
> 			if (part != null)
> 				return part;
> 		}
>+		
>+		// check for a wild card placeholder
>+		part = findPart(WILD_CARD, mainLayout.getChildren());
>+		if (part != null)
>+			return part;
> 
> 		// Not found.
> 		return null;
> 	}
> 	/**
>+	 * Find the first part that matches the specified 
>+	 * primary and secondary id pair.  Wild cards
>+	 * are supported.
>+	 */
>+	private LayoutPart findPart(String primaryId, String secondaryId) {
>+		// check main window.
>+		LayoutPart part = findPart(primaryId, secondaryId, mainLayout.getChildren());
>+		if (part != null)
>+			return part;
>+
>+		// check each detached windows.
>+		for (int i = 0, length = detachedWindowList.size(); i < length; i++) {
>+			DetachedWindow window = (DetachedWindow) detachedWindowList.get(i);
>+			part = findPart(primaryId, secondaryId, window.getChildren());
>+			if (part != null)
>+				return part;
>+		}
>+		for (int i = 0; i < detachedPlaceHolderList.size(); i++) {
>+			DetachedPlaceHolder holder =
>+				(DetachedPlaceHolder) detachedPlaceHolderList.get(i);
>+			part = findPart(primaryId, secondaryId, holder.getChildren());
>+			if (part != null)
>+				return part;
>+		}
>+		
>+		// check for a wild card placeholder
>+		part = findPart(WILD_CARD, mainLayout.getChildren());
>+		if (part != null)
>+			return part;
>+		
>+		// Not found.
>+		return null;
>+	}
>+	private class MatchingPart {
>+		String pid;
>+		String sid;
>+		LayoutPart part;
>+		MatchingPart (String pid, String sid, LayoutPart part) {
>+			this.pid = pid; this.sid = sid; this.part = part;
>+		}
>+	}
>+	/**
> 	 * Find the first part with a given ID in the presentation.
> 	 */
> 	private LayoutPart findPart(String id, LayoutPart[] parts) {
>+		MatchingPart currentMatchingPart = null;
> 		for (int i = 0, length = parts.length; i < length; i++) {
> 			LayoutPart part = parts[i];
> 			if (part.getID().equals(id)) {
> 				return part;
>-			} else if (part instanceof EditorArea) {
>+			} 
>+			else if (part.getID().indexOf(WILD_CARD) != -1) {
>+				StringMatcher sm = new StringMatcher(part.getID(), true, false);
>+				MatchingPart matchingPart;
>+				if (sm.match(id)) {
>+					matchingPart = new MatchingPart(part.getID(), null, part);
>+					if (currentMatchingPart != null && 
>+							matchingPart.pid.length() > currentMatchingPart.pid.length())
>+						currentMatchingPart = matchingPart;	
>+					else
>+						currentMatchingPart = matchingPart;
>+				}
>+			}
>+			else if (part instanceof EditorArea) {
> 				// Skip.
> 			} else if (part instanceof ILayoutContainer) {
> 				part = findPart(id, ((ILayoutContainer) part).getChildren());
> 				if (part != null)
> 					return part;
>+			} 
>+		}
>+		if (currentMatchingPart != null)
>+			return currentMatchingPart.part;
>+		return null;
>+	}
>+	/**
>+	 * Find the first part that matches the specified 
>+	 * primary and secondary id pair.  Wild cards
>+	 * are supported.
>+	 */
>+	private LayoutPart findPart(String primaryId, String secondaryId, LayoutPart[] parts) {
>+		MatchingPart currentMatchingPart = null;
>+		for (int i = 0, length = parts.length; i < length; i++) {
>+			LayoutPart part = parts[i];
>+			// check containers first
>+			if (part instanceof ILayoutContainer) {
>+				part = findPart(primaryId, secondaryId, ((ILayoutContainer) part).getChildren());
>+				if (part != null)
>+					return part;
>+			} 
>+			// check placeholders
>+			else if ((parts[i] instanceof PartPlaceholder)) {
>+				String id = part.getID();
>+				if (id.indexOf(":") == -1) continue;
>+				
>+				StringTokenizer st = new StringTokenizer(part.getID(), ":");
>+				String phPrimaryId = st.nextToken();
>+				String phSecondaryId = st.nextToken();
>+				// perfect matching pair
>+				if (phPrimaryId.equals(primaryId) && 
>+					phSecondaryId.equals(secondaryId)) {
>+					return part;
>+				}				
>+				// check for partial matching pair
>+				MatchingPart matchingPart;
>+				StringMatcher sm = new StringMatcher(phPrimaryId, true, false);
>+				if (sm.match(primaryId)) {
>+					sm = new StringMatcher(phSecondaryId, true, false);
>+					if (sm.match(secondaryId)) {
>+						matchingPart = new MatchingPart(phPrimaryId, phSecondaryId, part);						
>+						// check for most specific
>+						if (currentMatchingPart != null) {
>+							if (matchingPart.pid.length() > currentMatchingPart.pid.length())
>+								currentMatchingPart = matchingPart;							
>+							else if (matchingPart.pid.length() == currentMatchingPart.pid.length()) {
>+								if (matchingPart.sid.length() > currentMatchingPart.sid.length())
>+									currentMatchingPart = matchingPart;	
>+							}								
>+						}
>+						else
>+							currentMatchingPart = matchingPart;
>+					}
>+				}
>+									
>+			} 
>+			else if (part instanceof EditorArea) {
>+				// Skip.
> 			}
> 		}
>+		if (currentMatchingPart != null)
>+			return currentMatchingPart.part;
> 		return null;
> 	}
> 	/**
>@@ -879,7 +1037,15 @@
> 		// Replace part with a placeholder
> 		ILayoutContainer container = part.getContainer();
> 		if (container != null) {
>-			container.replace(part, new PartPlaceholder(part.getID()));
>+			String placeHolderId = part.getID();
>+			// check for a secondary id
>+			if (part instanceof ViewPane) {
>+				ViewPane pane = (ViewPane) part;
>+				IViewReference ref = (IViewReference)pane.getPartReference();
>+				if (ref.getSecondaryId() != null)
>+					placeHolderId = ref.getId()+":"+ref.getSecondaryId();
>+			}
>+			container.replace(part, new PartPlaceholder(placeHolderId));
> 
> 			// If the parent is root we're done. Do not try to replace
> 			// it with placeholder.
>Index: Eclipse UI/org/eclipse/ui/internal/progress/ProgressManager.java
>===================================================================
>RCS file: /home/eclipse/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/progress/ProgressManager.java,v
>retrieving revision 1.45
>diff -u -r1.45 ProgressManager.java
>--- Eclipse UI/org/eclipse/ui/internal/progress/ProgressManager.java	2 Apr 2004 21:14:15 -0000	1.45
>+++ Eclipse UI/org/eclipse/ui/internal/progress/ProgressManager.java	8 Apr 2004 18:43:29 -0000
>@@ -392,7 +392,7 @@
>                     next.incrementBusy(event.getJob());
>                 }                
> 
>-                if (event.getJob().isUser()) {
>+                if (!event.getJob().isSystem()) {
>                     boolean inDialog = WorkbenchPlugin
>                             .getDefault()
>                             .getPreferenceStore()

Actions: View | Diff

Attachments on bug 56431: 9271 | 9272 | 9339 | 9340 | 9355 | 9446 | 9713