Attachment 196787 Details for Bug 338261 – Image update patch v1

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

[patch] Image update patch v1

bug338261-patch-v1.txt (text/plain), 6.16 KB, created by Remy Suen

on 2011-05-27 12:54:43 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Remy Suen

Created: 2011-05-27 12:54:43 EDT

Size: 6.16 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.ui.workbench
>Index: Eclipse UI/org/eclipse/ui/internal/e4/compatibility/CompatibilityEditor.java
>===================================================================
>RCS file: /cvsroot/eclipse/e4/org.eclipse.e4.compatibility/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/e4/compatibility/CompatibilityEditor.java,v
>retrieving revision 1.30
>diff -u -r1.30 CompatibilityEditor.java
>--- Eclipse UI/org/eclipse/ui/internal/e4/compatibility/CompatibilityEditor.java	24 Nov 2010 15:13:31 -0000	1.30
>+++ Eclipse UI/org/eclipse/ui/internal/e4/compatibility/CompatibilityEditor.java	27 May 2011 16:53:31 -0000
>@@ -81,6 +81,11 @@
> 	}
> 
> 	@Override
>+	void updateImages(MPart part) {
>+		updateTabImages(part);
>+	}
>+
>+	@Override
> 	void disposeSite() {
> 		IEditorSite site = (IEditorSite) getReference().getSite();
> 		if (site != null) {
>Index: Eclipse UI/org/eclipse/ui/internal/e4/compatibility/CompatibilityPart.java
>===================================================================
>RCS file: /cvsroot/eclipse/e4/org.eclipse.e4.compatibility/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/e4/compatibility/CompatibilityPart.java,v
>retrieving revision 1.65
>diff -u -r1.65 CompatibilityPart.java
>--- Eclipse UI/org/eclipse/ui/internal/e4/compatibility/CompatibilityPart.java	25 May 2011 14:29:45 -0000	1.65
>+++ Eclipse UI/org/eclipse/ui/internal/e4/compatibility/CompatibilityPart.java	27 May 2011 16:53:31 -0000
>@@ -11,7 +11,6 @@
> 
> package org.eclipse.ui.internal.e4.compatibility;
> 
>-import java.util.List;
> import javax.annotation.PostConstruct;
> import javax.annotation.PreDestroy;
> import javax.inject.Inject;
>@@ -25,14 +24,11 @@
> import org.eclipse.e4.ui.internal.workbench.swt.AbstractPartRenderer;
> import org.eclipse.e4.ui.model.application.ui.MDirtyable;
> import org.eclipse.e4.ui.model.application.ui.MUIElement;
>-import org.eclipse.e4.ui.model.application.ui.advanced.MPlaceholder;
> import org.eclipse.e4.ui.model.application.ui.basic.MPart;
> import org.eclipse.e4.ui.model.application.ui.basic.MPartStack;
>-import org.eclipse.e4.ui.model.application.ui.basic.MWindow;
> import org.eclipse.e4.ui.widgets.CTabFolder;
> import org.eclipse.e4.ui.widgets.CTabItem;
> import org.eclipse.e4.ui.workbench.UIEvents;
>-import org.eclipse.e4.ui.workbench.modeling.EModelService;
> import org.eclipse.swt.SWT;
> import org.eclipse.swt.layout.FillLayout;
> import org.eclipse.swt.widgets.Composite;
>@@ -289,34 +285,32 @@
> 		});
> 	}
> 
>-	private void updateImages(MPart part) {
>+	void updateTabImages(MUIElement element) {
> 		// Try to update the image if we're using a CTF
>-		EModelService ms = part.getContext().get(EModelService.class);
>-		MWindow topWin = ms.getTopLevelWindowFor(part);
>-		List<MPlaceholder> partRefs = ms.findElements(topWin, part.getElementId(),
>-				MPlaceholder.class, null);
>-		for (MUIElement ref : partRefs) {
>-			MUIElement refParent = ref.getParent();
>-			if (!(refParent instanceof MPartStack))
>-				continue;
>-
>-			if (!(refParent.getWidget() instanceof CTabFolder))
>-				continue;
>-
>-			CTabFolder ctf = (CTabFolder) refParent.getWidget();
>-			if (ctf.isDisposed())
>-				continue;
>-
>-			CTabItem[] items = ctf.getItems();
>-			for (CTabItem item : items) {
>-				if (item.getData(AbstractPartRenderer.OWNING_ME) == ref) {
>-					item.setImage(wrapped.getTitleImage());
>-					ctf.getDisplay().update();
>-				}
>+		MUIElement refParent = element.getParent();
>+		if (!(refParent instanceof MPartStack)) {
>+			return;
>+		}
>+
>+		if (!(refParent.getWidget() instanceof CTabFolder)) {
>+			return;
>+		}
>+
>+		CTabFolder ctf = (CTabFolder) refParent.getWidget();
>+		if (ctf.isDisposed()) {
>+			return;
>+		}
>+
>+		CTabItem[] items = ctf.getItems();
>+		for (CTabItem item : items) {
>+			if (item.getData(AbstractPartRenderer.OWNING_ME) == element) {
>+				item.setImage(wrapped.getTitleImage());
> 			}
> 		}
> 	}
> 
>+	abstract void updateImages(MPart part);
>+
> 	public void deactivateActionBars(boolean forceHide) {
> 		PartSite site = getReference().getSite();
> 		site.deactivateActionBars(forceHide);
>Index: Eclipse UI/org/eclipse/ui/internal/e4/compatibility/CompatibilityView.java
>===================================================================
>RCS file: /cvsroot/eclipse/e4/org.eclipse.e4.compatibility/bundles/org.eclipse.ui.workbench/Eclipse UI/org/eclipse/ui/internal/e4/compatibility/CompatibilityView.java,v
>retrieving revision 1.37
>diff -u -r1.37 CompatibilityView.java
>--- Eclipse UI/org/eclipse/ui/internal/e4/compatibility/CompatibilityView.java	10 May 2011 14:19:01 -0000	1.37
>+++ Eclipse UI/org/eclipse/ui/internal/e4/compatibility/CompatibilityView.java	27 May 2011 16:53:31 -0000
>@@ -11,14 +11,19 @@
> 
> package org.eclipse.ui.internal.e4.compatibility;
> 
>+import java.util.List;
> import javax.inject.Inject;
> import org.eclipse.e4.core.contexts.IEclipseContext;
> import org.eclipse.e4.ui.internal.workbench.ContributionsAnalyzer;
> import org.eclipse.e4.ui.internal.workbench.swt.AbstractPartRenderer;
>+import org.eclipse.e4.ui.model.application.ui.MUIElement;
>+import org.eclipse.e4.ui.model.application.ui.advanced.MPlaceholder;
> import org.eclipse.e4.ui.model.application.ui.basic.MPart;
>+import org.eclipse.e4.ui.model.application.ui.basic.MWindow;
> import org.eclipse.e4.ui.model.application.ui.menu.MMenu;
> import org.eclipse.e4.ui.model.application.ui.menu.MToolBar;
> import org.eclipse.e4.ui.model.application.ui.menu.impl.MenuFactoryImpl;
>+import org.eclipse.e4.ui.workbench.modeling.EModelService;
> import org.eclipse.e4.ui.workbench.renderers.swt.MenuManagerRenderer;
> import org.eclipse.e4.ui.workbench.renderers.swt.StackRenderer;
> import org.eclipse.e4.ui.workbench.renderers.swt.ToolBarManagerRenderer;
>@@ -47,6 +52,17 @@
> 		return (IViewPart) getPart();
> 	}
> 
>+	@Override
>+	void updateImages(MPart part) {
>+		EModelService ms = part.getContext().get(EModelService.class);
>+		MWindow topWin = ms.getTopLevelWindowFor(part);
>+		List<MPlaceholder> partRefs = ms.findElements(topWin, part.getElementId(),
>+				MPlaceholder.class, null);
>+		for (MUIElement ref : partRefs) {
>+			updateTabImages(ref);
>+		}
>+	}
>+
> 	/*
> 	 * (non-Javadoc)
> 	 *

Actions: View | Diff

Attachments on bug 338261: 196235 | 196237 | 196787