Attachment 138750 Details for Bug 279728 – 2.1.4 patch with a null check

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

[patch] 2.1.4 patch with a null check

Bug_279728.txt (text/plain), 2.50 KB, created by Alex Boyko

on 2009-06-10 01:21:05 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Alex Boyko

Created: 2009-06-10 01:21:05 EDT

Size: 2.50 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.gmf.runtime.draw2d.ui.render
>Index: src/org/eclipse/gmf/runtime/draw2d/ui/render/figures/ScalableImageFigure.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.gmf/plugins/org.eclipse.gmf.runtime.draw2d.ui.render/src/org/eclipse/gmf/runtime/draw2d/ui/render/figures/ScalableImageFigure.java,v
>retrieving revision 1.12
>diff -u -r1.12 ScalableImageFigure.java
>--- src/org/eclipse/gmf/runtime/draw2d/ui/render/figures/ScalableImageFigure.java	25 Mar 2008 18:33:59 -0000	1.12
>+++ src/org/eclipse/gmf/runtime/draw2d/ui/render/figures/ScalableImageFigure.java	10 Jun 2009 05:22:01 -0000
>@@ -1,5 +1,5 @@
> /******************************************************************************
>- * Copyright (c) 2004, 2007 IBM Corporation and others.
>+ * Copyright (c) 2004, 2009 IBM Corporation and others.
>  * All rights reserved. This program and the accompanying materials
>  * are made available under the terms of the Eclipse Public License v1.0
>  * which accompanies this distribution, and is available at
>@@ -71,6 +71,7 @@
> 		public void imageRendered(RenderedImage rndImg) {
> 			if (ScalableImageFigure.this.getParent() != null) {
> 				ScalableImageFigure.this.setRenderedImage(rndImg);
>+				ScalableImageFigure.this.fireFigureMoved();
> 				ScalableImageFigure.this.repaint();
> 			}
> 		}
>@@ -403,6 +404,11 @@
> 	 *            this figure
> 	 */
> 	public void setRenderedImage(RenderedImage renderedImage) {
>-		this.lastRenderedImage = renderedImage;
>+		if (renderedImage != this.lastRenderedImage) {
>+			this.lastRenderedImage = renderedImage;
>+			if (renderedImage == null || renderedImage.isRendered()) {
>+				fireFigureMoved();
>+			}
>+		}
> 	}
> }
>Index: META-INF/MANIFEST.MF
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.gmf/plugins/org.eclipse.gmf.runtime.draw2d.ui.render/META-INF/MANIFEST.MF,v
>retrieving revision 1.16.2.1
>diff -u -r1.16.2.1 MANIFEST.MF
>--- META-INF/MANIFEST.MF	22 Jan 2009 19:43:14 -0000	1.16.2.1
>+++ META-INF/MANIFEST.MF	10 Jun 2009 05:22:01 -0000
>@@ -2,7 +2,7 @@
> Bundle-ManifestVersion: 2
> Bundle-Name: %Plugin.name
> Bundle-SymbolicName: org.eclipse.gmf.runtime.draw2d.ui.render;singleton:=true
>-Bundle-Version: 1.1.3.qualifier
>+Bundle-Version: 1.1.4.qualifier
> Bundle-Activator: org.eclipse.gmf.runtime.draw2d.ui.render.internal.Draw2dRenderPlugin
> Bundle-Vendor: %Plugin.providerName
> Bundle-Localization: plugin

Actions: View | Diff

Attachments on bug 279728: 138739 | 138750 | 138834 | 166538 | 166572