Mail Archive Home | fractal-commits List | August 2008 Index
| <-- Date Index --> | <-- Thread Index --> |
generated code + custom code commit. 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/refactoring/org.ow2.fractal.f4e.emf.diagram/.classpath (rev 0)
+++ trunk/f4e/refactoring/org.ow2.fractal.f4e.emf.diagram/.classpath 2008-08-29 14:54:37 UTC (rev 8415)
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="src" path="customsrc"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
Property changes on: trunk/f4e/refactoring/org.ow2.fractal.f4e.emf.diagram/.classpath
___________________________________________________________________
Name: svn:mime-type
+ text/plain
--- trunk/f4e/refactoring/org.ow2.fractal.f4e.emf.diagram/.options (rev 0)
+++ trunk/f4e/refactoring/org.ow2.fractal.f4e.emf.diagram/.options 2008-08-29 14:54:37 UTC (rev 8415)
@@ -0,0 +1,7 @@
+# Tracing options for the org.ow2.fractal.f4e.emf.diagram plug-in
+
+# Common issues
+org.ow2.fractal.f4e.emf.diagram/debug=false
+
+# Visual IDs
+org.ow2.fractal.f4e.emf.diagram/debug/visualID=false
Property changes on: trunk/f4e/refactoring/org.ow2.fractal.f4e.emf.diagram/.options
___________________________________________________________________
Name: svn:mime-type
+ text/plain
--- trunk/f4e/refactoring/org.ow2.fractal.f4e.emf.diagram/.project (rev 0)
+++ trunk/f4e/refactoring/org.ow2.fractal.f4e.emf.diagram/.project 2008-08-29 14:54:37 UTC (rev 8415)
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.ow2.fractal.f4e.emf.diagram</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.ManifestBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.SchemaBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.eclipse.pde.PluginNature</nature>
+ </natures>
+</projectDescription>
Property changes on: trunk/f4e/refactoring/org.ow2.fractal.f4e.emf.diagram/.project
___________________________________________________________________
Name: svn:mime-type
+ text/plain
--- trunk/f4e/refactoring/org.ow2.fractal.f4e.emf.diagram/META-INF/MANIFEST.MF (rev 0)
+++ trunk/f4e/refactoring/org.ow2.fractal.f4e.emf.diagram/META-INF/MANIFEST.MF 2008-08-29 14:54:37 UTC (rev 8415)
@@ -0,0 +1,41 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %pluginName
+Bundle-SymbolicName: org.ow2.fractal.f4e.emf.diagram; singleton:=true
+Bundle-Version: 1.0.0.qualifier
+Bundle-ClassPath: .
+Bundle-Activator: org.ow2.fractal.f4e.fractal.diagram.part.FractalDiagramEditorPlugin
+Bundle-Vendor: %providerName
+Bundle-Localization: plugin
+Export-Package: org.ow2.fractal.f4e.fractal.diagram.edit.parts,
+ org.ow2.fractal.f4e.fractal.diagram.part,
+ org.ow2.fractal.f4e.fractal.diagram.providers
+Require-Bundle: org.eclipse.core.runtime,
+ org.eclipse.core.resources,
+ org.eclipse.core.expressions,
+ org.eclipse.jface,
+ org.eclipse.ui.ide,
+ org.eclipse.ui.views,
+ org.eclipse.ui.navigator,
+ org.eclipse.ui.navigator.resources,
+ org.eclipse.emf.ecore,
+ org.eclipse.emf.ecore.xmi,
+ org.eclipse.emf.edit.ui,
+ org.eclipse.gmf.runtime.emf.core,
+ org.eclipse.gmf.runtime.emf.commands.core,
+ org.eclipse.gmf.runtime.emf.ui.properties,
+ org.eclipse.gmf.runtime.diagram.ui,
+ org.eclipse.gmf.runtime.diagram.ui.properties,
+ org.eclipse.gmf.runtime.diagram.ui.providers,
+ org.eclipse.gmf.runtime.diagram.ui.providers.ide,
+ org.eclipse.gmf.runtime.diagram.ui.render,
+ org.eclipse.gmf.runtime.diagram.ui.resources.editor,
+ org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide,
+ org.ow2.fractal.f4e.emf;visibility:=reexport,
+ org.ow2.fractal.f4e.emf.edit;visibility:=reexport,
+ org.eclipse.gmf.runtime.draw2d.ui;visibility:=reexport,
+ org.eclipse.gef;visibility:=reexport,
+ org.ow2.fractal.f4e.notation;bundle-version="1.0.1",
+ org.ow2.fractal.f4e.emf.editor;bundle-version="1.0.0",
+ org.eclipse.emf.ecoretools.diagram.ui.outline;bundle-version="0.8.0"
+Eclipse-LazyStart: true
Property changes on: trunk/f4e/refactoring/org.ow2.fractal.f4e.emf.diagram/META-INF/MANIFEST.MF
___________________________________________________________________
Name: svn:mime-type
+ text/plain
--- trunk/f4e/refactoring/org.ow2.fractal.f4e.emf.diagram/build.properties (rev 0)
+++ trunk/f4e/refactoring/org.ow2.fractal.f4e.emf.diagram/build.properties 2008-08-29 14:54:37 UTC (rev 8415)
@@ -0,0 +1,10 @@
+bin.includes = .,\
+ icons/,\
+ META-INF/,\
+ plugin.xml,\
+ plugin.properties,\
+ messages.properties,\
+ .options
+jars.compile.order = .
+source.. = src/
+output.. = bin/
Property changes on: trunk/f4e/refactoring/org.ow2.fractal.f4e.emf.diagram/build.properties
___________________________________________________________________
Name: svn:mime-type
+ text/plain
--- trunk/f4e/refactoring/org.ow2.fractal.f4e.emf.diagram/customsrc/org/ow2/fractal/f4e/diagram/custom/commands/OpenDefinitionCommand.java (rev 0)
+++ trunk/f4e/refactoring/org.ow2.fractal.f4e.emf.diagram/customsrc/org/ow2/fractal/f4e/diagram/custom/commands/OpenDefinitionCommand.java 2008-08-29 14:54:37 UTC (rev 8415)
@@ -0,0 +1,38 @@
+package org.ow2.fractal.f4e.diagram.custom.commands;
+
+import org.eclipse.core.commands.ExecutionException;
+import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.gmf.runtime.common.core.command.CommandResult;
+import org.eclipse.gmf.runtime.emf.commands.core.command.AbstractTransactionalCommand;
+import org.ow2.fractal.f4e.fractal.diagram.part.FractalDiagramEditorUtil;
+import org.ow2.fractal.f4e.fractal.util.FractalTransactionalEditingDomain;
+import org.ow2.fractal.f4e.fractal.util.SDefinitionLoadLocator;
+
+public class OpenDefinitionCommand extends AbstractTransactionalCommand{
+ private String definition;
+ private URI resourceURI;
+
+ protected CommandResult doExecuteWithResult(IProgressMonitor monitor,
+ IAdaptable info) throws ExecutionException {
+
+ URI uri = SDefinitionLoadLocator.getInstance().getLoadLocation(resourceURI,definition);
+ URI diagramURI = uri.trimFileExtension().appendFileExtension("fractald");
+
+ Resource resource = FractalTransactionalEditingDomain.getEditingDomain().getResourceSet().createResource(uri.trimFileExtension().appendFileExtension("fractald"));
+ try{
+ FractalDiagramEditorUtil.openDiagram(resource);
+ }catch(Exception e){
+ e.printStackTrace();
+ }
+ return CommandResult.newOKCommandResult();
+ }
+
+ public OpenDefinitionCommand(URI resourceURI, String definitionADLName) {
+ super(FractalTransactionalEditingDomain.getEditingDomain(), "Open definition diagram", null);
+ this.definition = definitionADLName;
+ this.resourceURI = resourceURI;
+ }
+}
Property changes on: trunk/f4e/refactoring/org.ow2.fractal.f4e.emf.diagram/customsrc/org/ow2/fractal/f4e/diagram/custom/commands/OpenDefinitionCommand.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
--- trunk/f4e/refactoring/org.ow2.fractal.f4e.emf.diagram/customsrc/org/ow2/fractal/f4e/diagram/custom/decorators/AttributesMaskerContainerDecorator.java (rev 0)
+++ trunk/f4e/refactoring/org.ow2.fractal.f4e.emf.diagram/customsrc/org/ow2/fractal/f4e/diagram/custom/decorators/AttributesMaskerContainerDecorator.java 2008-08-29 14:54:37 UTC (rev 8415)
@@ -0,0 +1,31 @@
+package org.ow2.fractal.f4e.diagram.custom.decorators;
+
+import org.eclipse.draw2d.ColorConstants;
+import org.eclipse.gef.EditPart;
+import org.eclipse.gmf.runtime.diagram.ui.services.decorator.AbstractDecorator;
+import org.eclipse.gmf.runtime.diagram.ui.services.decorator.IDecoratorTarget;
+import org.eclipse.gmf.runtime.draw2d.ui.figures.HashedCircle;
+import org.eclipse.gmf.runtime.notation.View;
+import org.eclipse.swt.graphics.Color;
+
+public class AttributesMaskerContainerDecorator extends AbstractDecorator{
+
+ public AttributesMaskerContainerDecorator(IDecoratorTarget decoratorTarget){
+ super(decoratorTarget);
+ }
+
+ public void activate(){
+ refresh();
+ }
+
+ public void refresh(){
+ EditPart editPart = (EditPart)getDecoratorTarget().getAdapter(EditPart.class);
+ View view = (View)getDecoratorTarget().getAdapter(View.class);
+
+ HashedCircle circle = new HashedCircle(HashedCircle.HashType.X,20);
+ circle.setBackgroundColor(ColorConstants.black);
+ circle.setFill(true);
+ //setDecoration(getDecoratorTarget().addShapeDecoration(circle, IDecoratorTarget.Direction.NORTH_EAST, -10, false));
+
+ }
+}
Property changes on: trunk/f4e/refactoring/org.ow2.fractal.f4e.emf.diagram/customsrc/org/ow2/fractal/f4e/diagram/custom/decorators/AttributesMaskerContainerDecorator.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
--- trunk/f4e/refactoring/org.ow2.fractal.f4e.emf.diagram/customsrc/org/ow2/fractal/f4e/diagram/custom/edit/parts/BindingConnectionEditPart.java (rev 0)
+++ trunk/f4e/refactoring/org.ow2.fractal.f4e.emf.diagram/customsrc/org/ow2/fractal/f4e/diagram/custom/edit/parts/BindingConnectionEditPart.java 2008-08-29 14:54:37 UTC (rev 8415)
@@ -0,0 +1,22 @@
+package org.ow2.fractal.f4e.diagram.custom.edit.parts;
+
+import org.eclipse.gmf.runtime.notation.View;
+import org.ow2.fractal.f4e.fractal.diagram.edit.parts.BindingEditPart;
+
+public class BindingConnectionEditPart extends BindingEditPart {
+
+ public BindingConnectionEditPart(View view) {
+ super(view);
+ }
+
+/*
+ protected ConnectionAnchor getSourceConnectionAnchor() {
+ return new BindingConnectionAnchorLeft(((InterfaceEditPart)this.getSource()).getFigure());
+ }
+
+ protected ConnectionAnchor getTargetConnectionAnchor() {
+ return new BindingConnectionAnchorRight(((InterfaceEditPart) this.getTarget()).getFigure());
+ }*/
+
+
+}
Property changes on: trunk/f4e/refactoring/org.ow2.fractal.f4e.emf.diagram/customsrc/org/ow2/fractal/f4e/diagram/custom/edit/parts/BindingConnectionEditPart.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
--- trunk/f4e/refactoring/org.ow2.fractal.f4e.emf.diagram/customsrc/org/ow2/fractal/f4e/diagram/custom/edit/parts/ComponentAttributesCompartmentEditPart.java (rev 0)
+++ trunk/f4e/refactoring/org.ow2.fractal.f4e.emf.diagram/customsrc/org/ow2/fractal/f4e/diagram/custom/edit/parts/ComponentAttributesCompartmentEditPart.java 2008-08-29 14:54:37 UTC (rev 8415)
@@ -0,0 +1,40 @@
+package org.ow2.fractal.f4e.diagram.custom.edit.parts;
+
+import org.eclipse.draw2d.IFigure;
+import org.eclipse.gmf.runtime.diagram.ui.figures.ResizableCompartmentFigure;
+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.fractal.diagram.edit.parts.ComponentCompartmentComponentAttributesEditPart;
+
+/**
+ *
+ * @author Yann Davin
+ * EditPart of the compartment of the component which contains the attribute controller figure.
+ * We extend the default one. As there is only one child in the compartment, the attribute controller figure,
+ * we want that the child fill all the container.
+ */
+public class ComponentAttributesCompartmentEditPart extends ComponentCompartmentComponentAttributesEditPart{
+
+ public ComponentAttributesCompartmentEditPart(View view) {
+ super(view);
+ }
+
+ public IFigure createFigure() {
+ ResizableCompartmentFigure rcf;
+ if (getParent() == getTopGraphicEditPart()){
+ rcf = (ResizableCompartmentFigure) super.createFigure();
+ } else {
+ rcf = new NestedResizableCompartmentFigure(getMapMode());
+ }
+
+ ConstrainedToolbarLayout layout = new ConstrainedToolbarLayout();
+ layout.setStretchMajorAxis(true);
+ layout.setStretchMinorAxis(true);
+ layout.setMinorAlignment(ConstrainedToolbarLayout.ALIGN_TOPLEFT);
+ rcf.getContentPane().setLayoutManager(layout);
+
+ rcf.setTitleVisibility(false);
+ return rcf;
+ }
+}
Property changes on: trunk/f4e/refactoring/org.ow2.fractal.f4e.emf.diagram/customsrc/org/ow2/fractal/f4e/diagram/custom/edit/parts/ComponentAttributesCompartmentEditPart.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
--- trunk/f4e/refactoring/org.ow2.fractal.f4e.emf.diagram/customsrc/org/ow2/fractal/f4e/diagram/custom/edit/parts/ComponentEditPart.java (rev 0)
+++ trunk/f4e/refactoring/org.ow2.fractal.f4e.emf.diagram/customsrc/org/ow2/fractal/f4e/diagram/custom/edit/parts/ComponentEditPart.java 2008-08-29