Attachment 166540 Details for Bug 309858 – Patch to fix the issue.

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

[patch] Patch to fix the issue.

patch.txt (text/plain), 13.38 KB, created by Anthony Hunter

on 2010-04-29 14:13:03 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Anthony Hunter

Created: 2010-04-29 14:13:03 EDT

Size: 13.38 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.gmf.runtime.diagram.ui
>Index: src/org/eclipse/gmf/runtime/diagram/ui/figures/BorderItemsAwareFreeFormLayer.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.gmf/plugins/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/figures/BorderItemsAwareFreeFormLayer.java,v
>retrieving revision 1.4
>diff -u -r1.4 BorderItemsAwareFreeFormLayer.java
>--- src/org/eclipse/gmf/runtime/diagram/ui/figures/BorderItemsAwareFreeFormLayer.java	2 Jan 2007 21:57:26 -0000	1.4
>+++ src/org/eclipse/gmf/runtime/diagram/ui/figures/BorderItemsAwareFreeFormLayer.java	29 Apr 2010 18:09:32 -0000
>@@ -1,5 +1,5 @@
> /******************************************************************************
>- * Copyright (c) 2006, 2006 IBM Corporation and others.
>+ * Copyright (c) 2006, 2010 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
>@@ -22,7 +22,6 @@
> import org.eclipse.draw2d.IFigure;
> import org.eclipse.draw2d.geometry.Insets;
> import org.eclipse.draw2d.geometry.Rectangle;
>-import org.eclipse.gmf.runtime.diagram.ui.internal.figures.IExpandableFigure;
> 
> 
> /**
>Index: src/org/eclipse/gmf/runtime/diagram/ui/figures/BorderedNodeFigure.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.gmf/plugins/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/figures/BorderedNodeFigure.java,v
>retrieving revision 1.9
>diff -u -r1.9 BorderedNodeFigure.java
>--- src/org/eclipse/gmf/runtime/diagram/ui/figures/BorderedNodeFigure.java	14 Jan 2009 15:07:29 -0000	1.9
>+++ src/org/eclipse/gmf/runtime/diagram/ui/figures/BorderedNodeFigure.java	29 Apr 2010 18:09:32 -0000
>@@ -1,5 +1,5 @@
> /******************************************************************************
>- * Copyright (c) 2003, 2009 IBM Corporation and others.
>+ * Copyright (c) 2003, 2010 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
>@@ -21,7 +21,7 @@
> import org.eclipse.draw2d.geometry.Point;
> import org.eclipse.draw2d.geometry.Rectangle;
> import org.eclipse.gmf.runtime.diagram.ui.internal.figures.BorderItemContainerFigure;
>-import org.eclipse.gmf.runtime.diagram.ui.internal.figures.IExpandableFigure;
>+import org.eclipse.gmf.runtime.diagram.ui.figures.IExpandableFigure;
> import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
> 
> /**
>Index: src/org/eclipse/gmf/runtime/diagram/ui/figures/IExpandableFigure.java
>===================================================================
>RCS file: src/org/eclipse/gmf/runtime/diagram/ui/figures/IExpandableFigure.java
>diff -N src/org/eclipse/gmf/runtime/diagram/ui/figures/IExpandableFigure.java
>--- /dev/null	1 Jan 1970 00:00:00 -0000
>+++ src/org/eclipse/gmf/runtime/diagram/ui/figures/IExpandableFigure.java	1 Jan 1970 00:00:00 -0000
>@@ -0,0 +1,26 @@
>+/******************************************************************************
>+ * Copyright (c) 2010 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
>+ * http://www.eclipse.org/legal/epl-v10.html
>+ *
>+ * Contributors:
>+ *    IBM Corporation - initial API and implementation 
>+ ****************************************************************************/
>+
>+package org.eclipse.gmf.runtime.diagram.ui.figures;
>+
>+import org.eclipse.draw2d.geometry.Rectangle;
>+
>+/**
>+ * An Expandable Figure.
>+ * 
>+ * @since 1.4
>+ * @author Anthony Hunter
>+ */
>+public interface IExpandableFigure {
>+
>+	Rectangle getExtendedBounds();
>+
>+}
>Index: src/org/eclipse/gmf/runtime/diagram/ui/internal/figures/BorderItemContainerFigure.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.gmf/plugins/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/figures/BorderItemContainerFigure.java,v
>retrieving revision 1.9
>diff -u -r1.9 BorderItemContainerFigure.java
>--- src/org/eclipse/gmf/runtime/diagram/ui/internal/figures/BorderItemContainerFigure.java	24 Apr 2009 19:18:18 -0000	1.9
>+++ src/org/eclipse/gmf/runtime/diagram/ui/internal/figures/BorderItemContainerFigure.java	29 Apr 2010 18:09:33 -0000
>@@ -1,5 +1,5 @@
> /******************************************************************************
>- * Copyright (c) 2003, 2009 IBM Corporation and others.
>+ * Copyright (c) 2003, 2010 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
>@@ -27,6 +27,7 @@
> import org.eclipse.gmf.runtime.diagram.ui.figures.BorderItemsAwareFreeFormLayer;
> import org.eclipse.gmf.runtime.diagram.ui.figures.BorderItemsUtil;
> import org.eclipse.gmf.runtime.diagram.ui.figures.BorderedNodeFigure;
>+import org.eclipse.gmf.runtime.diagram.ui.figures.IExpandableFigure;
> import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
> 
> /**
>Index: src/org/eclipse/gmf/runtime/diagram/ui/internal/figures/GroupFigure.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.gmf/plugins/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/figures/GroupFigure.java,v
>retrieving revision 1.1
>diff -u -r1.1 GroupFigure.java
>--- src/org/eclipse/gmf/runtime/diagram/ui/internal/figures/GroupFigure.java	21 Nov 2007 17:57:28 -0000	1.1
>+++ src/org/eclipse/gmf/runtime/diagram/ui/internal/figures/GroupFigure.java	29 Apr 2010 18:09:33 -0000
>@@ -1,5 +1,5 @@
> /******************************************************************************
>- * Copyright (c) 2007 IBM Corporation and others.
>+ * Copyright (c) 2007, 2010 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
>@@ -17,6 +17,7 @@
> import org.eclipse.draw2d.XYLayout;
> import org.eclipse.draw2d.geometry.Dimension;
> import org.eclipse.draw2d.geometry.Rectangle;
>+import org.eclipse.gmf.runtime.diagram.ui.figures.IExpandableFigure;
> import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
> 
> /**
>Index: src/org/eclipse/gmf/runtime/diagram/ui/internal/figures/IExpandableFigure.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.gmf/plugins/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/figures/IExpandableFigure.java,v
>retrieving revision 1.2
>diff -u -r1.2 IExpandableFigure.java
>--- src/org/eclipse/gmf/runtime/diagram/ui/internal/figures/IExpandableFigure.java	11 Oct 2006 20:46:28 -0000	1.2
>+++ src/org/eclipse/gmf/runtime/diagram/ui/internal/figures/IExpandableFigure.java	29 Apr 2010 18:09:33 -0000
>@@ -1,5 +1,5 @@
> /******************************************************************************
>- * Copyright (c) 2006 IBM Corporation and others.
>+ * Copyright (c) 2006, 2010 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
>@@ -13,9 +13,15 @@
> 
> import org.eclipse.draw2d.geometry.Rectangle;
> 
>+/**
>+ * An Expandable Figure
>+ * 
>+ * @author mmostafa
>+ * @deprecated Use {org.eclipse.gmf.runtime.diagram.ui.figures.IExpandableFigure}
>+ */
>+public interface IExpandableFigure extends
>+		org.eclipse.gmf.runtime.diagram.ui.figures.IExpandableFigure {
> 
>-public interface IExpandableFigure {
>-    
>-    Rectangle getExtendedBounds(); 
>+	Rectangle getExtendedBounds();
> 
> }
>Index: src/org/eclipse/gmf/runtime/diagram/ui/internal/pagesetup/PageInfoHelper.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.gmf/plugins/org.eclipse.gmf.runtime.diagram.ui/src/org/eclipse/gmf/runtime/diagram/ui/internal/pagesetup/PageInfoHelper.java,v
>retrieving revision 1.8
>diff -u -r1.8 PageInfoHelper.java
>--- src/org/eclipse/gmf/runtime/diagram/ui/internal/pagesetup/PageInfoHelper.java	24 Feb 2010 18:29:00 -0000	1.8
>+++ src/org/eclipse/gmf/runtime/diagram/ui/internal/pagesetup/PageInfoHelper.java	29 Apr 2010 18:09:33 -0000
>@@ -28,7 +28,7 @@
> import org.eclipse.gmf.runtime.diagram.ui.internal.DiagramUIDebugOptions;
> import org.eclipse.gmf.runtime.diagram.ui.internal.DiagramUIPlugin;
> import org.eclipse.gmf.runtime.diagram.ui.internal.DiagramUIStatusCodes;
>-import org.eclipse.gmf.runtime.diagram.ui.internal.figures.IExpandableFigure;
>+import org.eclipse.gmf.runtime.diagram.ui.figures.IExpandableFigure;
> import org.eclipse.gmf.runtime.diagram.ui.internal.properties.WorkspaceViewerProperties;
> import org.eclipse.gmf.runtime.draw2d.ui.mapmode.IMapMode;
> import org.eclipse.jface.preference.IPreferenceStore;
>#P org.eclipse.gmf.runtime.diagram.ui.render
>Index: src/org/eclipse/gmf/runtime/diagram/ui/render/clipboard/DiagramGenerator.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.gmf/plugins/org.eclipse.gmf.runtime.diagram.ui.render/src/org/eclipse/gmf/runtime/diagram/ui/render/clipboard/DiagramGenerator.java,v
>retrieving revision 1.21
>diff -u -r1.21 DiagramGenerator.java
>--- src/org/eclipse/gmf/runtime/diagram/ui/render/clipboard/DiagramGenerator.java	26 Nov 2009 20:37:00 -0000	1.21
>+++ src/org/eclipse/gmf/runtime/diagram/ui/render/clipboard/DiagramGenerator.java	29 Apr 2010 18:09:34 -0000
>@@ -1,5 +1,5 @@
> /******************************************************************************
>- * Copyright (c) 2002, 2009 IBM Corporation and others.
>+ * Copyright (c) 2002, 2010 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
>@@ -39,7 +39,7 @@
> import org.eclipse.gmf.runtime.diagram.ui.editparts.DiagramRootEditPart;
> import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
> import org.eclipse.gmf.runtime.diagram.ui.image.PartPositionInfo;
>-import org.eclipse.gmf.runtime.diagram.ui.internal.figures.IExpandableFigure;
>+import org.eclipse.gmf.runtime.diagram.ui.figures.IExpandableFigure;
> import org.eclipse.gmf.runtime.diagram.ui.internal.services.decorator.Decoration;
> import org.eclipse.gmf.runtime.diagram.ui.l10n.SharedImages;
> import org.eclipse.gmf.runtime.diagram.ui.render.util.DiagramImageUtils;
>Index: src/org/eclipse/gmf/runtime/diagram/ui/render/util/DiagramImageUtils.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.gmf/plugins/org.eclipse.gmf.runtime.diagram.ui.render/src/org/eclipse/gmf/runtime/diagram/ui/render/util/DiagramImageUtils.java,v
>retrieving revision 1.6
>diff -u -r1.6 DiagramImageUtils.java
>--- src/org/eclipse/gmf/runtime/diagram/ui/render/util/DiagramImageUtils.java	26 Nov 2009 20:37:37 -0000	1.6
>+++ src/org/eclipse/gmf/runtime/diagram/ui/render/util/DiagramImageUtils.java	29 Apr 2010 18:09:34 -0000
>@@ -1,5 +1,5 @@
> /******************************************************************************
>- * Copyright (c) 2009 IBM Corporation and others.
>+ * Copyright (c) 2009, 2010 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
>@@ -27,7 +27,7 @@
> import org.eclipse.gef.LayerConstants;
> import org.eclipse.gef.editparts.LayerManager;
> import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
>-import org.eclipse.gmf.runtime.diagram.ui.internal.figures.IExpandableFigure;
>+import org.eclipse.gmf.runtime.diagram.ui.figures.IExpandableFigure;
> 
> /**
>  * Utility methods used by various diagram image generators
>#P org.eclipse.gmf.tests.runtime.diagram.ui
>Index: src/org/eclipse/gmf/tests/runtime/diagram/ui/logic/GroupTests.java
>===================================================================
>RCS file: /cvsroot/modeling/org.eclipse.gmf/tests/org.eclipse.gmf.tests.runtime.diagram.ui/src/org/eclipse/gmf/tests/runtime/diagram/ui/logic/GroupTests.java,v
>retrieving revision 1.6
>diff -u -r1.6 GroupTests.java
>--- src/org/eclipse/gmf/tests/runtime/diagram/ui/logic/GroupTests.java	5 Jan 2010 22:22:46 -0000	1.6
>+++ src/org/eclipse/gmf/tests/runtime/diagram/ui/logic/GroupTests.java	29 Apr 2010 18:09:35 -0000
>@@ -41,8 +41,8 @@
> import org.eclipse.gmf.runtime.diagram.ui.editparts.GroupEditPart;
> import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
> import org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeEditPart;
>+import org.eclipse.gmf.runtime.diagram.ui.figures.IExpandableFigure;
> import org.eclipse.gmf.runtime.diagram.ui.geoshapes.type.GeoshapeType;
>-import org.eclipse.gmf.runtime.diagram.ui.internal.figures.IExpandableFigure;
> import org.eclipse.gmf.runtime.diagram.ui.requests.RequestConstants;
> import org.eclipse.gmf.runtime.diagram.ui.type.DiagramNotationType;
> import org.eclipse.gmf.runtime.emf.type.core.ElementTypeRegistry;

Actions: View | Diff

Attachments on bug 309858: 166408 | 166409 | 166540