Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'plugins/org.eclipse.gmf.tooldef')
-rw-r--r--plugins/org.eclipse.gmf.tooldef/models/tooldef.ecore278
-rw-r--r--plugins/org.eclipse.gmf.tooldef/models/tooldef.genmodel216
-rw-r--r--plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/AbstractTool.java1
-rw-r--r--plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/ActionKind.java1
-rw-r--r--plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/AppearanceStyle.java1
-rw-r--r--plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/BundleImage.java1
-rw-r--r--plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/ContextMenu.java1
-rw-r--r--plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/ContributionItem.java1
-rw-r--r--plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/GMFToolFactory.java1
-rw-r--r--plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/GMFToolPackage.java1
-rw-r--r--plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/GenericStyleSelector.java3
-rw-r--r--plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/GenericTool.java1
-rw-r--r--plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/ItemRef.java1
-rw-r--r--plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/MainMenu.java1
-rw-r--r--plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/Menu.java3
-rw-r--r--plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/MenuAction.java1
-rw-r--r--plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/Palette.java1
-rw-r--r--plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/PopupMenu.java1
-rw-r--r--plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/PredefinedItem.java1
-rw-r--r--plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/Separator.java1
-rw-r--r--plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/StandardTool.java1
-rw-r--r--plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/StandardToolKind.java1
-rw-r--r--plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/StyleSelector.java1
-rw-r--r--plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/ToolContainer.java3
-rw-r--r--plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/ToolRegistry.java5
-rw-r--r--plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/impl/AbstractToolImpl.java5
-rw-r--r--plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/impl/BundleImageImpl.java1
-rw-r--r--plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/impl/ContextMenuImpl.java3
-rw-r--r--plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/impl/CreationToolImpl.java1
-rw-r--r--plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/impl/DefaultImageImpl.java1
-rw-r--r--plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/impl/GMFToolFactoryImpl.java1
-rw-r--r--plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/impl/GMFToolPackageImpl.java26
-rw-r--r--plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/impl/GenericStyleSelectorImpl.java3
-rw-r--r--plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/impl/GenericToolImpl.java1
-rw-r--r--plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/impl/ItemRefImpl.java3
-rw-r--r--plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/impl/MainMenuImpl.java1
-rw-r--r--plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/impl/MenuActionImpl.java3
-rw-r--r--plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/impl/MenuImpl.java3
-rw-r--r--plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/impl/PaletteImpl.java3
-rw-r--r--plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/impl/PaletteSeparatorImpl.java1
-rw-r--r--plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/impl/PopupMenuImpl.java3
-rw-r--r--plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/impl/PredefinedItemImpl.java1
-rw-r--r--plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/impl/PredefinedMenuImpl.java1
-rw-r--r--plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/impl/SeparatorImpl.java1
-rw-r--r--plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/impl/StandardToolImpl.java1
-rw-r--r--plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/impl/ToolContainerImpl.java3
-rw-r--r--plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/impl/ToolGroupImpl.java10
-rw-r--r--plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/impl/ToolRegistryImpl.java7
-rw-r--r--plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/impl/ToolbarImpl.java1
-rw-r--r--plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/util/GMFToolAdapterFactory.java4
-rw-r--r--plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/util/GMFToolSwitch.java141
51 files changed, 393 insertions, 363 deletions
diff --git a/plugins/org.eclipse.gmf.tooldef/models/tooldef.ecore b/plugins/org.eclipse.gmf.tooldef/models/tooldef.ecore
index 7b8aa5795..bea3f3691 100644
--- a/plugins/org.eclipse.gmf.tooldef/models/tooldef.ecore
+++ b/plugins/org.eclipse.gmf.tooldef/models/tooldef.ecore
@@ -1,139 +1,139 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage xmi:version="2.0"
- xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="tooldef"
- nsURI="http://www.eclipse.org/gmf/2005/ToolDefinition" nsPrefix="gmftool">
- <eClassifiers xsi:type="ecore:EClass" name="ToolRegistry">
- <eStructuralFeatures xsi:type="ecore:EReference" name="sharedActions" upperBound="-1"
- eType="#//MenuAction" containment="true">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="Instead of placing&#x9;common actions somewhere in menu hierarchy and referencing them in (2..n) cases, keep them in this central registry and use ItemRef everywhere (i.e. in 1..n cases)"/>
- </eAnnotations>
- </eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EReference" name="allMenus" upperBound="-1"
- eType="#//Menu" containment="true"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="palette" eType="#//Palette"
- containment="true"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="AbstractTool" abstract="true">
- <eStructuralFeatures xsi:type="ecore:EReference" name="smallIcon" eType="#//Image"
- containment="true"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="largeIcon" eType="#//Image"
- containment="true"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="title" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="description" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="ToolContainer" abstract="true" eSuperTypes="#//AbstractTool">
- <eStructuralFeatures xsi:type="ecore:EReference" name="tools" upperBound="-1"
- eType="#//AbstractTool" containment="true"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="PaletteSeparator" eSuperTypes="#//AbstractTool"/>
- <eClassifiers xsi:type="ecore:EClass" name="ToolGroup" eSuperTypes="#//ToolContainer">
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="collapsible" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="stack" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
- <eStructuralFeatures xsi:type="ecore:EReference" name="active" eType="#//AbstractTool"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="Palette" eSuperTypes="#//ToolContainer">
- <eStructuralFeatures xsi:type="ecore:EReference" name="default" eType="#//AbstractTool"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="StandardTool" eSuperTypes="#//AbstractTool">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="predefined, like zoom or marquee"/>
- </eAnnotations>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="toolKind" eType="#//StandardToolKind"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EEnum" name="StandardToolKind">
- <eLiterals name="SELECT"/>
- <eLiterals name="SELECT_PAN" value="1"/>
- <eLiterals name="MARQUEE" value="2"/>
- <eLiterals name="ZOOM_PAN" value="3"/>
- <eLiterals name="ZOOM_IN" value="4"/>
- <eLiterals name="ZOOM_OUT" value="5"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="CreationTool" eSuperTypes="#//AbstractTool"/>
- <eClassifiers xsi:type="ecore:EClass" name="GenericTool" eSuperTypes="#//AbstractTool">
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="toolClass" lowerBound="1"
- eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="ItemBase" abstract="true" interface="true"/>
- <eClassifiers xsi:type="ecore:EClass" name="Menu" abstract="true">
- <eStructuralFeatures xsi:type="ecore:EReference" name="items" upperBound="-1"
- eType="#//ItemBase" containment="true"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="Separator" eSuperTypes="#//ItemBase">
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="PredefinedItem" eSuperTypes="#//ItemBase">
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="identifier" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="PredefinedMenu" eSuperTypes="#//Menu #//PredefinedItem"/>
- <eClassifiers xsi:type="ecore:EClass" name="ContributionItem" abstract="true" interface="true"
- eSuperTypes="#//ItemBase">
- <eStructuralFeatures xsi:type="ecore:EReference" name="icon" eType="#//Image"
- containment="true"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="title" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="MenuAction" eSuperTypes="#//ContributionItem">
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="kind" eType="#//ActionKind"/>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="hotKey" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="ItemRef" eSuperTypes="#//ItemBase">
- <eStructuralFeatures xsi:type="ecore:EReference" name="item" lowerBound="1" eType="#//ItemBase"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="ContextMenu" eSuperTypes="#//Menu">
- <eStructuralFeatures xsi:type="ecore:EReference" name="default" eType="#//MenuAction"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="PopupMenu" eSuperTypes="#//Menu #//ContributionItem">
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="iD" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
- iD="true"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="MainMenu" eSuperTypes="#//Menu">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="no default action and no id, just a collection of items"/>
- </eAnnotations>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="title" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="Toolbar" eSuperTypes="#//Menu"/>
- <eClassifiers xsi:type="ecore:EEnum" name="ActionKind">
- <eLiterals name="CREATE"/>
- <eLiterals name="PROPCHANGE" value="1"/>
- <eLiterals name="MODIFY" value="2"/>
- <eLiterals name="PROCESS" value="3"/>
- <eLiterals name="CUSTOM" value="99"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="Image" abstract="true" interface="true"/>
- <eClassifiers xsi:type="ecore:EClass" name="DefaultImage" eSuperTypes="#//Image">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="Delegate to EMF.Edit providers"/>
- </eAnnotations>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="BundleImage" eSuperTypes="#//Image">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="Image bundled as part of distribution"/>
- </eAnnotations>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="path" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="Relative path to image"/>
- </eAnnotations>
- </eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="bundle" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
- <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
- <details key="documentation" value="Empty value means image path is relative to generated bundle"/>
- </eAnnotations>
- </eStructuralFeatures>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="StyleSelector" abstract="true" interface="true">
- <eOperations name="isOk" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
- <eParameters name="style" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>
- </eOperations>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="GenericStyleSelector" eSuperTypes="#//StyleSelector">
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="values" lowerBound="1"
- upperBound="-1" eType="#//AppearanceStyle"/>
- </eClassifiers>
- <eClassifiers xsi:type="ecore:EEnum" name="AppearanceStyle">
- <eLiterals name="Font"/>
- <eLiterals name="Fill" value="1"/>
- <eLiterals name="Line" value="2"/>
- </eClassifiers>
-</ecore:EPackage>
+<?xml version="1.0" encoding="UTF-8"?>
+<ecore:EPackage xmi:version="2.0"
+ xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="tooldef"
+ nsURI="http://www.eclipse.org/gmf/2005/ToolDefinition" nsPrefix="gmftool">
+ <eClassifiers xsi:type="ecore:EClass" name="ToolRegistry">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="sharedActions" upperBound="-1"
+ eType="#//MenuAction" containment="true">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="documentation" value="Instead of placing&#x9;common actions somewhere in menu hierarchy and referencing them in (2..n) cases, keep them in this central registry and use ItemRef everywhere (i.e. in 1..n cases)"/>
+ </eAnnotations>
+ </eStructuralFeatures>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="allMenus" upperBound="-1"
+ eType="#//Menu" containment="true"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="palette" eType="#//Palette"
+ containment="true"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="AbstractTool" abstract="true">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="smallIcon" eType="#//Image"
+ containment="true"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="largeIcon" eType="#//Image"
+ containment="true"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="title" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="description" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="ToolContainer" abstract="true" eSuperTypes="#//AbstractTool">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="tools" upperBound="-1"
+ eType="#//AbstractTool" containment="true"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="PaletteSeparator" eSuperTypes="#//AbstractTool"/>
+ <eClassifiers xsi:type="ecore:EClass" name="ToolGroup" eSuperTypes="#//ToolContainer">
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="collapsible" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="stack" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
+ <eStructuralFeatures xsi:type="ecore:EReference" name="active" eType="#//AbstractTool"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="Palette" eSuperTypes="#//ToolContainer">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="default" eType="#//AbstractTool"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="StandardTool" eSuperTypes="#//AbstractTool">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="documentation" value="predefined, like zoom or marquee"/>
+ </eAnnotations>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="toolKind" eType="#//StandardToolKind"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EEnum" name="StandardToolKind">
+ <eLiterals name="SELECT"/>
+ <eLiterals name="SELECT_PAN" value="1"/>
+ <eLiterals name="MARQUEE" value="2"/>
+ <eLiterals name="ZOOM_PAN" value="3"/>
+ <eLiterals name="ZOOM_IN" value="4"/>
+ <eLiterals name="ZOOM_OUT" value="5"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="CreationTool" eSuperTypes="#//AbstractTool"/>
+ <eClassifiers xsi:type="ecore:EClass" name="GenericTool" eSuperTypes="#//AbstractTool">
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="toolClass" lowerBound="1"
+ eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="ItemBase" abstract="true" interface="true"/>
+ <eClassifiers xsi:type="ecore:EClass" name="Menu" abstract="true">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="items" upperBound="-1"
+ eType="#//ItemBase" containment="true"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="Separator" eSuperTypes="#//ItemBase">
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="PredefinedItem" eSuperTypes="#//ItemBase">
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="identifier" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="PredefinedMenu" eSuperTypes="#//Menu #//PredefinedItem"/>
+ <eClassifiers xsi:type="ecore:EClass" name="ContributionItem" abstract="true" interface="true"
+ eSuperTypes="#//ItemBase">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="icon" eType="#//Image"
+ containment="true"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="title" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="MenuAction" eSuperTypes="#//ContributionItem">
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="kind" eType="#//ActionKind"/>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="hotKey" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="ItemRef" eSuperTypes="#//ItemBase">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="item" lowerBound="1" eType="#//ItemBase"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="ContextMenu" eSuperTypes="#//Menu">
+ <eStructuralFeatures xsi:type="ecore:EReference" name="default" eType="#//MenuAction"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="PopupMenu" eSuperTypes="#//Menu #//ContributionItem">
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="iD" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
+ iD="true"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="MainMenu" eSuperTypes="#//Menu">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="documentation" value="no default action and no id, just a collection of items"/>
+ </eAnnotations>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="title" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="Toolbar" eSuperTypes="#//Menu"/>
+ <eClassifiers xsi:type="ecore:EEnum" name="ActionKind">
+ <eLiterals name="CREATE"/>
+ <eLiterals name="PROPCHANGE" value="1"/>
+ <eLiterals name="MODIFY" value="2"/>
+ <eLiterals name="PROCESS" value="3"/>
+ <eLiterals name="CUSTOM" value="99"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="Image" abstract="true" interface="true"/>
+ <eClassifiers xsi:type="ecore:EClass" name="DefaultImage" eSuperTypes="#//Image">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="documentation" value="Delegate to EMF.Edit providers"/>
+ </eAnnotations>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="BundleImage" eSuperTypes="#//Image">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="documentation" value="Image bundled as part of distribution"/>
+ </eAnnotations>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="path" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="documentation" value="Relative path to image"/>
+ </eAnnotations>
+ </eStructuralFeatures>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="bundle" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="documentation" value="Empty value means image path is relative to generated bundle"/>
+ </eAnnotations>
+ </eStructuralFeatures>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="StyleSelector" abstract="true" interface="true">
+ <eOperations name="isOk" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
+ <eParameters name="style" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>
+ </eOperations>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EClass" name="GenericStyleSelector" eSuperTypes="#//StyleSelector">
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="values" lowerBound="1"
+ upperBound="-1" eType="#//AppearanceStyle"/>
+ </eClassifiers>
+ <eClassifiers xsi:type="ecore:EEnum" name="AppearanceStyle">
+ <eLiterals name="Font"/>
+ <eLiterals name="Fill" value="1"/>
+ <eLiterals name="Line" value="2"/>
+ </eClassifiers>
+</ecore:EPackage>
diff --git a/plugins/org.eclipse.gmf.tooldef/models/tooldef.genmodel b/plugins/org.eclipse.gmf.tooldef/models/tooldef.genmodel
index 3f911f1ab..929cdb994 100644
--- a/plugins/org.eclipse.gmf.tooldef/models/tooldef.genmodel
+++ b/plugins/org.eclipse.gmf.tooldef/models/tooldef.genmodel
@@ -1,108 +1,108 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<genmodel:GenModel xmi:version="2.0"
- xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
- xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.eclipse.gmf.tooldef/src"
- editorDirectory="/org.eclipse.gmf.tooldef.edit/src" modelPluginID="org.eclipse.gmf.tooldef"
- templateDirectory="" redirection="" modelName="GMFTool" editorPluginClass="org.eclipse.gmf.tooldef.provider.GMFToolEditPlugin"
- codeFormatting="true" importerID="org.eclipse.emf.importer.ecore" complianceLevel="5.0">
- <foreignModel>tooldef.ecore</foreignModel>
- <genPackages prefix="GMFTool" basePackage="org.eclipse.gmf" disposableProviderFactory="true"
- literalsInterface="false" ecorePackage="tooldef.ecore#/">
- <genEnums ecoreEnum="tooldef.ecore#//StandardToolKind">
- <genEnumLiterals ecoreEnumLiteral="tooldef.ecore#//StandardToolKind/SELECT"/>
- <genEnumLiterals ecoreEnumLiteral="tooldef.ecore#//StandardToolKind/SELECT_PAN"/>
- <genEnumLiterals ecoreEnumLiteral="tooldef.ecore#//StandardToolKind/MARQUEE"/>
- <genEnumLiterals ecoreEnumLiteral="tooldef.ecore#//StandardToolKind/ZOOM_PAN"/>
- <genEnumLiterals ecoreEnumLiteral="tooldef.ecore#//StandardToolKind/ZOOM_IN"/>
- <genEnumLiterals ecoreEnumLiteral="tooldef.ecore#//StandardToolKind/ZOOM_OUT"/>
- </genEnums>
- <genEnums ecoreEnum="tooldef.ecore#//ActionKind">
- <genEnumLiterals ecoreEnumLiteral="tooldef.ecore#//ActionKind/CREATE"/>
- <genEnumLiterals ecoreEnumLiteral="tooldef.ecore#//ActionKind/PROPCHANGE"/>
- <genEnumLiterals ecoreEnumLiteral="tooldef.ecore#//ActionKind/MODIFY"/>
- <genEnumLiterals ecoreEnumLiteral="tooldef.ecore#//ActionKind/PROCESS"/>
- <genEnumLiterals ecoreEnumLiteral="tooldef.ecore#//ActionKind/CUSTOM"/>
- </genEnums>
- <genEnums ecoreEnum="tooldef.ecore#//AppearanceStyle">
- <genEnumLiterals ecoreEnumLiteral="tooldef.ecore#//AppearanceStyle/Font"/>
- <genEnumLiterals ecoreEnumLiteral="tooldef.ecore#//AppearanceStyle/Fill"/>
- <genEnumLiterals ecoreEnumLiteral="tooldef.ecore#//AppearanceStyle/Line"/>
- </genEnums>
- <genClasses ecoreClass="tooldef.ecore#//ToolRegistry">
- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference tooldef.ecore#//ToolRegistry/sharedActions"/>
- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference tooldef.ecore#//ToolRegistry/allMenus"/>
- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference tooldef.ecore#//ToolRegistry/palette"/>
- </genClasses>
- <genClasses image="false" ecoreClass="tooldef.ecore#//AbstractTool">
- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference tooldef.ecore#//AbstractTool/smallIcon"/>
- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference tooldef.ecore#//AbstractTool/largeIcon"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute tooldef.ecore#//AbstractTool/title"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute tooldef.ecore#//AbstractTool/description"/>
- </genClasses>
- <genClasses image="false" ecoreClass="tooldef.ecore#//ToolContainer">
- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference tooldef.ecore#//ToolContainer/tools"/>
- </genClasses>
- <genClasses ecoreClass="tooldef.ecore#//PaletteSeparator"/>
- <genClasses ecoreClass="tooldef.ecore#//ToolGroup">
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute tooldef.ecore#//ToolGroup/collapsible"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute tooldef.ecore#//ToolGroup/stack"/>
- <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference tooldef.ecore#//ToolGroup/active"/>
- </genClasses>
- <genClasses ecoreClass="tooldef.ecore#//Palette">
- <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference tooldef.ecore#//Palette/default"/>
- </genClasses>
- <genClasses ecoreClass="tooldef.ecore#//StandardTool">
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute tooldef.ecore#//StandardTool/toolKind"/>
- </genClasses>
- <genClasses ecoreClass="tooldef.ecore#//CreationTool"/>
- <genClasses ecoreClass="tooldef.ecore#//GenericTool">
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute tooldef.ecore#//GenericTool/toolClass"/>
- </genClasses>
- <genClasses ecoreClass="tooldef.ecore#//ItemBase"/>
- <genClasses image="false" ecoreClass="tooldef.ecore#//Menu">
- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference tooldef.ecore#//Menu/items"/>
- </genClasses>
- <genClasses ecoreClass="tooldef.ecore#//Separator">
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute tooldef.ecore#//Separator/name"/>
- </genClasses>
- <genClasses ecoreClass="tooldef.ecore#//PredefinedItem">
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute tooldef.ecore#//PredefinedItem/identifier"/>
- </genClasses>
- <genClasses ecoreClass="tooldef.ecore#//PredefinedMenu"/>
- <genClasses ecoreClass="tooldef.ecore#//ContributionItem">
- <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference tooldef.ecore#//ContributionItem/icon"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute tooldef.ecore#//ContributionItem/title"/>
- </genClasses>
- <genClasses ecoreClass="tooldef.ecore#//MenuAction">
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute tooldef.ecore#//MenuAction/kind"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute tooldef.ecore#//MenuAction/hotKey"/>
- </genClasses>
- <genClasses ecoreClass="tooldef.ecore#//ItemRef">
- <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference tooldef.ecore#//ItemRef/item"/>
- </genClasses>
- <genClasses ecoreClass="tooldef.ecore#//ContextMenu">
- <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference tooldef.ecore#//ContextMenu/default"/>
- </genClasses>
- <genClasses ecoreClass="tooldef.ecore#//PopupMenu">
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute tooldef.ecore#//PopupMenu/iD"/>
- </genClasses>
- <genClasses ecoreClass="tooldef.ecore#//MainMenu">
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute tooldef.ecore#//MainMenu/title"/>
- </genClasses>
- <genClasses ecoreClass="tooldef.ecore#//Toolbar"/>
- <genClasses ecoreClass="tooldef.ecore#//Image"/>
- <genClasses ecoreClass="tooldef.ecore#//DefaultImage"/>
- <genClasses ecoreClass="tooldef.ecore#//BundleImage">
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute tooldef.ecore#//BundleImage/path"/>
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute tooldef.ecore#//BundleImage/bundle"/>
- </genClasses>
- <genClasses ecoreClass="tooldef.ecore#//StyleSelector">
- <genOperations ecoreOperation="tooldef.ecore#//StyleSelector/isOk">
- <genParameters ecoreParameter="tooldef.ecore#//StyleSelector/isOk/style"/>
- </genOperations>
- </genClasses>
- <genClasses ecoreClass="tooldef.ecore#//GenericStyleSelector">
- <genFeatures createChild="false" ecoreFeature="ecore:EAttribute tooldef.ecore#//GenericStyleSelector/values"/>
- </genClasses>
- </genPackages>
-</genmodel:GenModel>
+<?xml version="1.0" encoding="UTF-8"?>
+<genmodel:GenModel xmi:version="2.0"
+ xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
+ xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.eclipse.gmf.tooldef/src"
+ editorDirectory="/org.eclipse.gmf.tooldef.edit/src" modelPluginID="org.eclipse.gmf.tooldef"
+ templateDirectory="" redirection="" modelName="GMFTool" editorPluginClass="org.eclipse.gmf.tooldef.provider.GMFToolEditPlugin"
+ codeFormatting="true" importerID="org.eclipse.emf.importer.ecore" complianceLevel="5.0">
+ <foreignModel>tooldef.ecore</foreignModel>
+ <genPackages prefix="GMFTool" basePackage="org.eclipse.gmf" disposableProviderFactory="true"
+ literalsInterface="false" ecorePackage="tooldef.ecore#/">
+ <genEnums ecoreEnum="tooldef.ecore#//StandardToolKind">
+ <genEnumLiterals ecoreEnumLiteral="tooldef.ecore#//StandardToolKind/SELECT"/>
+ <genEnumLiterals ecoreEnumLiteral="tooldef.ecore#//StandardToolKind/SELECT_PAN"/>
+ <genEnumLiterals ecoreEnumLiteral="tooldef.ecore#//StandardToolKind/MARQUEE"/>
+ <genEnumLiterals ecoreEnumLiteral="tooldef.ecore#//StandardToolKind/ZOOM_PAN"/>
+ <genEnumLiterals ecoreEnumLiteral="tooldef.ecore#//StandardToolKind/ZOOM_IN"/>
+ <genEnumLiterals ecoreEnumLiteral="tooldef.ecore#//StandardToolKind/ZOOM_OUT"/>
+ </genEnums>
+ <genEnums ecoreEnum="tooldef.ecore#//ActionKind">
+ <genEnumLiterals ecoreEnumLiteral="tooldef.ecore#//ActionKind/CREATE"/>
+ <genEnumLiterals ecoreEnumLiteral="tooldef.ecore#//ActionKind/PROPCHANGE"/>
+ <genEnumLiterals ecoreEnumLiteral="tooldef.ecore#//ActionKind/MODIFY"/>
+ <genEnumLiterals ecoreEnumLiteral="tooldef.ecore#//ActionKind/PROCESS"/>
+ <genEnumLiterals ecoreEnumLiteral="tooldef.ecore#//ActionKind/CUSTOM"/>
+ </genEnums>
+ <genEnums ecoreEnum="tooldef.ecore#//AppearanceStyle">
+ <genEnumLiterals ecoreEnumLiteral="tooldef.ecore#//AppearanceStyle/Font"/>
+ <genEnumLiterals ecoreEnumLiteral="tooldef.ecore#//AppearanceStyle/Fill"/>
+ <genEnumLiterals ecoreEnumLiteral="tooldef.ecore#//AppearanceStyle/Line"/>
+ </genEnums>
+ <genClasses ecoreClass="tooldef.ecore#//ToolRegistry">
+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference tooldef.ecore#//ToolRegistry/sharedActions"/>
+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference tooldef.ecore#//ToolRegistry/allMenus"/>
+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference tooldef.ecore#//ToolRegistry/palette"/>
+ </genClasses>
+ <genClasses image="false" ecoreClass="tooldef.ecore#//AbstractTool">
+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference tooldef.ecore#//AbstractTool/smallIcon"/>
+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference tooldef.ecore#//AbstractTool/largeIcon"/>
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute tooldef.ecore#//AbstractTool/title"/>
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute tooldef.ecore#//AbstractTool/description"/>
+ </genClasses>
+ <genClasses image="false" ecoreClass="tooldef.ecore#//ToolContainer">
+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference tooldef.ecore#//ToolContainer/tools"/>
+ </genClasses>
+ <genClasses ecoreClass="tooldef.ecore#//PaletteSeparator"/>
+ <genClasses ecoreClass="tooldef.ecore#//ToolGroup">
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute tooldef.ecore#//ToolGroup/collapsible"/>
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute tooldef.ecore#//ToolGroup/stack"/>
+ <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference tooldef.ecore#//ToolGroup/active"/>
+ </genClasses>
+ <genClasses ecoreClass="tooldef.ecore#//Palette">
+ <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference tooldef.ecore#//Palette/default"/>
+ </genClasses>
+ <genClasses ecoreClass="tooldef.ecore#//StandardTool">
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute tooldef.ecore#//StandardTool/toolKind"/>
+ </genClasses>
+ <genClasses ecoreClass="tooldef.ecore#//CreationTool"/>
+ <genClasses ecoreClass="tooldef.ecore#//GenericTool">
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute tooldef.ecore#//GenericTool/toolClass"/>
+ </genClasses>
+ <genClasses ecoreClass="tooldef.ecore#//ItemBase"/>
+ <genClasses image="false" ecoreClass="tooldef.ecore#//Menu">
+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference tooldef.ecore#//Menu/items"/>
+ </genClasses>
+ <genClasses ecoreClass="tooldef.ecore#//Separator">
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute tooldef.ecore#//Separator/name"/>
+ </genClasses>
+ <genClasses ecoreClass="tooldef.ecore#//PredefinedItem">
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute tooldef.ecore#//PredefinedItem/identifier"/>
+ </genClasses>
+ <genClasses ecoreClass="tooldef.ecore#//PredefinedMenu"/>
+ <genClasses ecoreClass="tooldef.ecore#//ContributionItem">
+ <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference tooldef.ecore#//ContributionItem/icon"/>
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute tooldef.ecore#//ContributionItem/title"/>
+ </genClasses>
+ <genClasses ecoreClass="tooldef.ecore#//MenuAction">
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute tooldef.ecore#//MenuAction/kind"/>
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute tooldef.ecore#//MenuAction/hotKey"/>
+ </genClasses>
+ <genClasses ecoreClass="tooldef.ecore#//ItemRef">
+ <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference tooldef.ecore#//ItemRef/item"/>
+ </genClasses>
+ <genClasses ecoreClass="tooldef.ecore#//ContextMenu">
+ <genFeatures notify="false" createChild="false" ecoreFeature="ecore:EReference tooldef.ecore#//ContextMenu/default"/>
+ </genClasses>
+ <genClasses ecoreClass="tooldef.ecore#//PopupMenu">
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute tooldef.ecore#//PopupMenu/iD"/>
+ </genClasses>
+ <genClasses ecoreClass="tooldef.ecore#//MainMenu">
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute tooldef.ecore#//MainMenu/title"/>
+ </genClasses>
+ <genClasses ecoreClass="tooldef.ecore#//Toolbar"/>
+ <genClasses ecoreClass="tooldef.ecore#//Image"/>
+ <genClasses ecoreClass="tooldef.ecore#//DefaultImage"/>
+ <genClasses ecoreClass="tooldef.ecore#//BundleImage">
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute tooldef.ecore#//BundleImage/path"/>
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute tooldef.ecore#//BundleImage/bundle"/>
+ </genClasses>
+ <genClasses ecoreClass="tooldef.ecore#//StyleSelector">
+ <genOperations ecoreOperation="tooldef.ecore#//StyleSelector/isOk">
+ <genParameters ecoreParameter="tooldef.ecore#//StyleSelector/isOk/style"/>
+ </genOperations>
+ </genClasses>
+ <genClasses ecoreClass="tooldef.ecore#//GenericStyleSelector">
+ <genFeatures createChild="false" ecoreFeature="ecore:EAttribute tooldef.ecore#//GenericStyleSelector/values"/>
+ </genClasses>
+ </genPackages>
+</genmodel:GenModel>
diff --git a/plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/AbstractTool.java b/plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/AbstractTool.java
index 12799a2a7..53bd86996 100644
--- a/plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/AbstractTool.java
+++ b/plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/AbstractTool.java
@@ -28,6 +28,7 @@ import org.eclipse.emf.ecore.EObject;
* @generated
*/
public interface AbstractTool extends EObject {
+
/**
* Returns the value of the '<em><b>Small Icon</b></em>' containment reference.
* <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/ActionKind.java b/plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/ActionKind.java
index de2122779..5d787c76c 100644
--- a/plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/ActionKind.java
+++ b/plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/ActionKind.java
@@ -67,6 +67,7 @@ public enum ActionKind implements Enumerator {
* @ordered
*/
CUSTOM_LITERAL(99, "CUSTOM", "CUSTOM");
+
/**
* The '<em><b>CREATE</b></em>' literal value.
* <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/AppearanceStyle.java b/plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/AppearanceStyle.java
index a04a40740..7f7e4d4fb 100644
--- a/plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/AppearanceStyle.java
+++ b/plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/AppearanceStyle.java
@@ -49,6 +49,7 @@ public enum AppearanceStyle implements Enumerator {
* @ordered
*/
LINE_LITERAL(2, "Line", "Line");
+
/**
* The '<em><b>Font</b></em>' literal value.
* <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/BundleImage.java b/plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/BundleImage.java
index a669077c6..33ab16cee 100644
--- a/plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/BundleImage.java
+++ b/plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/BundleImage.java
@@ -28,6 +28,7 @@ package org.eclipse.gmf.tooldef;
* @generated
*/
public interface BundleImage extends Image {
+
/**
* Returns the value of the '<em><b>Path</b></em>' attribute.
* <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/ContextMenu.java b/plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/ContextMenu.java
index 6b8d5534c..a6b4f464c 100644
--- a/plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/ContextMenu.java
+++ b/plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/ContextMenu.java
@@ -23,6 +23,7 @@ package org.eclipse.gmf.tooldef;
* @generated
*/
public interface ContextMenu extends Menu {
+
/**
* Returns the value of the '<em><b>Default</b></em>' reference.
* <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/ContributionItem.java b/plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/ContributionItem.java
index 801e97f54..c6abe6213 100644
--- a/plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/ContributionItem.java
+++ b/plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/ContributionItem.java
@@ -24,6 +24,7 @@ package org.eclipse.gmf.tooldef;
* @generated
*/
public interface ContributionItem extends ItemBase {
+
/**
* Returns the value of the '<em><b>Icon</b></em>' containment reference.
* <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/GMFToolFactory.java b/plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/GMFToolFactory.java
index 71a9ab1fe..8d7fbf39e 100644
--- a/plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/GMFToolFactory.java
+++ b/plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/GMFToolFactory.java
@@ -17,6 +17,7 @@ import org.eclipse.emf.ecore.EFactory;
* @generated
*/
public interface GMFToolFactory extends EFactory {
+
/**
* The singleton instance of the factory.
* <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/GMFToolPackage.java b/plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/GMFToolPackage.java
index 8167e14ad..b18f0c49d 100644
--- a/plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/GMFToolPackage.java
+++ b/plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/GMFToolPackage.java
@@ -28,6 +28,7 @@ import org.eclipse.emf.ecore.EReference;
* @generated
*/
public interface GMFToolPackage extends EPackage {
+
/**
* The package name.
* <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/GenericStyleSelector.java b/plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/GenericStyleSelector.java
index 1a07b171c..40c7c9d6c 100644
--- a/plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/GenericStyleSelector.java
+++ b/plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/GenericStyleSelector.java
@@ -25,6 +25,7 @@ import org.eclipse.emf.common.util.EList;
* @generated
*/
public interface GenericStyleSelector extends StyleSelector {
+
/**
* Returns the value of the '<em><b>Values</b></em>' attribute list.
* The list contents are of type {@link org.eclipse.gmf.tooldef.AppearanceStyle}.
@@ -38,7 +39,7 @@ public interface GenericStyleSelector extends StyleSelector {
* @return the value of the '<em>Values</em>' attribute list.
* @see org.eclipse.gmf.tooldef.AppearanceStyle
* @see org.eclipse.gmf.tooldef.GMFToolPackage#getGenericStyleSelector_Values()
- * @model type="org.eclipse.gmf.tooldef.AppearanceStyle" required="true"
+ * @model required="true"
* @generated
*/
EList<AppearanceStyle> getValues();
diff --git a/plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/GenericTool.java b/plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/GenericTool.java
index b1815cc99..88c8af4d7 100644
--- a/plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/GenericTool.java
+++ b/plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/GenericTool.java
@@ -23,6 +23,7 @@ package org.eclipse.gmf.tooldef;
* @generated
*/
public interface GenericTool extends AbstractTool {
+
/**
* Returns the value of the '<em><b>Tool Class</b></em>' attribute.
* <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/ItemRef.java b/plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/ItemRef.java
index 6171da10f..2934c4b2e 100644
--- a/plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/ItemRef.java
+++ b/plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/ItemRef.java
@@ -23,6 +23,7 @@ package org.eclipse.gmf.tooldef;
* @generated
*/
public interface ItemRef extends ItemBase {
+
/**
* Returns the value of the '<em><b>Item</b></em>' reference.
* <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/MainMenu.java b/plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/MainMenu.java
index ae3e5bcae..fbaa932da 100644
--- a/plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/MainMenu.java
+++ b/plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/MainMenu.java
@@ -27,6 +27,7 @@ package org.eclipse.gmf.tooldef;
* @generated
*/
public interface MainMenu extends Menu {
+
/**
* Returns the value of the '<em><b>Title</b></em>' attribute.
* <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/Menu.java b/plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/Menu.java
index 677735f94..d943607d6 100644
--- a/plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/Menu.java
+++ b/plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/Menu.java
@@ -27,6 +27,7 @@ import org.eclipse.emf.ecore.EObject;
* @generated
*/
public interface Menu extends EObject {
+
/**
* Returns the value of the '<em><b>Items</b></em>' containment reference list.
* The list contents are of type {@link org.eclipse.gmf.tooldef.ItemBase}.
@@ -38,7 +39,7 @@ public interface Menu extends EObject {
* <!-- end-user-doc -->
* @return the value of the '<em>Items</em>' containment reference list.
* @see org.eclipse.gmf.tooldef.GMFToolPackage#getMenu_Items()
- * @model type="org.eclipse.gmf.tooldef.ItemBase" containment="true"
+ * @model containment="true"
* @generated
*/
EList<ItemBase> getItems();
diff --git a/plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/MenuAction.java b/plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/MenuAction.java
index e071ce135..030a77bb7 100644
--- a/plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/MenuAction.java
+++ b/plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/MenuAction.java
@@ -24,6 +24,7 @@ package org.eclipse.gmf.tooldef;
* @generated
*/
public interface MenuAction extends ContributionItem {
+
/**
* Returns the value of the '<em><b>Kind</b></em>' attribute.
* The literals are from the enumeration {@link org.eclipse.gmf.tooldef.ActionKind}.
diff --git a/plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/Palette.java b/plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/Palette.java
index e9ec73ae6..6663f99b4 100644
--- a/plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/Palette.java
+++ b/plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/Palette.java
@@ -23,6 +23,7 @@ package org.eclipse.gmf.tooldef;
* @generated
*/
public interface Palette extends ToolContainer {
+
/**
* Returns the value of the '<em><b>Default</b></em>' reference.
* <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/PopupMenu.java b/plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/PopupMenu.java
index 6421a2fca..d5da24bca 100644
--- a/plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/PopupMenu.java
+++ b/plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/PopupMenu.java
@@ -23,6 +23,7 @@ package org.eclipse.gmf.tooldef;
* @generated
*/
public interface PopupMenu extends Menu, ContributionItem {
+
/**
* Returns the value of the '<em><b>ID</b></em>' attribute.
* <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/PredefinedItem.java b/plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/PredefinedItem.java
index 49ab040c8..473b86320 100644
--- a/plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/PredefinedItem.java
+++ b/plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/PredefinedItem.java
@@ -23,6 +23,7 @@ package org.eclipse.gmf.tooldef;
* @generated
*/
public interface PredefinedItem extends ItemBase {
+
/**
* Returns the value of the '<em><b>Identifier</b></em>' attribute.
* <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/Separator.java b/plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/Separator.java
index e192e0950..3a4ea0c89 100644
--- a/plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/Separator.java
+++ b/plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/Separator.java
@@ -23,6 +23,7 @@ package org.eclipse.gmf.tooldef;
* @generated
*/
public interface Separator extends ItemBase {
+
/**
* Returns the value of the '<em><b>Name</b></em>' attribute.
* <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/StandardTool.java b/plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/StandardTool.java
index 6d7ef816a..ff289d910 100644
--- a/plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/StandardTool.java
+++ b/plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/StandardTool.java
@@ -27,6 +27,7 @@ package org.eclipse.gmf.tooldef;
* @generated
*/
public interface StandardTool extends AbstractTool {
+
/**
* Returns the value of the '<em><b>Tool Kind</b></em>' attribute.
* The literals are from the enumeration {@link org.eclipse.gmf.tooldef.StandardToolKind}.
diff --git a/plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/StandardToolKind.java b/plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/StandardToolKind.java
index aa342482d..240d81a87 100644
--- a/plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/StandardToolKind.java
+++ b/plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/StandardToolKind.java
@@ -76,6 +76,7 @@ public enum StandardToolKind implements Enumerator {
* @ordered
*/
ZOOM_OUT_LITERAL(5, "ZOOM_OUT", "ZOOM_OUT");
+
/**
* The '<em><b>SELECT</b></em>' literal value.
* <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/StyleSelector.java b/plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/StyleSelector.java
index faae34081..b5ed7c3b7 100644
--- a/plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/StyleSelector.java
+++ b/plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/StyleSelector.java
@@ -19,6 +19,7 @@ import org.eclipse.emf.ecore.EObject;
* @generated
*/
public interface StyleSelector extends EObject {
+
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
diff --git a/plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/ToolContainer.java b/plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/ToolContainer.java
index 907f7758c..0ea51f871 100644
--- a/plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/ToolContainer.java
+++ b/plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/ToolContainer.java
@@ -25,6 +25,7 @@ import org.eclipse.emf.common.util.EList;
* @generated
*/
public interface ToolContainer extends AbstractTool {
+
/**
* Returns the value of the '<em><b>Tools</b></em>' containment reference list.
* The list contents are of type {@link org.eclipse.gmf.tooldef.AbstractTool}.
@@ -36,7 +37,7 @@ public interface ToolContainer extends AbstractTool {
* <!-- end-user-doc -->
* @return the value of the '<em>Tools</em>' containment reference list.
* @see org.eclipse.gmf.tooldef.GMFToolPackage#getToolContainer_Tools()
- * @model type="org.eclipse.gmf.tooldef.AbstractTool" containment="true"
+ * @model containment="true"
* @generated
*/
EList<AbstractTool> getTools();
diff --git a/plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/ToolRegistry.java b/plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/ToolRegistry.java
index 462356af1..a25ba9279 100644
--- a/plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/ToolRegistry.java
+++ b/plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/ToolRegistry.java
@@ -29,6 +29,7 @@ import org.eclipse.emf.ecore.EObject;
* @generated
*/
public interface ToolRegistry extends EObject {
+
/**
* Returns the value of the '<em><b>Shared Actions</b></em>' containment reference list.
* The list contents are of type {@link org.eclipse.gmf.tooldef.MenuAction}.
@@ -39,7 +40,7 @@ public interface ToolRegistry extends EObject {
* <!-- end-model-doc -->
* @return the value of the '<em>Shared Actions</em>' containment reference list.
* @see org.eclipse.gmf.tooldef.GMFToolPackage#getToolRegistry_SharedActions()
- * @model type="org.eclipse.gmf.tooldef.MenuAction" containment="true"
+ * @model containment="true"
* @generated
*/
EList<MenuAction> getSharedActions();
@@ -55,7 +56,7 @@ public interface ToolRegistry extends EObject {
* <!-- end-user-doc -->
* @return the value of the '<em>All Menus</em>' containment reference list.
* @see org.eclipse.gmf.tooldef.GMFToolPackage#getToolRegistry_AllMenus()
- * @model type="org.eclipse.gmf.tooldef.Menu" containment="true"
+ * @model containment="true"
* @generated
*/
EList<Menu> getAllMenus();
diff --git a/plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/impl/AbstractToolImpl.java b/plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/impl/AbstractToolImpl.java
index 6a3dc2a3e..44e27c85c 100644
--- a/plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/impl/AbstractToolImpl.java
+++ b/plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/impl/AbstractToolImpl.java
@@ -36,6 +36,7 @@ import org.eclipse.gmf.tooldef.Image;
* @generated
*/
public abstract class AbstractToolImpl extends EObjectImpl implements AbstractTool {
+
/**
* The cached value of the '{@link #getSmallIcon() <em>Small Icon</em>}' containment reference.
* <!-- begin-user-doc -->
@@ -44,7 +45,7 @@ public abstract class AbstractToolImpl extends EObjectImpl implements AbstractTo
* @generated
* @ordered
*/
- protected Image smallIcon = null;
+ protected Image smallIcon;
/**
* The cached value of the '{@link #getLargeIcon() <em>Large Icon</em>}' containment reference.
@@ -54,7 +55,7 @@ public abstract class AbstractToolImpl extends EObjectImpl implements AbstractTo
* @generated
* @ordered
*/
- protected Image largeIcon = null;
+ protected Image largeIcon;
/**
* The default value of the '{@link #getTitle() <em>Title</em>}' attribute.
diff --git a/plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/impl/BundleImageImpl.java b/plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/impl/BundleImageImpl.java
index febb84c28..93dc4408c 100644
--- a/plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/impl/BundleImageImpl.java
+++ b/plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/impl/BundleImageImpl.java
@@ -31,6 +31,7 @@ import org.eclipse.gmf.tooldef.GMFToolPackage;
* @generated
*/
public class BundleImageImpl extends EObjectImpl implements BundleImage {
+
/**
* The default value of the '{@link #getPath() <em>Path</em>}' attribute.
* <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/impl/ContextMenuImpl.java b/plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/impl/ContextMenuImpl.java
index 9febacab7..e8fb4394a 100644
--- a/plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/impl/ContextMenuImpl.java
+++ b/plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/impl/ContextMenuImpl.java
@@ -31,6 +31,7 @@ import org.eclipse.gmf.tooldef.MenuAction;
* @generated
*/
public class ContextMenuImpl extends MenuImpl implements ContextMenu {
+
/**
* The cached value of the '{@link #getDefault() <em>Default</em>}' reference.
* <!-- begin-user-doc -->
@@ -39,7 +40,7 @@ public class ContextMenuImpl extends MenuImpl implements ContextMenu {
* @generated
* @ordered
*/
- protected MenuAction default_ = null;
+ protected MenuAction default_;
/**
* <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/impl/CreationToolImpl.java b/plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/impl/CreationToolImpl.java
index 36d8dcf4d..754068e90 100644
--- a/plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/impl/CreationToolImpl.java
+++ b/plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/impl/CreationToolImpl.java
@@ -21,6 +21,7 @@ import org.eclipse.gmf.tooldef.GMFToolPackage;
* @generated
*/
public class CreationToolImpl extends AbstractToolImpl implements CreationTool {
+
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
diff --git a/plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/impl/DefaultImageImpl.java b/plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/impl/DefaultImageImpl.java
index daeb25792..8cbf6ebe3 100644
--- a/plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/impl/DefaultImageImpl.java
+++ b/plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/impl/DefaultImageImpl.java
@@ -23,6 +23,7 @@ import org.eclipse.gmf.tooldef.GMFToolPackage;
* @generated
*/
public class DefaultImageImpl extends EObjectImpl implements DefaultImage {
+
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
diff --git a/plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/impl/GMFToolFactoryImpl.java b/plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/impl/GMFToolFactoryImpl.java
index da224e941..5759ff673 100644
--- a/plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/impl/GMFToolFactoryImpl.java
+++ b/plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/impl/GMFToolFactoryImpl.java
@@ -24,6 +24,7 @@ import org.eclipse.gmf.tooldef.*;
* @generated
*/
public class GMFToolFactoryImpl extends EFactoryImpl implements GMFToolFactory {
+
/**
* Creates the default factory implementation.
* <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/impl/GMFToolPackageImpl.java b/plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/impl/GMFToolPackageImpl.java
index 9e5f09f8f..05d2b70a2 100644
--- a/plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/impl/GMFToolPackageImpl.java
+++ b/plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/impl/GMFToolPackageImpl.java
@@ -285,20 +285,10 @@ public class GMFToolPackageImpl extends EPackageImpl implements GMFToolPackage {
private static boolean isInited = false;
/**
- * Creates, registers, and initializes the <b>Package</b> for this
- * model, and for any others upon which it depends. Simple
- * dependencies are satisfied by calling this method on all
- * dependent packages before doing anything else. This method drives
- * initialization for interdependent packages directly, in parallel
- * with this package, itself.
- * <p>Of this package and its interdependencies, all packages which
- * have not yet been registered by their URI values are first created
- * and registered. The packages are then initialized in two steps:
- * meta-model objects for all of the packages are created before any
- * are initialized, since one package's meta-model objects may refer to
- * those of another.
- * <p>Invocation of this method will not affect any packages that have
- * already been initialized.
+ * Creates, registers, and initializes the <b>Package</b> for this model, and for any others upon which it depends.
+ *
+ * <p>This method is used to initialize {@link GMFToolPackage#eINSTANCE} when that field is accessed.
+ * Clients should not invoke it directly. Instead, they should simply access that field to obtain the package.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @see #eNS_URI
@@ -311,7 +301,7 @@ public class GMFToolPackageImpl extends EPackageImpl implements GMFToolPackage {
return (GMFToolPackage) EPackage.Registry.INSTANCE.getEPackage(GMFToolPackage.eNS_URI);
// Obtain or create and register package
- GMFToolPackageImpl theGMFToolPackage = (GMFToolPackageImpl) (EPackage.Registry.INSTANCE.getEPackage(eNS_URI) instanceof GMFToolPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(eNS_URI)
+ GMFToolPackageImpl theGMFToolPackage = (GMFToolPackageImpl) (EPackage.Registry.INSTANCE.get(eNS_URI) instanceof GMFToolPackageImpl ? EPackage.Registry.INSTANCE.get(eNS_URI)
: new GMFToolPackageImpl());
isInited = true;
@@ -325,6 +315,8 @@ public class GMFToolPackageImpl extends EPackageImpl implements GMFToolPackage {
// Mark meta-data to indicate it can't be changed
theGMFToolPackage.freeze();
+ // Update the registry and return the package
+ EPackage.Registry.INSTANCE.put(GMFToolPackage.eNS_URI, theGMFToolPackage);
return theGMFToolPackage;
}
@@ -1113,8 +1105,8 @@ public class GMFToolPackageImpl extends EPackageImpl implements GMFToolPackage {
initEClass(styleSelectorEClass, StyleSelector.class, "StyleSelector", IS_ABSTRACT, IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- EOperation op = addEOperation(styleSelectorEClass, ecorePackage.getEBoolean(), "isOk", 0, 1);
- addEParameter(op, ecorePackage.getEJavaObject(), "style", 0, 1);
+ EOperation op = addEOperation(styleSelectorEClass, ecorePackage.getEBoolean(), "isOk", 0, 1, IS_UNIQUE, IS_ORDERED);
+ addEParameter(op, ecorePackage.getEJavaObject(), "style", 0, 1, IS_UNIQUE, IS_ORDERED);
initEClass(genericStyleSelectorEClass, GenericStyleSelector.class, "GenericStyleSelector", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
initEAttribute(getGenericStyleSelector_Values(), this.getAppearanceStyle(), "values", null, 1, -1, GenericStyleSelector.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE,
diff --git a/plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/impl/GenericStyleSelectorImpl.java b/plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/impl/GenericStyleSelectorImpl.java
index 56183c1e4..8db9e044e 100644
--- a/plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/impl/GenericStyleSelectorImpl.java
+++ b/plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/impl/GenericStyleSelectorImpl.java
@@ -31,6 +31,7 @@ import org.eclipse.gmf.tooldef.GenericStyleSelector;
* @generated
*/
public class GenericStyleSelectorImpl extends EObjectImpl implements GenericStyleSelector {
+
/**
* The cached value of the '{@link #getValues() <em>Values</em>}' attribute list.
* <!-- begin-user-doc -->
@@ -39,7 +40,7 @@ public class GenericStyleSelectorImpl extends EObjectImpl implements GenericStyl
* @generated
* @ordered
*/
- protected EList<AppearanceStyle> values = null;
+ protected EList<AppearanceStyle> values;
/**
* <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/impl/GenericToolImpl.java b/plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/impl/GenericToolImpl.java
index 4e42a6aaf..dc91efd09 100644
--- a/plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/impl/GenericToolImpl.java
+++ b/plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/impl/GenericToolImpl.java
@@ -29,6 +29,7 @@ import org.eclipse.gmf.tooldef.GenericTool;
* @generated
*/
public class GenericToolImpl extends AbstractToolImpl implements GenericTool {
+
/**
* The default value of the '{@link #getToolClass() <em>Tool Class</em>}' attribute.
* <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/impl/ItemRefImpl.java b/plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/impl/ItemRefImpl.java
index 82cdbe529..62c6b1a46 100644
--- a/plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/impl/ItemRefImpl.java
+++ b/plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/impl/ItemRefImpl.java
@@ -32,6 +32,7 @@ import org.eclipse.gmf.tooldef.ItemRef;
* @generated
*/
public class ItemRefImpl extends EObjectImpl implements ItemRef {
+
/**
* The cached value of the '{@link #getItem() <em>Item</em>}' reference.
* <!-- begin-user-doc -->
@@ -40,7 +41,7 @@ public class ItemRefImpl extends EObjectImpl implements ItemRef {
* @generated
* @ordered
*/
- protected ItemBase item = null;
+ protected ItemBase item;
/**
* <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/impl/MainMenuImpl.java b/plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/impl/MainMenuImpl.java
index 18297454e..4e63fb279 100644
--- a/plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/impl/MainMenuImpl.java
+++ b/plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/impl/MainMenuImpl.java
@@ -29,6 +29,7 @@ import org.eclipse.gmf.tooldef.MainMenu;
* @generated
*/
public class MainMenuImpl extends MenuImpl implements MainMenu {
+
/**
* The default value of the '{@link #getTitle() <em>Title</em>}' attribute.
* <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/impl/MenuActionImpl.java b/plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/impl/MenuActionImpl.java
index 8bb1b5608..faad7eccd 100644
--- a/plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/impl/MenuActionImpl.java
+++ b/plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/impl/MenuActionImpl.java
@@ -37,6 +37,7 @@ import org.eclipse.gmf.tooldef.MenuAction;
* @generated
*/
public class MenuActionImpl extends EObjectImpl implements MenuAction {
+
/**
* The cached value of the '{@link #getIcon() <em>Icon</em>}' containment reference.
* <!-- begin-user-doc -->
@@ -45,7 +46,7 @@ public class MenuActionImpl extends EObjectImpl implements MenuAction {
* @generated
* @ordered
*/
- protected Image icon = null;
+ protected Image icon;
/**
* The default value of the '{@link #getTitle() <em>Title</em>}' attribute.
diff --git a/plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/impl/MenuImpl.java b/plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/impl/MenuImpl.java
index b332b0dd3..3c98e6877 100644
--- a/plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/impl/MenuImpl.java
+++ b/plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/impl/MenuImpl.java
@@ -38,6 +38,7 @@ import org.eclipse.gmf.tooldef.Menu;
* @generated
*/
public abstract class MenuImpl extends EObjectImpl implements Menu {
+
/**
* The cached value of the '{@link #getItems() <em>Items</em>}' containment reference list.
* <!-- begin-user-doc -->
@@ -46,7 +47,7 @@ public abstract class MenuImpl extends EObjectImpl implements Menu {
* @generated
* @ordered
*/
- protected EList<ItemBase> items = null;
+ protected EList<ItemBase> items;
/**
* <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/impl/PaletteImpl.java b/plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/impl/PaletteImpl.java
index a75d82adb..69a79863c 100644
--- a/plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/impl/PaletteImpl.java
+++ b/plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/impl/PaletteImpl.java
@@ -31,6 +31,7 @@ import org.eclipse.gmf.tooldef.Palette;
* @generated
*/
public class PaletteImpl extends ToolContainerImpl implements Palette {
+
/**
* The cached value of the '{@link #getDefault() <em>Default</em>}' reference.
* <!-- begin-user-doc -->
@@ -39,7 +40,7 @@ public class PaletteImpl extends ToolContainerImpl implements Palette {
* @generated
* @ordered
*/
- protected AbstractTool default_ = null;
+ protected AbstractTool default_;
/**
* <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/impl/PaletteSeparatorImpl.java b/plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/impl/PaletteSeparatorImpl.java
index 0df0ec244..eb349afdc 100644
--- a/plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/impl/PaletteSeparatorImpl.java
+++ b/plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/impl/PaletteSeparatorImpl.java
@@ -21,6 +21,7 @@ import org.eclipse.gmf.tooldef.PaletteSeparator;
* @generated
*/
public class PaletteSeparatorImpl extends AbstractToolImpl implements PaletteSeparator {
+
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
diff --git a/plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/impl/PopupMenuImpl.java b/plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/impl/PopupMenuImpl.java
index 74fb5cce9..52583db96 100644
--- a/plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/impl/PopupMenuImpl.java
+++ b/plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/impl/PopupMenuImpl.java
@@ -36,6 +36,7 @@ import org.eclipse.gmf.tooldef.PopupMenu;
* @generated
*/
public class PopupMenuImpl extends MenuImpl implements PopupMenu {
+
/**
* The cached value of the '{@link #getIcon() <em>Icon</em>}' containment reference.
* <!-- begin-user-doc -->
@@ -44,7 +45,7 @@ public class PopupMenuImpl extends MenuImpl implements PopupMenu {
* @generated
* @ordered
*/
- protected Image icon = null;
+ protected Image icon;
/**
* The default value of the '{@link #getTitle() <em>Title</em>}' attribute.
diff --git a/plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/impl/PredefinedItemImpl.java b/plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/impl/PredefinedItemImpl.java
index 221a6ff26..03b635f1f 100644
--- a/plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/impl/PredefinedItemImpl.java
+++ b/plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/impl/PredefinedItemImpl.java
@@ -30,6 +30,7 @@ import org.eclipse.gmf.tooldef.PredefinedItem;
* @generated
*/
public class PredefinedItemImpl extends EObjectImpl implements PredefinedItem {
+
/**
* The default value of the '{@link #getIdentifier() <em>Identifier</em>}' attribute.
* <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/impl/PredefinedMenuImpl.java b/plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/impl/PredefinedMenuImpl.java
index b13129fd1..938d3fef8 100644
--- a/plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/impl/PredefinedMenuImpl.java
+++ b/plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/impl/PredefinedMenuImpl.java
@@ -31,6 +31,7 @@ import org.eclipse.gmf.tooldef.PredefinedMenu;
* @generated
*/
public class PredefinedMenuImpl extends MenuImpl implements PredefinedMenu {
+
/**
* The default value of the '{@link #getIdentifier() <em>Identifier</em>}' attribute.
* <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/impl/SeparatorImpl.java b/plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/impl/SeparatorImpl.java
index 48cef68ab..54b032f1b 100644
--- a/plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/impl/SeparatorImpl.java
+++ b/plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/impl/SeparatorImpl.java
@@ -30,6 +30,7 @@ import org.eclipse.gmf.tooldef.Separator;
* @generated
*/
public class SeparatorImpl extends EObjectImpl implements Separator {
+
/**
* The default value of the '{@link #getName() <em>Name</em>}' attribute.
* <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/impl/StandardToolImpl.java b/plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/impl/StandardToolImpl.java
index 07ee2ad1b..36186eba6 100644
--- a/plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/impl/StandardToolImpl.java
+++ b/plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/impl/StandardToolImpl.java
@@ -30,6 +30,7 @@ import org.eclipse.gmf.tooldef.StandardToolKind;
* @generated
*/
public class StandardToolImpl extends AbstractToolImpl implements StandardTool {
+
/**
* The default value of the '{@link #getToolKind() <em>Tool Kind</em>}' attribute.
* <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/impl/ToolContainerImpl.java b/plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/impl/ToolContainerImpl.java
index 8c98fff5e..755903358 100644
--- a/plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/impl/ToolContainerImpl.java
+++ b/plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/impl/ToolContainerImpl.java
@@ -36,6 +36,7 @@ import org.eclipse.gmf.tooldef.ToolContainer;
* @generated
*/
public abstract class ToolContainerImpl extends AbstractToolImpl implements ToolContainer {
+
/**
* The cached value of the '{@link #getTools() <em>Tools</em>}' containment reference list.
* <!-- begin-user-doc -->
@@ -44,7 +45,7 @@ public abstract class ToolContainerImpl extends AbstractToolImpl implements Tool
* @generated
* @ordered
*/
- protected EList<AbstractTool> tools = null;
+ protected EList<AbstractTool> tools;
/**
* <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/impl/ToolGroupImpl.java b/plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/impl/ToolGroupImpl.java
index 6c2483be2..99fd9ee20 100644
--- a/plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/impl/ToolGroupImpl.java
+++ b/plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/impl/ToolGroupImpl.java
@@ -82,7 +82,7 @@ public class ToolGroupImpl extends ToolContainerImpl implements ToolGroup {
* @generated
* @ordered
*/
- protected AbstractTool active = null;
+ protected AbstractTool active;
/**
* <!-- begin-user-doc -->
@@ -192,9 +192,9 @@ public class ToolGroupImpl extends ToolContainerImpl implements ToolGroup {
public Object eGet(int featureID, boolean resolve, boolean coreType) {
switch (featureID) {
case GMFToolPackage.TOOL_GROUP__COLLAPSIBLE:
- return isCollapsible() ? Boolean.TRUE : Boolean.FALSE;
+ return isCollapsible();
case GMFToolPackage.TOOL_GROUP__STACK:
- return isStack() ? Boolean.TRUE : Boolean.FALSE;
+ return isStack();
case GMFToolPackage.TOOL_GROUP__ACTIVE:
if (resolve)
return getActive();
@@ -212,10 +212,10 @@ public class ToolGroupImpl extends ToolContainerImpl implements ToolGroup {
public void eSet(int featureID, Object newValue) {
switch (featureID) {
case GMFToolPackage.TOOL_GROUP__COLLAPSIBLE:
- setCollapsible(((Boolean) newValue).booleanValue());
+ setCollapsible((Boolean) newValue);
return;
case GMFToolPackage.TOOL_GROUP__STACK:
- setStack(((Boolean) newValue).booleanValue());
+ setStack((Boolean) newValue);
return;
case GMFToolPackage.TOOL_GROUP__ACTIVE:
setActive((AbstractTool) newValue);
diff --git a/plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/impl/ToolRegistryImpl.java b/plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/impl/ToolRegistryImpl.java
index 213e13f74..c2e31f24e 100644
--- a/plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/impl/ToolRegistryImpl.java
+++ b/plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/impl/ToolRegistryImpl.java
@@ -44,6 +44,7 @@ import org.eclipse.gmf.tooldef.ToolRegistry;
* @generated
*/
public class ToolRegistryImpl extends EObjectImpl implements ToolRegistry {
+
/**
* The cached value of the '{@link #getSharedActions() <em>Shared Actions</em>}' containment reference list.
* <!-- begin-user-doc -->
@@ -52,7 +53,7 @@ public class ToolRegistryImpl extends EObjectImpl implements ToolRegistry {
* @generated
* @ordered
*/
- protected EList<MenuAction> sharedActions = null;
+ protected EList<MenuAction> sharedActions;
/**
* The cached value of the '{@link #getAllMenus() <em>All Menus</em>}' containment reference list.
@@ -62,7 +63,7 @@ public class ToolRegistryImpl extends EObjectImpl implements ToolRegistry {
* @generated
* @ordered
*/
- protected EList<Menu> allMenus = null;
+ protected EList<Menu> allMenus;
/**
* The cached value of the '{@link #getPalette() <em>Palette</em>}' containment reference.
@@ -72,7 +73,7 @@ public class ToolRegistryImpl extends EObjectImpl implements ToolRegistry {
* @generated
* @ordered
*/
- protected Palette palette = null;
+ protected Palette palette;
/**
* <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/impl/ToolbarImpl.java b/plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/impl/ToolbarImpl.java
index 1813ffb3f..13453737f 100644
--- a/plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/impl/ToolbarImpl.java
+++ b/plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/impl/ToolbarImpl.java
@@ -21,6 +21,7 @@ import org.eclipse.gmf.tooldef.Toolbar;
* @generated
*/
public class ToolbarImpl extends MenuImpl implements Toolbar {
+
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
diff --git a/plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/util/GMFToolAdapterFactory.java b/plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/util/GMFToolAdapterFactory.java
index a4d1b5cbe..19121e4bd 100644
--- a/plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/util/GMFToolAdapterFactory.java
+++ b/plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/util/GMFToolAdapterFactory.java
@@ -24,6 +24,7 @@ import org.eclipse.gmf.tooldef.*;
* @generated
*/
public class GMFToolAdapterFactory extends AdapterFactoryImpl {
+
/**
* The cached model package.
* <!-- begin-user-doc -->
@@ -64,12 +65,13 @@ public class GMFToolAdapterFactory extends AdapterFactoryImpl {
}
/**
- * The switch the delegates to the <code>createXXX</code> methods.
+ * The switch that delegates to the <code>createXXX</code> methods.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
protected GMFToolSwitch<Adapter> modelSwitch = new GMFToolSwitch<Adapter>() {
+
@Override
public Adapter caseToolRegistry(ToolRegistry object) {
return createToolRegistryAdapter();
diff --git a/plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/util/GMFToolSwitch.java b/plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/util/GMFToolSwitch.java
index 80d2beb30..e68b0b1df 100644
--- a/plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/util/GMFToolSwitch.java
+++ b/plugins/org.eclipse.gmf.tooldef/src/org/eclipse/gmf/tooldef/util/GMFToolSwitch.java
@@ -11,6 +11,8 @@ import java.util.List;
import org.eclipse.emf.ecore.EClass;
import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.util.Switch;
import org.eclipse.gmf.tooldef.*;
/**
@@ -26,7 +28,8 @@ import org.eclipse.gmf.tooldef.*;
* @see org.eclipse.gmf.tooldef.GMFToolPackage
* @generated
*/
-public class GMFToolSwitch<T> {
+public class GMFToolSwitch<T> extends Switch<T> {
+
/**
* The cached model package
* <!-- begin-user-doc -->
@@ -48,30 +51,16 @@ public class GMFToolSwitch<T> {
}
/**
- * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
+ * Checks whether this is a switch for the given package.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @return the first non-null result returned by a <code>caseXXX</code> call.
+ * @parameter ePackage the package in question.
+ * @return whether this is a switch for the given package.
* @generated
*/
- public T doSwitch(EObject theEObject) {
- return doSwitch(theEObject.eClass(), theEObject);
- }
-
- /**
- * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @return the first non-null result returned by a <code>caseXXX</code> call.
- * @generated
- */
- protected T doSwitch(EClass theEClass, EObject theEObject) {
- if (theEClass.eContainer() == modelPackage) {
- return doSwitch(theEClass.getClassifierID(), theEObject);
- } else {
- List<EClass> eSuperTypes = theEClass.getESuperTypes();
- return eSuperTypes.isEmpty() ? defaultCase(theEObject) : doSwitch(eSuperTypes.get(0), theEObject);
- }
+ @Override
+ protected boolean isSwitchFor(EPackage ePackage) {
+ return ePackage == modelPackage;
}
/**
@@ -81,6 +70,7 @@ public class GMFToolSwitch<T> {
* @return the first non-null result returned by a <code>caseXXX</code> call.
* @generated
*/
+ @Override
protected T doSwitch(int classifierID, EObject theEObject) {
switch (classifierID) {
case GMFToolPackage.TOOL_REGISTRY: {
@@ -325,13 +315,13 @@ public class GMFToolSwitch<T> {
}
/**
- * Returns the result of interpretting the object as an instance of '<em>Tool Registry</em>'.
+ * Returns the result of interpreting the object as an instance of '<em>Tool Registry</em>'.
* <!-- begin-user-doc -->
* This implementation returns null;
* returning a non-null result will terminate the switch.
* <!-- end-user-doc -->
* @param object the target of the switch.
- * @return the result of interpretting the object as an instance of '<em>Tool Registry</em>'.
+ * @return the result of interpreting the object as an instance of '<em>Tool Registry</em>'.
* @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
* @generated
*/
@@ -340,13 +330,13 @@ public class GMFToolSwitch<T> {
}
/**
- * Returns the result of interpretting the object as an instance of '<em>Abstract Tool</em>'.
+ * Returns the result of interpreting the object as an instance of '<em>Abstract Tool</em>'.
* <!-- begin-user-doc -->
* This implementation returns null;
* returning a non-null result will terminate the switch.
* <!-- end-user-doc -->
* @param object the target of the switch.
- * @return the result of interpretting the object as an instance of '<em>Abstract Tool</em>'.
+ * @return the result of interpreting the object as an instance of '<em>Abstract Tool</em>'.
* @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
* @generated
*/
@@ -355,13 +345,13 @@ public class GMFToolSwitch<T> {
}
/**
- * Returns the result of interpretting the object as an instance of '<em>Tool Container</em>'.
+ * Returns the result of interpreting the object as an instance of '<em>Tool Container</em>'.
* <!-- begin-user-doc -->
* This implementation returns null;
* returning a non-null result will terminate the switch.
* <!-- end-user-doc -->
* @param object the target of the switch.
- * @return the result of interpretting the object as an instance of '<em>Tool Container</em>'.
+ * @return the result of interpreting the object as an instance of '<em>Tool Container</em>'.
* @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
* @generated
*/
@@ -370,13 +360,13 @@ public class GMFToolSwitch<T> {
}
/**
- * Returns the result of interpretting the object as an instance of '<em>Palette Separator</em>'.
+ * Returns the result of interpreting the object as an instance of '<em>Palette Separator</em>'.
* <!-- begin-user-doc -->
* This implementation returns null;
* returning a non-null result will terminate the switch.
* <!-- end-user-doc -->
* @param object the target of the switch.
- * @return the result of interpretting the object as an instance of '<em>Palette Separator</em>'.
+ * @return the result of interpreting the object as an instance of '<em>Palette Separator</em>'.
* @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
* @generated
*/
@@ -385,13 +375,13 @@ public class GMFToolSwitch<T> {
}
/**
- * Returns the result of interpretting the object as an instance of '<em>Tool Group</em>'.
+ * Returns the result of interpreting the object as an instance of '<em>Tool Group</em>'.
* <!-- begin-user-doc -->
* This implementation returns null;
* returning a non-null result will terminate the switch.
* <!-- end-user-doc -->
* @param object the target of the switch.
- * @return the result of interpretting the object as an instance of '<em>Tool Group</em>'.
+ * @return the result of interpreting the object as an instance of '<em>Tool Group</em>'.
* @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
* @generated
*/
@@ -400,13 +390,13 @@ public class GMFToolSwitch<T> {
}
/**
- * Returns the result of interpretting the object as an instance of '<em>Palette</em>'.
+ * Returns the result of interpreting the object as an instance of '<em>Palette</em>'.
* <!-- begin-user-doc -->
* This implementation returns null;
* returning a non-null result will terminate the switch.
* <!-- end-user-doc -->
* @param object the target of the switch.
- * @return the result of interpretting the object as an instance of '<em>Palette</em>'.
+ * @return the result of interpreting the object as an instance of '<em>Palette</em>'.
* @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
* @generated
*/
@@ -415,13 +405,13 @@ public class GMFToolSwitch<T> {
}
/**
- * Returns the result of interpretting the object as an instance of '<em>Standard Tool</em>'.
+ * Returns the result of interpreting the object as an instance of '<em>Standard Tool</em>'.
* <!-- begin-user-doc -->
* This implementation returns null;
* returning a non-null result will terminate the switch.
* <!-- end-user-doc -->
* @param object the target of the switch.
- * @return the result of interpretting the object as an instance of '<em>Standard Tool</em>'.
+ * @return the result of interpreting the object as an instance of '<em>Standard Tool</em>'.
* @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
* @generated
*/
@@ -430,13 +420,13 @@ public class GMFToolSwitch<T> {
}
/**
- * Returns the result of interpretting the object as an instance of '<em>Creation Tool</em>'.
+ * Returns the result of interpreting the object as an instance of '<em>Creation Tool</em>'.
* <!-- begin-user-doc -->
* This implementation returns null;
* returning a non-null result will terminate the switch.
* <!-- end-user-doc -->
* @param object the target of the switch.
- * @return the result of interpretting the object as an instance of '<em>Creation Tool</em>'.
+ * @return the result of interpreting the object as an instance of '<em>Creation Tool</em>'.
* @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
* @generated
*/
@@ -445,13 +435,13 @@ public class GMFToolSwitch<T> {
}
/**
- * Returns the result of interpretting the object as an instance of '<em>Generic Tool</em>'.
+ * Returns the result of interpreting the object as an instance of '<em>Generic Tool</em>'.
* <!-- begin-user-doc -->
* This implementation returns null;
* returning a non-null result will terminate the switch.
* <!-- end-user-doc -->
* @param object the target of the switch.
- * @return the result of interpretting the object as an instance of '<em>Generic Tool</em>'.
+ * @return the result of interpreting the object as an instance of '<em>Generic Tool</em>'.
* @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
* @generated
*/
@@ -460,13 +450,13 @@ public class GMFToolSwitch<T> {
}
/**
- * Returns the result of interpretting the object as an instance of '<em>Item Base</em>'.
+ * Returns the result of interpreting the object as an instance of '<em>Item Base</em>'.
* <!-- begin-user-doc -->
* This implementation returns null;
* returning a non-null result will terminate the switch.
* <!-- end-user-doc -->
* @param object the target of the switch.
- * @return the result of interpretting the object as an instance of '<em>Item Base</em>'.
+ * @return the result of interpreting the object as an instance of '<em>Item Base</em>'.
* @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
* @generated
*/
@@ -475,13 +465,13 @@ public class GMFToolSwitch<T> {
}
/**
- * Returns the result of interpretting the object as an instance of '<em>Menu</em>'.
+ * Returns the result of interpreting the object as an instance of '<em>Menu</em>'.
* <!-- begin-user-doc -->
* This implementation returns null;
* returning a non-null result will terminate the switch.
* <!-- end-user-doc -->
* @param object the target of the switch.
- * @return the result of interpretting the object as an instance of '<em>Menu</em>'.
+ * @return the result of interpreting the object as an instance of '<em>Menu</em>'.
* @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
* @generated
*/
@@ -490,13 +480,13 @@ public class GMFToolSwitch<T> {
}
/**
- * Returns the result of interpretting the object as an instance of '<em>Separator</em>'.
+ * Returns the result of interpreting the object as an instance of '<em>Separator</em>'.
* <!-- begin-user-doc -->
* This implementation returns null;
* returning a non-null result will terminate the switch.
* <!-- end-user-doc -->
* @param object the target of the switch.
- * @return the result of interpretting the object as an instance of '<em>Separator</em>'.
+ * @return the result of interpreting the object as an instance of '<em>Separator</em>'.
* @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
* @generated
*/
@@ -505,13 +495,13 @@ public class GMFToolSwitch<T> {
}
/**
- * Returns the result of interpretting the object as an instance of '<em>Predefined Item</em>'.
+ * Returns the result of interpreting the object as an instance of '<em>Predefined Item</em>'.
* <!-- begin-user-doc -->
* This implementation returns null;
* returning a non-null result will terminate the switch.
* <!-- end-user-doc -->
* @param object the target of the switch.
- * @return the result of interpretting the object as an instance of '<em>Predefined Item</em>'.
+ * @return the result of interpreting the object as an instance of '<em>Predefined Item</em>'.
* @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
* @generated
*/
@@ -520,13 +510,13 @@ public class GMFToolSwitch<T> {
}
/**
- * Returns the result of interpretting the object as an instance of '<em>Predefined Menu</em>'.
+ * Returns the result of interpreting the object as an instance of '<em>Predefined Menu</em>'.
* <!-- begin-user-doc -->
* This implementation returns null;
* returning a non-null result will terminate the switch.
* <!-- end-user-doc -->
* @param object the target of the switch.
- * @return the result of interpretting the object as an instance of '<em>Predefined Menu</em>'.
+ * @return the result of interpreting the object as an instance of '<em>Predefined Menu</em>'.
* @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
* @generated
*/
@@ -535,13 +525,13 @@ public class GMFToolSwitch<T> {
}
/**
- * Returns the result of interpretting the object as an instance of '<em>Contribution Item</em>'.
+ * Returns the result of interpreting the object as an instance of '<em>Contribution Item</em>'.
* <!-- begin-user-doc -->
* This implementation returns null;
* returning a non-null result will terminate the switch.
* <!-- end-user-doc -->
* @param object the target of the switch.
- * @return the result of interpretting the object as an instance of '<em>Contribution Item</em>'.
+ * @return the result of interpreting the object as an instance of '<em>Contribution Item</em>'.
* @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
* @generated
*/
@@ -550,13 +540,13 @@ public class GMFToolSwitch<T> {
}
/**
- * Returns the result of interpretting the object as an instance of '<em>Menu Action</em>'.
+ * Returns the result of interpreting the object as an instance of '<em>Menu Action</em>'.
* <!-- begin-user-doc -->
* This implementation returns null;
* returning a non-null result will terminate the switch.
* <!-- end-user-doc -->
* @param object the target of the switch.
- * @return the result of interpretting the object as an instance of '<em>Menu Action</em>'.
+ * @return the result of interpreting the object as an instance of '<em>Menu Action</em>'.
* @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
* @generated
*/
@@ -565,13 +555,13 @@ public class GMFToolSwitch<T> {
}
/**
- * Returns the result of interpretting the object as an instance of '<em>Item Ref</em>'.
+ * Returns the result of interpreting the object as an instance of '<em>Item Ref</em>'.
* <!-- begin-user-doc -->
* This implementation returns null;
* returning a non-null result will terminate the switch.
* <!-- end-user-doc -->
* @param object the target of the switch.
- * @return the result of interpretting the object as an instance of '<em>Item Ref</em>'.
+ * @return the result of interpreting the object as an instance of '<em>Item Ref</em>'.
* @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
* @generated
*/
@@ -580,13 +570,13 @@ public class GMFToolSwitch<T> {
}
/**
- * Returns the result of interpretting the object as an instance of '<em>Context Menu</em>'.
+ * Returns the result of interpreting the object as an instance of '<em>Context Menu</em>'.
* <!-- begin-user-doc -->
* This implementation returns null;
* returning a non-null result will terminate the switch.
* <!-- end-user-doc -->
* @param object the target of the switch.
- * @return the result of interpretting the object as an instance of '<em>Context Menu</em>'.
+ * @return the result of interpreting the object as an instance of '<em>Context Menu</em>'.
* @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
* @generated
*/
@@ -595,13 +585,13 @@ public class GMFToolSwitch<T> {
}
/**
- * Returns the result of interpretting the object as an instance of '<em>Popup Menu</em>'.
+ * Returns the result of interpreting the object as an instance of '<em>Popup Menu</em>'.
* <!-- begin-user-doc -->
* This implementation returns null;
* returning a non-null result will terminate the switch.
* <!-- end-user-doc -->
* @param object the target of the switch.
- * @return the result of interpretting the object as an instance of '<em>Popup Menu</em>'.
+ * @return the result of interpreting the object as an instance of '<em>Popup Menu</em>'.
* @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
* @generated
*/
@@ -610,13 +600,13 @@ public class GMFToolSwitch<T> {
}
/**
- * Returns the result of interpretting the object as an instance of '<em>Main Menu</em>'.
+ * Returns the result of interpreting the object as an instance of '<em>Main Menu</em>'.
* <!-- begin-user-doc -->
* This implementation returns null;
* returning a non-null result will terminate the switch.
* <!-- end-user-doc -->
* @param object the target of the switch.
- * @return the result of interpretting the object as an instance of '<em>Main Menu</em>'.
+ * @return the result of interpreting the object as an instance of '<em>Main Menu</em>'.
* @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
* @generated
*/
@@ -625,13 +615,13 @@ public class GMFToolSwitch<T> {
}
/**
- * Returns the result of interpretting the object as an instance of '<em>Toolbar</em>'.
+ * Returns the result of interpreting the object as an instance of '<em>Toolbar</em>'.
* <!-- begin-user-doc -->
* This implementation returns null;
* returning a non-null result will terminate the switch.
* <!-- end-user-doc -->
* @param object the target of the switch.
- * @return the result of interpretting the object as an instance of '<em>Toolbar</em>'.
+ * @return the result of interpreting the object as an instance of '<em>Toolbar</em>'.
* @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
* @generated
*/
@@ -640,13 +630,13 @@ public class GMFToolSwitch<T> {
}
/**
- * Returns the result of interpretting the object as an instance of '<em>Image</em>'.
+ * Returns the result of interpreting the object as an instance of '<em>Image</em>'.
* <!-- begin-user-doc -->
* This implementation returns null;
* returning a non-null result will terminate the switch.
* <!-- end-user-doc -->
* @param object the target of the switch.
- * @return the result of interpretting the object as an instance of '<em>Image</em>'.
+ * @return the result of interpreting the object as an instance of '<em>Image</em>'.
* @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
* @generated
*/
@@ -655,13 +645,13 @@ public class GMFToolSwitch<T> {
}
/**
- * Returns the result of interpretting the object as an instance of '<em>Default Image</em>'.
+ * Returns the result of interpreting the object as an instance of '<em>Default Image</em>'.
* <!-- begin-user-doc -->
* This implementation returns null;
* returning a non-null result will terminate the switch.
* <!-- end-user-doc -->
* @param object the target of the switch.
- * @return the result of interpretting the object as an instance of '<em>Default Image</em>'.
+ * @return the result of interpreting the object as an instance of '<em>Default Image</em>'.
* @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
* @generated
*/
@@ -670,13 +660,13 @@ public class GMFToolSwitch<T> {
}
/**
- * Returns the result of interpretting the object as an instance of '<em>Bundle Image</em>'.
+ * Returns the result of interpreting the object as an instance of '<em>Bundle Image</em>'.
* <!-- begin-user-doc -->
* This implementation returns null;
* returning a non-null result will terminate the switch.
* <!-- end-user-doc -->
* @param object the target of the switch.
- * @return the result of interpretting the object as an instance of '<em>Bundle Image</em>'.
+ * @return the result of interpreting the object as an instance of '<em>Bundle Image</em>'.
* @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
* @generated
*/
@@ -685,13 +675,13 @@ public class GMFToolSwitch<T> {
}
/**
- * Returns the result of interpretting the object as an instance of '<em>Style Selector</em>'.
+ * Returns the result of interpreting the object as an instance of '<em>Style Selector</em>'.
* <!-- begin-user-doc -->
* This implementation returns null;
* returning a non-null result will terminate the switch.
* <!-- end-user-doc -->
* @param object the target of the switch.
- * @return the result of interpretting the object as an instance of '<em>Style Selector</em>'.
+ * @return the result of interpreting the object as an instance of '<em>Style Selector</em>'.
* @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
* @generated
*/
@@ -700,13 +690,13 @@ public class GMFToolSwitch<T> {
}
/**
- * Returns the result of interpretting the object as an instance of '<em>Generic Style Selector</em>'.
+ * Returns the result of interpreting the object as an instance of '<em>Generic Style Selector</em>'.
* <!-- begin-user-doc -->
* This implementation returns null;
* returning a non-null result will terminate the switch.
* <!-- end-user-doc -->
* @param object the target of the switch.
- * @return the result of interpretting the object as an instance of '<em>Generic Style Selector</em>'.
+ * @return the result of interpreting the object as an instance of '<em>Generic Style Selector</em>'.
* @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
* @generated
*/
@@ -715,16 +705,17 @@ public class GMFToolSwitch<T> {
}
/**
- * Returns the result of interpretting the object as an instance of '<em>EObject</em>'.
+ * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.
* <!-- begin-user-doc -->
* This implementation returns null;
* returning a non-null result will terminate the switch, but this is the last case anyway.
* <!-- end-user-doc -->
* @param object the target of the switch.
- * @return the result of interpretting the object as an instance of '<em>EObject</em>'.
+ * @return the result of interpreting the object as an instance of '<em>EObject</em>'.
* @see #doSwitch(org.eclipse.emf.ecore.EObject)
* @generated
*/
+ @Override
public T defaultCase(EObject object) {
return null;
}

Back to the top