Mail Archive Home | fractal-commits List | August 2008 Index
| <-- Date Index --> | <-- Thread Index --> |
Update merge algorithms. GMF outline replacement. EMF properties view replaced by the same used by GMF. Modification to display in gray merged components in the graphical editor. Merged bindings are dotted.
--- trunk/f4e/trunk/org.ow2.fractal.adl.extended.diagram/customsrc/org/ow2/fractal/f4e/diagram/custom/edit/parts/ComponentAttributesCompartmentEditPart.java 2008-08-29 14:47:38 UTC (rev 8411)
+++ trunk/f4e/trunk/org.ow2.fractal.adl.extended.diagram/customsrc/org/ow2/fractal/f4e/diagram/custom/edit/parts/ComponentAttributesCompartmentEditPart.java 2008-08-29 14:49:09 UTC (rev 8412)
@@ -5,7 +5,7 @@
import org.eclipse.gmf.runtime.diagram.ui.internal.figures.NestedResizableCompartmentFigure;
import org.eclipse.gmf.runtime.draw2d.ui.figures.ConstrainedToolbarLayout;
import org.eclipse.gmf.runtime.notation.View;
-import org.ow2.fractal.f4e.diagram.edit.parts.ComponentCompartmentComponentAttributesEditPart;
+import org.ow2.fractal.f4e.fractal.diagram.edit.parts.ComponentCompartmentComponentAttributesEditPart;
/**
*
--- trunk/f4e/trunk/org.ow2.fractal.adl.extended.diagram/customsrc/org/ow2/fractal/f4e/diagram/custom/edit/policies/AbstractComponentResizableEditPolicy.java 2008-08-29 14:47:38 UTC (rev 8411)
+++ trunk/f4e/trunk/org.ow2.fractal.adl.extended.diagram/customsrc/org/ow2/fractal/f4e/diagram/custom/edit/policies/AbstractComponentResizableEditPolicy.java 2008-08-29 14:49:09 UTC (rev 8412)
@@ -8,18 +8,9 @@
import org.eclipse.gef.EditPartListener;
import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
import org.eclipse.gmf.runtime.diagram.ui.editparts.ResizableCompartmentEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableCompartmentEditPolicy;
import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableShapeEditPolicy;
import org.eclipse.gmf.runtime.diagram.ui.figures.BorderedNodeFigure;
import org.eclipse.gmf.runtime.diagram.ui.figures.ResizableCompartmentFigure;
-import org.ow2.fractal.f4e.diagram.custom.ui.handles.AttributesCollapseHandle;
-import org.ow2.fractal.f4e.diagram.custom.ui.handles.ExtendsCollapseHandle;
-import org.ow2.fractal.f4e.diagram.custom.ui.handles.OthersCollapseHandle;
-import org.ow2.fractal.f4e.diagram.custom.ui.handles.SubComponentsCollapseHandle;
-import org.ow2.fractal.f4e.diagram.edit.parts.DefinitionCompartmentDefinitionAttributesEditPart;
-import org.ow2.fractal.f4e.diagram.edit.parts.DefinitionCompartmentDefinitionExtendsEditPart;
-import org.ow2.fractal.f4e.diagram.edit.parts.DefinitionCompartmentDefinitionOthersEditPart;
-import org.ow2.fractal.f4e.diagram.edit.parts.DefinitionCompartmentDefinitionSubComponentsEditPart;
public abstract class AbstractComponentResizableEditPolicy extends ResizableShapeEditPolicy {
--- trunk/f4e/trunk/org.ow2.fractal.adl.extended.diagram/customsrc/org/ow2/fractal/f4e/diagram/custom/edit/policies/ComponentResizableEditPolicy.java 2008-08-29 14:47:38 UTC (rev 8411)
+++ trunk/f4e/trunk/org.ow2.fractal.adl.extended.diagram/customsrc/org/ow2/fractal/f4e/diagram/custom/edit/policies/ComponentResizableEditPolicy.java 2008-08-29 14:49:09 UTC (rev 8412)
@@ -5,13 +5,15 @@
import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
import org.ow2.fractal.f4e.diagram.custom.ui.handles.AttributesCollapseHandle;
+import org.ow2.fractal.f4e.diagram.custom.ui.handles.ContentCollapseHandle;
import org.ow2.fractal.f4e.diagram.custom.ui.handles.ExtendsCollapseHandle;
import org.ow2.fractal.f4e.diagram.custom.ui.handles.OthersCollapseHandle;
import org.ow2.fractal.f4e.diagram.custom.ui.handles.SubComponentsCollapseHandle;
-import org.ow2.fractal.f4e.diagram.edit.parts.ComponentCompartmentComponentAttributesEditPart;
-import org.ow2.fractal.f4e.diagram.edit.parts.ComponentCompartmentComponentExtendsEditPart;
-import org.ow2.fractal.f4e.diagram.edit.parts.ComponentCompartmentComponentOthersEditPart;
-import org.ow2.fractal.f4e.diagram.edit.parts.ComponentCompartmentComponentSubComponentsEditPart;
+import org.ow2.fractal.f4e.fractal.diagram.edit.parts.ComponentCompartmentComponentAttributesEditPart;
+import org.ow2.fractal.f4e.fractal.diagram.edit.parts.ComponentCompartmentComponentContentEditPart;
+import org.ow2.fractal.f4e.fractal.diagram.edit.parts.ComponentCompartmentComponentExtendsEditPart;
+import org.ow2.fractal.f4e.fractal.diagram.edit.parts.ComponentCompartmentComponentOthersEditPart;
+import org.ow2.fractal.f4e.fractal.diagram.edit.parts.ComponentCompartmentComponentSubComponentsEditPart;
public class ComponentResizableEditPolicy extends AbstractComponentResizableEditPolicy {
@@ -33,6 +35,7 @@
List collapseHandles = new ArrayList();
collapseHandles.add(new ExtendsCollapseHandle(part,ComponentCompartmentComponentExtendsEditPart.VISUAL_ID));
collapseHandles.add(new SubComponentsCollapseHandle(part,ComponentCompartmentComponentSubComponentsEditPart.VISUAL_ID));
+ collapseHandles.add(new ContentCollapseHandle(part,ComponentCompartmentComponentContentEditPart.VISUAL_ID));
collapseHandles.add(new AttributesCollapseHandle(part,ComponentCompartmentComponentAttributesEditPart.VISUAL_ID));
collapseHandles.add(new OthersCollapseHandle(part,ComponentCompartmentComponentOthersEditPart.VISUAL_ID));
return collapseHandles;
--- trunk/f4e/trunk/org.ow2.fractal.adl.extended.diagram/customsrc/org/ow2/fractal/f4e/diagram/custom/edit/policies/DefinitionResizableEditPolicy.java 2008-08-29 14:47:38 UTC (rev 8411)
+++ trunk/f4e/trunk/org.ow2.fractal.adl.extended.diagram/customsrc/org/ow2/fractal/f4e/diagram/custom/edit/policies/DefinitionResizableEditPolicy.java 2008-08-29 14:49:09 UTC (rev 8412)
@@ -3,22 +3,17 @@
import java.util.ArrayList;
import java.util.List;
-import org.eclipse.draw2d.IFigure;
-import org.eclipse.gef.EditPart;
-import org.eclipse.gef.EditPartListener;
import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editparts.ResizableCompartmentEditPart;
-import org.eclipse.gmf.runtime.diagram.ui.editpolicies.ResizableShapeEditPolicy;
-import org.eclipse.gmf.runtime.diagram.ui.figures.BorderedNodeFigure;
-import org.eclipse.gmf.runtime.diagram.ui.figures.ResizableCompartmentFigure;
import org.ow2.fractal.f4e.diagram.custom.ui.handles.AttributesCollapseHandle;
+import org.ow2.fractal.f4e.diagram.custom.ui.handles.ContentCollapseHandle;
import org.ow2.fractal.f4e.diagram.custom.ui.handles.ExtendsCollapseHandle;
import org.ow2.fractal.f4e.diagram.custom.ui.handles.OthersCollapseHandle;
import org.ow2.fractal.f4e.diagram.custom.ui.handles.SubComponentsCollapseHandle;
-import org.ow2.fractal.f4e.diagram.edit.parts.DefinitionCompartmentDefinitionAttributesEditPart;
-import org.ow2.fractal.f4e.diagram.edit.parts.DefinitionCompartmentDefinitionExtendsEditPart;
-import org.ow2.fractal.f4e.diagram.edit.parts.DefinitionCompartmentDefinitionOthersEditPart;
-import org.ow2.fractal.f4e.diagram.edit.parts.DefinitionCompartmentDefinitionSubComponentsEditPart;
+import org.ow2.fractal.f4e.fractal.diagram.edit.parts.DefinitionCompartmentDefinitionAttributesEditPart;
+import org.ow2.fractal.f4e.fractal.diagram.edit.parts.DefinitionCompartmentDefinitionContentEditPart;
+import org.ow2.fractal.f4e.fractal.diagram.edit.parts.DefinitionCompartmentDefinitionExtendsEditPart;
+import org.ow2.fractal.f4e.fractal.diagram.edit.parts.DefinitionCompartmentDefinitionOthersEditPart;
+import org.ow2.fractal.f4e.fractal.diagram.edit.parts.DefinitionCompartmentDefinitionSubComponentsEditPart;
public class DefinitionResizableEditPolicy extends AbstractComponentResizableEditPolicy {
@@ -40,6 +35,7 @@
List collapseHandles = new ArrayList();
collapseHandles.add(new ExtendsCollapseHandle(part,DefinitionCompartmentDefinitionExtendsEditPart.VISUAL_ID));
collapseHandles.add(new SubComponentsCollapseHandle(part,DefinitionCompartmentDefinitionSubComponentsEditPart.VISUAL_ID));
+ collapseHandles.add(new ContentCollapseHandle(part,DefinitionCompartmentDefinitionContentEditPart.VISUAL_ID));
collapseHandles.add(new AttributesCollapseHandle(part,DefinitionCompartmentDefinitionAttributesEditPart.VISUAL_ID));
collapseHandles.add(new OthersCollapseHandle(part,DefinitionCompartmentDefinitionOthersEditPart.VISUAL_ID));
return collapseHandles;
--- trunk/f4e/trunk/org.ow2.fractal.adl.extended.diagram/customsrc/org/ow2/fractal/f4e/diagram/custom/edit/policies/InterfaceBorderItemSelectionEditPolicy.java 2008-08-29 14:47:38 UTC (rev 8411)
+++ trunk/f4e/trunk/org.ow2.fractal.adl.extended.diagram/customsrc/org/ow2/fractal/f4e/diagram/custom/edit/policies/InterfaceBorderItemSelectionEditPolicy.java 2008-08-29 14:49:09 UTC (rev 8412)
@@ -15,11 +15,7 @@
import org.eclipse.gmf.runtime.diagram.ui.l10n.DiagramUIMessages;
import org.eclipse.gmf.runtime.emf.core.util.EObjectAdapter;
import org.eclipse.gmf.runtime.notation.View;
-import org.ow2.fractal.adl.extended.fractaladlextended.FractalAdlExtendedFactory;
-import org.ow2.fractal.adl.extended.fractaladlextended.FractalAdlExtendedPackage;
-import org.ow2.fractal.adl.extended.fractaladlextended.Interface;
-import org.ow2.fractal.adl.extended.fractaladlextended.Role;
-import org.ow2.fractal.f4e.diagram.custom.edit.parts.ComponentInterfaceEditPart;
+import org.ow2.fractal.f4e.fractal.Interface;
public class InterfaceBorderItemSelectionEditPolicy extends BorderItemSelectionEditPolicy{
--- trunk/f4e/trunk/org.ow2.fractal.adl.extended.diagram/customsrc/org/ow2/fractal/f4e/diagram/custom/edit/policies/MergedComponentResizableEditPolicy.java (rev 0)
+++ trunk/f4e/trunk/org.ow2.fractal.adl.extended.diagram/customsrc/org/ow2/fractal/f4e/diagram/custom/edit/policies/MergedComponentResizableEditPolicy.java 2008-08-29 14:49:09 UTC (rev 8412)
@@ -0,0 +1,41 @@
+package org.ow2.fractal.f4e.diagram.custom.edit.policies;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
+import org.ow2.fractal.f4e.diagram.custom.ui.handles.AttributesCollapseHandle;
+import org.ow2.fractal.f4e.diagram.custom.ui.handles.ContentCollapseHandle;
+import org.ow2.fractal.f4e.diagram.custom.ui.handles.OthersCollapseHandle;
+import org.ow2.fractal.f4e.diagram.custom.ui.handles.SubComponentsCollapseHandle;
+import org.ow2.fractal.f4e.fractal.diagram.edit.parts.ComponentMergedCompartmentComponentAttributesEditPart;
+import org.ow2.fractal.f4e.fractal.diagram.edit.parts.ComponentMergedCompartmentComponentContentEditPart;
+import org.ow2.fractal.f4e.fractal.diagram.edit.parts.ComponentMergedCompartmentComponentOthersEditPart;
+import org.ow2.fractal.f4e.fractal.diagram.edit.parts.ComponentMergedCompartmentComponentSubComponentsEditPart;
+
+public class MergedComponentResizableEditPolicy extends AbstractComponentResizableEditPolicy {
+
+ /**
+ * Creates a new vertical ResizableCompartmentEditPolicy
+ */
+ public MergedComponentResizableEditPolicy() {
+ super();
+ }
+ /**
+ * This method is used to get the collapse handle(s). Subclasses can
+ * override to provide different collapse handles
+ *
+ * @return a list of collapse handles
+ */
+ protected List createCollapseHandles() {
+ IGraphicalEditPart part = (IGraphicalEditPart) getHost();
+
+ List collapseHandles = new ArrayList();
+ collapseHandles.add(new SubComponentsCollapseHandle(part,ComponentMergedCompartmentComponentSubComponentsEditPart.VISUAL_ID));
+ collapseHandles.add(new ContentCollapseHandle(part,ComponentMergedCompartmentComponentContentEditPart.VISUAL_ID));
+ collapseHandles.add(new AttributesCollapseHandle(part,ComponentMergedCompartmentComponentAttributesEditPart.VISUAL_ID));
+ collapseHandles.add(new OthersCollapseHandle(part,ComponentMergedCompartmentComponentOthersEditPart.VISUAL_ID));
+ return collapseHandles;
+ }
+
+}
Property changes on: trunk/f4e/trunk/org.ow2.fractal.adl.extended.diagram/customsrc/org/ow2/fractal/f4e/diagram/custom/edit/policies/MergedComponentResizableEditPolicy.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
--- trunk/f4e/trunk/org.ow2.fractal.adl.extended.diagram/customsrc/org/ow2/fractal/f4e/diagram/custom/edit/policies/ResizableCompartmentWithoutHandleEditPolicy.java 2008-08-29 14:47:38 UTC (rev 8411)
+++ trunk/f4e/trunk/org.ow2.fractal.adl.extended.diagram/customsrc/org/ow2/fractal/f4e/diagram/custom/edit/policies/ResizableCompartmentWithoutHandleEditPolicy.java 2008-08-29 14:49:09 UTC (rev 8412)
@@ -15,5 +15,4 @@
List collapseHandles = new ArrayList();
return collapseHandles;
}
-
}
--- trunk/f4e/trunk/org.ow2.fractal.adl.extended.diagram/customsrc/org/ow2/fractal/f4e/diagram/custom/figures/ControllerShape.java (rev 0)
+++ trunk/f4e/trunk/org.ow2.fractal.adl.extended.diagram/customsrc/org/ow2/fractal/f4e/diagram/custom/figures/ControllerShape.java 2008-08-29 14:49:09 UTC (rev 8412)
@@ -0,0 +1,52 @@
+/*
+ * Copyright (c) 2005-2007 Obeo
+ *
+ * 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:
+ * Obeo - initial API and implementation
+ */
+package org.ow2.fractal.f4e.diagram.custom.figures;
+
+import org.eclipse.draw2d.Graphics;
+import org.eclipse.draw2d.Shape;
+import org.eclipse.draw2d.geometry.Rectangle;
+
+/**
+ * Define the area of a component/composite used to put services.
+ *
+ * @author Yann Davin inspired by Stephane Drapeau - Obeo
+ *
+ */
+public class ControllerShape extends Shape {
+
+ // private static final int SHIFT_X = 35;
+ private static final int SHIFT_Y = 35;
+
+ /**
+ * @see Shape#fillShape(Graphics)
+ */
+ protected void fillShape(Graphics graphics) {
+ graphics.fillRectangle(getBounds());
+ }
+
+ public Rectangle getBounds() {
+ Rectangle r = super.getBounds();
+ Rectangle result = new Rectangle(r.x, r.y , r.width, r.height);
+ return result;
+ }
+
+ /**
+ * @see Shape#outlineShape(Graphics)
+ */
+ protected void outlineShape(Graphics graphics) {
+ this.setLineWidth(1);
+ Rectangle r = this.getBounds();
+ r.setSize(r.width - 1, r.height - 1);
+ //graphics.drawRectangle(r);
+ }
+
+}
Property changes on: trunk/f4e/trunk/org.ow2.fractal.adl.extended.diagram/customsrc/org/ow2/fractal/f4e/diagram/custom/figures/ControllerShape.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
--- trunk/f4e/trunk/org.ow2.fractal.adl.extended.diagram/customsrc/org/ow2/fractal/f4e/diagram/custom/figures/FixedConnectionAnchor.java 2008-08-29 14:47:38 UTC (rev 8411)
+++ trunk/f4e/trunk/org.ow2.fractal.adl.extended.diagram/customsrc/org/ow2/fractal/f4e/diagram/custom/figures/FixedConnectionAnchor.java 2008-08-29 14:49:09 UTC (rev 8412)
@@ -6,7 +6,6 @@
import org.eclipse.draw2d.geometry.Point;
import org.eclipse.draw2d.geometry.PrecisionPoint;
import org.eclipse.draw2d.geometry.Rectangle;
-import org.ow2.fractal.f4e.diagram.part.FractaladlextendedVisualIDRegistry;
/**
* @author Yann Davin
--- trunk/f4e/trunk/org.ow2.fractal.adl.extended.diagram/customsrc/org/ow2/fractal/f4e/diagram/custom/ui/handles/CompartmentCollapseHandle.java 2008-08-29 14:47:38 UTC (rev 8411)
+++ trunk/f4e/trunk/org.ow2.fractal.adl.extended.diagram/customsrc/org/ow2/fractal/f4e/diagram/custom/ui/handles/CompartmentCollapseHandle.java 2008-08-29 14:49:09 UTC (rev 8412)
@@ -21,7 +21,7 @@
import org.eclipse.gmf.runtime.diagram.ui.editparts.IGraphicalEditPart;
import org.eclipse.gmf.runtime.diagram.ui.internal.figures.CollapseFigure;
import org.eclipse.gmf.runtime.notation.View;
-import org.ow2.fractal.f4e.diagram.part.FractaladlextendedVisualIDRegistry;
+import org.ow2.fractal.f4e.fractal.diagram.part.FractalVisualIDRegistry;
/**
* Custom handle to collapse child compartment of definition and component.
@@ -33,6 +33,11 @@
public abstract class CompartmentCollapseHandle extends AbstractHandle
implements PropertyChangeListener, NotificationListener, ICompartmentCollapseHandle {
+ /**
+ * Horizontal space between two handles.
+ */
+ protected static final int HORIZONTAL_SPACE = 5;
+
/**
* Positions the supplied figure in its owner's top left corner offset by [1,1]
*/
@@ -58,7 +63,7 @@
protected IGraphicalEditPart compartmentEditPart;
protected void intializeCompartmentEditPart(IGraphicalEditPart editPart, int compartmentVisualID){
- compartmentEditPart = (IGraphicalEditPart)editPart.getChildBySemanticHint(FractaladlextendedVisualIDRegistry.getType(compartmentVisualID));
+ compartmentEditPart = (IGraphicalEditPart)editPart.getChildBySemanticHint(FractalVisualIDRegistry.getType(compartmentVisualID));
}
@@ -121,8 +126,12 @@
/**
* return the x position relative to the top right corner point of the related edit part figure
*/
- protected abstract int getXPosition();
+ protected int getXPosition(){
+ return getSize().width * getHorizontalPosition() + getHorizontalPosition()*HORIZONTAL_SPACE;
+ }
+ abstract protected int getHorizontalPosition();
+
/**
* @see java.beans.PropertyChangeListener#propertyChange(java.beans.PropertyChangeEvent)
*/
| <-- Date Index --> | <-- Thread Index --> |
Powered by MHonArc.
Copyright © 2006-2007, OW2 Consortium | contact | webmaster.