- Summary: Refactor code (T55033)

- Description: Refactor code for tooltip (T55033)
eclipse-birt · Jan 7, 2013 · 7429f24 · 7429f24
1 parent 705f221
commit 7429f24
Show file tree

Hide file tree

Showing 27 changed files with 851 additions and 505 deletions.
diff --git a/chart/org.eclipse.birt.chart.engine/src/model/model.genmodel b/chart/org.eclipse.birt.chart.engine/src/model/model.genmodel
@@ -1,16 +1,15 @@
 <?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.birt.chart.engine/src"
-    editDirectory="/org.eclipse.birt.chart.engine.edit/src" editorDirectory="/org.eclipse.birt.chart.engine.editor/src"
-    modelPluginID="org.eclipse.birt.chart.engine" templateDirectory="/org.eclipse.birt.chart.engine/templates"
-    runtimeJar="true" dynamicTemplates="true" modelName="Model" editPluginClass="org.eclipse.birt.chart.model.data.provider.ModelEditPlugin"
+<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.birt.chart.engine/src" editDirectory="/org.eclipse.birt.chart.engine.edit/src"
+    editorDirectory="/org.eclipse.birt.chart.engine.editor/src" modelPluginID="org.eclipse.birt.chart.engine"
+    templateDirectory="/org.eclipse.birt.chart.engine/templates" runtimeJar="true"
+    dynamicTemplates="true" modelName="Model" editPluginClass="org.eclipse.birt.chart.model.data.provider.ModelEditPlugin"
     editorPluginClass="org.eclipse.birt.chart.model.data.presentation.ModelEditorPlugin"
     nonNLSMarkers="true" rootExtendsInterface="org.eclipse.birt.chart.model.IChartObject"
     rootImplementsInterface="" featureMapWrapperInterface="" featureMapWrapperInternalInterface=""
     codeFormatting="true" booleanFlagsField="" importerID="org.eclipse.xsd.ecore.importer"
     complianceLevel="5.0">
-  <foreignModel>../../xsd/type.xsd</foreignModel>
+  <foreignModel>../../xsd/attribute.xsd</foreignModel>
   <genPackages prefix="Attribute" basePackage="org.eclipse.birt.chart.model" resource="XML"
       ecorePackage="org.eclipse.birt.chart.model.attribute.ecore#/">
     <genEnums ecoreEnum="org.eclipse.birt.chart.model.attribute.ecore#//ActionType">
@@ -503,6 +502,7 @@
     <genClasses ecoreClass="org.eclipse.birt.chart.model.attribute.ecore#//TooltipValue">
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute org.eclipse.birt.chart.model.attribute.ecore#//TooltipValue/text"/>
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute org.eclipse.birt.chart.model.attribute.ecore#//TooltipValue/delay"/>
+      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference org.eclipse.birt.chart.model.attribute.ecore#//TooltipValue/formatSpecifier"/>
     </genClasses>
     <genClasses ecoreClass="org.eclipse.birt.chart.model.attribute.ecore#//URLValue">
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute org.eclipse.birt.chart.model.attribute.ecore#//URLValue/baseUrl"/>

diff --git a/chart/org.eclipse.birt.chart.engine/src/model/model.xsd2ecore b/chart/org.eclipse.birt.chart.engine/src/model/model.xsd2ecore
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="ASCII"?>
-<xsd2ecore:XSD2EcoreMappingRoot xmi:version="2.0"
-    xmlns:xmi="http://www.omg.org/XMI" xmlns:xsd2ecore="http://www.eclipse.org/emf/2002/XSD2Ecore" inputs="../../xsd/type.xsd#/ ../../xsd/attribute.xsd#/ ../../xsd/component.xsd#/ ../../xsd/data.xsd#/ ../../xsd/layout.xsd#/ ../../xsd/model.xsd#/"
+<xsd2ecore:XSD2EcoreMappingRoot xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI"
+    xmlns:xsd2ecore="http://www.eclipse.org/emf/2002/XSD2Ecore" inputs="../../xsd/attribute.xsd#/ ../../xsd/component.xsd#/ ../../xsd/data.xsd#/ ../../xsd/type.xsd#/ ../../xsd/layout.xsd#/ ../../xsd/model.xsd#/"
     outputs="org.eclipse.birt.chart.model.attribute.ecore#/ org.eclipse.birt.chart.model.component.ecore#/ org.eclipse.birt.chart.model.data.ecore#/ org.eclipse.birt.chart.model.type.ecore#/ org.eclipse.birt.chart.model.layout.ecore#/ org.eclipse.birt.chart.model.ecore#/"
     topToBottom="true">
-  <nested inputs="bundleentry://311.fwk24569170/cache/www.w3.org/2001/XMLSchema.xsd#//string;XSDSimpleTypeDefinition=9"
+  <nested inputs="bundleentry://354.fwk26425437/cache/www.w3.org/2001/XMLSchema.xsd#//string;XSDSimpleTypeDefinition=9"
       outputs="http://www.eclipse.org/emf/2003/XMLType#//String"/>
-  <nested inputs="bundleentry://311.fwk24569170/cache/www.w3.org/2001/XMLSchema.xsd#//float;XSDSimpleTypeDefinition=11"
+  <nested inputs="bundleentry://354.fwk26425437/cache/www.w3.org/2001/XMLSchema.xsd#//float;XSDSimpleTypeDefinition=11"
       outputs="http://www.eclipse.org/emf/2003/XMLType#//Float"/>
-  <nested inputs="bundleentry://311.fwk24569170/cache/www.w3.org/2001/XMLSchema.xsd#//boolean;XSDSimpleTypeDefinition=10"
+  <nested inputs="bundleentry://354.fwk26425437/cache/www.w3.org/2001/XMLSchema.xsd#//boolean;XSDSimpleTypeDefinition=10"
       outputs="http://www.eclipse.org/emf/2003/XMLType#//Boolean"/>
   <nested inputs="../../xsd/attribute.xsd#//HorizontalAlignment;XSDSimpleTypeDefinition=12"
       outputs="org.eclipse.birt.chart.model.attribute.ecore#//HorizontalAlignment">
@@ -34,7 +34,7 @@
     <nested inputs="../../xsd/attribute.xsd#//TextAlignment;XSDComplexTypeDefinition=9/XSDParticle/XSDModelGroup/XSDParticle=1"
         outputs="org.eclipse.birt.chart.model.attribute.ecore#//TextAlignment/verticalAlignment"/>
   </nested>
-  <nested inputs="bundleentry://311.fwk24569170/cache/www.w3.org/2001/XMLSchema.xsd#//double;XSDSimpleTypeDefinition=12"
+  <nested inputs="bundleentry://354.fwk26425437/cache/www.w3.org/2001/XMLSchema.xsd#//double;XSDSimpleTypeDefinition=12"
       outputs="http://www.eclipse.org/emf/2003/XMLType#//Double"/>
   <nested inputs="../../xsd/attribute.xsd#//FontDefinition;XSDComplexTypeDefinition=25"
       outputs="org.eclipse.birt.chart.model.attribute.ecore#//FontDefinition">
@@ -57,7 +57,7 @@
     <nested inputs="../../xsd/attribute.xsd#//FontDefinition;XSDComplexTypeDefinition=25/XSDParticle/XSDModelGroup/XSDParticle=8"
         outputs="org.eclipse.birt.chart.model.attribute.ecore#//FontDefinition/rotation"/>
   </nested>
-  <nested inputs="bundleentry://311.fwk24569170/cache/www.w3.org/2001/XMLSchema.xsd#//int;XSDSimpleTypeDefinition=44"
+  <nested inputs="bundleentry://354.fwk26425437/cache/www.w3.org/2001/XMLSchema.xsd#//int;XSDSimpleTypeDefinition=44"
       outputs="http://www.eclipse.org/emf/2003/XMLType#//Int"/>
   <nested inputs="../../xsd/attribute.xsd#//Fill;XSDComplexTypeDefinition=19" outputs="org.eclipse.birt.chart.model.attribute.ecore#//Fill">
     <nested inputs="../../xsd/attribute.xsd#//Fill;XSDComplexTypeDefinition=19/XSDParticle/XSDModelGroup/XSDParticle"
@@ -276,7 +276,7 @@
     <nested inputs="../../xsd/data.xsd#//Query;XSDComplexTypeDefinition=16/XSDParticle/XSDModelGroup/XSDParticle=2"
         outputs="org.eclipse.birt.chart.model.data.ecore#//Query/grouping"/>
   </nested>
-  <nested inputs="bundleentry://311.fwk24569170/cache/www.w3.org/2001/MagicXMLSchema.xsd#//anySimpleType;XSDSimpleTypeDefinition=1"
+  <nested inputs="bundleentry://354.fwk26425437/cache/www.w3.org/2001/MagicXMLSchema.xsd#//anySimpleType;XSDSimpleTypeDefinition=1"
       outputs="http://www.eclipse.org/emf/2003/XMLType#//AnySimpleType"/>
   <nested inputs="../../xsd/attribute.xsd#//DataPointComponentType;XSDSimpleTypeDefinition=7"
       outputs="org.eclipse.birt.chart.model.attribute.ecore#//DataPointComponentType">
@@ -798,7 +798,7 @@
     <nested inputs="../../xsd/data.xsd#//BaseSampleData;XSDComplexTypeDefinition=19/XSDParticle/XSDModelGroup/XSDParticle"
         outputs="org.eclipse.birt.chart.model.data.ecore#//BaseSampleData/dataSetRepresentation"/>
   </nested>
-  <nested inputs="bundleentry://311.fwk24569170/cache/www.w3.org/2001/XMLSchema.xsd#//decimal;XSDSimpleTypeDefinition=13"
+  <nested inputs="bundleentry://354.fwk26425437/cache/www.w3.org/2001/XMLSchema.xsd#//decimal;XSDSimpleTypeDefinition=13"
       outputs="http://www.eclipse.org/emf/2003/XMLType#//Decimal"/>
   <nested inputs="../../xsd/data.xsd#//BigNumberDataElement;XSDComplexTypeDefinition=22"
       outputs="org.eclipse.birt.chart.model.data.ecore#//BigNumberDataElement">
@@ -1100,7 +1100,7 @@
     <nested inputs="../../xsd/attribute.xsd#//DateFormatSpecifier;XSDComplexTypeDefinition=27/XSDParticle/XSDModelGroup/XSDParticle=1"
         outputs="org.eclipse.birt.chart.model.attribute.ecore#//DateFormatSpecifier/detail"/>
   </nested>
-  <nested inputs="bundleentry://311.fwk24569170/cache/www.w3.org/2001/XMLSchema.xsd#//long;XSDSimpleTypeDefinition=43"
+  <nested inputs="bundleentry://354.fwk26425437/cache/www.w3.org/2001/XMLSchema.xsd#//long;XSDSimpleTypeDefinition=43"
       outputs="http://www.eclipse.org/emf/2003/XMLType#//Long"/>
   <nested inputs="../../xsd/data.xsd#//DateTimeDataElement;XSDComplexTypeDefinition=11"
       outputs="org.eclipse.birt.chart.model.data.ecore#//DateTimeDataElement">
@@ -1435,6 +1435,8 @@
         outputs="org.eclipse.birt.chart.model.type.ecore#//PieSeries/clockwise"/>
     <nested inputs="../../xsd/type.xsd#//PieSeries;XSDComplexTypeDefinition=1/XSDParticle/XSDModelGroup/XSDParticle=11"
         outputs="org.eclipse.birt.chart.model.type.ecore#//PieSeries/innerRadius"/>
+    <nested inputs="../../xsd/type.xsd#//PieSeries;XSDComplexTypeDefinition=1/XSDParticle/XSDModelGroup/XSDParticle=12"
+        outputs="org.eclipse.birt.chart.model.type.ecore#//PieSeries/innerRadiusPercent"/>
   </nested>
   <nested inputs="../../xsd/layout.xsd#//Plot;XSDComplexTypeDefinition" outputs="org.eclipse.birt.chart.model.layout.ecore#//Plot">
     <nested inputs="../../xsd/layout.xsd#//Plot;XSDComplexTypeDefinition/XSDParticle/XSDModelGroup/XSDParticle"
@@ -1481,6 +1483,8 @@
         outputs="org.eclipse.birt.chart.model.attribute.ecore#//TooltipValue/text"/>
     <nested inputs="../../xsd/attribute.xsd#//TooltipValue;XSDComplexTypeDefinition=4/XSDParticle/XSDModelGroup/XSDParticle=1"
         outputs="org.eclipse.birt.chart.model.attribute.ecore#//TooltipValue/delay"/>
+    <nested inputs="../../xsd/attribute.xsd#//TooltipValue;XSDComplexTypeDefinition=4/XSDParticle/XSDModelGroup/XSDParticle=2"
+        outputs="org.eclipse.birt.chart.model.attribute.ecore#//TooltipValue/formatSpecifier"/>
   </nested>
   <nested inputs="../../xsd/attribute.xsd#//UnitsOfMeasurement;XSDSimpleTypeDefinition=30"
       outputs="org.eclipse.birt.chart.model.attribute.ecore#//UnitsOfMeasurement">