Attachment 138834 Details for Bug 279728 – 2.2.1 proposed patch

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

[patch] 2.2.1 proposed patch

ImageAnchor_GMF (text/plain), 4.96 KB, created by Alex Boyko

on 2009-06-10 14:53:21 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Alex Boyko

Created: 2009-06-10 14:53:21 EDT

Size: 4.96 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.gmf.runtime.gef.ui
>Index: src/org/eclipse/gmf/runtime/gef/ui/figures/SlidableImageAnchor.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.gmf/plugins/org.eclipse.gmf.runtime.gef.ui/src/org/eclipse/gmf/runtime/gef/ui/figures/SlidableImageAnchor.java,v
>retrieving revision 1.6
>diff -u -r1.6 SlidableImageAnchor.java
>--- src/org/eclipse/gmf/runtime/gef/ui/figures/SlidableImageAnchor.java	10 Jan 2008 23:02:29 -0000	1.6
>+++ src/org/eclipse/gmf/runtime/gef/ui/figures/SlidableImageAnchor.java	10 Jun 2009 05:08:28 -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
>@@ -15,8 +15,10 @@
> import java.util.Map;
> import java.util.WeakHashMap;
> 
>+import org.eclipse.draw2d.AnchorListener;
> import org.eclipse.draw2d.IFigure;
>-import org.eclipse.draw2d.ImageFigure;
>+import org.eclipse.draw2d.IImageFigure;
>+import org.eclipse.draw2d.IImageFigure.ImageChangedListener;
> import org.eclipse.draw2d.geometry.Dimension;
> import org.eclipse.draw2d.geometry.Point;
> import org.eclipse.draw2d.geometry.PointList;
>@@ -35,7 +37,7 @@
>  *
>  */
> public class SlidableImageAnchor
>-	extends SlidableAnchor {
>+	extends SlidableAnchor implements ImageChangedListener {
> 
> 	static private class ImageAnchorLocation {
> 
>@@ -239,7 +241,7 @@
> 		}
> 	}
> 
>-	private ImageFigure imageFig;
>+	private IImageFigure imageFig;
> 
> 	/**
> 	 * Empty constructor
>@@ -254,6 +256,13 @@
> 	 */
> 	public SlidableImageAnchor(IFigure f) {
> 		super(f);
>+		if (f instanceof IImageFigure) {
>+			this.imageFig = (IImageFigure) f;
>+		}
>+	}
>+	
>+	public SlidableImageAnchor(IImageFigure imageFigure) {
>+		this(imageFigure, imageFigure);
> 	}
> 
> 	/**
>@@ -262,11 +271,29 @@
> 	 * @param container the <code>IFigure</code> bounding figure
> 	 * @param imageFig the <code>ImageFigure</code> inside the bounding figure
> 	 */
>-	public SlidableImageAnchor(IFigure container, ImageFigure imageFig) {
>+	public SlidableImageAnchor(IFigure container, IImageFigure imageFig) {
> 		super(container);
> 		this.imageFig = imageFig;
> 	}
> 
>+	@Override
>+	public void addAnchorListener(AnchorListener listener) {
>+		if (listener == null)
>+			return;
>+		if (listeners.isEmpty() && imageFig != null) {
>+			imageFig.addImageChangedListener(this);
>+		}
>+		super.addAnchorListener(listener);
>+	}
>+
>+	@Override
>+	public void removeAnchorListener(AnchorListener listener) {
>+		super.removeAnchorListener(listener);
>+		if (listeners.isEmpty() && imageFig != null) {
>+			imageFig.removeImageChangedListener(this);
>+		}
>+	}
>+
> 	/**
> 	 * Constructor, for which reference point is specified
> 	 * 
>@@ -274,10 +301,14 @@
> 	 * @param imageFig the <code>ImageFigure</code> inside the bounding figure
> 	 * @param p the <code>PrecisionPoint</code> relative reference
> 	 */
>-	public SlidableImageAnchor(IFigure f, ImageFigure imageFig, PrecisionPoint p) {
>+	public SlidableImageAnchor(IFigure f, IImageFigure imageFig, PrecisionPoint p) {
> 		super(f, p);
> 		this.imageFig = imageFig;
> 	}
>+	
>+	public SlidableImageAnchor(IImageFigure imageFig, PrecisionPoint p) {
>+		this(imageFig, imageFig, p);
>+	}
> 
> 	/**
> 	 * Returns the image.
>@@ -324,4 +355,9 @@
> 		return null;
> 	}
> 
>+	@Override
>+	public void imageChanged() {
>+		fireAnchorMoved();
>+	}
>+
> }
>#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:08:30 -0000
>@@ -71,6 +71,7 @@
> 		public void imageRendered(RenderedImage rndImg) {
> 			if (ScalableImageFigure.this.getParent() != null) {
> 				ScalableImageFigure.this.setRenderedImage(rndImg);
>+				ScalableImageFigure.this.notifyImageChanged();
> 				ScalableImageFigure.this.repaint();
> 			}
> 		}
>@@ -403,6 +404,11 @@
> 	 *            this figure
> 	 */
> 	public void setRenderedImage(RenderedImage renderedImage) {
>-		this.lastRenderedImage = renderedImage;
>+		if (this.lastRenderedImage != renderedImage) {
>+			this.lastRenderedImage = renderedImage;
>+			if (renderedImage == null || renderedImage.isRendered()) {
>+				notifyImageChanged();
>+			}
>+		}
> 	}
> }

Actions: View | Diff

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