summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJerzy ZAGORSKI <xendoo@gmail.com>2010-06-20 16:54:11 +0200
committerJerzy ZAGORSKI <xendoo@gmail.com>2010-06-22 12:16:49 +0200
commitf8f70f3c4aa0180bf3a4cec6489ca4838635ce78 (patch)
treeed6ce74aa651932335d0c7caea52a636a3e4a313
parent34c55c241ae617488cefd8ab9ce96bdd02f5bd39 (diff)
downloadscilab-f8f70f3c4aa0180bf3a4cec6489ca4838635ce78.zip
scilab-f8f70f3c4aa0180bf3a4cec6489ca4838635ce78.tar.gz
Compatibility patterns schema changes, and java pattern files headers removal
Change-Id: Ic2205a3035c779dd7d3e98fa4796e679cde5e142
-rw-r--r--scilab/modules/xcos/etc/SimulinkImportConfiguration.xsd6
-rw-r--r--scilab/modules/xcos/etc/simulinkImportBlocks.xml277
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/simulink/patterns/Block.java7
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/simulink/patterns/BlockPalette.java7
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/simulink/patterns/GeneralParameters.java17
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/simulink/patterns/Int2StrParameters.java7
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/simulink/patterns/Int2StrValueMap.java7
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/simulink/patterns/IntegerParameters.java7
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/simulink/patterns/IntegerValueMap.java7
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/simulink/patterns/ObjectFactory.java73
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/simulink/patterns/SimpleParameter.java7
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/simulink/patterns/Str2IntParameters.java7
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/simulink/patterns/Str2IntValueMap.java7
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/simulink/patterns/StringParameters.java7
-rw-r--r--scilab/modules/xcos/src/java/org/scilab/modules/xcos/simulink/patterns/StringValueMap.java7
15 files changed, 211 insertions, 239 deletions
diff --git a/scilab/modules/xcos/etc/SimulinkImportConfiguration.xsd b/scilab/modules/xcos/etc/SimulinkImportConfiguration.xsd
index 4a2a12b..847a015 100644
--- a/scilab/modules/xcos/etc/SimulinkImportConfiguration.xsd
+++ b/scilab/modules/xcos/etc/SimulinkImportConfiguration.xsd
@@ -9,7 +9,7 @@
9 9
10 <xsd:complexType name="GeneralParameters"> 10 <xsd:complexType name="GeneralParameters">
11 <xsd:sequence> 11 <xsd:sequence>
12 <xsd:element name="string" type="StringParameter" minOccurs="0" maxOccurs="unbounded"/> 12 <xsd:element name="string" type="StringParameters" minOccurs="0" maxOccurs="unbounded"/>
13 <xsd:element name="integer" type="IntegerParameters" minOccurs="0" maxOccurs="unbounded"/> 13 <xsd:element name="integer" type="IntegerParameters" minOccurs="0" maxOccurs="unbounded"/>
14 <xsd:element name="simple" type="SimpleParameter" minOccurs="0" maxOccurs="unbounded"/> 14 <xsd:element name="simple" type="SimpleParameter" minOccurs="0" maxOccurs="unbounded"/>
15 </xsd:sequence> 15 </xsd:sequence>
@@ -24,7 +24,7 @@
24 <!-- parameter won't be found in Block scope, It'll be searched among general parameters. This way it will be possible to shadow parameter --> 24 <!-- parameter won't be found in Block scope, It'll be searched among general parameters. This way it will be possible to shadow parameter -->
25 <xsd:complexType name="Block"> 25 <xsd:complexType name="Block">
26 <xsd:sequence> 26 <xsd:sequence>
27 <xsd:element name="string" type="StringParameter" minOccurs="0" maxOccurs="unbounded"/> 27 <xsd:element name="string" type="StringParameters" minOccurs="0" maxOccurs="unbounded"/>
28 <xsd:element name="integer" type="IntegerParameters" minOccurs="0" maxOccurs="unbounded"/> 28 <xsd:element name="integer" type="IntegerParameters" minOccurs="0" maxOccurs="unbounded"/>
29 <xsd:element name="simple" type="SimpleParameter" minOccurs="0" maxOccurs="unbounded"/> 29 <xsd:element name="simple" type="SimpleParameter" minOccurs="0" maxOccurs="unbounded"/>
30 <xsd:element name="str2int" type="Str2IntParameters" minOccurs="0" maxOccurs="unbounded"/> 30 <xsd:element name="str2int" type="Str2IntParameters" minOccurs="0" maxOccurs="unbounded"/>
@@ -41,7 +41,7 @@
41 <xsd:attribute name="description" type="xsd:string" use="optional"/> 41 <xsd:attribute name="description" type="xsd:string" use="optional"/>
42 </xsd:complexType> 42 </xsd:complexType>
43 <!-- parameters that in name, and have different string values ex:CSCOPE SCOPE --> 43 <!-- parameters that in name, and have different string values ex:CSCOPE SCOPE -->
44 <xsd:complexType name="StringParameter"> 44 <xsd:complexType name="StringParameters">
45 <xsd:sequence> 45 <xsd:sequence>
46 <xsd:element name="parMap" type="StringValueMap" minOccurs="1" maxOccurs="unbounded"/> 46 <xsd:element name="parMap" type="StringValueMap" minOccurs="1" maxOccurs="unbounded"/>
47 </xsd:sequence> 47 </xsd:sequence>
diff --git a/scilab/modules/xcos/etc/simulinkImportBlocks.xml b/scilab/modules/xcos/etc/simulinkImportBlocks.xml
index 837242e..fcd2ca6 100644
--- a/scilab/modules/xcos/etc/simulinkImportBlocks.xml
+++ b/scilab/modules/xcos/etc/simulinkImportBlocks.xml
@@ -1,27 +1,86 @@
1<blocks> 1<blocks>
2<!--Template--> 2<!--Template-->
3 <block sim="string" xcos="string" description="string"> 3 <block sim="string" xcos="string" description="string">
4 <!--Zero or more repetitions:--> 4 <!--Zero or more repetitions:-->
5 <string sim="string" xcos="string" description="string"> 5 <string sim="string" xcos="string" description="string">
6 <!--1 or more repetitions:--> 6 <!--1 or more repetitions:-->
7 <parMap simVal="string" xcosVal="string"/> 7 <parMap simVal="string" xcosVal="string"/>
8 </string> 8 </string>
9 <!--Zero or more repetitions:--> 9 <!--Zero or more repetitions:-->
10 <integer sim="string" xcos="string" description="string"> 10 <integer sim="string" xcos="string" description="string">
11 <!--1 or more repetitions:--> 11 <!--1 or more repetitions:-->
12 <parMap simVal="100" xcosVal="100"/> 12 <parMap simVal="100" xcosVal="100"/>
13 </integer> 13 </integer>
14 <!--Zero or more repetitions:--> 14 <!--Zero or more repetitions:-->
15 <simple sim="string" xcos="string" description="string"/> 15 <simple sim="string" xcos="string" description="string"/>
16 </block> 16 </block>
17
18<!-- General parameters, common for many blocks -->
19<!-- Ports, ShowName, SID, BlockMirror, DropShadow, FontSize, BackgroundColor, BlockType, NamePlacement, ShowSaturationPort(?), FontName, ShowStatePort, FontWeigh, ContinuousStateAttributes, FontAngle, Name, ForegroundColor, BlockRotation, NumInputPorts, DataFormat -->
20
21 <block sim="general" xcos="general" description="">
22 <!--Zero or more repetitions:-->
23 <string sim="string" xcos="string" description="string">
24 <!--1 or more repetitions:-->
25 <parMap simVal="string" xcosVal="string"/>
26 </string>
27 <!--Zero or more repetitions:-->
28 <integer sim="string" xcos="string" description="string">
29 <!--1 or more repetitions:-->
30 <parMap simVal="100" xcosVal="100"/>
31 </integer>
32 <!--Zero or more repetitions:-->
33 <simple sim="string" xcos="string" description="string"/>
34 <str2int sim="ZeroCross" xcos="zero_crossing" description="Enable zero-crossing detection">
35 <parMap simVal="off" xcosVal="0"/>
36 <parMap simVal="on" xcosVal="1"/>
37 </str2int>
38 <!--
39 * - "interfaceFunctionName"
40 * - "simulationFunctionName"
41 * - "simulationFunctionType"
42 * - "exprs"
43 * - "realParameters"
44 * - "integerParameters"
45 * - "objectsParameters"
46 * - "nbZerosCrossing"
47 * - "nmode"
48 * - "state"
49 * - "dState"
50 * - "oDState"
51 * - "equations"
52 * - "dependsOnU"
53 * - "dependsOnT"
54 * - "blockType"
55 * - "ordering"
56 -->
57 </block>
58
59<!--Compatibility patterns for diagram parameters -->
60 <block sim="diagram" xcos="diagram" description="">
61 <!--
62 private double finalIntegrationTime;
63 private double integratorAbsoluteTolerance;
64 private double integratorRelativeTolerance;
65 private double toleranceOnTime;
66 private double maxIntegrationTimeInterval;
67 private double realTimeScaling;
68 private double solver;
69 private double maximumStepSize;
70 private int debugLevel;
71 private String[] context;
72 private String version;
73 -->
74 </block>
75
17<!-- Continuous Library Block Parameters --> 76<!-- Continuous Library Block Parameters -->
18 <!-- Derivative Block Compatibility Pattern --> 77 <!-- Derivative Block Compatibility Pattern -->
19 <block sim="Derivative" xcos="DERIV" description=" 78 <block sim="Derivative" xcos="DERIV" description="
20 LinearizePole - not available; 79 LinearizePole - not available;
21 "> 80 ">
22 </block> 81 </block>
23 <!-- Integrator Block Compatibility Pattern --> 82 <!-- Integrator Block Compatibility Pattern -->
24 <block sim="Integrator" xcos="INTEGRAL_m" description=" 83 <block sim="Integrator" xcos="INTEGRAL_m" description="
25 ExternalReset - not available; 84 ExternalReset - not available;
26 InitialConditionSource - external?internal (?); 85 InitialConditionSource - external?internal (?);
27 LimitOutput - switched on by default; 86 LimitOutput - switched on by default;
@@ -29,102 +88,106 @@
29 ShowStatePort - N/A; 88 ShowStatePort - N/A;
30 AbsoluteTolerance- N/A; 89 AbsoluteTolerance- N/A;
31 IgnoreLimit - N/A; 90 IgnoreLimit - N/A;
32 ContinuousStateAttributes - N/A; 91 ContinuousStateAttributes - N/A;"
33 "> 92 >
34 <!--FIXME: Can be complex! --> 93 <!--FIXME: Can be complex! -->
35 <integer sim="InitialCondition" xcos="Initial Condition" description=""> 94 <integer sim="InitialCondition" xcos="state" description="">
36 <parMap simVal="1" xcosVal="1"/> 95 <parMap simVal="1" xcosVal="1"/>
37 </integer> 96 </integer>
38 <integer sim="UpperSaturationLimit" xcos="Upper limit" description=""> 97 <integer sim="UpperSaturationLimit" xcos="rpar1" description="">
39 <parMap simVal="1" xcosVal="1"/> 98 <parMap simVal="1" xcosVal="1"/>
40 </integer> 99 </integer>
41 <!--FIXME: Can be complex! --> 100 <!--FIXME: Can be complex! -->
42 <integer sim="LowerSaturationLimit" xcos="Lower limit" description=""> 101 <integer sim="LowerSaturationLimit" xcos="rpar2" description="">
43 <parMap simVal="1" xcosVal="1"/> 102 <parMap simVal="1" xcosVal="1"/>
44 </integer> 103 </integer>
45 <!--FIXME: Can be complex! --> 104 <simple sim="FunctionName" xcos="integral_func"></simple>
46 <str2int sim="ZeroCross" xcos="zero_crossing" description="Enable zero-crossing detection"> 105 <simple sim="FunctionType" xcos="4"></simple>
47 <parMap simVal="off" xcosVal="0"/> 106 <simple sim="BlockType" xcos="c"></simple>
48 <parMap simVal="on" xcosVal="1"/> 107
49 </str2int> 108 <str2int sim="ZeroCross" xcos="nzcross" description="Enable zero-crossing detection">
50 <str2int sim="ExternalReset" xcos="With re-initialization" description=""> 109 <parMap simVal="off" xcosVal="0"/>
51 <!-- TODO: {'none'} | 'rising' | 'falling' | 'either' | 'level' | 'level hold' --> 110 <parMap simVal="on" xcosVal="1"/>
52 <parMap simVal="none" xcosVal="0"/> 111 </str2int>
53 </str2int> 112 <str2int sim="ExternalReset" xcos="With re-initialization" description="">
54 <str2int sim="LimitOutput" xcos="With saturation" description=""> 113 <!-- TODO: {'none'} | 'rising' | 'falling' | 'either' | 'level' | 'level hold' -->
55 <parMap simVal="off" xcosVal="0"/> 114 <parMap simVal="none" xcosVal="0"/>
56 <parMap simVal="on" xcosVal="1"/> 115 </str2int>
57 </str2int> 116 <str2int sim="LimitOutput" xcos="rpar" description="">
58 </block> 117 <parMap simVal="off" xcosVal="0"/>
118 <parMap simVal="on" xcosVal="1"/>
119 </str2int>
120 </block>
121 <!-- StateSpace Block compatibility pattern -->
59<!-- Math Operations Library Block Parameters --> 122<!-- Math Operations Library Block Parameters -->
60 <!-- A --> 123 <!-- A -->
61 <!--Absolute Value Block Compatibility Pattern:--> 124 <!--Absolute Value Block Compatibility Pattern:-->
62 <block sim="Abs" xcos="ABSOLUTE_VALUE" description=" 125 <block sim="Abs" xcos="ABSOLUTE_VALUE" description="
63 SampleTime - in xcos always inherited; 126 SampleTime - in xcos always inherited;
64 OutMax - output limiter not available; 127 OutMax - output limiter not available;
65 OutDataTypeStr - always inherited(?); 128 OutDataTypeStr - always inherited(?);
66 RndMeth - rounding mode not available(?); 129 RndMeth - rounding mode not available(?);
67 SaturateOnIntegerOverflow - always saturated(?); 130 SaturateOnIntegerOverflow - always saturated(?);
68 "> 131 ">
69 <!-- TODO: ZeroCross for the second time, create general parameter --> 132 <!-- TODO: ZeroCross for the second time, create general parameter -->
70 <str2int sim="ZeroCross" xcos="zero_crossing" description="Enable zero-crossing detection"> 133 <str2int sim="ZeroCross" xcos="zero_crossing" description="Enable zero-crossing detection">
71 <parMap simVal="off" xcosVal="0"/> 134 <parMap simVal="off" xcosVal="0"/>
72 <parMap simVal="on" xcosVal="1"/> 135 <parMap simVal="on" xcosVal="1"/>
73 </str2int> 136 </str2int>
74 </block> 137 </block>
75 <!--Add Block Compatibility Pattern:--> 138 <!--Add Block Compatibility Pattern:-->
76 <block sim="Add" xcos="SUMMATION" description=" 139 <block sim="Add" xcos="SUMMATION" description="
77 IconShape - not available; 140 IconShape - not available;
78 CollapseMode - not available; 141 CollapseMode - not available;
79 CollapseDim - not available; 142 CollapseDim - not available;
80 SampleTime - always inherited; 143 SampleTime - always inherited;
81 AccumDataTypeStr - always inherited; 144 AccumDataTypeStr - always inherited;
82 OutMin, OutMax - limiters of in/out values not available; 145 OutMin, OutMax - limiters of in/out values not available;
83 OutputDataType - always inherited; 146 OutputDataType - always inherited;
84 LockScale - (?); 147 LockScale - (?);
85 RndMeth - integer rounding method, unneccesery as output is inherited from 148 RndMeth - integer rounding method, unneccesery as output is inherited from
86 "> 149 ">
87 <!-- TODO: unavailable parameter of data type, should be inherited from inputs some special handling needed --> 150 <!-- TODO: unavailable parameter of data type, should be inherited from inputs some special handling needed -->
88 <simple sim="unavailable" xcos="Datatype" description="should be inherited from inputs"/> 151 <simple sim="unavailable" xcos="Datatype" description="should be inherited from inputs"/>
89 <!-- TODO: '++-' to [1 , 1 , -1], some special handling needed --> 152 <!-- TODO: '++-' to [1 , 1 , -1], some special handling needed -->
90 <str2int sim="Inputs" xcos="Number of inputs or sign vector" description="String with +/- to vec [1/-1]"> 153 <str2int sim="Inputs" xcos="Number of inputs or sign vector" description="String with +/- to vec [1/-1]">
91 <parMap simVal="+" xcosVal="1"/> 154 <parMap simVal="+" xcosVal="1"/>
92 <parMap simVal="-" xcosVal="-1"/> 155 <parMap simVal="-" xcosVal="-1"/>
93 </str2int> 156 </str2int>
94 <str2int sim=" SaturateOnIntegerOverflow" xcos="Do on Overflow" description=""> 157 <str2int sim=" SaturateOnIntegerOverflow" xcos="Do on Overflow" description="">
95 <parMap simVal="on" xcosVal="1"/> 158 <parMap simVal="on" xcosVal="1"/>
96 <parMap simVal="off" xcosVal="0"/> 159 <parMap simVal="off" xcosVal="0"/>
97 </str2int> 160 </str2int>
98 </block> 161 </block>
99 <!--Algebraic Constraint Compatibility Pattern:--> 162 <!--Algebraic Constraint Compatibility Pattern:-->
100 <block sim="Algebraic Constraint" xcos="CONSTRAINT_c" description="no description"> 163 <block sim="Algebraic Constraint" xcos="CONSTRAINT_c" description="no description">
101 <simple sim="z0" xcos="initial guess values" description="no description"/> 164 <simple sim="z0" xcos="initial guess values" description="no description"/>
102 </block> 165 </block>
103 <!--Assignment Compatibility Pattern:--> 166 <!--Assignment Compatibility Pattern:-->
104 <block sim="Assignment" xcos="Assignment" description="no description"> 167 <block sim="Assignment" xcos="Assignment" description="no description">
105 <integer sim="NumberOfDimensions" xcos="Number of output dimensions" description=""> 168 <integer sim="NumberOfDimensions" xcos="Number of output dimensions" description="">
106 <parMap simVal="1" xcosVal="1"/> 169 <parMap simVal="1" xcosVal="1"/>
107 </integer> 170 </integer>
108 <str2int sim="IndexMode" xcos="Index Base" description=""> 171 <str2int sim="IndexMode" xcos="Index Base" description="">
109 <parMap simVal="Zero-based" xcosVal="0"/> 172 <parMap simVal="Zero-based" xcosVal="0"/>
110 <parMap simVal="One-based" xcosVal="1"/> 173 <parMap simVal="One-based" xcosVal="1"/>
111 </str2int> 174 </str2int>
112 <str2int sim="IndexOptionArray" xcos="Index Option" description=""> 175 <str2int sim="IndexOptionArray" xcos="Index Option" description="">
113 <parMap simVal="Zero-based" xcosVal="0"/> 176 <parMap simVal="Zero-based" xcosVal="0"/>
114 <parMap simVal="One-based" xcosVal="1"/> 177 <parMap simVal="One-based" xcosVal="1"/>
115 </str2int> 178 </str2int>
116 <!--TODO: IndexOptions: See IndexOptionArray parameter for more information. 179 <!--TODO: IndexOptions: See IndexOptionArray parameter for more information.
117 'Assign all' | {'Index vector (dialog)'} | 'Index vector (port)' | 'Starting index (dialog)' | 'Starting index (port)' 180 'Assign all' | {'Index vector (dialog)'} | 'Index vector (port)' | 'Starting index (dialog)' | 'Starting index (port)'
118 FIXME: Is it available only in scicos? 181 FIXME: Is it available only in scicos?
119 --> 182 -->
120 </block> 183 </block>
121 <!-- B --> 184 <!-- B -->
122 185
123<!-- Sources Library Block Parameters --> 186<!-- Sources Library Block Parameters -->
124 <!-- C --> 187 <!-- C -->
125 <!-- Constant Block Compatibility Pattern --> 188 <!-- Constant Block Compatibility Pattern -->
126 <block sim="Constant" xcos="CONST_m" description="no description"> 189 <block sim="Constant" xcos="CONST_m" description="4">
127 <simple sim="Value" xcos="Constant" description="no description"/> 190 <simple sim="Value" xcos="Constant" description="no description"/>
128 </block> 191 </block>
129 192
130</blocks> 193</blocks>
diff --git a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/simulink/patterns/Block.java b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/simulink/patterns/Block.java
index f01050b..99e8c68 100644
--- a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/simulink/patterns/Block.java
+++ b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/simulink/patterns/Block.java
@@ -1,10 +1,3 @@
1//
2// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10
3// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
4// Any modifications to this file will be lost upon recompilation of the source schema.
5// Generated on: 2010.06.17 at 05:42:35 PM CEST
6//
7
8 1
9package org.scilab.modules.xcos.simulink.patterns; 2package org.scilab.modules.xcos.simulink.patterns;
10 3
diff --git a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/simulink/patterns/BlockPalette.java b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/simulink/patterns/BlockPalette.java
index 3d1ec03..895907e 100644
--- a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/simulink/patterns/BlockPalette.java
+++ b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/simulink/patterns/BlockPalette.java
@@ -1,10 +1,3 @@
1//
2// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10
3// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
4// Any modifications to this file will be lost upon recompilation of the source schema.
5// Generated on: 2010.06.17 at 05:42:35 PM CEST
6//
7
8 1
9package org.scilab.modules.xcos.simulink.patterns; 2package org.scilab.modules.xcos.simulink.patterns;
10 3
diff --git a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/simulink/patterns/GeneralParameters.java b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/simulink/patterns/GeneralParameters.java
index a0f2c38..4c86aed 100644
--- a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/simulink/patterns/GeneralParameters.java
+++ b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/simulink/patterns/GeneralParameters.java
@@ -1,10 +1,3 @@
1//
2// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10
3// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
4// Any modifications to this file will be lost upon recompilation of the source schema.
5// Generated on: 2010.06.21 at 07:40:24 PM CEST
6//
7
8 1
9package org.scilab.modules.xcos.simulink.patterns; 2package org.scilab.modules.xcos.simulink.patterns;
10 3
@@ -26,7 +19,7 @@ import javax.xml.bind.annotation.XmlType;
26 * &lt;complexContent> 19 * &lt;complexContent>
27 * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> 20 * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
28 * &lt;sequence> 21 * &lt;sequence>
29 * &lt;element name="string" type="{}StringParameter" maxOccurs="unbounded" minOccurs="0"/> 22 * &lt;element name="string" type="{}StringParameters" maxOccurs="unbounded" minOccurs="0"/>
30 * &lt;element name="integer" type="{}IntegerParameters" maxOccurs="unbounded" minOccurs="0"/> 23 * &lt;element name="integer" type="{}IntegerParameters" maxOccurs="unbounded" minOccurs="0"/>
31 * &lt;element name="simple" type="{}SimpleParameter" maxOccurs="unbounded" minOccurs="0"/> 24 * &lt;element name="simple" type="{}SimpleParameter" maxOccurs="unbounded" minOccurs="0"/>
32 * &lt;/sequence> 25 * &lt;/sequence>
@@ -46,7 +39,7 @@ import javax.xml.bind.annotation.XmlType;
46}) 39})
47public class GeneralParameters { 40public class GeneralParameters {
48 41
49 protected List<StringParameter> string; 42 protected List<StringParameters> string;
50 protected List<IntegerParameters> integer; 43 protected List<IntegerParameters> integer;
51 protected List<SimpleParameter> simple; 44 protected List<SimpleParameter> simple;
52 @XmlAttribute 45 @XmlAttribute
@@ -70,13 +63,13 @@ public class GeneralParameters {
70 * 63 *
71 * <p> 64 * <p>
72 * Objects of the following type(s) are allowed in the list 65 * Objects of the following type(s) are allowed in the list
73 * {@link StringParameter } 66 * {@link StringParameters }
74 * 67 *
75 * 68 *
76 */ 69 */
77 public List<StringParameter> getString() { 70 public List<StringParameters> getString() {
78 if (string == null) { 71 if (string == null) {
79 string = new ArrayList<StringParameter>(); 72 string = new ArrayList<StringParameters>();
80 } 73 }
81 return this.string; 74 return this.string;
82 } 75 }
diff --git a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/simulink/patterns/Int2StrParameters.java b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/simulink/patterns/Int2StrParameters.java
index 7304b70..35cc83e 100644
--- a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/simulink/patterns/Int2StrParameters.java
+++ b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/simulink/patterns/Int2StrParameters.java
@@ -1,10 +1,3 @@
1//
2// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10
3// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
4// Any modifications to this file will be lost upon recompilation of the source schema.
5// Generated on: 2010.06.17 at 05:42:35 PM CEST
6//
7
8 1
9package org.scilab.modules.xcos.simulink.patterns; 2package org.scilab.modules.xcos.simulink.patterns;
10 3
diff --git a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/simulink/patterns/Int2StrValueMap.java b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/simulink/patterns/Int2StrValueMap.java
index f2232ee..3f7b2f4 100644
--- a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/simulink/patterns/Int2StrValueMap.java
+++ b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/simulink/patterns/Int2StrValueMap.java
@@ -1,10 +1,3 @@
1//
2// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10
3// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
4// Any modifications to this file will be lost upon recompilation of the source schema.
5// Generated on: 2010.06.17 at 05:42:35 PM CEST
6//
7
8 1
9package org.scilab.modules.xcos.simulink.patterns; 2package org.scilab.modules.xcos.simulink.patterns;
10 3
diff --git a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/simulink/patterns/IntegerParameters.java b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/simulink/patterns/IntegerParameters.java
index 389d00d..b902464 100644
--- a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/simulink/patterns/IntegerParameters.java
+++ b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/simulink/patterns/IntegerParameters.java
@@ -1,10 +1,3 @@
1//
2// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10
3// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
4// Any modifications to this file will be lost upon recompilation of the source schema.
5// Generated on: 2010.06.17 at 05:42:35 PM CEST
6//
7
8 1
9package org.scilab.modules.xcos.simulink.patterns; 2package org.scilab.modules.xcos.simulink.patterns;
10 3
diff --git a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/simulink/patterns/IntegerValueMap.java b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/simulink/patterns/IntegerValueMap.java
index b2dd488..31a515b 100644
--- a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/simulink/patterns/IntegerValueMap.java
+++ b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/simulink/patterns/IntegerValueMap.java
@@ -1,10 +1,3 @@
1//
2// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10
3// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
4// Any modifications to this file will be lost upon recompilation of the source schema.
5// Generated on: 2010.06.17 at 05:42:35 PM CEST
6//
7
8 1
9package org.scilab.modules.xcos.simulink.patterns; 2package org.scilab.modules.xcos.simulink.patterns;
10 3
diff --git a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/simulink/patterns/ObjectFactory.java b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/simulink/patterns/ObjectFactory.java
index eda434a..17869ca 100644
--- a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/simulink/patterns/ObjectFactory.java
+++ b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/simulink/patterns/ObjectFactory.java
@@ -1,10 +1,3 @@
1//
2// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10
3// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
4// Any modifications to this file will be lost upon recompilation of the source schema.
5// Generated on: 2010.06.17 at 05:42:35 PM CEST
6//
7
8 1
9package org.scilab.modules.xcos.simulink.patterns; 2package org.scilab.modules.xcos.simulink.patterns;
10 3
@@ -41,35 +34,35 @@ public class ObjectFactory {
41 } 34 }
42 35
43 /** 36 /**
44 * Create an instance of {@link Block } 37 * Create an instance of {@link Int2StrValueMap }
45 * 38 *
46 */ 39 */
47 public Block createBlock() { 40 public Int2StrValueMap createInt2StrValueMap() {
48 return new Block(); 41 return new Int2StrValueMap();
49 } 42 }
50 43
51 /** 44 /**
52 * Create an instance of {@link SimpleParameter } 45 * Create an instance of {@link Str2IntParameters }
53 * 46 *
54 */ 47 */
55 public SimpleParameter createSimpleParameter() { 48 public Str2IntParameters createStr2IntParameters() {
56 return new SimpleParameter(); 49 return new Str2IntParameters();
57 } 50 }
58 51
59 /** 52 /**
60 * Create an instance of {@link Str2IntValueMap } 53 * Create an instance of {@link Int2StrParameters }
61 * 54 *
62 */ 55 */
63 public Str2IntValueMap createStr2IntValueMap() { 56 public Int2StrParameters createInt2StrParameters() {
64 return new Str2IntValueMap(); 57 return new Int2StrParameters();
65 } 58 }
66 59
67 /** 60 /**
68 * Create an instance of {@link IntegerValueMap } 61 * Create an instance of {@link GeneralParameters }
69 * 62 *
70 */ 63 */
71 public IntegerValueMap createIntegerValueMap() { 64 public GeneralParameters createGeneralParameters() {
72 return new IntegerValueMap(); 65 return new GeneralParameters();
73 } 66 }
74 67
75 /** 68 /**
@@ -81,59 +74,59 @@ public class ObjectFactory {
81 } 74 }
82 75
83 /** 76 /**
84 * Create an instance of {@link Int2StrValueMap } 77 * Create an instance of {@link BlockPalette }
85 * 78 *
86 */ 79 */
87 public Int2StrValueMap createInt2StrValueMap() { 80 public BlockPalette createBlockPalette() {
88 return new Int2StrValueMap(); 81 return new BlockPalette();
89 } 82 }
90 83
91 /** 84 /**
92 * Create an instance of {@link IntegerParameters } 85 * Create an instance of {@link SimpleParameter }
93 * 86 *
94 */ 87 */
95 public IntegerParameters createIntegerParameters() { 88 public SimpleParameter createSimpleParameter() {
96 return new IntegerParameters(); 89 return new SimpleParameter();
97 } 90 }
98 91
99 /** 92 /**
100 * Create an instance of {@link GeneralParameters } 93 * Create an instance of {@link StringParameters }
101 * 94 *
102 */ 95 */
103 public GeneralParameters createGeneralParameters() { 96 public StringParameters createStringParameters() {
104 return new GeneralParameters(); 97 return new StringParameters();
105 } 98 }
106 99
107 /** 100 /**
108 * Create an instance of {@link BlockPalette } 101 * Create an instance of {@link IntegerParameters }
109 * 102 *
110 */ 103 */
111 public BlockPalette createBlockPalette() { 104 public IntegerParameters createIntegerParameters() {
112 return new BlockPalette(); 105 return new IntegerParameters();
113 } 106 }
114 107
115 /** 108 /**
116 * Create an instance of {@link StringParameters } 109 * Create an instance of {@link Str2IntValueMap }
117 * 110 *
118 */ 111 */
119 public StringParameters createStringParameters() { 112 public Str2IntValueMap createStr2IntValueMap() {
120 return new StringParameters(); 113 return new Str2IntValueMap();
121 } 114 }
122 115
123 /** 116 /**
124 * Create an instance of {@link Str2IntParameters } 117 * Create an instance of {@link Block }
125 * 118 *
126 */ 119 */
127 public Str2IntParameters createStr2IntParameters() { 120 public Block createBlock() {
128 return new Str2IntParameters(); 121 return new Block();
129 } 122 }
130 123
131 /** 124 /**
132 * Create an instance of {@link Int2StrParameters } 125 * Create an instance of {@link IntegerValueMap }
133 * 126 *
134 */ 127 */
135 public Int2StrParameters createInt2StrParameters() { 128 public IntegerValueMap createIntegerValueMap() {
136 return new Int2StrParameters(); 129 return new IntegerValueMap();
137 } 130 }
138 131
139 /** 132 /**
diff --git a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/simulink/patterns/SimpleParameter.java b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/simulink/patterns/SimpleParameter.java
index 59e0e49..08f7394 100644
--- a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/simulink/patterns/SimpleParameter.java
+++ b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/simulink/patterns/SimpleParameter.java
@@ -1,10 +1,3 @@
1//
2// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10
3// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
4// Any modifications to this file will be lost upon recompilation of the source schema.
5// Generated on: 2010.06.17 at 05:42:35 PM CEST
6//
7
8 1
9package org.scilab.modules.xcos.simulink.patterns; 2package org.scilab.modules.xcos.simulink.patterns;
10 3
diff --git a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/simulink/patterns/Str2IntParameters.java b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/simulink/patterns/Str2IntParameters.java
index be54548..5f5413b 100644
--- a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/simulink/patterns/Str2IntParameters.java
+++ b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/simulink/patterns/Str2IntParameters.java
@@ -1,10 +1,3 @@
1//
2// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10
3// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
4// Any modifications to this file will be lost upon recompilation of the source schema.
5// Generated on: 2010.06.17 at 05:42:35 PM CEST
6//
7
8 1
9package org.scilab.modules.xcos.simulink.patterns; 2package org.scilab.modules.xcos.simulink.patterns;
10 3
diff --git a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/simulink/patterns/Str2IntValueMap.java b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/simulink/patterns/Str2IntValueMap.java
index 5fe0017..ccef855 100644
--- a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/simulink/patterns/Str2IntValueMap.java
+++ b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/simulink/patterns/Str2IntValueMap.java
@@ -1,10 +1,3 @@
1//
2// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10
3// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
4// Any modifications to this file will be lost upon recompilation of the source schema.
5// Generated on: 2010.06.17 at 05:42:35 PM CEST
6//
7
8 1
9package org.scilab.modules.xcos.simulink.patterns; 2package org.scilab.modules.xcos.simulink.patterns;
10 3
diff --git a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/simulink/patterns/StringParameters.java b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/simulink/patterns/StringParameters.java
index 5d5e0e9..2f89a6a 100644
--- a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/simulink/patterns/StringParameters.java
+++ b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/simulink/patterns/StringParameters.java
@@ -1,10 +1,3 @@
1//
2// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10
3// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
4// Any modifications to this file will be lost upon recompilation of the source schema.
5// Generated on: 2010.06.17 at 05:42:35 PM CEST
6//
7
8 1
9package org.scilab.modules.xcos.simulink.patterns; 2package org.scilab.modules.xcos.simulink.patterns;
10 3
diff --git a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/simulink/patterns/StringValueMap.java b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/simulink/patterns/StringValueMap.java
index d89f572..e960ddb 100644
--- a/scilab/modules/xcos/src/java/org/scilab/modules/xcos/simulink/patterns/StringValueMap.java
+++ b/scilab/modules/xcos/src/java/org/scilab/modules/xcos/simulink/patterns/StringValueMap.java
@@ -1,10 +1,3 @@
1//
2// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10
3// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a>
4// Any modifications to this file will be lost upon recompilation of the source schema.
5// Generated on: 2010.06.17 at 05:42:35 PM CEST
6//
7
8 1
9package org.scilab.modules.xcos.simulink.patterns; 2package org.scilab.modules.xcos.simulink.patterns;
10 3