OW2 Consortium
Search OW2 Mail Archive: 

Advanced Search - Powered by Google

Mail Archive Home | fractal-commits List | August 2008 Index

<--  Date Index  --> <--  Thread Index  -->

[fractal-commits] [8411] trunk/f4e: Update merge algorithms.

Title: [8411] trunk/f4e: Update merge algorithms.
Revision
8411
Author
yann_davin
Date
2008-08-29 16:47:38 +0200 (Fri, 29 Aug 2008)

Log Message

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.

Modified Paths

Added Paths

Removed Paths

Diff

Modified: trunk/f4e/refactoring/org.ow2.fractal.f4e.emf.diagram/META-INF/MANIFEST.MF (8410 => 8411)


--- trunk/f4e/refactoring/org.ow2.fractal.f4e.emf.diagram/META-INF/MANIFEST.MF	2008-08-29 08:52:06 UTC (rev 8410)
+++ trunk/f4e/refactoring/org.ow2.fractal.f4e.emf.diagram/META-INF/MANIFEST.MF	2008-08-29 14:47:38 UTC (rev 8411)
@@ -36,5 +36,6 @@
  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.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

Modified: trunk/f4e/refactoring/org.ow2.fractal.f4e.emf.diagram/messages.properties (8410 => 8411)


--- trunk/f4e/refactoring/org.ow2.fractal.f4e.emf.diagram/messages.properties	2008-08-29 08:52:06 UTC (rev 8410)
+++ trunk/f4e/refactoring/org.ow2.fractal.f4e.emf.diagram/messages.properties	2008-08-29 14:47:38 UTC (rev 8411)
@@ -105,3 +105,10 @@
 NavigatorGroupName_Interface_2009_outgoinglinks=outgoing links
 NavigatorGroupName_Interface_2008_incominglinks=incoming links
 NavigatorGroupName_Interface_2008_outgoinglinks=outgoing links
+ComponentMergedCompartmentComponentSubComponentsEditPart_title=MergedCompartmentComponentSubComponents
+ComponentMergedCompartmentComponentContentEditPart_title=MergedCompartmentComponentContent
+ComponentMergedCompartmentComponentAttributesEditPart_title=MergedCompartmentComponentAttributes
+ComponentMergedCompartmentComponentOthersEditPart_title=MergedCompartmentComponentOthers
+AttributesControllerMergedCompartmentAttributesControllerEditPart_title=MergedCompartmentAttributesController
+NavigatorGroupName_Interface_2010_incominglinks=incoming links
+NavigatorGroupName_Interface_2010_outgoinglinks=outgoing links

Modified: trunk/f4e/refactoring/org.ow2.fractal.f4e.emf.diagram/plugin.properties (8410 => 8411)


--- trunk/f4e/refactoring/org.ow2.fractal.f4e.emf.diagram/plugin.properties	2008-08-29 08:52:06 UTC (rev 8410)
+++ trunk/f4e/refactoring/org.ow2.fractal.f4e.emf.diagram/plugin.properties	2008-08-29 14:47:38 UTC (rev 8411)
@@ -72,3 +72,16 @@
 metatype.name.Interface_2009=Interface
 metatype.name.VirtualNode_2007=VirtualNode
 metatype.name.Interface_2008=Interface
+metatype.name.Component_2010=Component
+metatype.name.Content_2011=Content
+metatype.name.AttributesController_2012=AttributesController
+metatype.name.Attribute_2013=Attribute
+metatype.name.Controller_2014=Controller
+metatype.name.VirtualNode_2015=VirtualNode
+metatype.name.Interface_2010=Interface
+metatype.name.Component_2011=Component
+metatype.name.Content_2012=Content
+metatype.name.AttributesController_2013=AttributesController
+metatype.name.Attribute_2014=Attribute
+metatype.name.Controller_2015=Controller
+metatype.name.VirtualNode_2016=VirtualNode

Modified: trunk/f4e/refactoring/org.ow2.fractal.f4e.emf.diagram/plugin.xml (8410 => 8411)


--- trunk/f4e/refactoring/org.ow2.fractal.f4e.emf.diagram/plugin.xml	2008-08-29 08:52:06 UTC (rev 8410)
+++ trunk/f4e/refactoring/org.ow2.fractal.f4e.emf.diagram/plugin.xml	2008-08-29 14:47:38 UTC (rev 8411)
@@ -229,6 +229,7 @@
             <input type="org.eclipse.gmf.runtime.notation.View"/>
             <input type="org.eclipse.gef.EditPart"/>
             <input type="org.ow2.fractal.f4e.fractal.diagram.navigator.FractalAbstractNavigatorItem"/>
+            <input type="org.eclipse.emf.ecore.EObject"/>
          </propertySection>
       </propertySections>
    </extension>
@@ -344,45 +345,108 @@
          </metamodelType>
       </metamodel>
       <metamodel nsURI="http://org.ow2.fractal/f4e/fractal.ecore/1.0.0">
+         <specializationType
+               id="org.ow2.fractal.f4e.emf.diagram.Attribute_2006"
+               name="%metatype.name.Attribute_2006"
+               kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType">
+            <specializes id="org.ow2.fractal.f4e.emf.diagram.Attribute_2005"/>
+            <param name="semanticHint" value="2006"/>
+         </specializationType>
+      </metamodel>
+      <metamodel nsURI="http://org.ow2.fractal/f4e/fractal.ecore/1.0.0">
          <metamodelType
-               id="org.ow2.fractal.f4e.emf.diagram.Controller_2006"
-               name="%metatype.name.Controller_2006"
+               id="org.ow2.fractal.f4e.emf.diagram.Controller_2007"
+               name="%metatype.name.Controller_2007"
                kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
                eclass="Controller"
                edithelper="org.ow2.fractal.f4e.fractal.diagram.edit.helpers.ControllerEditHelper">
-            <param name="semanticHint" value="2006"/>
+            <param name="semanticHint" value="2007"/>
          </metamodelType>
       </metamodel>
       <metamodel nsURI="http://org.ow2.fractal/f4e/fractal.ecore/1.0.0">
          <metamodelType
-               id="org.ow2.fractal.f4e.emf.diagram.VirtualNode_2007"
-               name="%metatype.name.VirtualNode_2007"
+               id="org.ow2.fractal.f4e.emf.diagram.VirtualNode_2008"
+               name="%metatype.name.VirtualNode_2008"
                kind="org.eclipse.gmf.runtime.emf.type.core.IHintedType"
                eclass="VirtualNode"
                edithelper="org.ow2.fractal.f4e.fractal.diagram.edit.helpers.VirtualNodeEditHelper">
-            <param name="semanticHint" value="2007"/>
+            <param name="semanticHint" value="2008"/>
          </metamodelType>
       </metamodel>
       <metamodel nsURI="http://o