Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.
View | Details | Raw Unified | Return to bug 256357 | Differences between
and this patch

Collapse All | Expand All

(-)src/org/eclipse/datatools/connectivity/oda/design/TextFormatType.java (-38 / +95 lines)
Lines 1-6 Link Here
1
/**
1
/**
2
 *************************************************************************
2
 *************************************************************************
3
 * Copyright (c) 2005, 2007 Actuate Corporation.
3
 * Copyright (c) 2005, 2009 Actuate Corporation.
4
 * All rights reserved. This program and the accompanying materials
4
 * All rights reserved. This program and the accompanying materials
5
 * are made available under the terms of the Eclipse Public License v1.0
5
 * are made available under the terms of the Eclipse Public License v1.0
6
 * which accompanies this distribution, and is available at
6
 * which accompanies this distribution, and is available at
Lines 19-25 Link Here
19
import java.util.Collections;
19
import java.util.Collections;
20
import java.util.List;
20
import java.util.List;
21
21
22
import org.eclipse.emf.common.util.AbstractEnumerator;
22
import org.eclipse.emf.common.util.Enumerator;
23
23
24
/**
24
/**
25
 * <!-- begin-user-doc -->
25
 * <!-- begin-user-doc -->
Lines 30-112 Link Here
30
 * The type of text content of the data column values, i.e. plain text, HTML or RTF.  It provides a hint on the type of text control to use for displaying the data value, e.g. a Text Control vs. Dynamic Text Control.
30
 * The type of text content of the data column values, i.e. plain text, HTML or RTF.  It provides a hint on the type of text control to use for displaying the data value, e.g. a Text Control vs. Dynamic Text Control.
31
 * <!-- end-model-doc -->
31
 * <!-- end-model-doc -->
32
 * @see org.eclipse.datatools.connectivity.oda.design.DesignPackage#getTextFormatType()
32
 * @see org.eclipse.datatools.connectivity.oda.design.DesignPackage#getTextFormatType()
33
 * @model
33
 * @model extendedMetaData="name='TextFormatType'"
34
 * @generated
34
 * @generated
35
 */
35
 */
36
public final class TextFormatType extends AbstractEnumerator
36
public enum TextFormatType implements Enumerator {
37
{
38
    /**
37
    /**
38
     * The '<em><b>Plain</b></em>' literal object.
39
     * <!-- begin-user-doc -->
39
     * <!-- begin-user-doc -->
40
     * <!-- end-user-doc -->
40
     * <!-- end-user-doc -->
41
     * @see #PLAIN
41
     * @generated
42
     * @generated
43
     * @ordered
42
     */
44
     */
43
    public static final String copyright = "Copyright (c) 2005, 2007 Actuate Corporation"; //$NON-NLS-1$
45
    PLAIN_LITERAL(0, "Plain", "Plain"), //$NON-NLS-1$ //$NON-NLS-2$
44
45
    /**
46
    /**
46
     * The '<em><b>Plain</b></em>' literal value.
47
     * The '<em><b>HTML</b></em>' literal object.
47
     * <!-- begin-user-doc -->
48
     * <!-- begin-user-doc -->
48
     * <!-- end-user-doc -->
49
     * <!-- end-user-doc -->
49
     * @see #PLAIN_LITERAL
50
     * @see #HTML
50
     * @model name="Plain"
51
     * @generated
51
     * @generated
52
     * @ordered
52
     * @ordered
53
     */
53
     */
54
    public static final int PLAIN = 0;
54
    HTML_LITERAL(1, "HTML", "HTML"), //$NON-NLS-1$ //$NON-NLS-2$
55
56
    /**
55
    /**
57
     * The '<em><b>HTML</b></em>' literal value.
56
     * The '<em><b>RTF</b></em>' literal object.
58
     * <!-- begin-user-doc -->
57
     * <!-- begin-user-doc -->
59
     * <!-- end-user-doc -->
58
     * <!-- end-user-doc -->
60
     * @see #HTML_LITERAL
59
     * @see #RTF
61
     * @model
62
     * @generated
60
     * @generated
63
     * @ordered
61
     * @ordered
64
     */
62
     */
65
    public static final int HTML = 1;
63
    RTF_LITERAL(2, "RTF", "RTF"); //$NON-NLS-1$ //$NON-NLS-2$
66
67
    /**
64
    /**
68
     * The '<em><b>RTF</b></em>' literal value.
69
     * <!-- begin-user-doc -->
65
     * <!-- begin-user-doc -->
70
     * <!-- end-user-doc -->
66
     * <!-- end-user-doc -->
71
     * @see #RTF_LITERAL
72
     * @model
73
     * @generated
67
     * @generated
74
     * @ordered
75
     */
68
     */
76
    public static final int RTF = 2;
69
    public static final String copyright = "Copyright (c) 2005, 2009 Actuate Corporation"; //$NON-NLS-1$
77
70
78
    /**
71
    /**
79
     * The '<em><b>Plain</b></em>' literal object.
72
     * The '<em><b>Plain</b></em>' literal value.
80
     * <!-- begin-user-doc -->
73
     * <!-- begin-user-doc -->
81
     * <!-- end-user-doc -->
74
     * <!-- end-user-doc -->
82
     * @see #PLAIN
75
     * @see #PLAIN_LITERAL
76
     * @model name="Plain"
83
     * @generated
77
     * @generated
84
     * @ordered
78
     * @ordered
85
     */
79
     */
86
    public static final TextFormatType PLAIN_LITERAL = new TextFormatType(
80
    public static final int PLAIN = 0;
87
            PLAIN, "Plain", "Plain" ); //$NON-NLS-1$ //$NON-NLS-2$
88
81
89
    /**
82
    /**
90
     * The '<em><b>HTML</b></em>' literal object.
83
     * The '<em><b>HTML</b></em>' literal value.
91
     * <!-- begin-user-doc -->
84
     * <!-- begin-user-doc -->
92
     * <!-- end-user-doc -->
85
     * <!-- end-user-doc -->
93
     * @see #HTML
86
     * @see #HTML_LITERAL
87
     * @model
94
     * @generated
88
     * @generated
95
     * @ordered
89
     * @ordered
96
     */
90
     */
97
    public static final TextFormatType HTML_LITERAL = new TextFormatType( HTML,
91
    public static final int HTML = 1;
98
            "HTML", "HTML" ); //$NON-NLS-1$ //$NON-NLS-2$
99
92
100
    /**
93
    /**
101
     * The '<em><b>RTF</b></em>' literal object.
94
     * The '<em><b>RTF</b></em>' literal value.
102
     * <!-- begin-user-doc -->
95
     * <!-- begin-user-doc -->
103
     * <!-- end-user-doc -->
96
     * <!-- end-user-doc -->
104
     * @see #RTF
97
     * @see #RTF_LITERAL
98
     * @model
105
     * @generated
99
     * @generated
106
     * @ordered
100
     * @ordered
107
     */
101
     */
108
    public static final TextFormatType RTF_LITERAL = new TextFormatType( RTF,
102
    public static final int RTF = 2;
109
            "RTF", "RTF" ); //$NON-NLS-1$ //$NON-NLS-2$
110
103
111
    /**
104
    /**
112
     * An array of all the '<em><b>Text Format Type</b></em>' enumerators.
105
     * An array of all the '<em><b>Text Format Type</b></em>' enumerators.
Lines 123-130 Link Here
123
     * <!-- end-user-doc -->
116
     * <!-- end-user-doc -->
124
     * @generated
117
     * @generated
125
     */
118
     */
126
    public static final List VALUES = Collections.unmodifiableList( Arrays
119
    public static final List<TextFormatType> VALUES = Collections
127
            .asList( VALUES_ARRAY ) );
120
            .unmodifiableList( Arrays.asList( VALUES_ARRAY ) );
128
121
129
    /**
122
    /**
130
     * Returns the '<em><b>Text Format Type</b></em>' literal with the specified literal value.
123
     * Returns the '<em><b>Text Format Type</b></em>' literal with the specified literal value.
Lines 185-190 Link Here
185
    }
178
    }
186
179
187
    /**
180
    /**
181
     * <!-- begin-user-doc -->
182
     * <!-- end-user-doc -->
183
     * @generated
184
     */
185
    private final int value;
186
187
    /**
188
     * <!-- begin-user-doc -->
189
     * <!-- end-user-doc -->
190
     * @generated
191
     */
192
    private final String name;
193
194
    /**
195
     * <!-- begin-user-doc -->
196
     * <!-- end-user-doc -->
197
     * @generated
198
     */
199
    private final String literal;
200
201
    /**
188
     * Only this class can construct instances.
202
     * Only this class can construct instances.
189
     * <!-- begin-user-doc -->
203
     * <!-- begin-user-doc -->
190
     * <!-- end-user-doc -->
204
     * <!-- end-user-doc -->
Lines 192-198 Link Here
192
     */
206
     */
193
    private TextFormatType( int value, String name, String literal )
207
    private TextFormatType( int value, String name, String literal )
194
    {
208
    {
195
        super( value, name, literal );
209
        this.value = value;
210
        this.name = name;
211
        this.literal = literal;
196
    }
212
    }
197
213
198
} //TextFormatType
214
    /**
215
     * <!-- begin-user-doc -->
216
     * <!-- end-user-doc -->
217
     * @generated
218
     */
219
    public int getValue()
220
    {
221
        return value;
222
    }
223
224
    /**
225
     * <!-- begin-user-doc -->
226
     * <!-- end-user-doc -->
227
     * @generated
228
     */
229
    public String getName()
230
    {
231
        return name;
232
    }
233
234
    /**
235
     * <!-- begin-user-doc -->
236
     * <!-- end-user-doc -->
237
     * @generated
238
     */
239
    public String getLiteral()
240
    {
241
        return literal;
242
    }
243
244
    /**
245
     * Returns the literal value of the enumerator, which is its string representation.
246
     * <!-- begin-user-doc -->
247
     * <!-- end-user-doc -->
248
     * @generated
249
     */
250
    @Override
251
    public String toString()
252
    {
253
        return literal;
254
    }
255
}
(-)src/org/eclipse/datatools/connectivity/oda/design/ResultSets.java (-5 / +5 lines)
Lines 1-6 Link Here
1
/**
1
/**
2
 *************************************************************************
2
 *************************************************************************
3
 * Copyright (c) 2005, 2007 Actuate Corporation.
3
 * Copyright (c) 2005, 2009 Actuate Corporation.
4
 * All rights reserved. This program and the accompanying materials
4
 * All rights reserved. This program and the accompanying materials
5
 * are made available under the terms of the Eclipse Public License v1.0
5
 * are made available under the terms of the Eclipse Public License v1.0
6
 * which accompanies this distribution, and is available at
6
 * which accompanies this distribution, and is available at
Lines 46-52 Link Here
46
     * <!-- end-user-doc -->
46
     * <!-- end-user-doc -->
47
     * @generated
47
     * @generated
48
     */
48
     */
49
    String copyright = "Copyright (c) 2005, 2007 Actuate Corporation"; //$NON-NLS-1$
49
    String copyright = "Copyright (c) 2005, 2009 Actuate Corporation"; //$NON-NLS-1$
50
50
51
    /**
51
    /**
52
     * Finds and returns a named result set definition that
52
     * Finds and returns a named result set definition that
Lines 89-99 Link Here
89
     * <!-- end-user-doc -->
89
     * <!-- end-user-doc -->
90
     * @return the value of the '<em>Result Set Definitions</em>' containment reference list.
90
     * @return the value of the '<em>Result Set Definitions</em>' containment reference list.
91
     * @see org.eclipse.datatools.connectivity.oda.design.DesignPackage#getResultSets_ResultSetDefinitions()
91
     * @see org.eclipse.datatools.connectivity.oda.design.DesignPackage#getResultSets_ResultSetDefinitions()
92
     * @model type="org.eclipse.datatools.connectivity.oda.design.ResultSetDefinition" containment="true" required="true"
92
     * @model containment="true" required="true"
93
     *        extendedMetaData="kind='element' name='resultSetDefinitions' namespace='##targetNamespace'"
93
     *        extendedMetaData="kind='element' name='resultSetDefinitions' namespace='##targetNamespace'"
94
     * @generated
94
     * @generated
95
     */
95
     */
96
    EList getResultSetDefinitions();
96
    EList<ResultSetDefinition> getResultSetDefinitions();
97
97
98
    /**
98
    /**
99
     * Returns the value of the '<em><b>Derived Meta Data</b></em>' attribute.
99
     * Returns the value of the '<em><b>Derived Meta Data</b></em>' attribute.
Lines 108-114 Link Here
108
     * @see #unsetDerivedMetaData()
108
     * @see #unsetDerivedMetaData()
109
     * @see #setDerivedMetaData(boolean)
109
     * @see #setDerivedMetaData(boolean)
110
     * @see org.eclipse.datatools.connectivity.oda.design.DesignPackage#getResultSets_DerivedMetaData()
110
     * @see org.eclipse.datatools.connectivity.oda.design.DesignPackage#getResultSets_DerivedMetaData()
111
     * @model default="true" unique="false" unsettable="true" dataType="org.eclipse.emf.ecore.xml.type.Boolean"
111
     * @model default="true" unsettable="true" dataType="org.eclipse.emf.ecore.xml.type.Boolean"
112
     *        extendedMetaData="kind='attribute' name='derivedMetaData'"
112
     *        extendedMetaData="kind='attribute' name='derivedMetaData'"
113
     * @generated
113
     * @generated
114
     */
114
     */
(-)src/org/eclipse/datatools/connectivity/oda/design/Properties.java (-4 / +4 lines)
Lines 1-6 Link Here
1
/**
1
/**
2
 *************************************************************************
2
 *************************************************************************
3
 * Copyright (c) 2005, 2007 Actuate Corporation.
3
 * Copyright (c) 2005, 2009 Actuate Corporation.
4
 * All rights reserved. This program and the accompanying materials
4
 * All rights reserved. This program and the accompanying materials
5
 * are made available under the terms of the Eclipse Public License v1.0
5
 * are made available under the terms of the Eclipse Public License v1.0
6
 * which accompanies this distribution, and is available at
6
 * which accompanies this distribution, and is available at
Lines 45-51 Link Here
45
     * <!-- end-user-doc -->
45
     * <!-- end-user-doc -->
46
     * @generated
46
     * @generated
47
     */
47
     */
48
    String copyright = "Copyright (c) 2005, 2007 Actuate Corporation"; //$NON-NLS-1$
48
    String copyright = "Copyright (c) 2005, 2009 Actuate Corporation"; //$NON-NLS-1$
49
49
50
    /**
50
    /**
51
     * Finds and returns the Property with the
51
     * Finds and returns the Property with the
Lines 101-110 Link Here
101
     * <!-- end-user-doc -->
101
     * <!-- end-user-doc -->
102
     * @return the value of the '<em>Properties</em>' containment reference list.
102
     * @return the value of the '<em>Properties</em>' containment reference list.
103
     * @see org.eclipse.datatools.connectivity.oda.design.DesignPackage#getProperties_Properties()
103
     * @see org.eclipse.datatools.connectivity.oda.design.DesignPackage#getProperties_Properties()
104
     * @model type="org.eclipse.datatools.connectivity.oda.design.Property" containment="true" required="true"
104
     * @model containment="true" required="true"
105
     *        extendedMetaData="kind='element' name='properties' namespace='##targetNamespace'"
105
     *        extendedMetaData="kind='element' name='properties' namespace='##targetNamespace'"
106
     * @generated
106
     * @generated
107
     */
107
     */
108
    EList getProperties();
108
    EList<Property> getProperties();
109
109
110
} // Properties
110
} // Properties
(-)src/org/eclipse/datatools/connectivity/oda/design/ParameterFields.java (-5 / +5 lines)
Lines 1-6 Link Here
1
/**
1
/**
2
 *************************************************************************
2
 *************************************************************************
3
 * Copyright (c) 2005, 2007 Actuate Corporation.
3
 * Copyright (c) 2005, 2009 Actuate Corporation.
4
 * All rights reserved. This program and the accompanying materials
4
 * All rights reserved. This program and the accompanying materials
5
 * are made available under the terms of the Eclipse Public License v1.0
5
 * are made available under the terms of the Eclipse Public License v1.0
6
 * which accompanies this distribution, and is available at
6
 * which accompanies this distribution, and is available at
Lines 45-51 Link Here
45
     * <!-- end-user-doc -->
45
     * <!-- end-user-doc -->
46
     * @generated
46
     * @generated
47
     */
47
     */
48
    String copyright = "Copyright (c) 2005, 2007 Actuate Corporation"; //$NON-NLS-1$
48
    String copyright = "Copyright (c) 2005, 2009 Actuate Corporation"; //$NON-NLS-1$
49
49
50
    /**
50
    /**
51
     * Returns the value of the '<em><b>Field Collection</b></em>' containment reference list.
51
     * Returns the value of the '<em><b>Field Collection</b></em>' containment reference list.
Lines 54-63 Link Here
54
     * <!-- end-user-doc -->
54
     * <!-- end-user-doc -->
55
     * @return the value of the '<em>Field Collection</em>' containment reference list.
55
     * @return the value of the '<em>Field Collection</em>' containment reference list.
56
     * @see org.eclipse.datatools.connectivity.oda.design.DesignPackage#getParameterFields_FieldCollection()
56
     * @see org.eclipse.datatools.connectivity.oda.design.DesignPackage#getParameterFields_FieldCollection()
57
     * @model type="org.eclipse.datatools.connectivity.oda.design.ParameterFieldDefinition" containment="true" required="true"
57
     * @model containment="true" required="true"
58
     *        extendedMetaData="kind='element' name='fields' namespace='##targetNamespace'"
58
     *        extendedMetaData="kind='element' name='fieldCollection' namespace='##targetNamespace'"
59
     * @generated
59
     * @generated
60
     */
60
     */
61
    EList getFieldCollection();
61
    EList<ParameterFieldDefinition> getFieldCollection();
62
62
63
} // ParameterFields
63
} // ParameterFields
(-)src/org/eclipse/datatools/connectivity/oda/design/ResourceIdentifiers.java (-8 / +7 lines)
Lines 1-6 Link Here
1
/**
1
/**
2
 *************************************************************************
2
 *************************************************************************
3
 * Copyright (c) 2008 Actuate Corporation.
3
 * Copyright (c) 2008, 2009 Actuate Corporation.
4
 * All rights reserved. This program and the accompanying materials
4
 * All rights reserved. This program and the accompanying materials
5
 * are made available under the terms of the Eclipse Public License v1.0
5
 * are made available under the terms of the Eclipse Public License v1.0
6
 * which accompanies this distribution, and is available at
6
 * which accompanies this distribution, and is available at
Lines 20-26 Link Here
20
import org.eclipse.emf.ecore.EObject;
20
import org.eclipse.emf.ecore.EObject;
21
21
22
/**
22
/**
23
 * <b>Experimental</b>
24
 * <!-- begin-user-doc -->
23
 * <!-- begin-user-doc -->
25
 * A representation of the model object '<em><b>Resource Identifiers</b></em>'.
24
 * A representation of the model object '<em><b>Resource Identifiers</b></em>'.
26
 * <!-- end-user-doc -->
25
 * <!-- end-user-doc -->
Lines 40-46 Link Here
40
 * @see org.eclipse.datatools.connectivity.oda.design.DesignPackage#getResourceIdentifiers()
39
 * @see org.eclipse.datatools.connectivity.oda.design.DesignPackage#getResourceIdentifiers()
41
 * @model extendedMetaData="name='ResourceIdentifiers' kind='elementOnly'"
40
 * @model extendedMetaData="name='ResourceIdentifiers' kind='elementOnly'"
42
 * @generated
41
 * @generated
43
 * @since DTP 1.6.1
42
 * @since DTP 1.7
44
 */
43
 */
45
public interface ResourceIdentifiers extends EObject
44
public interface ResourceIdentifiers extends EObject
46
{
45
{
Lines 49-55 Link Here
49
     * <!-- end-user-doc -->
48
     * <!-- end-user-doc -->
50
     * @generated
49
     * @generated
51
     */
50
     */
52
    String copyright = "Copyright (c) 2008 Actuate Corporation"; //$NON-NLS-1$
51
    String copyright = "Copyright (c) 2008, 2009 Actuate Corporation"; //$NON-NLS-1$
53
52
54
    /**
53
    /**
55
     * Returns the value of the '<em><b>Appl Resource Base URI String</b></em>' attribute in URI form.
54
     * Returns the value of the '<em><b>Appl Resource Base URI String</b></em>' attribute in URI form.
Lines 58-64 Link Here
58
     * @generated NOT
57
     * @generated NOT
59
     */
58
     */
60
    URI getApplResourceBaseURI();
59
    URI getApplResourceBaseURI();
61
    
60
62
    /**
61
    /**
63
     * Sets the value of the '<em><b>Appl Resource Base URI String</b></em>' attribute in URI form.
62
     * Sets the value of the '<em><b>Appl Resource Base URI String</b></em>' attribute in URI form.
64
     * @param baseURI the base URI of general purpose resources of an ODA consumer application
63
     * @param baseURI the base URI of general purpose resources of an ODA consumer application
Lines 78-84 Link Here
78
     * @see #getApplResourceBaseURI()
77
     * @see #getApplResourceBaseURI()
79
     * @see #setApplResourceBaseURIString(String)
78
     * @see #setApplResourceBaseURIString(String)
80
     * @see org.eclipse.datatools.connectivity.oda.design.DesignPackage#getResourceIdentifiers_ApplResourceBaseURIString()
79
     * @see org.eclipse.datatools.connectivity.oda.design.DesignPackage#getResourceIdentifiers_ApplResourceBaseURIString()
81
     * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.String"
80
     * @model dataType="org.eclipse.emf.ecore.xml.type.String"
82
     *        extendedMetaData="kind='element' name='applResourceBaseURIString' namespace='##targetNamespace'"
81
     *        extendedMetaData="kind='element' name='applResourceBaseURIString' namespace='##targetNamespace'"
83
     * @generated
82
     * @generated
84
     */
83
     */
Lines 102-108 Link Here
102
     * @generated NOT
101
     * @generated NOT
103
     */
102
     */
104
    URI getDesignResourceBaseURI();
103
    URI getDesignResourceBaseURI();
105
    
104
106
    /**
105
    /**
107
     * Sets the value of the '<em><b>Design Resource Base URI String</b></em>' attribute in URI form.
106
     * Sets the value of the '<em><b>Design Resource Base URI String</b></em>' attribute in URI form.
108
     * @param baseURI the base URI of design resources of an ODA consumer application
107
     * @param baseURI the base URI of design resources of an ODA consumer application
Lines 122-128 Link Here
122
     * @see #getDesignResourceBaseURI()
121
     * @see #getDesignResourceBaseURI()
123
     * @see #setDesignResourceBaseURIString(String)
122
     * @see #setDesignResourceBaseURIString(String)
124
     * @see org.eclipse.datatools.connectivity.oda.design.DesignPackage#getResourceIdentifiers_DesignResourceBaseURIString()
123
     * @see org.eclipse.datatools.connectivity.oda.design.DesignPackage#getResourceIdentifiers_DesignResourceBaseURIString()
125
     * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.String"
124
     * @model dataType="org.eclipse.emf.ecore.xml.type.String"
126
     *        extendedMetaData="kind='element' name='designResourceBaseURIString' namespace='##targetNamespace'"
125
     *        extendedMetaData="kind='element' name='designResourceBaseURIString' namespace='##targetNamespace'"
127
     * @generated
126
     * @generated
128
     */
127
     */
(-)src/org/eclipse/datatools/connectivity/oda/design/TextWrapType.java (-29 / +88 lines)
Lines 1-6 Link Here
1
/**
1
/**
2
 *************************************************************************
2
 *************************************************************************
3
 * Copyright (c) 2005, 2007 Actuate Corporation.
3
 * Copyright (c) 2005, 2009 Actuate Corporation.
4
 * All rights reserved. This program and the accompanying materials
4
 * All rights reserved. This program and the accompanying materials
5
 * are made available under the terms of the Eclipse Public License v1.0
5
 * are made available under the terms of the Eclipse Public License v1.0
6
 * which accompanies this distribution, and is available at
6
 * which accompanies this distribution, and is available at
Lines 19-25 Link Here
19
import java.util.Collections;
19
import java.util.Collections;
20
import java.util.List;
20
import java.util.List;
21
21
22
import org.eclipse.emf.common.util.AbstractEnumerator;
22
import org.eclipse.emf.common.util.Enumerator;
23
23
24
/**
24
/**
25
 * <!-- begin-user-doc -->
25
 * <!-- begin-user-doc -->
Lines 30-90 Link Here
30
 * A hint on the type of text wrapping on the data column values.  It could be in a single line (None), or word-wrapped (Word).
30
 * A hint on the type of text wrapping on the data column values.  It could be in a single line (None), or word-wrapped (Word).
31
 * <!-- end-model-doc -->
31
 * <!-- end-model-doc -->
32
 * @see org.eclipse.datatools.connectivity.oda.design.DesignPackage#getTextWrapType()
32
 * @see org.eclipse.datatools.connectivity.oda.design.DesignPackage#getTextWrapType()
33
 * @model
33
 * @model extendedMetaData="name='TextWrapType'"
34
 * @generated
34
 * @generated
35
 */
35
 */
36
public final class TextWrapType extends AbstractEnumerator
36
public enum TextWrapType implements Enumerator {
37
{
38
    /**
37
    /**
38
     * The '<em><b>None</b></em>' literal object.
39
     * <!-- begin-user-doc -->
39
     * <!-- begin-user-doc -->
40
     * <!-- end-user-doc -->
40
     * <!-- end-user-doc -->
41
     * @see #NONE
41
     * @generated
42
     * @generated
43
     * @ordered
42
     */
44
     */
43
    public static final String copyright = "Copyright (c) 2005, 2007 Actuate Corporation"; //$NON-NLS-1$
45
    NONE_LITERAL(0, "None", "None"), //$NON-NLS-1$ //$NON-NLS-2$
44
45
    /**
46
    /**
46
     * The '<em><b>None</b></em>' literal value.
47
     * The '<em><b>Word</b></em>' literal object.
47
     * <!-- begin-user-doc -->
48
     * <!-- begin-user-doc -->
48
     * <!-- end-user-doc -->
49
     * <!-- end-user-doc -->
49
     * @see #NONE_LITERAL
50
     * @see #WORD
50
     * @model name="None"
51
     * @generated
51
     * @generated
52
     * @ordered
52
     * @ordered
53
     */
53
     */
54
    public static final int NONE = 0;
54
    WORD_LITERAL(1, "Word", "Word"); //$NON-NLS-1$ //$NON-NLS-2$
55
56
    /**
55
    /**
57
     * The '<em><b>Word</b></em>' literal value.
58
     * <!-- begin-user-doc -->
56
     * <!-- begin-user-doc -->
59
     * <!-- end-user-doc -->
57
     * <!-- end-user-doc -->
60
     * @see #WORD_LITERAL
61
     * @model name="Word"
62
     * @generated
58
     * @generated
63
     * @ordered
64
     */
59
     */
65
    public static final int WORD = 1;
60
    public static final String copyright = "Copyright (c) 2005, 2009 Actuate Corporation"; //$NON-NLS-1$
66
61
67
    /**
62
    /**
68
     * The '<em><b>None</b></em>' literal object.
63
     * The '<em><b>None</b></em>' literal value.
69
     * <!-- begin-user-doc -->
64
     * <!-- begin-user-doc -->
70
     * <!-- end-user-doc -->
65
     * <!-- end-user-doc -->
71
     * @see #NONE
66
     * @see #NONE_LITERAL
67
     * @model name="None"
72
     * @generated
68
     * @generated
73
     * @ordered
69
     * @ordered
74
     */
70
     */
75
    public static final TextWrapType NONE_LITERAL = new TextWrapType( NONE,
71
    public static final int NONE = 0;
76
            "None", "None" ); //$NON-NLS-1$ //$NON-NLS-2$
77
72
78
    /**
73
    /**
79
     * The '<em><b>Word</b></em>' literal object.
74
     * The '<em><b>Word</b></em>' literal value.
80
     * <!-- begin-user-doc -->
75
     * <!-- begin-user-doc -->
81
     * <!-- end-user-doc -->
76
     * <!-- end-user-doc -->
82
     * @see #WORD
77
     * @see #WORD_LITERAL
78
     * @model name="Word"
83
     * @generated
79
     * @generated
84
     * @ordered
80
     * @ordered
85
     */
81
     */
86
    public static final TextWrapType WORD_LITERAL = new TextWrapType( WORD,
82
    public static final int WORD = 1;
87
            "Word", "Word" ); //$NON-NLS-1$ //$NON-NLS-2$
88
83
89
    /**
84
    /**
90
     * An array of all the '<em><b>Text Wrap Type</b></em>' enumerators.
85
     * An array of all the '<em><b>Text Wrap Type</b></em>' enumerators.
Lines 101-108 Link Here
101
     * <!-- end-user-doc -->
96
     * <!-- end-user-doc -->
102
     * @generated
97
     * @generated
103
     */
98
     */
104
    public static final List VALUES = Collections.unmodifiableList( Arrays
99
    public static final List<TextWrapType> VALUES = Collections
105
            .asList( VALUES_ARRAY ) );
100
            .unmodifiableList( Arrays.asList( VALUES_ARRAY ) );
106
101
107
    /**
102
    /**
108
     * Returns the '<em><b>Text Wrap Type</b></em>' literal with the specified literal value.
103
     * Returns the '<em><b>Text Wrap Type</b></em>' literal with the specified literal value.
Lines 161-166 Link Here
161
    }
156
    }
162
157
163
    /**
158
    /**
159
     * <!-- begin-user-doc -->
160
     * <!-- end-user-doc -->
161
     * @generated
162
     */
163
    private final int value;
164
165
    /**
166
     * <!-- begin-user-doc -->
167
     * <!-- end-user-doc -->
168
     * @generated
169
     */
170
    private final String name;
171
172
    /**
173
     * <!-- begin-user-doc -->
174
     * <!-- end-user-doc -->
175
     * @generated
176
     */
177
    private final String literal;
178
179
    /**
164
     * Only this class can construct instances.
180
     * Only this class can construct instances.
165
     * <!-- begin-user-doc -->
181
     * <!-- begin-user-doc -->
166
     * <!-- end-user-doc -->
182
     * <!-- end-user-doc -->
Lines 168-174 Link Here
168
     */
184
     */
169
    private TextWrapType( int value, String name, String literal )
185
    private TextWrapType( int value, String name, String literal )
170
    {
186
    {
171
        super( value, name, literal );
187
        this.value = value;
188
        this.name = name;
189
        this.literal = literal;
190
    }
191
192
    /**
193
     * <!-- begin-user-doc -->
194
     * <!-- end-user-doc -->
195
     * @generated
196
     */
197
    public int getValue()
198
    {
199
        return value;
200
    }
201
202
    /**
203
     * <!-- begin-user-doc -->
204
     * <!-- end-user-doc -->
205
     * @generated
206
     */
207
    public String getName()
208
    {
209
        return name;
172
    }
210
    }
173
211
174
} //TextWrapType
212
    /**
213
     * <!-- begin-user-doc -->
214
     * <!-- end-user-doc -->
215
     * @generated
216
     */
217
    public String getLiteral()
218
    {
219
        return literal;
220
    }
221
222
    /**
223
     * Returns the literal value of the enumerator, which is its string representation.
224
     * <!-- begin-user-doc -->
225
     * <!-- end-user-doc -->
226
     * @generated
227
     */
228
    @Override
229
    public String toString()
230
    {
231
        return literal;
232
    }
233
}
(-)src/org/eclipse/datatools/connectivity/oda/design/ScalarValueChoices.java (-4 / +4 lines)
Lines 1-6 Link Here
1
/**
1
/**
2
 *************************************************************************
2
 *************************************************************************
3
 * Copyright (c) 2005, 2007 Actuate Corporation.
3
 * Copyright (c) 2005, 2009 Actuate Corporation.
4
 * All rights reserved. This program and the accompanying materials
4
 * All rights reserved. This program and the accompanying materials
5
 * are made available under the terms of the Eclipse Public License v1.0
5
 * are made available under the terms of the Eclipse Public License v1.0
6
 * which accompanies this distribution, and is available at
6
 * which accompanies this distribution, and is available at
Lines 45-51 Link Here
45
     * <!-- end-user-doc -->
45
     * <!-- end-user-doc -->
46
     * @generated
46
     * @generated
47
     */
47
     */
48
    String copyright = "Copyright (c) 2005, 2007 Actuate Corporation"; //$NON-NLS-1$
48
    String copyright = "Copyright (c) 2005, 2009 Actuate Corporation"; //$NON-NLS-1$
49
49
50
    /**
50
    /**
51
     * Returns the value of the '<em><b>Scalar Values</b></em>' containment reference list.
51
     * Returns the value of the '<em><b>Scalar Values</b></em>' containment reference list.
Lines 54-63 Link Here
54
     * <!-- end-user-doc -->
54
     * <!-- end-user-doc -->
55
     * @return the value of the '<em>Scalar Values</em>' containment reference list.
55
     * @return the value of the '<em>Scalar Values</em>' containment reference list.
56
     * @see org.eclipse.datatools.connectivity.oda.design.DesignPackage#getScalarValueChoices_ScalarValues()
56
     * @see org.eclipse.datatools.connectivity.oda.design.DesignPackage#getScalarValueChoices_ScalarValues()
57
     * @model type="org.eclipse.datatools.connectivity.oda.design.ScalarValueDefinition" containment="true" required="true"
57
     * @model containment="true" required="true"
58
     *        extendedMetaData="kind='element' name='scalarValues' namespace='##targetNamespace'"
58
     *        extendedMetaData="kind='element' name='scalarValues' namespace='##targetNamespace'"
59
     * @generated
59
     * @generated
60
     */
60
     */
61
    EList getScalarValues();
61
    EList<ScalarValueDefinition> getScalarValues();
62
62
63
} // ScalarValueChoices
63
} // ScalarValueChoices
(-)src/org/eclipse/datatools/connectivity/oda/design/ElementNullability.java (-38 / +95 lines)
Lines 1-6 Link Here
1
/**
1
/**
2
 *************************************************************************
2
 *************************************************************************
3
 * Copyright (c) 2005, 2007 Actuate Corporation.
3
 * Copyright (c) 2005, 2009 Actuate Corporation.
4
 * All rights reserved. This program and the accompanying materials
4
 * All rights reserved. This program and the accompanying materials
5
 * are made available under the terms of the Eclipse Public License v1.0
5
 * are made available under the terms of the Eclipse Public License v1.0
6
 * which accompanies this distribution, and is available at
6
 * which accompanies this distribution, and is available at
Lines 19-25 Link Here
19
import java.util.Collections;
19
import java.util.Collections;
20
import java.util.List;
20
import java.util.List;
21
21
22
import org.eclipse.emf.common.util.AbstractEnumerator;
22
import org.eclipse.emf.common.util.Enumerator;
23
23
24
/**
24
/**
25
 * <!-- begin-user-doc -->
25
 * <!-- begin-user-doc -->
Lines 30-112 Link Here
30
 * Indicates whether a data element's value can be null.
30
 * Indicates whether a data element's value can be null.
31
 * <!-- end-model-doc -->
31
 * <!-- end-model-doc -->
32
 * @see org.eclipse.datatools.connectivity.oda.design.DesignPackage#getElementNullability()
32
 * @see org.eclipse.datatools.connectivity.oda.design.DesignPackage#getElementNullability()
33
 * @model
33
 * @model extendedMetaData="name='ElementNullability'"
34
 * @generated
34
 * @generated
35
 */
35
 */
36
public final class ElementNullability extends AbstractEnumerator
36
public enum ElementNullability implements Enumerator {
37
{
38
    /**
37
    /**
38
     * The '<em><b>Unknown</b></em>' literal object.
39
     * <!-- begin-user-doc -->
39
     * <!-- begin-user-doc -->
40
     * <!-- end-user-doc -->
40
     * <!-- end-user-doc -->
41
     * @see #UNKNOWN
41
     * @generated
42
     * @generated
43
     * @ordered
42
     */
44
     */
43
    public static final String copyright = "Copyright (c) 2005, 2007 Actuate Corporation"; //$NON-NLS-1$
45
    UNKNOWN_LITERAL(0, "Unknown", "Unknown"), //$NON-NLS-1$ //$NON-NLS-2$
44
45
    /**
46
    /**
46
     * The '<em><b>Unknown</b></em>' literal value.
47
     * The '<em><b>Nullable</b></em>' literal object.
47
     * <!-- begin-user-doc -->
48
     * <!-- begin-user-doc -->
48
     * <!-- end-user-doc -->
49
     * <!-- end-user-doc -->
49
     * @see #UNKNOWN_LITERAL
50
     * @see #NULLABLE
50
     * @model name="Unknown"
51
     * @generated
51
     * @generated
52
     * @ordered
52
     * @ordered
53
     */
53
     */
54
    public static final int UNKNOWN = 0;
54
    NULLABLE_LITERAL(1, "Nullable", "Nullable"), //$NON-NLS-1$ //$NON-NLS-2$
55
56
    /**
55
    /**
57
     * The '<em><b>Nullable</b></em>' literal value.
56
     * The '<em><b>Not Nullable</b></em>' literal object.
58
     * <!-- begin-user-doc -->
57
     * <!-- begin-user-doc -->
59
     * <!-- end-user-doc -->
58
     * <!-- end-user-doc -->
60
     * @see #NULLABLE_LITERAL
59
     * @see #NOT_NULLABLE
61
     * @model name="Nullable"
62
     * @generated
60
     * @generated
63
     * @ordered
61
     * @ordered
64
     */
62
     */
65
    public static final int NULLABLE = 1;
63
    NOT_NULLABLE_LITERAL(2, "NotNullable", "NotNullable"); //$NON-NLS-1$ //$NON-NLS-2$
66
67
    /**
64
    /**
68
     * The '<em><b>Not Nullable</b></em>' literal value.
69
     * <!-- begin-user-doc -->
65
     * <!-- begin-user-doc -->
70
     * <!-- end-user-doc -->
66
     * <!-- end-user-doc -->
71
     * @see #NOT_NULLABLE_LITERAL
72
     * @model name="NotNullable"
73
     * @generated
67
     * @generated
74
     * @ordered
75
     */
68
     */
76
    public static final int NOT_NULLABLE = 2;
69
    public static final String copyright = "Copyright (c) 2005, 2009 Actuate Corporation"; //$NON-NLS-1$
77
70
78
    /**
71
    /**
79
     * The '<em><b>Unknown</b></em>' literal object.
72
     * The '<em><b>Unknown</b></em>' literal value.
80
     * <!-- begin-user-doc -->
73
     * <!-- begin-user-doc -->
81
     * <!-- end-user-doc -->
74
     * <!-- end-user-doc -->
82
     * @see #UNKNOWN
75
     * @see #UNKNOWN_LITERAL
76
     * @model name="Unknown"
83
     * @generated
77
     * @generated
84
     * @ordered
78
     * @ordered
85
     */
79
     */
86
    public static final ElementNullability UNKNOWN_LITERAL = new ElementNullability(
80
    public static final int UNKNOWN = 0;
87
            UNKNOWN, "Unknown", "Unknown" ); //$NON-NLS-1$ //$NON-NLS-2$
88
81
89
    /**
82
    /**
90
     * The '<em><b>Nullable</b></em>' literal object.
83
     * The '<em><b>Nullable</b></em>' literal value.
91
     * <!-- begin-user-doc -->
84
     * <!-- begin-user-doc -->
92
     * <!-- end-user-doc -->
85
     * <!-- end-user-doc -->
93
     * @see #NULLABLE
86
     * @see #NULLABLE_LITERAL
87
     * @model name="Nullable"
94
     * @generated
88
     * @generated
95
     * @ordered
89
     * @ordered
96
     */
90
     */
97
    public static final ElementNullability NULLABLE_LITERAL = new ElementNullability(
91
    public static final int NULLABLE = 1;
98
            NULLABLE, "Nullable", "Nullable" ); //$NON-NLS-1$ //$NON-NLS-2$
99
92
100
    /**
93
    /**
101
     * The '<em><b>Not Nullable</b></em>' literal object.
94
     * The '<em><b>Not Nullable</b></em>' literal value.
102
     * <!-- begin-user-doc -->
95
     * <!-- begin-user-doc -->
103
     * <!-- end-user-doc -->
96
     * <!-- end-user-doc -->
104
     * @see #NOT_NULLABLE
97
     * @see #NOT_NULLABLE_LITERAL
98
     * @model name="NotNullable"
105
     * @generated
99
     * @generated
106
     * @ordered
100
     * @ordered
107
     */
101
     */
108
    public static final ElementNullability NOT_NULLABLE_LITERAL = new ElementNullability(
102
    public static final int NOT_NULLABLE = 2;
109
            NOT_NULLABLE, "NotNullable", "NotNullable" ); //$NON-NLS-1$ //$NON-NLS-2$
110
103
111
    /**
104
    /**
112
     * An array of all the '<em><b>Element Nullability</b></em>' enumerators.
105
     * An array of all the '<em><b>Element Nullability</b></em>' enumerators.
Lines 123-130 Link Here
123
     * <!-- end-user-doc -->
116
     * <!-- end-user-doc -->
124
     * @generated
117
     * @generated
125
     */
118
     */
126
    public static final List VALUES = Collections.unmodifiableList( Arrays
119
    public static final List<ElementNullability> VALUES = Collections
127
            .asList( VALUES_ARRAY ) );
120
            .unmodifiableList( Arrays.asList( VALUES_ARRAY ) );
128
121
129
    /**
122
    /**
130
     * Returns the '<em><b>Element Nullability</b></em>' literal with the specified literal value.
123
     * Returns the '<em><b>Element Nullability</b></em>' literal with the specified literal value.
Lines 185-190 Link Here
185
    }
178
    }
186
179
187
    /**
180
    /**
181
     * <!-- begin-user-doc -->
182
     * <!-- end-user-doc -->
183
     * @generated
184
     */
185
    private final int value;
186
187
    /**
188
     * <!-- begin-user-doc -->
189
     * <!-- end-user-doc -->
190
     * @generated
191
     */
192
    private final String name;
193
194
    /**
195
     * <!-- begin-user-doc -->
196
     * <!-- end-user-doc -->
197
     * @generated
198
     */
199
    private final String literal;
200
201
    /**
188
     * Only this class can construct instances.
202
     * Only this class can construct instances.
189
     * <!-- begin-user-doc -->
203
     * <!-- begin-user-doc -->
190
     * <!-- end-user-doc -->
204
     * <!-- end-user-doc -->
Lines 192-198 Link Here
192
     */
206
     */
193
    private ElementNullability( int value, String name, String literal )
207
    private ElementNullability( int value, String name, String literal )
194
    {
208
    {
195
        super( value, name, literal );
209
        this.value = value;
210
        this.name = name;
211
        this.literal = literal;
196
    }
212
    }
197
213
198
} //ElementNullability
214
    /**
215
     * <!-- begin-user-doc -->
216
     * <!-- end-user-doc -->
217
     * @generated
218
     */
219
    public int getValue()
220
    {
221
        return value;
222
    }
223
224
    /**
225
     * <!-- begin-user-doc -->
226
     * <!-- end-user-doc -->
227
     * @generated
228
     */
229
    public String getName()
230
    {
231
        return name;
232
    }
233
234
    /**
235
     * <!-- begin-user-doc -->
236
     * <!-- end-user-doc -->
237
     * @generated
238
     */
239
    public String getLiteral()
240
    {
241
        return literal;
242
    }
243
244
    /**
245
     * Returns the literal value of the enumerator, which is its string representation.
246
     * <!-- begin-user-doc -->
247
     * <!-- end-user-doc -->
248
     * @generated
249
     */
250
    @Override
251
    public String toString()
252
    {
253
        return literal;
254
    }
255
}
(-)src/org/eclipse/datatools/connectivity/oda/design/InputPromptControlStyle.java (-57 / +110 lines)
Lines 1-6 Link Here
1
/**
1
/**
2
 *************************************************************************
2
 *************************************************************************
3
 * Copyright (c) 2005, 2007 Actuate Corporation.
3
 * Copyright (c) 2005, 2009 Actuate Corporation.
4
 * All rights reserved. This program and the accompanying materials
4
 * All rights reserved. This program and the accompanying materials
5
 * are made available under the terms of the Eclipse Public License v1.0
5
 * are made available under the terms of the Eclipse Public License v1.0
6
 * which accompanies this distribution, and is available at
6
 * which accompanies this distribution, and is available at
Lines 19-25 Link Here
19
import java.util.Collections;
19
import java.util.Collections;
20
import java.util.List;
20
import java.util.List;
21
21
22
import org.eclipse.emf.common.util.AbstractEnumerator;
22
import org.eclipse.emf.common.util.Enumerator;
23
23
24
/**
24
/**
25
 * <!-- begin-user-doc -->
25
 * <!-- begin-user-doc -->
Lines 30-157 Link Here
30
 * The style of UI control for prompting user to input a value.
30
 * The style of UI control for prompting user to input a value.
31
 * <!-- end-model-doc -->
31
 * <!-- end-model-doc -->
32
 * @see org.eclipse.datatools.connectivity.oda.design.DesignPackage#getInputPromptControlStyle()
32
 * @see org.eclipse.datatools.connectivity.oda.design.DesignPackage#getInputPromptControlStyle()
33
 * @model
33
 * @model extendedMetaData="name='InputPromptControlStyle'"
34
 * @generated
34
 * @generated
35
 */
35
 */
36
public final class InputPromptControlStyle extends AbstractEnumerator
36
public enum InputPromptControlStyle implements Enumerator {
37
{
38
    /**
37
    /**
38
     * The '<em><b>Text Field</b></em>' literal object.
39
     * <!-- begin-user-doc -->
39
     * <!-- begin-user-doc -->
40
     * <!-- end-user-doc -->
40
     * <!-- end-user-doc -->
41
     * @see #TEXT_FIELD
41
     * @generated
42
     * @generated
43
     * @ordered
42
     */
44
     */
43
    public static final String copyright = "Copyright (c) 2005, 2007 Actuate Corporation"; //$NON-NLS-1$
45
    TEXT_FIELD_LITERAL(0, "TextField", "TextField"), //$NON-NLS-1$ //$NON-NLS-2$
44
45
    /**
46
    /**
46
     * The '<em><b>Text Field</b></em>' literal value.
47
     * The '<em><b>Selectable List</b></em>' literal object.
47
     * <!-- begin-user-doc -->
48
     * <!-- begin-user-doc -->
48
     * <!-- end-user-doc -->
49
     * <!-- end-user-doc -->
49
     * @see #TEXT_FIELD_LITERAL
50
     * @see #SELECTABLE_LIST
50
     * @model name="TextField"
51
     * @generated
51
     * @generated
52
     * @ordered
52
     * @ordered
53
     */
53
     */
54
    public static final int TEXT_FIELD = 0;
54
    SELECTABLE_LIST_LITERAL(1, "SelectableList", "SelectableList"), //$NON-NLS-1$ //$NON-NLS-2$
55
56
    /**
55
    /**
57
     * The '<em><b>Selectable List</b></em>' literal value.
56
     * The '<em><b>Selectable List With Text Field</b></em>' literal object.
58
     * <!-- begin-user-doc -->
57
     * <!-- begin-user-doc -->
59
     * <!-- end-user-doc -->
58
     * <!-- end-user-doc -->
60
     * @see #SELECTABLE_LIST_LITERAL
59
     * @see #SELECTABLE_LIST_WITH_TEXT_FIELD
61
     * @model name="SelectableList"
62
     * @generated
60
     * @generated
63
     * @ordered
61
     * @ordered
64
     */
62
     */
65
    public static final int SELECTABLE_LIST = 1;
63
    SELECTABLE_LIST_WITH_TEXT_FIELD_LITERAL(2, "SelectableListWithTextField", //$NON-NLS-1$
66
64
            "SelectableListWithTextField"), //$NON-NLS-1$
67
    /**
65
    /**
68
     * The '<em><b>Selectable List With Text Field</b></em>' literal value.
66
     * The '<em><b>Check Box</b></em>' literal object.
69
     * <!-- begin-user-doc -->
67
     * <!-- begin-user-doc -->
70
     * <!-- end-user-doc -->
68
     * <!-- end-user-doc -->
71
     * @see #SELECTABLE_LIST_WITH_TEXT_FIELD_LITERAL
69
     * @see #CHECK_BOX
72
     * @model name="SelectableListWithTextField"
73
     * @generated
70
     * @generated
74
     * @ordered
71
     * @ordered
75
     */
72
     */
76
    public static final int SELECTABLE_LIST_WITH_TEXT_FIELD = 2;
73
    CHECK_BOX_LITERAL(3, "CheckBox", "CheckBox"), //$NON-NLS-1$ //$NON-NLS-2$
77
78
    /**
74
    /**
79
     * The '<em><b>Check Box</b></em>' literal value.
75
     * The '<em><b>Radio Button</b></em>' literal object.
80
     * <!-- begin-user-doc -->
76
     * <!-- begin-user-doc -->
81
     * <!-- end-user-doc -->
77
     * <!-- end-user-doc -->
82
     * @see #CHECK_BOX_LITERAL
78
     * @see #RADIO_BUTTON
83
     * @model name="CheckBox"
84
     * @generated
79
     * @generated
85
     * @ordered
80
     * @ordered
86
     */
81
     */
87
    public static final int CHECK_BOX = 3;
82
    RADIO_BUTTON_LITERAL(4, "RadioButton", "RadioButton"); //$NON-NLS-1$ //$NON-NLS-2$
88
89
    /**
83
    /**
90
     * The '<em><b>Radio Button</b></em>' literal value.
91
     * <!-- begin-user-doc -->
84
     * <!-- begin-user-doc -->
92
     * <!-- end-user-doc -->
85
     * <!-- end-user-doc -->
93
     * @see #RADIO_BUTTON_LITERAL
94
     * @model name="RadioButton"
95
     * @generated
86
     * @generated
96
     * @ordered
97
     */
87
     */
98
    public static final int RADIO_BUTTON = 4;
88
    public static final String copyright = "Copyright (c) 2005, 2009 Actuate Corporation"; //$NON-NLS-1$
99
89
100
    /**
90
    /**
101
     * The '<em><b>Text Field</b></em>' literal object.
91
     * The '<em><b>Text Field</b></em>' literal value.
102
     * <!-- begin-user-doc -->
92
     * <!-- begin-user-doc -->
103
     * <!-- end-user-doc -->
93
     * <!-- end-user-doc -->
104
     * @see #TEXT_FIELD
94
     * @see #TEXT_FIELD_LITERAL
95
     * @model name="TextField"
105
     * @generated
96
     * @generated
106
     * @ordered
97
     * @ordered
107
     */
98
     */
108
    public static final InputPromptControlStyle TEXT_FIELD_LITERAL = new InputPromptControlStyle(
99
    public static final int TEXT_FIELD = 0;
109
            TEXT_FIELD, "TextField", "TextField" ); //$NON-NLS-1$ //$NON-NLS-2$
110
100
111
    /**
101
    /**
112
     * The '<em><b>Selectable List</b></em>' literal object.
102
     * The '<em><b>Selectable List</b></em>' literal value.
113
     * <!-- begin-user-doc -->
103
     * <!-- begin-user-doc -->
114
     * <!-- end-user-doc -->
104
     * <!-- end-user-doc -->
115
     * @see #SELECTABLE_LIST
105
     * @see #SELECTABLE_LIST_LITERAL
106
     * @model name="SelectableList"
116
     * @generated
107
     * @generated
117
     * @ordered
108
     * @ordered
118
     */
109
     */
119
    public static final InputPromptControlStyle SELECTABLE_LIST_LITERAL = new InputPromptControlStyle(
110
    public static final int SELECTABLE_LIST = 1;
120
            SELECTABLE_LIST, "SelectableList", "SelectableList" ); //$NON-NLS-1$ //$NON-NLS-2$
121
111
122
    /**
112
    /**
123
     * The '<em><b>Selectable List With Text Field</b></em>' literal object.
113
     * The '<em><b>Selectable List With Text Field</b></em>' literal value.
124
     * <!-- begin-user-doc -->
114
     * <!-- begin-user-doc -->
125
     * <!-- end-user-doc -->
115
     * <!-- end-user-doc -->
126
     * @see #SELECTABLE_LIST_WITH_TEXT_FIELD
116
     * @see #SELECTABLE_LIST_WITH_TEXT_FIELD_LITERAL
117
     * @model name="SelectableListWithTextField"
127
     * @generated
118
     * @generated
128
     * @ordered
119
     * @ordered
129
     */
120
     */
130
    public static final InputPromptControlStyle SELECTABLE_LIST_WITH_TEXT_FIELD_LITERAL = new InputPromptControlStyle(
121
    public static final int SELECTABLE_LIST_WITH_TEXT_FIELD = 2;
131
            SELECTABLE_LIST_WITH_TEXT_FIELD,
132
            "SelectableListWithTextField", "SelectableListWithTextField" ); //$NON-NLS-1$ //$NON-NLS-2$
133
122
134
    /**
123
    /**
135
     * The '<em><b>Check Box</b></em>' literal object.
124
     * The '<em><b>Check Box</b></em>' literal value.
136
     * <!-- begin-user-doc -->
125
     * <!-- begin-user-doc -->
137
     * <!-- end-user-doc -->
126
     * <!-- end-user-doc -->
138
     * @see #CHECK_BOX
127
     * @see #CHECK_BOX_LITERAL
128
     * @model name="CheckBox"
139
     * @generated
129
     * @generated
140
     * @ordered
130
     * @ordered
141
     */
131
     */
142
    public static final InputPromptControlStyle CHECK_BOX_LITERAL = new InputPromptControlStyle(
132
    public static final int CHECK_BOX = 3;
143
            CHECK_BOX, "CheckBox", "CheckBox" ); //$NON-NLS-1$ //$NON-NLS-2$
144
133
145
    /**
134
    /**
146
     * The '<em><b>Radio Button</b></em>' literal object.
135
     * The '<em><b>Radio Button</b></em>' literal value.
147
     * <!-- begin-user-doc -->
136
     * <!-- begin-user-doc -->
148
     * <!-- end-user-doc -->
137
     * <!-- end-user-doc -->
149
     * @see #RADIO_BUTTON
138
     * @see #RADIO_BUTTON_LITERAL
139
     * @model name="RadioButton"
150
     * @generated
140
     * @generated
151
     * @ordered
141
     * @ordered
152
     */
142
     */
153
    public static final InputPromptControlStyle RADIO_BUTTON_LITERAL = new InputPromptControlStyle(
143
    public static final int RADIO_BUTTON = 4;
154
            RADIO_BUTTON, "RadioButton", "RadioButton" ); //$NON-NLS-1$ //$NON-NLS-2$
155
144
156
    /**
145
    /**
157
     * An array of all the '<em><b>Input Prompt Control Style</b></em>' enumerators.
146
     * An array of all the '<em><b>Input Prompt Control Style</b></em>' enumerators.
Lines 170-177 Link Here
170
     * <!-- end-user-doc -->
159
     * <!-- end-user-doc -->
171
     * @generated
160
     * @generated
172
     */
161
     */
173
    public static final List VALUES = Collections.unmodifiableList( Arrays
162
    public static final List<InputPromptControlStyle> VALUES = Collections
174
            .asList( VALUES_ARRAY ) );
163
            .unmodifiableList( Arrays.asList( VALUES_ARRAY ) );
175
164
176
    /**
165
    /**
177
     * Returns the '<em><b>Input Prompt Control Style</b></em>' literal with the specified literal value.
166
     * Returns the '<em><b>Input Prompt Control Style</b></em>' literal with the specified literal value.
Lines 236-241 Link Here
236
    }
225
    }
237
226
238
    /**
227
    /**
228
     * <!-- begin-user-doc -->
229
     * <!-- end-user-doc -->
230
     * @generated
231
     */
232
    private final int value;
233
234
    /**
235
     * <!-- begin-user-doc -->
236
     * <!-- end-user-doc -->
237
     * @generated
238
     */
239
    private final String name;
240
241
    /**
242
     * <!-- begin-user-doc -->
243
     * <!-- end-user-doc -->
244
     * @generated
245
     */
246
    private final String literal;
247
248
    /**
239
     * Only this class can construct instances.
249
     * Only this class can construct instances.
240
     * <!-- begin-user-doc -->
250
     * <!-- begin-user-doc -->
241
     * <!-- end-user-doc -->
251
     * <!-- end-user-doc -->
Lines 243-249 Link Here
243
     */
253
     */
244
    private InputPromptControlStyle( int value, String name, String literal )
254
    private InputPromptControlStyle( int value, String name, String literal )
245
    {
255
    {
246
        super( value, name, literal );
256
        this.value = value;
257
        this.name = name;
258
        this.literal = literal;
259
    }
260
261
    /**
262
     * <!-- begin-user-doc -->
263
     * <!-- end-user-doc -->
264
     * @generated
265
     */
266
    public int getValue()
267
    {
268
        return value;
247
    }
269
    }
248
270
249
} //InputPromptControlStyle
271
    /**
272
     * <!-- begin-user-doc -->
273
     * <!-- end-user-doc -->
274
     * @generated
275
     */
276
    public String getName()
277
    {
278
        return name;
279
    }
280
281
    /**
282
     * <!-- begin-user-doc -->
283
     * <!-- end-user-doc -->
284
     * @generated
285
     */
286
    public String getLiteral()
287
    {
288
        return literal;
289
    }
290
291
    /**
292
     * Returns the literal value of the enumerator, which is its string representation.
293
     * <!-- begin-user-doc -->
294
     * <!-- end-user-doc -->
295
     * @generated
296
     */
297
    @Override
298
    public String toString()
299
    {
300
        return literal;
301
    }
302
}
(-)src/org/eclipse/datatools/connectivity/oda/design/ParameterMode.java (-38 / +95 lines)
Lines 1-6 Link Here
1
/**
1
/**
2
 *************************************************************************
2
 *************************************************************************
3
 * Copyright (c) 2005, 2007 Actuate Corporation.
3
 * Copyright (c) 2005, 2009 Actuate Corporation.
4
 * All rights reserved. This program and the accompanying materials
4
 * All rights reserved. This program and the accompanying materials
5
 * are made available under the terms of the Eclipse Public License v1.0
5
 * are made available under the terms of the Eclipse Public License v1.0
6
 * which accompanies this distribution, and is available at
6
 * which accompanies this distribution, and is available at
Lines 19-25 Link Here
19
import java.util.Collections;
19
import java.util.Collections;
20
import java.util.List;
20
import java.util.List;
21
21
22
import org.eclipse.emf.common.util.AbstractEnumerator;
22
import org.eclipse.emf.common.util.Enumerator;
23
23
24
/**
24
/**
25
 * <!-- begin-user-doc -->
25
 * <!-- begin-user-doc -->
Lines 30-112 Link Here
30
 * Indicates whether a parameter is of input and/or output mode.
30
 * Indicates whether a parameter is of input and/or output mode.
31
 * <!-- end-model-doc -->
31
 * <!-- end-model-doc -->
32
 * @see org.eclipse.datatools.connectivity.oda.design.DesignPackage#getParameterMode()
32
 * @see org.eclipse.datatools.connectivity.oda.design.DesignPackage#getParameterMode()
33
 * @model
33
 * @model extendedMetaData="name='ParameterMode'"
34
 * @generated
34
 * @generated
35
 */
35
 */
36
public final class ParameterMode extends AbstractEnumerator
36
public enum ParameterMode implements Enumerator {
37
{
38
    /**
37
    /**
38
     * The '<em><b>In</b></em>' literal object.
39
     * <!-- begin-user-doc -->
39
     * <!-- begin-user-doc -->
40
     * <!-- end-user-doc -->
40
     * <!-- end-user-doc -->
41
     * @see #IN
41
     * @generated
42
     * @generated
43
     * @ordered
42
     */
44
     */
43
    public static final String copyright = "Copyright (c) 2005, 2007 Actuate Corporation"; //$NON-NLS-1$
45
    IN_LITERAL(0, "In", "In"), //$NON-NLS-1$ //$NON-NLS-2$
44
45
    /**
46
    /**
46
     * The '<em><b>In</b></em>' literal value.
47
     * The '<em><b>Out</b></em>' literal object.
47
     * <!-- begin-user-doc -->
48
     * <!-- begin-user-doc -->
48
     * <!-- end-user-doc -->
49
     * <!-- end-user-doc -->
49
     * @see #IN_LITERAL
50
     * @see #OUT
50
     * @model name="In"
51
     * @generated
51
     * @generated
52
     * @ordered
52
     * @ordered
53
     */
53
     */
54
    public static final int IN = 0;
54
    OUT_LITERAL(1, "Out", "Out"), //$NON-NLS-1$ //$NON-NLS-2$
55
56
    /**
55
    /**
57
     * The '<em><b>Out</b></em>' literal value.
56
     * The '<em><b>In Out</b></em>' literal object.
58
     * <!-- begin-user-doc -->
57
     * <!-- begin-user-doc -->
59
     * <!-- end-user-doc -->
58
     * <!-- end-user-doc -->
60
     * @see #OUT_LITERAL
59
     * @see #IN_OUT
61
     * @model name="Out"
62
     * @generated
60
     * @generated
63
     * @ordered
61
     * @ordered
64
     */
62
     */
65
    public static final int OUT = 1;
63
    IN_OUT_LITERAL(2, "InOut", "InOut"); //$NON-NLS-1$ //$NON-NLS-2$
66
67
    /**
64
    /**
68
     * The '<em><b>In Out</b></em>' literal value.
69
     * <!-- begin-user-doc -->
65
     * <!-- begin-user-doc -->
70
     * <!-- end-user-doc -->
66
     * <!-- end-user-doc -->
71
     * @see #IN_OUT_LITERAL
72
     * @model name="InOut"
73
     * @generated
67
     * @generated
74
     * @ordered
75
     */
68
     */
76
    public static final int IN_OUT = 2;
69
    public static final String copyright = "Copyright (c) 2005, 2009 Actuate Corporation"; //$NON-NLS-1$
77
70
78
    /**
71
    /**
79
     * The '<em><b>In</b></em>' literal object.
72
     * The '<em><b>In</b></em>' literal value.
80
     * <!-- begin-user-doc -->
73
     * <!-- begin-user-doc -->
81
     * <!-- end-user-doc -->
74
     * <!-- end-user-doc -->
82
     * @see #IN
75
     * @see #IN_LITERAL
76
     * @model name="In"
83
     * @generated
77
     * @generated
84
     * @ordered
78
     * @ordered
85
     */
79
     */
86
    public static final ParameterMode IN_LITERAL = new ParameterMode( IN,
80
    public static final int IN = 0;
87
            "In", "In" ); //$NON-NLS-1$ //$NON-NLS-2$
88
81
89
    /**
82
    /**
90
     * The '<em><b>Out</b></em>' literal object.
83
     * The '<em><b>Out</b></em>' literal value.
91
     * <!-- begin-user-doc -->
84
     * <!-- begin-user-doc -->
92
     * <!-- end-user-doc -->
85
     * <!-- end-user-doc -->
93
     * @see #OUT
86
     * @see #OUT_LITERAL
87
     * @model name="Out"
94
     * @generated
88
     * @generated
95
     * @ordered
89
     * @ordered
96
     */
90
     */
97
    public static final ParameterMode OUT_LITERAL = new ParameterMode( OUT,
91
    public static final int OUT = 1;
98
            "Out", "Out" ); //$NON-NLS-1$ //$NON-NLS-2$
99
92
100
    /**
93
    /**
101
     * The '<em><b>In Out</b></em>' literal object.
94
     * The '<em><b>In Out</b></em>' literal value.
102
     * <!-- begin-user-doc -->
95
     * <!-- begin-user-doc -->
103
     * <!-- end-user-doc -->
96
     * <!-- end-user-doc -->
104
     * @see #IN_OUT
97
     * @see #IN_OUT_LITERAL
98
     * @model name="InOut"
105
     * @generated
99
     * @generated
106
     * @ordered
100
     * @ordered
107
     */
101
     */
108
    public static final ParameterMode IN_OUT_LITERAL = new ParameterMode(
102
    public static final int IN_OUT = 2;
109
            IN_OUT, "InOut", "InOut" ); //$NON-NLS-1$ //$NON-NLS-2$
110
103
111
    /**
104
    /**
112
     * An array of all the '<em><b>Parameter Mode</b></em>' enumerators.
105
     * An array of all the '<em><b>Parameter Mode</b></em>' enumerators.
Lines 123-130 Link Here
123
     * <!-- end-user-doc -->
116
     * <!-- end-user-doc -->
124
     * @generated
117
     * @generated
125
     */
118
     */
126
    public static final List VALUES = Collections.unmodifiableList( Arrays
119
    public static final List<ParameterMode> VALUES = Collections
127
            .asList( VALUES_ARRAY ) );
120
            .unmodifiableList( Arrays.asList( VALUES_ARRAY ) );
128
121
129
    /**
122
    /**
130
     * Returns the '<em><b>Parameter Mode</b></em>' literal with the specified literal value.
123
     * Returns the '<em><b>Parameter Mode</b></em>' literal with the specified literal value.
Lines 185-190 Link Here
185
    }
178
    }
186
179
187
    /**
180
    /**
181
     * <!-- begin-user-doc -->
182
     * <!-- end-user-doc -->
183
     * @generated
184
     */
185
    private final int value;
186
187
    /**
188
     * <!-- begin-user-doc -->
189
     * <!-- end-user-doc -->
190
     * @generated
191
     */
192
    private final String name;
193
194
    /**
195
     * <!-- begin-user-doc -->
196
     * <!-- end-user-doc -->
197
     * @generated
198
     */
199
    private final String literal;
200
201
    /**
188
     * Only this class can construct instances.
202
     * Only this class can construct instances.
189
     * <!-- begin-user-doc -->
203
     * <!-- begin-user-doc -->
190
     * <!-- end-user-doc -->
204
     * <!-- end-user-doc -->
Lines 192-198 Link Here
192
     */
206
     */
193
    private ParameterMode( int value, String name, String literal )
207
    private ParameterMode( int value, String name, String literal )
194
    {
208
    {
195
        super( value, name, literal );
209
        this.value = value;
210
        this.name = name;
211
        this.literal = literal;
196
    }
212
    }
197
213
198
} //ParameterMode
214
    /**
215
     * <!-- begin-user-doc -->
216
     * <!-- end-user-doc -->
217
     * @generated
218
     */
219
    public int getValue()
220
    {
221
        return value;
222
    }
223
224
    /**
225
     * <!-- begin-user-doc -->
226
     * <!-- end-user-doc -->
227
     * @generated
228
     */
229
    public String getName()
230
    {
231
        return name;
232
    }
233
234
    /**
235
     * <!-- begin-user-doc -->
236
     * <!-- end-user-doc -->
237
     * @generated
238
     */
239
    public String getLiteral()
240
    {
241
        return literal;
242
    }
243
244
    /**
245
     * Returns the literal value of the enumerator, which is its string representation.
246
     * <!-- begin-user-doc -->
247
     * <!-- end-user-doc -->
248
     * @generated
249
     */
250
    @Override
251
    public String toString()
252
    {
253
        return literal;
254
    }
255
}
(-)src/org/eclipse/datatools/connectivity/oda/design/DataSetParameters.java (-5 / +5 lines)
Lines 1-6 Link Here
1
/**
1
/**
2
 *************************************************************************
2
 *************************************************************************
3
 * Copyright (c) 2005, 2007 Actuate Corporation.
3
 * Copyright (c) 2005, 2009 Actuate Corporation.
4
 * All rights reserved. This program and the accompanying materials
4
 * All rights reserved. This program and the accompanying materials
5
 * are made available under the terms of the Eclipse Public License v1.0
5
 * are made available under the terms of the Eclipse Public License v1.0
6
 * which accompanies this distribution, and is available at
6
 * which accompanies this distribution, and is available at
Lines 46-52 Link Here
46
     * <!-- end-user-doc -->
46
     * <!-- end-user-doc -->
47
     * @generated
47
     * @generated
48
     */
48
     */
49
    String copyright = "Copyright (c) 2005, 2007 Actuate Corporation"; //$NON-NLS-1$
49
    String copyright = "Copyright (c) 2005, 2009 Actuate Corporation"; //$NON-NLS-1$
50
50
51
    /**
51
    /**
52
     * Returns the value of the '<em><b>Parameter Definitions</b></em>' containment reference list.
52
     * Returns the value of the '<em><b>Parameter Definitions</b></em>' containment reference list.
Lines 55-65 Link Here
55
     * <!-- end-user-doc -->
55
     * <!-- end-user-doc -->
56
     * @return the value of the '<em>Parameter Definitions</em>' containment reference list.
56
     * @return the value of the '<em>Parameter Definitions</em>' containment reference list.
57
     * @see org.eclipse.datatools.connectivity.oda.design.DesignPackage#getDataSetParameters_ParameterDefinitions()
57
     * @see org.eclipse.datatools.connectivity.oda.design.DesignPackage#getDataSetParameters_ParameterDefinitions()
58
     * @model type="org.eclipse.datatools.connectivity.oda.design.ParameterDefinition" containment="true" required="true"
58
     * @model containment="true" required="true"
59
     *        extendedMetaData="kind='element' name='parameterDefinitions' namespace='##targetNamespace'"
59
     *        extendedMetaData="kind='element' name='parameterDefinitions' namespace='##targetNamespace'"
60
     * @generated
60
     * @generated
61
     */
61
     */
62
    EList getParameterDefinitions();
62
    EList<ParameterDefinition> getParameterDefinitions();
63
63
64
    /**
64
    /**
65
     * Returns the value of the '<em><b>Derived Meta Data</b></em>' attribute.
65
     * Returns the value of the '<em><b>Derived Meta Data</b></em>' attribute.
Lines 74-80 Link Here
74
     * @see #unsetDerivedMetaData()
74
     * @see #unsetDerivedMetaData()
75
     * @see #setDerivedMetaData(boolean)
75
     * @see #setDerivedMetaData(boolean)
76
     * @see org.eclipse.datatools.connectivity.oda.design.DesignPackage#getDataSetParameters_DerivedMetaData()
76
     * @see org.eclipse.datatools.connectivity.oda.design.DesignPackage#getDataSetParameters_DerivedMetaData()
77
     * @model default="true" unique="false" unsettable="true" dataType="org.eclipse.emf.ecore.xml.type.Boolean"
77
     * @model default="true" unsettable="true" dataType="org.eclipse.emf.ecore.xml.type.Boolean"
78
     *        extendedMetaData="kind='attribute' name='derivedMetaData'"
78
     *        extendedMetaData="kind='attribute' name='derivedMetaData'"
79
     * @generated
79
     * @generated
80
     */
80
     */
(-)src/org/eclipse/datatools/connectivity/oda/design/AxisType.java (-38 / +95 lines)
Lines 1-6 Link Here
1
/**
1
/**
2
 *************************************************************************
2
 *************************************************************************
3
 * Copyright (c) 2005, 2007 Actuate Corporation.
3
 * Copyright (c) 2005, 2009 Actuate Corporation.
4
 * All rights reserved. This program and the accompanying materials
4
 * All rights reserved. This program and the accompanying materials
5
 * are made available under the terms of the Eclipse Public License v1.0
5
 * are made available under the terms of the Eclipse Public License v1.0
6
 * which accompanies this distribution, and is available at
6
 * which accompanies this distribution, and is available at
Lines 19-25 Link Here
19
import java.util.Collections;
19
import java.util.Collections;
20
import java.util.List;
20
import java.util.List;
21
21
22
import org.eclipse.emf.common.util.AbstractEnumerator;
22
import org.eclipse.emf.common.util.Enumerator;
23
23
24
/**
24
/**
25
 * <!-- begin-user-doc -->
25
 * <!-- begin-user-doc -->
Lines 30-112 Link Here
30
 * Axis type of a result set column.
30
 * Axis type of a result set column.
31
 * <!-- end-model-doc -->
31
 * <!-- end-model-doc -->
32
 * @see org.eclipse.datatools.connectivity.oda.design.DesignPackage#getAxisType()
32
 * @see org.eclipse.datatools.connectivity.oda.design.DesignPackage#getAxisType()
33
 * @model
33
 * @model extendedMetaData="name='AxisType'"
34
 * @generated
34
 * @generated
35
 */
35
 */
36
public final class AxisType extends AbstractEnumerator
36
public enum AxisType implements Enumerator {
37
{
38
    /**
37
    /**
38
     * The '<em><b>Dimension Member</b></em>' literal object.
39
     * <!-- begin-user-doc -->
39
     * <!-- begin-user-doc -->
40
     * <!-- end-user-doc -->
40
     * <!-- end-user-doc -->
41
     * @see #DIMENSION_MEMBER
41
     * @generated
42
     * @generated
43
     * @ordered
42
     */
44
     */
43
    public static final String copyright = "Copyright (c) 2005, 2007 Actuate Corporation"; //$NON-NLS-1$
45
    DIMENSION_MEMBER_LITERAL(0, "DimensionMember", "DimensionMember"), //$NON-NLS-1$ //$NON-NLS-2$
44
45
    /**
46
    /**
46
     * The '<em><b>Dimension Member</b></em>' literal value.
47
     * The '<em><b>Dimension Attribute</b></em>' literal object.
47
     * <!-- begin-user-doc -->
48
     * <!-- begin-user-doc -->
48
     * <!-- end-user-doc -->
49
     * <!-- end-user-doc -->
49
     * @see #DIMENSION_MEMBER_LITERAL
50
     * @see #DIMENSION_ATTRIBUTE
50
     * @model name="DimensionMember"
51
     * @generated
51
     * @generated
52
     * @ordered
52
     * @ordered
53
     */
53
     */
54
    public static final int DIMENSION_MEMBER = 0;
54
    DIMENSION_ATTRIBUTE_LITERAL(1, "DimensionAttribute", "DimensionAttribute"), //$NON-NLS-1$ //$NON-NLS-2$
55
56
    /**
55
    /**
57
     * The '<em><b>Dimension Attribute</b></em>' literal value.
56
     * The '<em><b>Measure</b></em>' literal object.
58
     * <!-- begin-user-doc -->
57
     * <!-- begin-user-doc -->
59
     * <!-- end-user-doc -->
58
     * <!-- end-user-doc -->
60
     * @see #DIMENSION_ATTRIBUTE_LITERAL
59
     * @see #MEASURE
61
     * @model name="DimensionAttribute"
62
     * @generated
60
     * @generated
63
     * @ordered
61
     * @ordered
64
     */
62
     */
65
    public static final int DIMENSION_ATTRIBUTE = 1;
63
    MEASURE_LITERAL(2, "Measure", "Measure"); //$NON-NLS-1$ //$NON-NLS-2$
66
67
    /**
64
    /**
68
     * The '<em><b>Measure</b></em>' literal value.
69
     * <!-- begin-user-doc -->
65
     * <!-- begin-user-doc -->
70
     * <!-- end-user-doc -->
66
     * <!-- end-user-doc -->
71
     * @see #MEASURE_LITERAL
72
     * @model name="Measure"
73
     * @generated
67
     * @generated
74
     * @ordered
75
     */
68
     */
76
    public static final int MEASURE = 2;
69
    public static final String copyright = "Copyright (c) 2005, 2009 Actuate Corporation"; //$NON-NLS-1$
77
70
78
    /**
71
    /**
79
     * The '<em><b>Dimension Member</b></em>' literal object.
72
     * The '<em><b>Dimension Member</b></em>' literal value.
80
     * <!-- begin-user-doc -->
73
     * <!-- begin-user-doc -->
81
     * <!-- end-user-doc -->
74
     * <!-- end-user-doc -->
82
     * @see #DIMENSION_MEMBER
75
     * @see #DIMENSION_MEMBER_LITERAL
76
     * @model name="DimensionMember"
83
     * @generated
77
     * @generated
84
     * @ordered
78
     * @ordered
85
     */
79
     */
86
    public static final AxisType DIMENSION_MEMBER_LITERAL = new AxisType(
80
    public static final int DIMENSION_MEMBER = 0;
87
            DIMENSION_MEMBER, "DimensionMember", "DimensionMember" ); //$NON-NLS-1$ //$NON-NLS-2$
88
81
89
    /**
82
    /**
90
     * The '<em><b>Dimension Attribute</b></em>' literal object.
83
     * The '<em><b>Dimension Attribute</b></em>' literal value.
91
     * <!-- begin-user-doc -->
84
     * <!-- begin-user-doc -->
92
     * <!-- end-user-doc -->
85
     * <!-- end-user-doc -->
93
     * @see #DIMENSION_ATTRIBUTE
86
     * @see #DIMENSION_ATTRIBUTE_LITERAL
87
     * @model name="DimensionAttribute"
94
     * @generated
88
     * @generated
95
     * @ordered
89
     * @ordered
96
     */
90
     */
97
    public static final AxisType DIMENSION_ATTRIBUTE_LITERAL = new AxisType(
91
    public static final int DIMENSION_ATTRIBUTE = 1;
98
            DIMENSION_ATTRIBUTE, "DimensionAttribute", "DimensionAttribute" ); //$NON-NLS-1$ //$NON-NLS-2$
99
92
100
    /**
93
    /**
101
     * The '<em><b>Measure</b></em>' literal object.
94
     * The '<em><b>Measure</b></em>' literal value.
102
     * <!-- begin-user-doc -->
95
     * <!-- begin-user-doc -->
103
     * <!-- end-user-doc -->
96
     * <!-- end-user-doc -->
104
     * @see #MEASURE
97
     * @see #MEASURE_LITERAL
98
     * @model name="Measure"
105
     * @generated
99
     * @generated
106
     * @ordered
100
     * @ordered
107
     */
101
     */
108
    public static final AxisType MEASURE_LITERAL = new AxisType( MEASURE,
102
    public static final int MEASURE = 2;
109
            "Measure", "Measure" ); //$NON-NLS-1$ //$NON-NLS-2$
110
103
111
    /**
104
    /**
112
     * An array of all the '<em><b>Axis Type</b></em>' enumerators.
105
     * An array of all the '<em><b>Axis Type</b></em>' enumerators.
Lines 123-130 Link Here
123
     * <!-- end-user-doc -->
116
     * <!-- end-user-doc -->
124
     * @generated
117
     * @generated
125
     */
118
     */
126
    public static final List VALUES = Collections.unmodifiableList( Arrays
119
    public static final List<AxisType> VALUES = Collections
127
            .asList( VALUES_ARRAY ) );
120
            .unmodifiableList( Arrays.asList( VALUES_ARRAY ) );
128
121
129
    /**
122
    /**
130
     * Returns the '<em><b>Axis Type</b></em>' literal with the specified literal value.
123
     * Returns the '<em><b>Axis Type</b></em>' literal with the specified literal value.
Lines 185-190 Link Here
185
    }
178
    }
186
179
187
    /**
180
    /**
181
     * <!-- begin-user-doc -->
182
     * <!-- end-user-doc -->
183
     * @generated
184
     */
185
    private final int value;
186
187
    /**
188
     * <!-- begin-user-doc -->
189
     * <!-- end-user-doc -->
190
     * @generated
191
     */
192
    private final String name;
193
194
    /**
195
     * <!-- begin-user-doc -->
196
     * <!-- end-user-doc -->
197
     * @generated
198
     */
199
    private final String literal;
200
201
    /**
188
     * Only this class can construct instances.
202
     * Only this class can construct instances.
189
     * <!-- begin-user-doc -->
203
     * <!-- begin-user-doc -->
190
     * <!-- end-user-doc -->
204
     * <!-- end-user-doc -->
Lines 192-198 Link Here
192
     */
206
     */
193
    private AxisType( int value, String name, String literal )
207
    private AxisType( int value, String name, String literal )
194
    {
208
    {
195
        super( value, name, literal );
209
        this.value = value;
210
        this.name = name;
211
        this.literal = literal;
196
    }
212
    }
197
213
198
} //AxisType
214
    /**
215
     * <!-- begin-user-doc -->
216
     * <!-- end-user-doc -->
217
     * @generated
218
     */
219
    public int getValue()
220
    {
221
        return value;
222
    }
223
224
    /**
225
     * <!-- begin-user-doc -->
226
     * <!-- end-user-doc -->
227
     * @generated
228
     */
229
    public String getName()
230
    {
231
        return name;
232
    }
233
234
    /**
235
     * <!-- begin-user-doc -->
236
     * <!-- end-user-doc -->
237
     * @generated
238
     */
239
    public String getLiteral()
240
    {
241
        return literal;
242
    }
243
244
    /**
245
     * Returns the literal value of the enumerator, which is its string representation.
246
     * <!-- begin-user-doc -->
247
     * <!-- end-user-doc -->
248
     * @generated
249
     */
250
    @Override
251
    public String toString()
252
    {
253
        return literal;
254
    }
255
}
(-)src/org/eclipse/datatools/connectivity/oda/design/ParameterDefinition.java (-5 / +5 lines)
Lines 22-28 Link Here
22
 * <!-- end-user-doc -->
22
 * <!-- end-user-doc -->
23
 *
23
 *
24
 * <!-- begin-model-doc -->
24
 * <!-- begin-model-doc -->
25
 * Top-level parameter definition.  Parameter could be scalar or complex type.
25
 * Top-level parameter definition; may be input and/or output mode.  Parameter may be of scalar or complex type.
26
 * <!-- end-model-doc -->
26
 * <!-- end-model-doc -->
27
 *
27
 *
28
 * <p>
28
 * <p>
Lines 47-53 Link Here
47
     * <!-- end-user-doc -->
47
     * <!-- end-user-doc -->
48
     * @generated
48
     * @generated
49
     */
49
     */
50
    String copyright = "Copyright (c) 2005, 2007 Actuate Corporation"; //$NON-NLS-1$
50
    String copyright = "Copyright (c) 2005, 2009 Actuate Corporation"; //$NON-NLS-1$
51
51
52
    /**
52
    /**
53
     * Indicates whether this parameter is defined to take input value.
53
     * Indicates whether this parameter is defined to take input value.
Lines 114-120 Link Here
114
     * @generated NOT
114
     * @generated NOT
115
     */
115
     */
116
    int getDefaultValueCount();
116
    int getDefaultValueCount();
117
    
117
118
    /**
118
    /**
119
     * A convenience method to append a default value to this parameter's default value collection.
119
     * A convenience method to append a default value to this parameter's default value collection.
120
     * It is the responsibility of the caller to ensure compatible type of value object
120
     * It is the responsibility of the caller to ensure compatible type of value object
Lines 124-130 Link Here
124
     * @generated NOT
124
     * @generated NOT
125
     */
125
     */
126
    void addDefaultValue( Object aValue );
126
    void addDefaultValue( Object aValue );
127
    
127
128
    /**
128
    /**
129
     * Returns the value of the '<em><b>In Out Mode</b></em>' attribute.
129
     * Returns the value of the '<em><b>In Out Mode</b></em>' attribute.
130
     * The default value is <code>"In"</code>.
130
     * The default value is <code>"In"</code>.
Lines 137-143 Link Here
137
     * @see #unsetInOutMode()
137
     * @see #unsetInOutMode()
138
     * @see #setInOutMode(ParameterMode)
138
     * @see #setInOutMode(ParameterMode)
139
     * @see org.eclipse.datatools.connectivity.oda.design.DesignPackage#getParameterDefinition_InOutMode()
139
     * @see org.eclipse.datatools.connectivity.oda.design.DesignPackage#getParameterDefinition_InOutMode()
140
     * @model default="In" unique="false" unsettable="true" required="true"
140
     * @model default="In" unsettable="true"
141
     *        extendedMetaData="kind='element' name='inOutMode' namespace='##targetNamespace'"
141
     *        extendedMetaData="kind='element' name='inOutMode' namespace='##targetNamespace'"
142
     * @generated
142
     * @generated
143
     */
143
     */
(-)src/org/eclipse/datatools/connectivity/oda/design/SessionStatus.java (-47 / +102 lines)
Lines 1-6 Link Here
1
/**
1
/**
2
 *************************************************************************
2
 *************************************************************************
3
 * Copyright (c) 2005, 2007 Actuate Corporation.
3
 * Copyright (c) 2005, 2009 Actuate Corporation.
4
 * All rights reserved. This program and the accompanying materials
4
 * All rights reserved. This program and the accompanying materials
5
 * are made available under the terms of the Eclipse Public License v1.0
5
 * are made available under the terms of the Eclipse Public License v1.0
6
 * which accompanies this distribution, and is available at
6
 * which accompanies this distribution, and is available at
Lines 19-25 Link Here
19
import java.util.Collections;
19
import java.util.Collections;
20
import java.util.List;
20
import java.util.List;
21
21
22
import org.eclipse.emf.common.util.AbstractEnumerator;
22
import org.eclipse.emf.common.util.Enumerator;
23
23
24
/**
24
/**
25
 * <!-- begin-user-doc -->
25
 * <!-- begin-user-doc -->
Lines 30-134 Link Here
30
 * Indicates to ODA host designer on how to proceed after an ODA design session exits.
30
 * Indicates to ODA host designer on how to proceed after an ODA design session exits.
31
 * <!-- end-model-doc -->
31
 * <!-- end-model-doc -->
32
 * @see org.eclipse.datatools.connectivity.oda.design.DesignPackage#getSessionStatus()
32
 * @see org.eclipse.datatools.connectivity.oda.design.DesignPackage#getSessionStatus()
33
 * @model
33
 * @model extendedMetaData="name='SessionStatus'"
34
 * @generated
34
 * @generated
35
 */
35
 */
36
public final class SessionStatus extends AbstractEnumerator
36
public enum SessionStatus implements Enumerator {
37
{
38
    /**
37
    /**
38
     * The '<em><b>Ok</b></em>' literal object.
39
     * <!-- begin-user-doc -->
39
     * <!-- begin-user-doc -->
40
     * <!-- end-user-doc -->
40
     * <!-- end-user-doc -->
41
     * @see #OK
41
     * @generated
42
     * @generated
43
     * @ordered
42
     */
44
     */
43
    public static final String copyright = "Copyright (c) 2005, 2007 Actuate Corporation"; //$NON-NLS-1$
45
    OK_LITERAL(0, "Ok", "Ok"), //$NON-NLS-1$ //$NON-NLS-2$
44
45
    /**
46
    /**
46
     * The '<em><b>Ok</b></em>' literal value.
47
     * The '<em><b>User Cancelled</b></em>' literal object.
47
     * <!-- begin-user-doc -->
48
     * <!-- begin-user-doc -->
48
     * <!-- end-user-doc -->
49
     * <!-- end-user-doc -->
49
     * @see #OK_LITERAL
50
     * @see #USER_CANCELLED
50
     * @model name="Ok"
51
     * @generated
51
     * @generated
52
     * @ordered
52
     * @ordered
53
     */
53
     */
54
    public static final int OK = 0;
54
    USER_CANCELLED_LITERAL(1, "UserCancelled", "UserCancelled"), //$NON-NLS-1$ //$NON-NLS-2$
55
56
    /**
55
    /**
57
     * The '<em><b>User Cancelled</b></em>' literal value.
56
     * The '<em><b>Login Failed</b></em>' literal object.
58
     * <!-- begin-user-doc -->
57
     * <!-- begin-user-doc -->
59
     * <!-- end-user-doc -->
58
     * <!-- end-user-doc -->
60
     * @see #USER_CANCELLED_LITERAL
59
     * @see #LOGIN_FAILED
61
     * @model name="UserCancelled"
62
     * @generated
60
     * @generated
63
     * @ordered
61
     * @ordered
64
     */
62
     */
65
    public static final int USER_CANCELLED = 1;
63
    LOGIN_FAILED_LITERAL(2, "LoginFailed", "LoginFailed"), //$NON-NLS-1$ //$NON-NLS-2$
66
67
    /**
64
    /**
68
     * The '<em><b>Login Failed</b></em>' literal value.
65
     * The '<em><b>Error</b></em>' literal object.
69
     * <!-- begin-user-doc -->
66
     * <!-- begin-user-doc -->
70
     * <!-- end-user-doc -->
67
     * <!-- end-user-doc -->
71
     * @see #LOGIN_FAILED_LITERAL
68
     * @see #ERROR
72
     * @model name="LoginFailed"
73
     * @generated
69
     * @generated
74
     * @ordered
70
     * @ordered
75
     */
71
     */
76
    public static final int LOGIN_FAILED = 2;
72
    ERROR_LITERAL(3, "Error", "Error"); //$NON-NLS-1$ //$NON-NLS-2$
77
78
    /**
73
    /**
79
     * The '<em><b>Error</b></em>' literal value.
80
     * <!-- begin-user-doc -->
74
     * <!-- begin-user-doc -->
81
     * <!-- end-user-doc -->
75
     * <!-- end-user-doc -->
82
     * @see #ERROR_LITERAL
83
     * @model name="Error"
84
     * @generated
76
     * @generated
85
     * @ordered
86
     */
77
     */
87
    public static final int ERROR = 3;
78
    public static final String copyright = "Copyright (c) 2005, 2009 Actuate Corporation"; //$NON-NLS-1$
88
79
89
    /**
80
    /**
90
     * The '<em><b>Ok</b></em>' literal object.
81
     * The '<em><b>Ok</b></em>' literal value.
91
     * <!-- begin-user-doc -->
82
     * <!-- begin-user-doc -->
92
     * <!-- end-user-doc -->
83
     * <!-- end-user-doc -->
93
     * @see #OK
84
     * @see #OK_LITERAL
85
     * @model name="Ok"
94
     * @generated
86
     * @generated
95
     * @ordered
87
     * @ordered
96
     */
88
     */
97
    public static final SessionStatus OK_LITERAL = new SessionStatus( OK,
89
    public static final int OK = 0;
98
            "Ok", "Ok" ); //$NON-NLS-1$ //$NON-NLS-2$
99
90
100
    /**
91
    /**
101
     * The '<em><b>User Cancelled</b></em>' literal object.
92
     * The '<em><b>User Cancelled</b></em>' literal value.
102
     * <!-- begin-user-doc -->
93
     * <!-- begin-user-doc -->
103
     * <!-- end-user-doc -->
94
     * <!-- end-user-doc -->
104
     * @see #USER_CANCELLED
95
     * @see #USER_CANCELLED_LITERAL
96
     * @model name="UserCancelled"
105
     * @generated
97
     * @generated
106
     * @ordered
98
     * @ordered
107
     */
99
     */
108
    public static final SessionStatus USER_CANCELLED_LITERAL = new SessionStatus(
100
    public static final int USER_CANCELLED = 1;
109
            USER_CANCELLED, "UserCancelled", "UserCancelled" ); //$NON-NLS-1$ //$NON-NLS-2$
110
101
111
    /**
102
    /**
112
     * The '<em><b>Login Failed</b></em>' literal object.
103
     * The '<em><b>Login Failed</b></em>' literal value.
113
     * <!-- begin-user-doc -->
104
     * <!-- begin-user-doc -->
114
     * <!-- end-user-doc -->
105
     * <!-- end-user-doc -->
115
     * @see #LOGIN_FAILED
106
     * @see #LOGIN_FAILED_LITERAL
107
     * @model name="LoginFailed"
116
     * @generated
108
     * @generated
117
     * @ordered
109
     * @ordered
118
     */
110
     */
119
    public static final SessionStatus LOGIN_FAILED_LITERAL = new SessionStatus(
111
    public static final int LOGIN_FAILED = 2;
120
            LOGIN_FAILED, "LoginFailed", "LoginFailed" ); //$NON-NLS-1$ //$NON-NLS-2$
121
112
122
    /**
113
    /**
123
     * The '<em><b>Error</b></em>' literal object.
114
     * The '<em><b>Error</b></em>' literal value.
124
     * <!-- begin-user-doc -->
115
     * <!-- begin-user-doc -->
125
     * <!-- end-user-doc -->
116
     * <!-- end-user-doc -->
126
     * @see #ERROR
117
     * @see #ERROR_LITERAL
118
     * @model name="Error"
127
     * @generated
119
     * @generated
128
     * @ordered
120
     * @ordered
129
     */
121
     */
130
    public static final SessionStatus ERROR_LITERAL = new SessionStatus( ERROR,
122
    public static final int ERROR = 3;
131
            "Error", "Error" ); //$NON-NLS-1$ //$NON-NLS-2$
132
123
133
    /**
124
    /**
134
     * An array of all the '<em><b>Session Status</b></em>' enumerators.
125
     * An array of all the '<em><b>Session Status</b></em>' enumerators.
Lines 145-152 Link Here
145
     * <!-- end-user-doc -->
136
     * <!-- end-user-doc -->
146
     * @generated
137
     * @generated
147
     */
138
     */
148
    public static final List VALUES = Collections.unmodifiableList( Arrays
139
    public static final List<SessionStatus> VALUES = Collections
149
            .asList( VALUES_ARRAY ) );
140
            .unmodifiableList( Arrays.asList( VALUES_ARRAY ) );
150
141
151
    /**
142
    /**
152
     * Returns the '<em><b>Session Status</b></em>' literal with the specified literal value.
143
     * Returns the '<em><b>Session Status</b></em>' literal with the specified literal value.
Lines 209-214 Link Here
209
    }
200
    }
210
201
211
    /**
202
    /**
203
     * <!-- begin-user-doc -->
204
     * <!-- end-user-doc -->
205
     * @generated
206
     */
207
    private final int value;
208
209
    /**
210
     * <!-- begin-user-doc -->
211
     * <!-- end-user-doc -->
212
     * @generated
213
     */
214
    private final String name;
215
216
    /**
217
     * <!-- begin-user-doc -->
218
     * <!-- end-user-doc -->
219
     * @generated
220
     */
221
    private final String literal;
222
223
    /**
212
     * Only this class can construct instances.
224
     * Only this class can construct instances.
213
     * <!-- begin-user-doc -->
225
     * <!-- begin-user-doc -->
214
     * <!-- end-user-doc -->
226
     * <!-- end-user-doc -->
Lines 216-222 Link Here
216
     */
228
     */
217
    private SessionStatus( int value, String name, String literal )
229
    private SessionStatus( int value, String name, String literal )
218
    {
230
    {
219
        super( value, name, literal );
231
        this.value = value;
232
        this.name = name;
233
        this.literal = literal;
220
    }
234
    }
221
235
222
} //SessionStatus
236
    /**
237
     * <!-- begin-user-doc -->
238
     * <!-- end-user-doc -->
239
     * @generated
240
     */
241
    public int getValue()
242
    {
243
        return value;
244
    }
245
246
    /**
247
     * <!-- begin-user-doc -->
248
     * <!-- end-user-doc -->
249
     * @generated
250
     */
251
    public String getName()
252
    {
253
        return name;
254
    }
255
256
    /**
257
     * <!-- begin-user-doc -->
258
     * <!-- end-user-doc -->
259
     * @generated
260
     */
261
    public String getLiteral()
262
    {
263
        return literal;
264
    }
265
266
    /**
267
     * Returns the literal value of the enumerator, which is its string representation.
268
     * <!-- begin-user-doc -->
269
     * <!-- end-user-doc -->
270
     * @generated
271
     */
272
    @Override
273
    public String toString()
274
    {
275
        return literal;
276
    }
277
}
(-)src/org/eclipse/datatools/connectivity/oda/design/DocumentRoot.java (-6 / +6 lines)
Lines 1-6 Link Here
1
/**
1
/**
2
 *************************************************************************
2
 *************************************************************************
3
 * Copyright (c) 2005, 2007 Actuate Corporation.
3
 * Copyright (c) 2005, 2009 Actuate Corporation.
4
 * All rights reserved. This program and the accompanying materials
4
 * All rights reserved. This program and the accompanying materials
5
 * are made available under the terms of the Eclipse Public License v1.0
5
 * are made available under the terms of the Eclipse Public License v1.0
6
 * which accompanies this distribution, and is available at
6
 * which accompanies this distribution, and is available at
Lines 46-52 Link Here
46
     * <!-- end-user-doc -->
46
     * <!-- end-user-doc -->
47
     * @generated
47
     * @generated
48
     */
48
     */
49
    String copyright = "Copyright (c) 2005, 2007 Actuate Corporation"; //$NON-NLS-1$
49
    String copyright = "Copyright (c) 2005, 2009 Actuate Corporation"; //$NON-NLS-1$
50
50
51
    /**
51
    /**
52
     * Returns the value of the '<em><b>Mixed</b></em>' attribute list.
52
     * Returns the value of the '<em><b>Mixed</b></em>' attribute list.
Lines 69-79 Link Here
69
     * <!-- end-user-doc -->
69
     * <!-- end-user-doc -->
70
     * @return the value of the '<em>XMLNS Prefix Map</em>' map.
70
     * @return the value of the '<em>XMLNS Prefix Map</em>' map.
71
     * @see org.eclipse.datatools.connectivity.oda.design.DesignPackage#getDocumentRoot_XMLNSPrefixMap()
71
     * @see org.eclipse.datatools.connectivity.oda.design.DesignPackage#getDocumentRoot_XMLNSPrefixMap()
72
     * @model mapType="org.eclipse.emf.ecore.EStringToStringMapEntry" keyType="java.lang.String" valueType="java.lang.String" transient="true"
72
     * @model mapType="org.eclipse.emf.ecore.EStringToStringMapEntry<org.eclipse.emf.ecore.EString, org.eclipse.emf.ecore.EString>" transient="true"
73
     *        extendedMetaData="kind='attribute' name='xmlns:prefix'"
73
     *        extendedMetaData="kind='attribute' name='xmlns:prefix'"
74
     * @generated
74
     * @generated
75
     */
75
     */
76
    EMap getXMLNSPrefixMap();
76
    EMap<String, String> getXMLNSPrefixMap();
77
77
78
    /**
78
    /**
79
     * Returns the value of the '<em><b>XSI Schema Location</b></em>' map.
79
     * Returns the value of the '<em><b>XSI Schema Location</b></em>' map.
Lines 83-93 Link Here
83
     * <!-- end-user-doc -->
83
     * <!-- end-user-doc -->
84
     * @return the value of the '<em>XSI Schema Location</em>' map.
84
     * @return the value of the '<em>XSI Schema Location</em>' map.
85
     * @see org.eclipse.datatools.connectivity.oda.design.DesignPackage#getDocumentRoot_XSISchemaLocation()
85
     * @see org.eclipse.datatools.connectivity.oda.design.DesignPackage#getDocumentRoot_XSISchemaLocation()
86
     * @model mapType="org.eclipse.emf.ecore.EStringToStringMapEntry" keyType="java.lang.String" valueType="java.lang.String" transient="true"
86
     * @model mapType="org.eclipse.emf.ecore.EStringToStringMapEntry<org.eclipse.emf.ecore.EString, org.eclipse.emf.ecore.EString>" transient="true"
87
     *        extendedMetaData="kind='attribute' name='xsi:schemaLocation'"
87
     *        extendedMetaData="kind='attribute' name='xsi:schemaLocation'"
88
     * @generated
88
     * @generated
89
     */
89
     */
90
    EMap getXSISchemaLocation();
90
    EMap<String, String> getXSISchemaLocation();
91
91
92
    /**
92
    /**
93
     * Returns the value of the '<em><b>Oda Design Session</b></em>' containment reference.
93
     * Returns the value of the '<em><b>Oda Design Session</b></em>' containment reference.
(-)src/org/eclipse/datatools/connectivity/oda/design/OdaComplexDataType.java (-29 / +88 lines)
Lines 1-6 Link Here
1
/**
1
/**
2
 *************************************************************************
2
 *************************************************************************
3
 * Copyright (c) 2005, 2007 Actuate Corporation.
3
 * Copyright (c) 2005, 2009 Actuate Corporation.
4
 * All rights reserved. This program and the accompanying materials
4
 * All rights reserved. This program and the accompanying materials
5
 * are made available under the terms of the Eclipse Public License v1.0
5
 * are made available under the terms of the Eclipse Public License v1.0
6
 * which accompanies this distribution, and is available at
6
 * which accompanies this distribution, and is available at
Lines 19-25 Link Here
19
import java.util.Collections;
19
import java.util.Collections;
20
import java.util.List;
20
import java.util.List;
21
21
22
import org.eclipse.emf.common.util.AbstractEnumerator;
22
import org.eclipse.emf.common.util.Enumerator;
23
23
24
/**
24
/**
25
 * <!-- begin-user-doc -->
25
 * <!-- begin-user-doc -->
Lines 30-90 Link Here
30
 * ODA complex data types.
30
 * ODA complex data types.
31
 * <!-- end-model-doc -->
31
 * <!-- end-model-doc -->
32
 * @see org.eclipse.datatools.connectivity.oda.design.DesignPackage#getOdaComplexDataType()
32
 * @see org.eclipse.datatools.connectivity.oda.design.DesignPackage#getOdaComplexDataType()
33
 * @model
33
 * @model extendedMetaData="name='OdaComplexDataType'"
34
 * @generated
34
 * @generated
35
 */
35
 */
36
public final class OdaComplexDataType extends AbstractEnumerator
36
public enum OdaComplexDataType implements Enumerator {
37
{
38
    /**
37
    /**
38
     * The '<em><b>Structure</b></em>' literal object.
39
     * <!-- begin-user-doc -->
39
     * <!-- begin-user-doc -->
40
     * <!-- end-user-doc -->
40
     * <!-- end-user-doc -->
41
     * @see #STRUCTURE
41
     * @generated
42
     * @generated
43
     * @ordered
42
     */
44
     */
43
    public static final String copyright = "Copyright (c) 2005, 2007 Actuate Corporation"; //$NON-NLS-1$
45
    STRUCTURE_LITERAL(0, "Structure", "Structure"), //$NON-NLS-1$ //$NON-NLS-2$
44
45
    /**
46
    /**
46
     * The '<em><b>Structure</b></em>' literal value.
47
     * The '<em><b>Table</b></em>' literal object.
47
     * <!-- begin-user-doc -->
48
     * <!-- begin-user-doc -->
48
     * <!-- end-user-doc -->
49
     * <!-- end-user-doc -->
49
     * @see #STRUCTURE_LITERAL
50
     * @see #TABLE
50
     * @model name="Structure"
51
     * @generated
51
     * @generated
52
     * @ordered
52
     * @ordered
53
     */
53
     */
54
    public static final int STRUCTURE = 0;
54
    TABLE_LITERAL(1, "Table", "Table"); //$NON-NLS-1$ //$NON-NLS-2$
55
56
    /**
55
    /**
57
     * The '<em><b>Table</b></em>' literal value.
58
     * <!-- begin-user-doc -->
56
     * <!-- begin-user-doc -->
59
     * <!-- end-user-doc -->
57
     * <!-- end-user-doc -->
60
     * @see #TABLE_LITERAL
61
     * @model name="Table"
62
     * @generated
58
     * @generated
63
     * @ordered
64
     */
59
     */
65
    public static final int TABLE = 1;
60
    public static final String copyright = "Copyright (c) 2005, 2009 Actuate Corporation"; //$NON-NLS-1$
66
61
67
    /**
62
    /**
68
     * The '<em><b>Structure</b></em>' literal object.
63
     * The '<em><b>Structure</b></em>' literal value.
69
     * <!-- begin-user-doc -->
64
     * <!-- begin-user-doc -->
70
     * <!-- end-user-doc -->
65
     * <!-- end-user-doc -->
71
     * @see #STRUCTURE
66
     * @see #STRUCTURE_LITERAL
67
     * @model name="Structure"
72
     * @generated
68
     * @generated
73
     * @ordered
69
     * @ordered
74
     */
70
     */
75
    public static final OdaComplexDataType STRUCTURE_LITERAL = new OdaComplexDataType(
71
    public static final int STRUCTURE = 0;
76
            STRUCTURE, "Structure", "Structure" ); //$NON-NLS-1$ //$NON-NLS-2$
77
72
78
    /**
73
    /**
79
     * The '<em><b>Table</b></em>' literal object.
74
     * The '<em><b>Table</b></em>' literal value.
80
     * <!-- begin-user-doc -->
75
     * <!-- begin-user-doc -->
81
     * <!-- end-user-doc -->
76
     * <!-- end-user-doc -->
82
     * @see #TABLE
77
     * @see #TABLE_LITERAL
78
     * @model name="Table"
83
     * @generated
79
     * @generated
84
     * @ordered
80
     * @ordered
85
     */
81
     */
86
    public static final OdaComplexDataType TABLE_LITERAL = new OdaComplexDataType(
82
    public static final int TABLE = 1;
87
            TABLE, "Table", "Table" ); //$NON-NLS-1$ //$NON-NLS-2$
88
83
89
    /**
84
    /**
90
     * An array of all the '<em><b>Oda Complex Data Type</b></em>' enumerators.
85
     * An array of all the '<em><b>Oda Complex Data Type</b></em>' enumerators.
Lines 101-108 Link Here
101
     * <!-- end-user-doc -->
96
     * <!-- end-user-doc -->
102
     * @generated
97
     * @generated
103
     */
98
     */
104
    public static final List VALUES = Collections.unmodifiableList( Arrays
99
    public static final List<OdaComplexDataType> VALUES = Collections
105
            .asList( VALUES_ARRAY ) );
100
            .unmodifiableList( Arrays.asList( VALUES_ARRAY ) );
106
101
107
    /**
102
    /**
108
     * Returns the '<em><b>Oda Complex Data Type</b></em>' literal with the specified literal value.
103
     * Returns the '<em><b>Oda Complex Data Type</b></em>' literal with the specified literal value.
Lines 161-166 Link Here
161
    }
156
    }
162
157
163
    /**
158
    /**
159
     * <!-- begin-user-doc -->
160
     * <!-- end-user-doc -->
161
     * @generated
162
     */
163
    private final int value;
164
165
    /**
166
     * <!-- begin-user-doc -->
167
     * <!-- end-user-doc -->
168
     * @generated
169
     */
170
    private final String name;
171
172
    /**
173
     * <!-- begin-user-doc -->
174
     * <!-- end-user-doc -->
175
     * @generated
176
     */
177
    private final String literal;
178
179
    /**
164
     * Only this class can construct instances.
180
     * Only this class can construct instances.
165
     * <!-- begin-user-doc -->
181
     * <!-- begin-user-doc -->
166
     * <!-- end-user-doc -->
182
     * <!-- end-user-doc -->
Lines 168-174 Link Here
168
     */
184
     */
169
    private OdaComplexDataType( int value, String name, String literal )
185
    private OdaComplexDataType( int value, String name, String literal )
170
    {
186
    {
171
        super( value, name, literal );
187
        this.value = value;
188
        this.name = name;
189
        this.literal = literal;
190
    }
191
192
    /**
193
     * <!-- begin-user-doc -->
194
     * <!-- end-user-doc -->
195
     * @generated
196
     */
197
    public int getValue()
198
    {
199
        return value;
200
    }
201
202
    /**
203
     * <!-- begin-user-doc -->
204
     * <!-- end-user-doc -->
205
     * @generated
206
     */
207
    public String getName()
208
    {
209
        return name;
172
    }
210
    }
173
211
174
} //OdaComplexDataType
212
    /**
213
     * <!-- begin-user-doc -->
214
     * <!-- end-user-doc -->
215
     * @generated
216
     */
217
    public String getLiteral()
218
    {
219
        return literal;
220
    }
221
222
    /**
223
     * Returns the literal value of the enumerator, which is its string representation.
224
     * <!-- begin-user-doc -->
225
     * <!-- end-user-doc -->
226
     * @generated
227
     */
228
    @Override
229
    public String toString()
230
    {
231
        return literal;
232
    }
233
}
(-)src/org/eclipse/datatools/connectivity/oda/design/HorizontalAlignment.java (-47 / +102 lines)
Lines 1-6 Link Here
1
/**
1
/**
2
 *************************************************************************
2
 *************************************************************************
3
 * Copyright (c) 2005, 2007 Actuate Corporation.
3
 * Copyright (c) 2005, 2009 Actuate Corporation.
4
 * All rights reserved. This program and the accompanying materials
4
 * All rights reserved. This program and the accompanying materials
5
 * are made available under the terms of the Eclipse Public License v1.0
5
 * are made available under the terms of the Eclipse Public License v1.0
6
 * which accompanies this distribution, and is available at
6
 * which accompanies this distribution, and is available at
Lines 19-25 Link Here
19
import java.util.Collections;
19
import java.util.Collections;
20
import java.util.List;
20
import java.util.List;
21
21
22
import org.eclipse.emf.common.util.AbstractEnumerator;
22
import org.eclipse.emf.common.util.Enumerator;
23
23
24
/**
24
/**
25
 * <!-- begin-user-doc -->
25
 * <!-- begin-user-doc -->
Lines 30-134 Link Here
30
 * Horizontal display alignment of the data value.
30
 * Horizontal display alignment of the data value.
31
 * <!-- end-model-doc -->
31
 * <!-- end-model-doc -->
32
 * @see org.eclipse.datatools.connectivity.oda.design.DesignPackage#getHorizontalAlignment()
32
 * @see org.eclipse.datatools.connectivity.oda.design.DesignPackage#getHorizontalAlignment()
33
 * @model
33
 * @model extendedMetaData="name='HorizontalAlignment'"
34
 * @generated
34
 * @generated
35
 */
35
 */
36
public final class HorizontalAlignment extends AbstractEnumerator
36
public enum HorizontalAlignment implements Enumerator {
37
{
38
    /**
37
    /**
38
     * The '<em><b>Automatic</b></em>' literal object.
39
     * <!-- begin-user-doc -->
39
     * <!-- begin-user-doc -->
40
     * <!-- end-user-doc -->
40
     * <!-- end-user-doc -->
41
     * @see #AUTOMATIC
41
     * @generated
42
     * @generated
43
     * @ordered
42
     */
44
     */
43
    public static final String copyright = "Copyright (c) 2005, 2007 Actuate Corporation"; //$NON-NLS-1$
45
    AUTOMATIC_LITERAL(0, "Automatic", "Automatic"), //$NON-NLS-1$ //$NON-NLS-2$
44
45
    /**
46
    /**
46
     * The '<em><b>Automatic</b></em>' literal value.
47
     * The '<em><b>Left</b></em>' literal object.
47
     * <!-- begin-user-doc -->
48
     * <!-- begin-user-doc -->
48
     * <!-- end-user-doc -->
49
     * <!-- end-user-doc -->
49
     * @see #AUTOMATIC_LITERAL
50
     * @see #LEFT
50
     * @model name="Automatic"
51
     * @generated
51
     * @generated
52
     * @ordered
52
     * @ordered
53
     */
53
     */
54
    public static final int AUTOMATIC = 0;
54
    LEFT_LITERAL(1, "Left", "Left"), //$NON-NLS-1$ //$NON-NLS-2$
55
56
    /**
55
    /**
57
     * The '<em><b>Left</b></em>' literal value.
56
     * The '<em><b>Center</b></em>' literal object.
58
     * <!-- begin-user-doc -->
57
     * <!-- begin-user-doc -->
59
     * <!-- end-user-doc -->
58
     * <!-- end-user-doc -->
60
     * @see #LEFT_LITERAL
59
     * @see #CENTER
61
     * @model name="Left"
62
     * @generated
60
     * @generated
63
     * @ordered
61
     * @ordered
64
     */
62
     */
65
    public static final int LEFT = 1;
63
    CENTER_LITERAL(2, "Center", "Center"), //$NON-NLS-1$ //$NON-NLS-2$
66
67
    /**
64
    /**
68
     * The '<em><b>Center</b></em>' literal value.
65
     * The '<em><b>Right</b></em>' literal object.
69
     * <!-- begin-user-doc -->
66
     * <!-- begin-user-doc -->
70
     * <!-- end-user-doc -->
67
     * <!-- end-user-doc -->
71
     * @see #CENTER_LITERAL
68
     * @see #RIGHT
72
     * @model name="Center"
73
     * @generated
69
     * @generated
74
     * @ordered
70
     * @ordered
75
     */
71
     */
76
    public static final int CENTER = 2;
72
    RIGHT_LITERAL(3, "Right", "Right"); //$NON-NLS-1$ //$NON-NLS-2$
77
78
    /**
73
    /**
79
     * The '<em><b>Right</b></em>' literal value.
80
     * <!-- begin-user-doc -->
74
     * <!-- begin-user-doc -->
81
     * <!-- end-user-doc -->
75
     * <!-- end-user-doc -->
82
     * @see #RIGHT_LITERAL
83
     * @model name="Right"
84
     * @generated
76
     * @generated
85
     * @ordered
86
     */
77
     */
87
    public static final int RIGHT = 3;
78
    public static final String copyright = "Copyright (c) 2005, 2009 Actuate Corporation"; //$NON-NLS-1$
88
79
89
    /**
80
    /**
90
     * The '<em><b>Automatic</b></em>' literal object.
81
     * The '<em><b>Automatic</b></em>' literal value.
91
     * <!-- begin-user-doc -->
82
     * <!-- begin-user-doc -->
92
     * <!-- end-user-doc -->
83
     * <!-- end-user-doc -->
93
     * @see #AUTOMATIC
84
     * @see #AUTOMATIC_LITERAL
85
     * @model name="Automatic"
94
     * @generated
86
     * @generated
95
     * @ordered
87
     * @ordered
96
     */
88
     */
97
    public static final HorizontalAlignment AUTOMATIC_LITERAL = new HorizontalAlignment(
89
    public static final int AUTOMATIC = 0;
98
            AUTOMATIC, "Automatic", "Automatic" ); //$NON-NLS-1$ //$NON-NLS-2$
99
90
100
    /**
91
    /**
101
     * The '<em><b>Left</b></em>' literal object.
92
     * The '<em><b>Left</b></em>' literal value.
102
     * <!-- begin-user-doc -->
93
     * <!-- begin-user-doc -->
103
     * <!-- end-user-doc -->
94
     * <!-- end-user-doc -->
104
     * @see #LEFT
95
     * @see #LEFT_LITERAL
96
     * @model name="Left"
105
     * @generated
97
     * @generated
106
     * @ordered
98
     * @ordered
107
     */
99
     */
108
    public static final HorizontalAlignment LEFT_LITERAL = new HorizontalAlignment(
100
    public static final int LEFT = 1;
109
            LEFT, "Left", "Left" ); //$NON-NLS-1$ //$NON-NLS-2$
110
101
111
    /**
102
    /**
112
     * The '<em><b>Center</b></em>' literal object.
103
     * The '<em><b>Center</b></em>' literal value.
113
     * <!-- begin-user-doc -->
104
     * <!-- begin-user-doc -->
114
     * <!-- end-user-doc -->
105
     * <!-- end-user-doc -->
115
     * @see #CENTER
106
     * @see #CENTER_LITERAL
107
     * @model name="Center"
116
     * @generated
108
     * @generated
117
     * @ordered
109
     * @ordered
118
     */
110
     */
119
    public static final HorizontalAlignment CENTER_LITERAL = new HorizontalAlignment(
111
    public static final int CENTER = 2;
120
            CENTER, "Center", "Center" ); //$NON-NLS-1$ //$NON-NLS-2$
121
112
122
    /**
113
    /**
123
     * The '<em><b>Right</b></em>' literal object.
114
     * The '<em><b>Right</b></em>' literal value.
124
     * <!-- begin-user-doc -->
115
     * <!-- begin-user-doc -->
125
     * <!-- end-user-doc -->
116
     * <!-- end-user-doc -->
126
     * @see #RIGHT
117
     * @see #RIGHT_LITERAL
118
     * @model name="Right"
127
     * @generated
119
     * @generated
128
     * @ordered
120
     * @ordered
129
     */
121
     */
130
    public static final HorizontalAlignment RIGHT_LITERAL = new HorizontalAlignment(
122
    public static final int RIGHT = 3;
131
            RIGHT, "Right", "Right" ); //$NON-NLS-1$ //$NON-NLS-2$
132
123
133
    /**
124
    /**
134
     * An array of all the '<em><b>Horizontal Alignment</b></em>' enumerators.
125
     * An array of all the '<em><b>Horizontal Alignment</b></em>' enumerators.
Lines 145-152 Link Here
145
     * <!-- end-user-doc -->
136
     * <!-- end-user-doc -->
146
     * @generated
137
     * @generated
147
     */
138
     */
148
    public static final List VALUES = Collections.unmodifiableList( Arrays
139
    public static final List<HorizontalAlignment> VALUES = Collections
149
            .asList( VALUES_ARRAY ) );
140
            .unmodifiableList( Arrays.asList( VALUES_ARRAY ) );
150
141
151
    /**
142
    /**
152
     * Returns the '<em><b>Horizontal Alignment</b></em>' literal with the specified literal value.
143
     * Returns the '<em><b>Horizontal Alignment</b></em>' literal with the specified literal value.
Lines 209-214 Link Here
209
    }
200
    }
210
201
211
    /**
202
    /**
203
     * <!-- begin-user-doc -->
204
     * <!-- end-user-doc -->
205
     * @generated
206
     */
207
    private final int value;
208
209
    /**
210
     * <!-- begin-user-doc -->
211
     * <!-- end-user-doc -->
212
     * @generated
213
     */
214
    private final String name;
215
216
    /**
217
     * <!-- begin-user-doc -->
218
     * <!-- end-user-doc -->
219
     * @generated
220
     */
221
    private final String literal;
222
223
    /**
212
     * Only this class can construct instances.
224
     * Only this class can construct instances.
213
     * <!-- begin-user-doc -->
225
     * <!-- begin-user-doc -->
214
     * <!-- end-user-doc -->
226
     * <!-- end-user-doc -->
Lines 216-222 Link Here
216
     */
228
     */
217
    private HorizontalAlignment( int value, String name, String literal )
229
    private HorizontalAlignment( int value, String name, String literal )
218
    {
230
    {
219
        super( value, name, literal );
231
        this.value = value;
232
        this.name = name;
233
        this.literal = literal;
220
    }
234
    }
221
235
222
} //HorizontalAlignment
236
    /**
237
     * <!-- begin-user-doc -->
238
     * <!-- end-user-doc -->
239
     * @generated
240
     */
241
    public int getValue()
242
    {
243
        return value;
244
    }
245
246
    /**
247
     * <!-- begin-user-doc -->
248
     * <!-- end-user-doc -->
249
     * @generated
250
     */
251
    public String getName()
252
    {
253
        return name;
254
    }
255
256
    /**
257
     * <!-- begin-user-doc -->
258
     * <!-- end-user-doc -->
259
     * @generated
260
     */
261
    public String getLiteral()
262
    {
263
        return literal;
264
    }
265
266
    /**
267
     * Returns the literal value of the enumerator, which is its string representation.
268
     * <!-- begin-user-doc -->
269
     * <!-- end-user-doc -->
270
     * @generated
271
     */
272
    @Override
273
    public String toString()
274
    {
275
        return literal;
276
    }
277
}
(-)src/org/eclipse/datatools/connectivity/oda/design/ResultSetColumns.java (-4 / +4 lines)
Lines 1-6 Link Here
1
/**
1
/**
2
 *************************************************************************
2
 *************************************************************************
3
 * Copyright (c) 2005, 2007 Actuate Corporation.
3
 * Copyright (c) 2005, 2009 Actuate Corporation.
4
 * All rights reserved. This program and the accompanying materials
4
 * All rights reserved. This program and the accompanying materials
5
 * are made available under the terms of the Eclipse Public License v1.0
5
 * are made available under the terms of the Eclipse Public License v1.0
6
 * which accompanies this distribution, and is available at
6
 * which accompanies this distribution, and is available at
Lines 45-51 Link Here
45
     * <!-- end-user-doc -->
45
     * <!-- end-user-doc -->
46
     * @generated
46
     * @generated
47
     */
47
     */
48
    String copyright = "Copyright (c) 2005, 2007 Actuate Corporation"; //$NON-NLS-1$
48
    String copyright = "Copyright (c) 2005, 2009 Actuate Corporation"; //$NON-NLS-1$
49
49
50
    /**
50
    /**
51
     * Returns the value of the '<em><b>Result Column Definitions</b></em>' containment reference list.
51
     * Returns the value of the '<em><b>Result Column Definitions</b></em>' containment reference list.
Lines 54-63 Link Here
54
     * <!-- end-user-doc -->
54
     * <!-- end-user-doc -->
55
     * @return the value of the '<em>Result Column Definitions</em>' containment reference list.
55
     * @return the value of the '<em>Result Column Definitions</em>' containment reference list.
56
     * @see org.eclipse.datatools.connectivity.oda.design.DesignPackage#getResultSetColumns_ResultColumnDefinitions()
56
     * @see org.eclipse.datatools.connectivity.oda.design.DesignPackage#getResultSetColumns_ResultColumnDefinitions()
57
     * @model type="org.eclipse.datatools.connectivity.oda.design.ColumnDefinition" containment="true" required="true"
57
     * @model containment="true" required="true"
58
     *        extendedMetaData="kind='element' name='resultColumnDefinitions' namespace='##targetNamespace'"
58
     *        extendedMetaData="kind='element' name='resultColumnDefinitions' namespace='##targetNamespace'"
59
     * @generated
59
     * @generated
60
     */
60
     */
61
    EList getResultColumnDefinitions();
61
    EList<ColumnDefinition> getResultColumnDefinitions();
62
62
63
} // ResultSetColumns
63
} // ResultSetColumns
(-)src/org/eclipse/datatools/connectivity/oda/design/impl/DataSourceDesignImpl.java (-5 / +12 lines)
Lines 1-6 Link Here
1
/**
1
/**
2
 *************************************************************************
2
 *************************************************************************
3
 * Copyright (c) 2005, 2008 Actuate Corporation.
3
 * Copyright (c) 2005, 2009 Actuate Corporation.
4
 * All rights reserved. This program and the accompanying materials
4
 * All rights reserved. This program and the accompanying materials
5
 * are made available under the terms of the Eclipse Public License v1.0
5
 * are made available under the terms of the Eclipse Public License v1.0
6
 * which accompanies this distribution, and is available at
6
 * which accompanies this distribution, and is available at
Lines 63-69 Link Here
63
     * <!-- end-user-doc -->
63
     * <!-- end-user-doc -->
64
     * @generated
64
     * @generated
65
     */
65
     */
66
    public static final String copyright = "Copyright (c) 2005, 2008 Actuate Corporation"; //$NON-NLS-1$
66
    public static final String copyright = "Copyright (c) 2005, 2009 Actuate Corporation"; //$NON-NLS-1$
67
67
68
    /**
68
    /**
69
     * The default value of the '{@link #getName() <em>Name</em>}' attribute.
69
     * The default value of the '{@link #getName() <em>Name</em>}' attribute.
Lines 153-159 Link Here
153
     * @generated
153
     * @generated
154
     * @ordered
154
     * @ordered
155
     */
155
     */
156
    protected Properties m_publicProperties = null;
156
    protected Properties m_publicProperties;
157
157
158
    /**
158
    /**
159
     * The cached value of the '{@link #getPrivateProperties() <em>Private Properties</em>}' containment reference.
159
     * The cached value of the '{@link #getPrivateProperties() <em>Private Properties</em>}' containment reference.
Lines 163-169 Link Here
163
     * @generated
163
     * @generated
164
     * @ordered
164
     * @ordered
165
     */
165
     */
166
    protected Properties m_privateProperties = null;
166
    protected Properties m_privateProperties;
167
167
168
    /**
168
    /**
169
     * The default value of the '{@link #getLinkedProfileName() <em>Linked Profile Name</em>}' attribute.
169
     * The default value of the '{@link #getLinkedProfileName() <em>Linked Profile Name</em>}' attribute.
Lines 215-221 Link Here
215
     * @generated
215
     * @generated
216
     * @ordered
216
     * @ordered
217
     */
217
     */
218
    protected ResourceIdentifiers m_hostResourceIdentifiers = null;
218
    protected ResourceIdentifiers m_hostResourceIdentifiers;
219
219
220
    /**
220
    /**
221
     * property name for storing linked profile instance's name
221
     * property name for storing linked profile instance's name
Lines 246-251 Link Here
246
     * <!-- end-user-doc -->
246
     * <!-- end-user-doc -->
247
     * @generated
247
     * @generated
248
     */
248
     */
249
    @Override
249
    protected EClass eStaticClass()
250
    protected EClass eStaticClass()
250
    {
251
    {
251
        return DesignPackage.Literals.DATA_SOURCE_DESIGN;
252
        return DesignPackage.Literals.DATA_SOURCE_DESIGN;
Lines 771-776 Link Here
771
     * <!-- end-user-doc -->
772
     * <!-- end-user-doc -->
772
     * @generated
773
     * @generated
773
     */
774
     */
775
    @Override
774
    public NotificationChain eInverseRemove( InternalEObject otherEnd,
776
    public NotificationChain eInverseRemove( InternalEObject otherEnd,
775
            int featureID, NotificationChain msgs )
777
            int featureID, NotificationChain msgs )
776
    {
778
    {
Lines 791-796 Link Here
791
     * <!-- end-user-doc -->
793
     * <!-- end-user-doc -->
792
     * @generated
794
     * @generated
793
     */
795
     */
796
    @Override
794
    public Object eGet( int featureID, boolean resolve, boolean coreType )
797
    public Object eGet( int featureID, boolean resolve, boolean coreType )
795
    {
798
    {
796
        switch( featureID )
799
        switch( featureID )
Lines 822-827 Link Here
822
     * <!-- end-user-doc -->
825
     * <!-- end-user-doc -->
823
     * @generated
826
     * @generated
824
     */
827
     */
828
    @Override
825
    public void eSet( int featureID, Object newValue )
829
    public void eSet( int featureID, Object newValue )
826
    {
830
    {
827
        switch( featureID )
831
        switch( featureID )
Lines 862-867 Link Here
862
     * <!-- end-user-doc -->
866
     * <!-- end-user-doc -->
863
     * @generated
867
     * @generated
864
     */
868
     */
869
    @Override
865
    public void eUnset( int featureID )
870
    public void eUnset( int featureID )
866
    {
871
    {
867
        switch( featureID )
872
        switch( featureID )
Lines 902-907 Link Here
902
     * <!-- end-user-doc -->
907
     * <!-- end-user-doc -->
903
     * @generated
908
     * @generated
904
     */
909
     */
910
    @Override
905
    public boolean eIsSet( int featureID )
911
    public boolean eIsSet( int featureID )
906
    {
912
    {
907
        switch( featureID )
913
        switch( featureID )
Lines 990-995 Link Here
990
     * <!-- end-user-doc -->
996
     * <!-- end-user-doc -->
991
     * @generated
997
     * @generated
992
     */
998
     */
999
    @Override
993
    public String toString()
1000
    public String toString()
994
    {
1001
    {
995
        if( eIsProxy() )
1002
        if( eIsProxy() )
(-)src/org/eclipse/datatools/connectivity/oda/design/impl/DesignerStateImpl.java (-3 / +10 lines)
Lines 1-6 Link Here
1
/**
1
/**
2
 *************************************************************************
2
 *************************************************************************
3
 * Copyright (c) 2005, 2007 Actuate Corporation.
3
 * Copyright (c) 2005, 2009 Actuate Corporation.
4
 * All rights reserved. This program and the accompanying materials
4
 * All rights reserved. This program and the accompanying materials
5
 * are made available under the terms of the Eclipse Public License v1.0
5
 * are made available under the terms of the Eclipse Public License v1.0
6
 * which accompanies this distribution, and is available at
6
 * which accompanies this distribution, and is available at
Lines 47-53 Link Here
47
     * <!-- end-user-doc -->
47
     * <!-- end-user-doc -->
48
     * @generated
48
     * @generated
49
     */
49
     */
50
    public static final String copyright = "Copyright (c) 2005, 2007 Actuate Corporation"; //$NON-NLS-1$
50
    public static final String copyright = "Copyright (c) 2005, 2009 Actuate Corporation"; //$NON-NLS-1$
51
51
52
    /**
52
    /**
53
     * The default value of the '{@link #getVersion() <em>Version</em>}' attribute.
53
     * The default value of the '{@link #getVersion() <em>Version</em>}' attribute.
Lines 77-83 Link Here
77
     * @generated
77
     * @generated
78
     * @ordered
78
     * @ordered
79
     */
79
     */
80
    protected DesignerStateContent m_stateContent = null;
80
    protected DesignerStateContent m_stateContent;
81
81
82
    /**
82
    /**
83
     * <!-- begin-user-doc -->
83
     * <!-- begin-user-doc -->
Lines 94-99 Link Here
94
     * <!-- end-user-doc -->
94
     * <!-- end-user-doc -->
95
     * @generated
95
     * @generated
96
     */
96
     */
97
    @Override
97
    protected EClass eStaticClass()
98
    protected EClass eStaticClass()
98
    {
99
    {
99
        return DesignPackage.Literals.DESIGNER_STATE;
100
        return DesignPackage.Literals.DESIGNER_STATE;
Lines 223-228 Link Here
223
     * <!-- end-user-doc -->
224
     * <!-- end-user-doc -->
224
     * @generated
225
     * @generated
225
     */
226
     */
227
    @Override
226
    public NotificationChain eInverseRemove( InternalEObject otherEnd,
228
    public NotificationChain eInverseRemove( InternalEObject otherEnd,
227
            int featureID, NotificationChain msgs )
229
            int featureID, NotificationChain msgs )
228
    {
230
    {
Lines 239-244 Link Here
239
     * <!-- end-user-doc -->
241
     * <!-- end-user-doc -->
240
     * @generated
242
     * @generated
241
     */
243
     */
244
    @Override
242
    public Object eGet( int featureID, boolean resolve, boolean coreType )
245
    public Object eGet( int featureID, boolean resolve, boolean coreType )
243
    {
246
    {
244
        switch( featureID )
247
        switch( featureID )
Lines 256-261 Link Here
256
     * <!-- end-user-doc -->
259
     * <!-- end-user-doc -->
257
     * @generated
260
     * @generated
258
     */
261
     */
262
    @Override
259
    public void eSet( int featureID, Object newValue )
263
    public void eSet( int featureID, Object newValue )
260
    {
264
    {
261
        switch( featureID )
265
        switch( featureID )
Lines 275-280 Link Here
275
     * <!-- end-user-doc -->
279
     * <!-- end-user-doc -->
276
     * @generated
280
     * @generated
277
     */
281
     */
282
    @Override
278
    public void eUnset( int featureID )
283
    public void eUnset( int featureID )
279
    {
284
    {
280
        switch( featureID )
285
        switch( featureID )
Lines 294-299 Link Here
294
     * <!-- end-user-doc -->
299
     * <!-- end-user-doc -->
295
     * @generated
300
     * @generated
296
     */
301
     */
302
    @Override
297
    public boolean eIsSet( int featureID )
303
    public boolean eIsSet( int featureID )
298
    {
304
    {
299
        switch( featureID )
305
        switch( featureID )
Lines 312-317 Link Here
312
     * <!-- end-user-doc -->
318
     * <!-- end-user-doc -->
313
     * @generated
319
     * @generated
314
     */
320
     */
321
    @Override
315
    public String toString()
322
    public String toString()
316
    {
323
    {
317
        if( eIsProxy() )
324
        if( eIsProxy() )
(-)src/org/eclipse/datatools/connectivity/oda/design/impl/PropertyImpl.java (-4 / +10 lines)
Lines 1-6 Link Here
1
/**
1
/**
2
 *************************************************************************
2
 *************************************************************************
3
 * Copyright (c) 2005, 2007 Actuate Corporation.
3
 * Copyright (c) 2005, 2009 Actuate Corporation.
4
 * All rights reserved. This program and the accompanying materials
4
 * All rights reserved. This program and the accompanying materials
5
 * are made available under the terms of the Eclipse Public License v1.0
5
 * are made available under the terms of the Eclipse Public License v1.0
6
 * which accompanies this distribution, and is available at
6
 * which accompanies this distribution, and is available at
Lines 48-54 Link Here
48
     * <!-- end-user-doc -->
48
     * <!-- end-user-doc -->
49
     * @generated
49
     * @generated
50
     */
50
     */
51
    public static final String copyright = "Copyright (c) 2005, 2007 Actuate Corporation"; //$NON-NLS-1$
51
    public static final String copyright = "Copyright (c) 2005, 2009 Actuate Corporation"; //$NON-NLS-1$
52
52
53
    /**
53
    /**
54
     * The cached value of the '{@link #getNameValue() <em>Name Value</em>}' containment reference.
54
     * The cached value of the '{@link #getNameValue() <em>Name Value</em>}' containment reference.
Lines 58-64 Link Here
58
     * @generated
58
     * @generated
59
     * @ordered
59
     * @ordered
60
     */
60
     */
61
    protected NameValuePair m_nameValue = null;
61
    protected NameValuePair m_nameValue;
62
62
63
    /**
63
    /**
64
     * The cached value of the '{@link #getDesignAttributes() <em>Design Attributes</em>}' containment reference.
64
     * The cached value of the '{@link #getDesignAttributes() <em>Design Attributes</em>}' containment reference.
Lines 68-74 Link Here
68
     * @generated
68
     * @generated
69
     * @ordered
69
     * @ordered
70
     */
70
     */
71
    protected PropertyAttributes m_designAttributes = null;
71
    protected PropertyAttributes m_designAttributes;
72
72
73
    /**
73
    /**
74
     * <!-- begin-user-doc -->
74
     * <!-- begin-user-doc -->
Lines 85-90 Link Here
85
     * <!-- end-user-doc -->
85
     * <!-- end-user-doc -->
86
     * @generated
86
     * @generated
87
     */
87
     */
88
    @Override
88
    protected EClass eStaticClass()
89
    protected EClass eStaticClass()
89
    {
90
    {
90
        return DesignPackage.Literals.PROPERTY;
91
        return DesignPackage.Literals.PROPERTY;
Lines 257-262 Link Here
257
     * <!-- end-user-doc -->
258
     * <!-- end-user-doc -->
258
     * @generated
259
     * @generated
259
     */
260
     */
261
    @Override
260
    public NotificationChain eInverseRemove( InternalEObject otherEnd,
262
    public NotificationChain eInverseRemove( InternalEObject otherEnd,
261
            int featureID, NotificationChain msgs )
263
            int featureID, NotificationChain msgs )
262
    {
264
    {
Lines 275-280 Link Here
275
     * <!-- end-user-doc -->
277
     * <!-- end-user-doc -->
276
     * @generated
278
     * @generated
277
     */
279
     */
280
    @Override
278
    public Object eGet( int featureID, boolean resolve, boolean coreType )
281
    public Object eGet( int featureID, boolean resolve, boolean coreType )
279
    {
282
    {
280
        switch( featureID )
283
        switch( featureID )
Lines 292-297 Link Here
292
     * <!-- end-user-doc -->
295
     * <!-- end-user-doc -->
293
     * @generated
296
     * @generated
294
     */
297
     */
298
    @Override
295
    public void eSet( int featureID, Object newValue )
299
    public void eSet( int featureID, Object newValue )
296
    {
300
    {
297
        switch( featureID )
301
        switch( featureID )
Lines 311-316 Link Here
311
     * <!-- end-user-doc -->
315
     * <!-- end-user-doc -->
312
     * @generated
316
     * @generated
313
     */
317
     */
318
    @Override
314
    public void eUnset( int featureID )
319
    public void eUnset( int featureID )
315
    {
320
    {
316
        switch( featureID )
321
        switch( featureID )
Lines 330-335 Link Here
330
     * <!-- end-user-doc -->
335
     * <!-- end-user-doc -->
331
     * @generated
336
     * @generated
332
     */
337
     */
338
    @Override
333
    public boolean eIsSet( int featureID )
339
    public boolean eIsSet( int featureID )
334
    {
340
    {
335
        switch( featureID )
341
        switch( featureID )
(-)src/org/eclipse/datatools/connectivity/oda/design/impl/DynamicFilterExpressionImpl.java (-1 lines)
Lines 55-61 Link Here
55
     * <!-- end-user-doc -->
55
     * <!-- end-user-doc -->
56
     * @generated
56
     * @generated
57
     */
57
     */
58
    @SuppressWarnings("hiding")
59
    public static final String copyright = "Copyright (c) 2009 Actuate Corporation"; //$NON-NLS-1$
58
    public static final String copyright = "Copyright (c) 2009 Actuate Corporation"; //$NON-NLS-1$
60
59
61
    /**
60
    /**
(-)src/org/eclipse/datatools/connectivity/oda/design/impl/ParameterFieldDefinitionImpl.java (-5 / +11 lines)
Lines 1-6 Link Here
1
/**
1
/**
2
 *************************************************************************
2
 *************************************************************************
3
 * Copyright (c) 2005, 2007 Actuate Corporation.
3
 * Copyright (c) 2005, 2009 Actuate Corporation.
4
 * All rights reserved. This program and the accompanying materials
4
 * All rights reserved. This program and the accompanying materials
5
 * are made available under the terms of the Eclipse Public License v1.0
5
 * are made available under the terms of the Eclipse Public License v1.0
6
 * which accompanies this distribution, and is available at
6
 * which accompanies this distribution, and is available at
Lines 53-59 Link Here
53
     * <!-- end-user-doc -->
53
     * <!-- end-user-doc -->
54
     * @generated
54
     * @generated
55
     */
55
     */
56
    public static final String copyright = "Copyright (c) 2005, 2007 Actuate Corporation"; //$NON-NLS-1$
56
    public static final String copyright = "Copyright (c) 2005, 2009 Actuate Corporation"; //$NON-NLS-1$
57
57
58
    /**
58
    /**
59
     * The cached value of the '{@link #getAttributes() <em>Attributes</em>}' containment reference.
59
     * The cached value of the '{@link #getAttributes() <em>Attributes</em>}' containment reference.
Lines 63-69 Link Here
63
     * @generated
63
     * @generated
64
     * @ordered
64
     * @ordered
65
     */
65
     */
66
    protected DataElementAttributes m_attributes = null;
66
    protected DataElementAttributes m_attributes;
67
67
68
    /**
68
    /**
69
     * The cached value of the '{@link #getInputAttributes() <em>Input Attributes</em>}' containment reference.
69
     * The cached value of the '{@link #getInputAttributes() <em>Input Attributes</em>}' containment reference.
Lines 73-79 Link Here
73
     * @generated
73
     * @generated
74
     * @ordered
74
     * @ordered
75
     */
75
     */
76
    protected InputElementAttributes m_inputAttributes = null;
76
    protected InputElementAttributes m_inputAttributes;
77
77
78
    /**
78
    /**
79
     * The cached value of the '{@link #getOutputUsageHints() <em>Output Usage Hints</em>}' containment reference.
79
     * The cached value of the '{@link #getOutputUsageHints() <em>Output Usage Hints</em>}' containment reference.
Lines 83-89 Link Here
83
     * @generated
83
     * @generated
84
     * @ordered
84
     * @ordered
85
     */
85
     */
86
    protected OutputElementAttributes m_outputUsageHints = null;
86
    protected OutputElementAttributes m_outputUsageHints;
87
87
88
    /**
88
    /**
89
     * <!-- begin-user-doc -->
89
     * <!-- begin-user-doc -->
Lines 100-105 Link Here
100
     * <!-- end-user-doc -->
100
     * <!-- end-user-doc -->
101
     * @generated
101
     * @generated
102
     */
102
     */
103
    @Override
103
    protected EClass eStaticClass()
104
    protected EClass eStaticClass()
104
    {
105
    {
105
        return DesignPackage.Literals.PARAMETER_FIELD_DEFINITION;
106
        return DesignPackage.Literals.PARAMETER_FIELD_DEFINITION;
Lines 345-350 Link Here
345
     * <!-- end-user-doc -->
346
     * <!-- end-user-doc -->
346
     * @generated
347
     * @generated
347
     */
348
     */
349
    @Override
348
    public NotificationChain eInverseRemove( InternalEObject otherEnd,
350
    public NotificationChain eInverseRemove( InternalEObject otherEnd,
349
            int featureID, NotificationChain msgs )
351
            int featureID, NotificationChain msgs )
350
    {
352
    {
Lines 365-370 Link Here
365
     * <!-- end-user-doc -->
367
     * <!-- end-user-doc -->
366
     * @generated
368
     * @generated
367
     */
369
     */
370
    @Override
368
    public Object eGet( int featureID, boolean resolve, boolean coreType )
371
    public Object eGet( int featureID, boolean resolve, boolean coreType )
369
    {
372
    {
370
        switch( featureID )
373
        switch( featureID )
Lines 384-389 Link Here
384
     * <!-- end-user-doc -->
387
     * <!-- end-user-doc -->
385
     * @generated
388
     * @generated
386
     */
389
     */
390
    @Override
387
    public void eSet( int featureID, Object newValue )
391
    public void eSet( int featureID, Object newValue )
388
    {
392
    {
389
        switch( featureID )
393
        switch( featureID )
Lines 406-411 Link Here
406
     * <!-- end-user-doc -->
410
     * <!-- end-user-doc -->
407
     * @generated
411
     * @generated
408
     */
412
     */
413
    @Override
409
    public void eUnset( int featureID )
414
    public void eUnset( int featureID )
410
    {
415
    {
411
        switch( featureID )
416
        switch( featureID )
Lines 428-433 Link Here
428
     * <!-- end-user-doc -->
433
     * <!-- end-user-doc -->
429
     * @generated
434
     * @generated
430
     */
435
     */
436
    @Override
431
    public boolean eIsSet( int featureID )
437
    public boolean eIsSet( int featureID )
432
    {
438
    {
433
        switch( featureID )
439
        switch( featureID )
(-)src/org/eclipse/datatools/connectivity/oda/design/impl/ColumnDefinitionImpl.java (-5 / +11 lines)
Lines 1-6 Link Here
1
/**
1
/**
2
 *************************************************************************
2
 *************************************************************************
3
 * Copyright (c) 2005, 2007 Actuate Corporation.
3
 * Copyright (c) 2005, 2009 Actuate Corporation.
4
 * All rights reserved. This program and the accompanying materials
4
 * All rights reserved. This program and the accompanying materials
5
 * are made available under the terms of the Eclipse Public License v1.0
5
 * are made available under the terms of the Eclipse Public License v1.0
6
 * which accompanies this distribution, and is available at
6
 * which accompanies this distribution, and is available at
Lines 50-56 Link Here
50
     * <!-- end-user-doc -->
50
     * <!-- end-user-doc -->
51
     * @generated
51
     * @generated
52
     */
52
     */
53
    public static final String copyright = "Copyright (c) 2005, 2007 Actuate Corporation"; //$NON-NLS-1$
53
    public static final String copyright = "Copyright (c) 2005, 2009 Actuate Corporation"; //$NON-NLS-1$
54
54
55
    /**
55
    /**
56
     * The cached value of the '{@link #getAttributes() <em>Attributes</em>}' containment reference.
56
     * The cached value of the '{@link #getAttributes() <em>Attributes</em>}' containment reference.
Lines 60-66 Link Here
60
     * @generated
60
     * @generated
61
     * @ordered
61
     * @ordered
62
     */
62
     */
63
    protected DataElementAttributes m_attributes = null;
63
    protected DataElementAttributes m_attributes;
64
64
65
    /**
65
    /**
66
     * The cached value of the '{@link #getUsageHints() <em>Usage Hints</em>}' containment reference.
66
     * The cached value of the '{@link #getUsageHints() <em>Usage Hints</em>}' containment reference.
Lines 70-76 Link Here
70
     * @generated
70
     * @generated
71
     * @ordered
71
     * @ordered
72
     */
72
     */
73
    protected OutputElementAttributes m_usageHints = null;
73
    protected OutputElementAttributes m_usageHints;
74
74
75
    /**
75
    /**
76
     * The cached value of the '{@link #getMultiDimensionAttributes() <em>Multi Dimension Attributes</em>}' containment reference.
76
     * The cached value of the '{@link #getMultiDimensionAttributes() <em>Multi Dimension Attributes</em>}' containment reference.
Lines 80-86 Link Here
80
     * @generated
80
     * @generated
81
     * @ordered
81
     * @ordered
82
     */
82
     */
83
    protected AxisAttributes m_multiDimensionAttributes = null;
83
    protected AxisAttributes m_multiDimensionAttributes;
84
84
85
    /**
85
    /**
86
     * <!-- begin-user-doc -->
86
     * <!-- begin-user-doc -->
Lines 97-102 Link Here
97
     * <!-- end-user-doc -->
97
     * <!-- end-user-doc -->
98
     * @generated
98
     * @generated
99
     */
99
     */
100
    @Override
100
    protected EClass eStaticClass()
101
    protected EClass eStaticClass()
101
    {
102
    {
102
        return DesignPackage.Literals.COLUMN_DEFINITION;
103
        return DesignPackage.Literals.COLUMN_DEFINITION;
Lines 308-313 Link Here
308
     * <!-- end-user-doc -->
309
     * <!-- end-user-doc -->
309
     * @generated
310
     * @generated
310
     */
311
     */
312
    @Override
311
    public NotificationChain eInverseRemove( InternalEObject otherEnd,
313
    public NotificationChain eInverseRemove( InternalEObject otherEnd,
312
            int featureID, NotificationChain msgs )
314
            int featureID, NotificationChain msgs )
313
    {
315
    {
Lines 328-333 Link Here
328
     * <!-- end-user-doc -->
330
     * <!-- end-user-doc -->
329
     * @generated
331
     * @generated
330
     */
332
     */
333
    @Override
331
    public Object eGet( int featureID, boolean resolve, boolean coreType )
334
    public Object eGet( int featureID, boolean resolve, boolean coreType )
332
    {
335
    {
333
        switch( featureID )
336
        switch( featureID )
Lines 347-352 Link Here
347
     * <!-- end-user-doc -->
350
     * <!-- end-user-doc -->
348
     * @generated
351
     * @generated
349
     */
352
     */
353
    @Override
350
    public void eSet( int featureID, Object newValue )
354
    public void eSet( int featureID, Object newValue )
351
    {
355
    {
352
        switch( featureID )
356
        switch( featureID )
Lines 369-374 Link Here
369
     * <!-- end-user-doc -->
373
     * <!-- end-user-doc -->
370
     * @generated
374
     * @generated
371
     */
375
     */
376
    @Override
372
    public void eUnset( int featureID )
377
    public void eUnset( int featureID )
373
    {
378
    {
374
        switch( featureID )
379
        switch( featureID )
Lines 391-396 Link Here
391
     * <!-- end-user-doc -->
396
     * <!-- end-user-doc -->
392
     * @generated
397
     * @generated
393
     */
398
     */
399
    @Override
394
    public boolean eIsSet( int featureID )
400
    public boolean eIsSet( int featureID )
395
    {
401
    {
396
        switch( featureID )
402
        switch( featureID )
(-)src/org/eclipse/datatools/connectivity/oda/design/impl/ParameterFieldsImpl.java (-7 / +15 lines)
Lines 1-6 Link Here
1
/**
1
/**
2
 *************************************************************************
2
 *************************************************************************
3
 * Copyright (c) 2005, 2007 Actuate Corporation.
3
 * Copyright (c) 2005, 2009 Actuate Corporation.
4
 * All rights reserved. This program and the accompanying materials
4
 * All rights reserved. This program and the accompanying materials
5
 * are made available under the terms of the Eclipse Public License v1.0
5
 * are made available under the terms of the Eclipse Public License v1.0
6
 * which accompanies this distribution, and is available at
6
 * which accompanies this distribution, and is available at
Lines 48-54 Link Here
48
     * <!-- end-user-doc -->
48
     * <!-- end-user-doc -->
49
     * @generated
49
     * @generated
50
     */
50
     */
51
    public static final String copyright = "Copyright (c) 2005, 2007 Actuate Corporation"; //$NON-NLS-1$
51
    public static final String copyright = "Copyright (c) 2005, 2009 Actuate Corporation"; //$NON-NLS-1$
52
52
53
    /**
53
    /**
54
     * The cached value of the '{@link #getFieldCollection() <em>Field Collection</em>}' containment reference list.
54
     * The cached value of the '{@link #getFieldCollection() <em>Field Collection</em>}' containment reference list.
Lines 58-64 Link Here
58
     * @generated
58
     * @generated
59
     * @ordered
59
     * @ordered
60
     */
60
     */
61
    protected EList m_fieldCollection = null;
61
    protected EList<ParameterFieldDefinition> m_fieldCollection;
62
62
63
    /**
63
    /**
64
     * <!-- begin-user-doc -->
64
     * <!-- begin-user-doc -->
Lines 75-80 Link Here
75
     * <!-- end-user-doc -->
75
     * <!-- end-user-doc -->
76
     * @generated
76
     * @generated
77
     */
77
     */
78
    @Override
78
    protected EClass eStaticClass()
79
    protected EClass eStaticClass()
79
    {
80
    {
80
        return DesignPackage.Literals.PARAMETER_FIELDS;
81
        return DesignPackage.Literals.PARAMETER_FIELDS;
Lines 85-95 Link Here
85
     * <!-- end-user-doc -->
86
     * <!-- end-user-doc -->
86
     * @generated
87
     * @generated
87
     */
88
     */
88
    public EList getFieldCollection()
89
    public EList<ParameterFieldDefinition> getFieldCollection()
89
    {
90
    {
90
        if( m_fieldCollection == null )
91
        if( m_fieldCollection == null )
91
        {
92
        {
92
            m_fieldCollection = new EObjectContainmentEList(
93
            m_fieldCollection = new EObjectContainmentEList<ParameterFieldDefinition>(
93
                    ParameterFieldDefinition.class, this,
94
                    ParameterFieldDefinition.class, this,
94
                    DesignPackage.PARAMETER_FIELDS__FIELD_COLLECTION );
95
                    DesignPackage.PARAMETER_FIELDS__FIELD_COLLECTION );
95
        }
96
        }
Lines 101-113 Link Here
101
     * <!-- end-user-doc -->
102
     * <!-- end-user-doc -->
102
     * @generated
103
     * @generated
103
     */
104
     */
105
    @Override
104
    public NotificationChain eInverseRemove( InternalEObject otherEnd,
106
    public NotificationChain eInverseRemove( InternalEObject otherEnd,
105
            int featureID, NotificationChain msgs )
107
            int featureID, NotificationChain msgs )
106
    {
108
    {
107
        switch( featureID )
109
        switch( featureID )
108
        {
110
        {
109
        case DesignPackage.PARAMETER_FIELDS__FIELD_COLLECTION:
111
        case DesignPackage.PARAMETER_FIELDS__FIELD_COLLECTION:
110
            return ((InternalEList) getFieldCollection()).basicRemove(
112
            return ((InternalEList<?>) getFieldCollection()).basicRemove(
111
                    otherEnd, msgs );
113
                    otherEnd, msgs );
112
        }
114
        }
113
        return super.eInverseRemove( otherEnd, featureID, msgs );
115
        return super.eInverseRemove( otherEnd, featureID, msgs );
Lines 118-123 Link Here
118
     * <!-- end-user-doc -->
120
     * <!-- end-user-doc -->
119
     * @generated
121
     * @generated
120
     */
122
     */
123
    @Override
121
    public Object eGet( int featureID, boolean resolve, boolean coreType )
124
    public Object eGet( int featureID, boolean resolve, boolean coreType )
122
    {
125
    {
123
        switch( featureID )
126
        switch( featureID )
Lines 133-145 Link Here
133
     * <!-- end-user-doc -->
136
     * <!-- end-user-doc -->
134
     * @generated
137
     * @generated
135
     */
138
     */
139
    @SuppressWarnings("unchecked")
140
    @Override
136
    public void eSet( int featureID, Object newValue )
141
    public void eSet( int featureID, Object newValue )
137
    {
142
    {
138
        switch( featureID )
143
        switch( featureID )
139
        {
144
        {
140
        case DesignPackage.PARAMETER_FIELDS__FIELD_COLLECTION:
145
        case DesignPackage.PARAMETER_FIELDS__FIELD_COLLECTION:
141
            getFieldCollection().clear();
146
            getFieldCollection().clear();
142
            getFieldCollection().addAll( (Collection) newValue );
147
            getFieldCollection().addAll(
148
                    (Collection<? extends ParameterFieldDefinition>) newValue );
143
            return;
149
            return;
144
        }
150
        }
145
        super.eSet( featureID, newValue );
151
        super.eSet( featureID, newValue );
Lines 150-155 Link Here
150
     * <!-- end-user-doc -->
156
     * <!-- end-user-doc -->
151
     * @generated
157
     * @generated
152
     */
158
     */
159
    @Override
153
    public void eUnset( int featureID )
160
    public void eUnset( int featureID )
154
    {
161
    {
155
        switch( featureID )
162
        switch( featureID )
Lines 166-171 Link Here
166
     * <!-- end-user-doc -->
173
     * <!-- end-user-doc -->
167
     * @generated
174
     * @generated
168
     */
175
     */
176
    @Override
169
    public boolean eIsSet( int featureID )
177
    public boolean eIsSet( int featureID )
170
    {
178
    {
171
        switch( featureID )
179
        switch( featureID )
(-)src/org/eclipse/datatools/connectivity/oda/design/impl/DataSetParametersImpl.java (-8 / +17 lines)
Lines 1-6 Link Here
1
/**
1
/**
2
 *************************************************************************
2
 *************************************************************************
3
 * Copyright (c) 2005, 2007 Actuate Corporation.
3
 * Copyright (c) 2005, 2009 Actuate Corporation.
4
 * All rights reserved. This program and the accompanying materials
4
 * All rights reserved. This program and the accompanying materials
5
 * are made available under the terms of the Eclipse Public License v1.0
5
 * are made available under the terms of the Eclipse Public License v1.0
6
 * which accompanies this distribution, and is available at
6
 * which accompanies this distribution, and is available at
Lines 52-58 Link Here
52
     * <!-- end-user-doc -->
52
     * <!-- end-user-doc -->
53
     * @generated
53
     * @generated
54
     */
54
     */
55
    public static final String copyright = "Copyright (c) 2005, 2007 Actuate Corporation"; //$NON-NLS-1$
55
    public static final String copyright = "Copyright (c) 2005, 2009 Actuate Corporation"; //$NON-NLS-1$
56
56
57
    /**
57
    /**
58
     * The cached value of the '{@link #getParameterDefinitions() <em>Parameter Definitions</em>}' containment reference list.
58
     * The cached value of the '{@link #getParameterDefinitions() <em>Parameter Definitions</em>}' containment reference list.
Lines 62-68 Link Here
62
     * @generated
62
     * @generated
63
     * @ordered
63
     * @ordered
64
     */
64
     */
65
    protected EList m_parameterDefinitions = null;
65
    protected EList<ParameterDefinition> m_parameterDefinitions;
66
66
67
    /**
67
    /**
68
     * The default value of the '{@link #isDerivedMetaData() <em>Derived Meta Data</em>}' attribute.
68
     * The default value of the '{@link #isDerivedMetaData() <em>Derived Meta Data</em>}' attribute.
Lines 91-97 Link Here
91
     * @generated
91
     * @generated
92
     * @ordered
92
     * @ordered
93
     */
93
     */
94
    protected boolean m_derivedMetaDataESet = false;
94
    protected boolean m_derivedMetaDataESet;
95
95
96
    /**
96
    /**
97
     * <!-- begin-user-doc -->
97
     * <!-- begin-user-doc -->
Lines 108-113 Link Here
108
     * <!-- end-user-doc -->
108
     * <!-- end-user-doc -->
109
     * @generated
109
     * @generated
110
     */
110
     */
111
    @Override
111
    protected EClass eStaticClass()
112
    protected EClass eStaticClass()
112
    {
113
    {
113
        return DesignPackage.Literals.DATA_SET_PARAMETERS;
114
        return DesignPackage.Literals.DATA_SET_PARAMETERS;
Lines 118-128 Link Here
118
     * <!-- end-user-doc -->
119
     * <!-- end-user-doc -->
119
     * @generated
120
     * @generated
120
     */
121
     */
121
    public EList getParameterDefinitions()
122
    public EList<ParameterDefinition> getParameterDefinitions()
122
    {
123
    {
123
        if( m_parameterDefinitions == null )
124
        if( m_parameterDefinitions == null )
124
        {
125
        {
125
            m_parameterDefinitions = new EObjectContainmentEList(
126
            m_parameterDefinitions = new EObjectContainmentEList<ParameterDefinition>(
126
                    ParameterDefinition.class, this,
127
                    ParameterDefinition.class, this,
127
                    DesignPackage.DATA_SET_PARAMETERS__PARAMETER_DEFINITIONS );
128
                    DesignPackage.DATA_SET_PARAMETERS__PARAMETER_DEFINITIONS );
128
        }
129
        }
Lines 190-202 Link Here
190
     * <!-- end-user-doc -->
191
     * <!-- end-user-doc -->
191
     * @generated
192
     * @generated
192
     */
193
     */
194
    @Override
193
    public NotificationChain eInverseRemove( InternalEObject otherEnd,
195
    public NotificationChain eInverseRemove( InternalEObject otherEnd,
194
            int featureID, NotificationChain msgs )
196
            int featureID, NotificationChain msgs )
195
    {
197
    {
196
        switch( featureID )
198
        switch( featureID )
197
        {
199
        {
198
        case DesignPackage.DATA_SET_PARAMETERS__PARAMETER_DEFINITIONS:
200
        case DesignPackage.DATA_SET_PARAMETERS__PARAMETER_DEFINITIONS:
199
            return ((InternalEList) getParameterDefinitions()).basicRemove(
201
            return ((InternalEList<?>) getParameterDefinitions()).basicRemove(
200
                    otherEnd, msgs );
202
                    otherEnd, msgs );
201
        }
203
        }
202
        return super.eInverseRemove( otherEnd, featureID, msgs );
204
        return super.eInverseRemove( otherEnd, featureID, msgs );
Lines 207-212 Link Here
207
     * <!-- end-user-doc -->
209
     * <!-- end-user-doc -->
208
     * @generated
210
     * @generated
209
     */
211
     */
212
    @Override
210
    public Object eGet( int featureID, boolean resolve, boolean coreType )
213
    public Object eGet( int featureID, boolean resolve, boolean coreType )
211
    {
214
    {
212
        switch( featureID )
215
        switch( featureID )
Lines 224-236 Link Here
224
     * <!-- end-user-doc -->
227
     * <!-- end-user-doc -->
225
     * @generated
228
     * @generated
226
     */
229
     */
230
    @SuppressWarnings("unchecked")
231
    @Override
227
    public void eSet( int featureID, Object newValue )
232
    public void eSet( int featureID, Object newValue )
228
    {
233
    {
229
        switch( featureID )
234
        switch( featureID )
230
        {
235
        {
231
        case DesignPackage.DATA_SET_PARAMETERS__PARAMETER_DEFINITIONS:
236
        case DesignPackage.DATA_SET_PARAMETERS__PARAMETER_DEFINITIONS:
232
            getParameterDefinitions().clear();
237
            getParameterDefinitions().clear();
233
            getParameterDefinitions().addAll( (Collection) newValue );
238
            getParameterDefinitions().addAll(
239
                    (Collection<? extends ParameterDefinition>) newValue );
234
            return;
240
            return;
235
        case DesignPackage.DATA_SET_PARAMETERS__DERIVED_META_DATA:
241
        case DesignPackage.DATA_SET_PARAMETERS__DERIVED_META_DATA:
236
            setDerivedMetaData( ((Boolean) newValue).booleanValue() );
242
            setDerivedMetaData( ((Boolean) newValue).booleanValue() );
Lines 244-249 Link Here
244
     * <!-- end-user-doc -->
250
     * <!-- end-user-doc -->
245
     * @generated
251
     * @generated
246
     */
252
     */
253
    @Override
247
    public void eUnset( int featureID )
254
    public void eUnset( int featureID )
248
    {
255
    {
249
        switch( featureID )
256
        switch( featureID )
Lines 263-268 Link Here
263
     * <!-- end-user-doc -->
270
     * <!-- end-user-doc -->
264
     * @generated
271
     * @generated
265
     */
272
     */
273
    @Override
266
    public boolean eIsSet( int featureID )
274
    public boolean eIsSet( int featureID )
267
    {
275
    {
268
        switch( featureID )
276
        switch( featureID )
Lines 281-286 Link Here
281
     * <!-- end-user-doc -->
289
     * <!-- end-user-doc -->
282
     * @generated
290
     * @generated
283
     */
291
     */
292
    @Override
284
    public String toString()
293
    public String toString()
285
    {
294
    {
286
        if( eIsProxy() )
295
        if( eIsProxy() )
(-)src/org/eclipse/datatools/connectivity/oda/design/impl/DataElementAttributesImpl.java (-11 / +18 lines)
Lines 1-6 Link Here
1
/**
1
/**
2
 *************************************************************************
2
 *************************************************************************
3
 * Copyright (c) 2005, 2007 Actuate Corporation.
3
 * Copyright (c) 2005, 2009 Actuate Corporation.
4
 * All rights reserved. This program and the accompanying materials
4
 * All rights reserved. This program and the accompanying materials
5
 * are made available under the terms of the Eclipse Public License v1.0
5
 * are made available under the terms of the Eclipse Public License v1.0
6
 * which accompanies this distribution, and is available at
6
 * which accompanies this distribution, and is available at
Lines 55-61 Link Here
55
     * <!-- end-user-doc -->
55
     * <!-- end-user-doc -->
56
     * @generated
56
     * @generated
57
     */
57
     */
58
    public static final String copyright = "Copyright (c) 2005, 2007 Actuate Corporation"; //$NON-NLS-1$
58
    public static final String copyright = "Copyright (c) 2005, 2009 Actuate Corporation"; //$NON-NLS-1$
59
59
60
    /**
60
    /**
61
     * @generated NOT
61
     * @generated NOT
Lines 109-115 Link Here
109
     * @generated
109
     * @generated
110
     * @ordered
110
     * @ordered
111
     */
111
     */
112
    protected boolean m_positionESet = false;
112
    protected boolean m_positionESet;
113
113
114
    /**
114
    /**
115
     * The default value of the '{@link #getNativeDataTypeCode() <em>Native Data Type Code</em>}' attribute.
115
     * The default value of the '{@link #getNativeDataTypeCode() <em>Native Data Type Code</em>}' attribute.
Lines 138-144 Link Here
138
     * @generated
138
     * @generated
139
     * @ordered
139
     * @ordered
140
     */
140
     */
141
    protected boolean m_nativeDataTypeCodeESet = false;
141
    protected boolean m_nativeDataTypeCodeESet;
142
142
143
    /**
143
    /**
144
     * The default value of the '{@link #getPrecision() <em>Precision</em>}' attribute.
144
     * The default value of the '{@link #getPrecision() <em>Precision</em>}' attribute.
Lines 167-173 Link Here
167
     * @generated
167
     * @generated
168
     * @ordered
168
     * @ordered
169
     */
169
     */
170
    protected boolean m_precisionESet = false;
170
    protected boolean m_precisionESet;
171
171
172
    /**
172
    /**
173
     * The default value of the '{@link #getScale() <em>Scale</em>}' attribute.
173
     * The default value of the '{@link #getScale() <em>Scale</em>}' attribute.
Lines 196-202 Link Here
196
     * @generated
196
     * @generated
197
     * @ordered
197
     * @ordered
198
     */
198
     */
199
    protected boolean m_scaleESet = false;
199
    protected boolean m_scaleESet;
200
200
201
    /**
201
    /**
202
     * The default value of the '{@link #getNullability() <em>Nullability</em>}' attribute.
202
     * The default value of the '{@link #getNullability() <em>Nullability</em>}' attribute.
Lines 225-231 Link Here
225
     * @generated
225
     * @generated
226
     * @ordered
226
     * @ordered
227
     */
227
     */
228
    protected boolean m_nullabilityESet = false;
228
    protected boolean m_nullabilityESet;
229
229
230
    /**
230
    /**
231
     * The cached value of the '{@link #getUiHints() <em>Ui Hints</em>}' containment reference.
231
     * The cached value of the '{@link #getUiHints() <em>Ui Hints</em>}' containment reference.
Lines 235-241 Link Here
235
     * @generated
235
     * @generated
236
     * @ordered
236
     * @ordered
237
     */
237
     */
238
    protected DataElementUIHints m_uiHints = null;
238
    protected DataElementUIHints m_uiHints;
239
239
240
    /**
240
    /**
241
     * <!-- begin-user-doc -->
241
     * <!-- begin-user-doc -->
Lines 252-257 Link Here
252
     * <!-- end-user-doc -->
252
     * <!-- end-user-doc -->
253
     * @generated
253
     * @generated
254
     */
254
     */
255
    @Override
255
    protected EClass eStaticClass()
256
    protected EClass eStaticClass()
256
    {
257
    {
257
        return DesignPackage.Literals.DATA_ELEMENT_ATTRIBUTES;
258
        return DesignPackage.Literals.DATA_ELEMENT_ATTRIBUTES;
Lines 367-373 Link Here
367
    {
368
    {
368
        return m_name;
369
        return m_name;
369
    }
370
    }
370
    
371
371
    /*
372
    /*
372
     * (non-Javadoc)
373
     * (non-Javadoc)
373
     * @see org.eclipse.datatools.connectivity.oda.design.DataElementAttributes#setName(java.lang.String)
374
     * @see org.eclipse.datatools.connectivity.oda.design.DataElementAttributes#setName(java.lang.String)
Lines 376-385 Link Here
376
    public void setName( String newName )
377
    public void setName( String newName )
377
    {
378
    {
378
        if( newName == null )
379
        if( newName == null )
379
            newName = EMPTY_STR;  // cannot be null per design definition
380
            newName = EMPTY_STR; // cannot be null per design definition
380
        setNameGen( newName );
381
        setNameGen( newName );
381
    }
382
    }
382
    
383
383
    /**
384
    /**
384
     * <!-- begin-user-doc -->
385
     * <!-- begin-user-doc -->
385
     * <!-- end-user-doc -->
386
     * <!-- end-user-doc -->
Lines 761-766 Link Here
761
     * <!-- end-user-doc -->
762
     * <!-- end-user-doc -->
762
     * @generated
763
     * @generated
763
     */
764
     */
765
    @Override
764
    public NotificationChain eInverseRemove( InternalEObject otherEnd,
766
    public NotificationChain eInverseRemove( InternalEObject otherEnd,
765
            int featureID, NotificationChain msgs )
767
            int featureID, NotificationChain msgs )
766
    {
768
    {
Lines 777-782 Link Here
777
     * <!-- end-user-doc -->
779
     * <!-- end-user-doc -->
778
     * @generated
780
     * @generated
779
     */
781
     */
782
    @Override
780
    public Object eGet( int featureID, boolean resolve, boolean coreType )
783
    public Object eGet( int featureID, boolean resolve, boolean coreType )
781
    {
784
    {
782
        switch( featureID )
785
        switch( featureID )
Lines 804-809 Link Here
804
     * <!-- end-user-doc -->
807
     * <!-- end-user-doc -->
805
     * @generated
808
     * @generated
806
     */
809
     */
810
    @Override
807
    public void eSet( int featureID, Object newValue )
811
    public void eSet( int featureID, Object newValue )
808
    {
812
    {
809
        switch( featureID )
813
        switch( featureID )
Lines 838-843 Link Here
838
     * <!-- end-user-doc -->
842
     * <!-- end-user-doc -->
839
     * @generated
843
     * @generated
840
     */
844
     */
845
    @Override
841
    public void eUnset( int featureID )
846
    public void eUnset( int featureID )
842
    {
847
    {
843
        switch( featureID )
848
        switch( featureID )
Lines 872-877 Link Here
872
     * <!-- end-user-doc -->
877
     * <!-- end-user-doc -->
873
     * @generated
878
     * @generated
874
     */
879
     */
880
    @Override
875
    public boolean eIsSet( int featureID )
881
    public boolean eIsSet( int featureID )
876
    {
882
    {
877
        switch( featureID )
883
        switch( featureID )
Lines 900-905 Link Here
900
     * <!-- end-user-doc -->
906
     * <!-- end-user-doc -->
901
     * @generated
907
     * @generated
902
     */
908
     */
909
    @Override
903
    public String toString()
910
    public String toString()
904
    {
911
    {
905
        if( eIsProxy() )
912
        if( eIsProxy() )
(-)src/org/eclipse/datatools/connectivity/oda/design/impl/ResultSetColumnsImpl.java (-8 / +16 lines)
Lines 1-6 Link Here
1
/**
1
/**
2
 *************************************************************************
2
 *************************************************************************
3
 * Copyright (c) 2005, 2007 Actuate Corporation.
3
 * Copyright (c) 2005, 2009 Actuate Corporation.
4
 * All rights reserved. This program and the accompanying materials
4
 * All rights reserved. This program and the accompanying materials
5
 * are made available under the terms of the Eclipse Public License v1.0
5
 * are made available under the terms of the Eclipse Public License v1.0
6
 * which accompanies this distribution, and is available at
6
 * which accompanies this distribution, and is available at
Lines 49-55 Link Here
49
     * <!-- end-user-doc -->
49
     * <!-- end-user-doc -->
50
     * @generated
50
     * @generated
51
     */
51
     */
52
    public static final String copyright = "Copyright (c) 2005, 2007 Actuate Corporation"; //$NON-NLS-1$
52
    public static final String copyright = "Copyright (c) 2005, 2009 Actuate Corporation"; //$NON-NLS-1$
53
53
54
    /**
54
    /**
55
     * The cached value of the '{@link #getResultColumnDefinitions() <em>Result Column Definitions</em>}' containment reference list.
55
     * The cached value of the '{@link #getResultColumnDefinitions() <em>Result Column Definitions</em>}' containment reference list.
Lines 59-65 Link Here
59
     * @generated
59
     * @generated
60
     * @ordered
60
     * @ordered
61
     */
61
     */
62
    protected EList m_resultColumnDefinitions = null;
62
    protected EList<ColumnDefinition> m_resultColumnDefinitions;
63
63
64
    /**
64
    /**
65
     * <!-- begin-user-doc -->
65
     * <!-- begin-user-doc -->
Lines 76-81 Link Here
76
     * <!-- end-user-doc -->
76
     * <!-- end-user-doc -->
77
     * @generated
77
     * @generated
78
     */
78
     */
79
    @Override
79
    protected EClass eStaticClass()
80
    protected EClass eStaticClass()
80
    {
81
    {
81
        return DesignPackage.Literals.RESULT_SET_COLUMNS;
82
        return DesignPackage.Literals.RESULT_SET_COLUMNS;
Lines 86-96 Link Here
86
     * <!-- end-user-doc -->
87
     * <!-- end-user-doc -->
87
     * @generated
88
     * @generated
88
     */
89
     */
89
    public EList getResultColumnDefinitions()
90
    public EList<ColumnDefinition> getResultColumnDefinitions()
90
    {
91
    {
91
        if( m_resultColumnDefinitions == null )
92
        if( m_resultColumnDefinitions == null )
92
        {
93
        {
93
            m_resultColumnDefinitions = new EObjectContainmentEList(
94
            m_resultColumnDefinitions = new EObjectContainmentEList<ColumnDefinition>(
94
                    ColumnDefinition.class, this,
95
                    ColumnDefinition.class, this,
95
                    DesignPackage.RESULT_SET_COLUMNS__RESULT_COLUMN_DEFINITIONS );
96
                    DesignPackage.RESULT_SET_COLUMNS__RESULT_COLUMN_DEFINITIONS );
96
        }
97
        }
Lines 102-115 Link Here
102
     * <!-- end-user-doc -->
103
     * <!-- end-user-doc -->
103
     * @generated
104
     * @generated
104
     */
105
     */
106
    @Override
105
    public NotificationChain eInverseRemove( InternalEObject otherEnd,
107
    public NotificationChain eInverseRemove( InternalEObject otherEnd,
106
            int featureID, NotificationChain msgs )
108
            int featureID, NotificationChain msgs )
107
    {
109
    {
108
        switch( featureID )
110
        switch( featureID )
109
        {
111
        {
110
        case DesignPackage.RESULT_SET_COLUMNS__RESULT_COLUMN_DEFINITIONS:
112
        case DesignPackage.RESULT_SET_COLUMNS__RESULT_COLUMN_DEFINITIONS:
111
            return ((InternalEList) getResultColumnDefinitions()).basicRemove(
113
            return ((InternalEList<?>) getResultColumnDefinitions())
112
                    otherEnd, msgs );
114
                    .basicRemove( otherEnd, msgs );
113
        }
115
        }
114
        return super.eInverseRemove( otherEnd, featureID, msgs );
116
        return super.eInverseRemove( otherEnd, featureID, msgs );
115
    }
117
    }
Lines 119-124 Link Here
119
     * <!-- end-user-doc -->
121
     * <!-- end-user-doc -->
120
     * @generated
122
     * @generated
121
     */
123
     */
124
    @Override
122
    public Object eGet( int featureID, boolean resolve, boolean coreType )
125
    public Object eGet( int featureID, boolean resolve, boolean coreType )
123
    {
126
    {
124
        switch( featureID )
127
        switch( featureID )
Lines 134-146 Link Here
134
     * <!-- end-user-doc -->
137
     * <!-- end-user-doc -->
135
     * @generated
138
     * @generated
136
     */
139
     */
140
    @SuppressWarnings("unchecked")
141
    @Override
137
    public void eSet( int featureID, Object newValue )
142
    public void eSet( int featureID, Object newValue )
138
    {
143
    {
139
        switch( featureID )
144
        switch( featureID )
140
        {
145
        {
141
        case DesignPackage.RESULT_SET_COLUMNS__RESULT_COLUMN_DEFINITIONS:
146
        case DesignPackage.RESULT_SET_COLUMNS__RESULT_COLUMN_DEFINITIONS:
142
            getResultColumnDefinitions().clear();
147
            getResultColumnDefinitions().clear();
143
            getResultColumnDefinitions().addAll( (Collection) newValue );
148
            getResultColumnDefinitions().addAll(
149
                    (Collection<? extends ColumnDefinition>) newValue );
144
            return;
150
            return;
145
        }
151
        }
146
        super.eSet( featureID, newValue );
152
        super.eSet( featureID, newValue );
Lines 151-156 Link Here
151
     * <!-- end-user-doc -->
157
     * <!-- end-user-doc -->
152
     * @generated
158
     * @generated
153
     */
159
     */
160
    @Override
154
    public void eUnset( int featureID )
161
    public void eUnset( int featureID )
155
    {
162
    {
156
        switch( featureID )
163
        switch( featureID )
Lines 167-172 Link Here
167
     * <!-- end-user-doc -->
174
     * <!-- end-user-doc -->
168
     * @generated
175
     * @generated
169
     */
176
     */
177
    @Override
170
    public boolean eIsSet( int featureID )
178
    public boolean eIsSet( int featureID )
171
    {
179
    {
172
        switch( featureID )
180
        switch( featureID )
(-)src/org/eclipse/datatools/connectivity/oda/design/impl/ScalarValueChoicesImpl.java (-8 / +16 lines)
Lines 1-6 Link Here
1
/**
1
/**
2
 *************************************************************************
2
 *************************************************************************
3
 * Copyright (c) 2005, 2007 Actuate Corporation.
3
 * Copyright (c) 2005, 2009 Actuate Corporation.
4
 * All rights reserved. This program and the accompanying materials
4
 * All rights reserved. This program and the accompanying materials
5
 * are made available under the terms of the Eclipse Public License v1.0
5
 * are made available under the terms of the Eclipse Public License v1.0
6
 * which accompanies this distribution, and is available at
6
 * which accompanies this distribution, and is available at
Lines 49-55 Link Here
49
     * <!-- end-user-doc -->
49
     * <!-- end-user-doc -->
50
     * @generated
50
     * @generated
51
     */
51
     */
52
    public static final String copyright = "Copyright (c) 2005, 2007 Actuate Corporation"; //$NON-NLS-1$
52
    public static final String copyright = "Copyright (c) 2005, 2009 Actuate Corporation"; //$NON-NLS-1$
53
53
54
    /**
54
    /**
55
     * The cached value of the '{@link #getScalarValues() <em>Scalar Values</em>}' containment reference list.
55
     * The cached value of the '{@link #getScalarValues() <em>Scalar Values</em>}' containment reference list.
Lines 59-65 Link Here
59
     * @generated
59
     * @generated
60
     * @ordered
60
     * @ordered
61
     */
61
     */
62
    protected EList m_scalarValues = null;
62
    protected EList<ScalarValueDefinition> m_scalarValues;
63
63
64
    /**
64
    /**
65
     * <!-- begin-user-doc -->
65
     * <!-- begin-user-doc -->
Lines 76-81 Link Here
76
     * <!-- end-user-doc -->
76
     * <!-- end-user-doc -->
77
     * @generated
77
     * @generated
78
     */
78
     */
79
    @Override
79
    protected EClass eStaticClass()
80
    protected EClass eStaticClass()
80
    {
81
    {
81
        return DesignPackage.Literals.SCALAR_VALUE_CHOICES;
82
        return DesignPackage.Literals.SCALAR_VALUE_CHOICES;
Lines 86-96 Link Here
86
     * <!-- end-user-doc -->
87
     * <!-- end-user-doc -->
87
     * @generated
88
     * @generated
88
     */
89
     */
89
    public EList getScalarValues()
90
    public EList<ScalarValueDefinition> getScalarValues()
90
    {
91
    {
91
        if( m_scalarValues == null )
92
        if( m_scalarValues == null )
92
        {
93
        {
93
            m_scalarValues = new EObjectContainmentEList(
94
            m_scalarValues = new EObjectContainmentEList<ScalarValueDefinition>(
94
                    ScalarValueDefinition.class, this,
95
                    ScalarValueDefinition.class, this,
95
                    DesignPackage.SCALAR_VALUE_CHOICES__SCALAR_VALUES );
96
                    DesignPackage.SCALAR_VALUE_CHOICES__SCALAR_VALUES );
96
        }
97
        }
Lines 102-115 Link Here
102
     * <!-- end-user-doc -->
103
     * <!-- end-user-doc -->
103
     * @generated
104
     * @generated
104
     */
105
     */
106
    @Override
105
    public NotificationChain eInverseRemove( InternalEObject otherEnd,
107
    public NotificationChain eInverseRemove( InternalEObject otherEnd,
106
            int featureID, NotificationChain msgs )
108
            int featureID, NotificationChain msgs )
107
    {
109
    {
108
        switch( featureID )
110
        switch( featureID )
109
        {
111
        {
110
        case DesignPackage.SCALAR_VALUE_CHOICES__SCALAR_VALUES:
112
        case DesignPackage.SCALAR_VALUE_CHOICES__SCALAR_VALUES:
111
            return ((InternalEList) getScalarValues()).basicRemove( otherEnd,
113
            return ((InternalEList<?>) getScalarValues()).basicRemove(
112
                    msgs );
114
                    otherEnd, msgs );
113
        }
115
        }
114
        return super.eInverseRemove( otherEnd, featureID, msgs );
116
        return super.eInverseRemove( otherEnd, featureID, msgs );
115
    }
117
    }
Lines 119-124 Link Here
119
     * <!-- end-user-doc -->
121
     * <!-- end-user-doc -->
120
     * @generated
122
     * @generated
121
     */
123
     */
124
    @Override
122
    public Object eGet( int featureID, boolean resolve, boolean coreType )
125
    public Object eGet( int featureID, boolean resolve, boolean coreType )
123
    {
126
    {
124
        switch( featureID )
127
        switch( featureID )
Lines 134-146 Link Here
134
     * <!-- end-user-doc -->
137
     * <!-- end-user-doc -->
135
     * @generated
138
     * @generated
136
     */
139
     */
140
    @SuppressWarnings("unchecked")
141
    @Override
137
    public void eSet( int featureID, Object newValue )
142
    public void eSet( int featureID, Object newValue )
138
    {
143
    {
139
        switch( featureID )
144
        switch( featureID )
140
        {
145
        {
141
        case DesignPackage.SCALAR_VALUE_CHOICES__SCALAR_VALUES:
146
        case DesignPackage.SCALAR_VALUE_CHOICES__SCALAR_VALUES:
142
            getScalarValues().clear();
147
            getScalarValues().clear();
143
            getScalarValues().addAll( (Collection) newValue );
148
            getScalarValues().addAll(
149
                    (Collection<? extends ScalarValueDefinition>) newValue );
144
            return;
150
            return;
145
        }
151
        }
146
        super.eSet( featureID, newValue );
152
        super.eSet( featureID, newValue );
Lines 151-156 Link Here
151
     * <!-- end-user-doc -->
157
     * <!-- end-user-doc -->
152
     * @generated
158
     * @generated
153
     */
159
     */
160
    @Override
154
    public void eUnset( int featureID )
161
    public void eUnset( int featureID )
155
    {
162
    {
156
        switch( featureID )
163
        switch( featureID )
Lines 167-172 Link Here
167
     * <!-- end-user-doc -->
174
     * <!-- end-user-doc -->
168
     * @generated
175
     * @generated
169
     */
176
     */
177
    @Override
170
    public boolean eIsSet( int featureID )
178
    public boolean eIsSet( int featureID )
171
    {
179
    {
172
        switch( featureID )
180
        switch( featureID )
(-)src/org/eclipse/datatools/connectivity/oda/design/impl/ResultSetsImpl.java (-10 / +19 lines)
Lines 1-6 Link Here
1
/**
1
/**
2
 *************************************************************************
2
 *************************************************************************
3
 * Copyright (c) 2005, 2007 Actuate Corporation.
3
 * Copyright (c) 2005, 2009 Actuate Corporation.
4
 * All rights reserved. This program and the accompanying materials
4
 * All rights reserved. This program and the accompanying materials
5
 * are made available under the terms of the Eclipse Public License v1.0
5
 * are made available under the terms of the Eclipse Public License v1.0
6
 * which accompanies this distribution, and is available at
6
 * which accompanies this distribution, and is available at
Lines 51-57 Link Here
51
     * <!-- end-user-doc -->
51
     * <!-- end-user-doc -->
52
     * @generated
52
     * @generated
53
     */
53
     */
54
    public static final String copyright = "Copyright (c) 2005, 2007 Actuate Corporation"; //$NON-NLS-1$
54
    public static final String copyright = "Copyright (c) 2005, 2009 Actuate Corporation"; //$NON-NLS-1$
55
55
56
    /**
56
    /**
57
     * The cached value of the '{@link #getResultSetDefinitions() <em>Result Set Definitions</em>}' containment reference list.
57
     * The cached value of the '{@link #getResultSetDefinitions() <em>Result Set Definitions</em>}' containment reference list.
Lines 61-67 Link Here
61
     * @generated
61
     * @generated
62
     * @ordered
62
     * @ordered
63
     */
63
     */
64
    protected EList m_resultSetDefinitions = null;
64
    protected EList<ResultSetDefinition> m_resultSetDefinitions;
65
65
66
    /**
66
    /**
67
     * The default value of the '{@link #isDerivedMetaData() <em>Derived Meta Data</em>}' attribute.
67
     * The default value of the '{@link #isDerivedMetaData() <em>Derived Meta Data</em>}' attribute.
Lines 90-96 Link Here
90
     * @generated
90
     * @generated
91
     * @ordered
91
     * @ordered
92
     */
92
     */
93
    protected boolean m_derivedMetaDataESet = false;
93
    protected boolean m_derivedMetaDataESet;
94
94
95
    /**
95
    /**
96
     * <!-- begin-user-doc -->
96
     * <!-- begin-user-doc -->
Lines 107-112 Link Here
107
     * <!-- end-user-doc -->
107
     * <!-- end-user-doc -->
108
     * @generated
108
     * @generated
109
     */
109
     */
110
    @Override
110
    protected EClass eStaticClass()
111
    protected EClass eStaticClass()
111
    {
112
    {
112
        return DesignPackage.Literals.RESULT_SETS;
113
        return DesignPackage.Literals.RESULT_SETS;
Lines 122-131 Link Here
122
                || resultSetName.length() == 0 )
123
                || resultSetName.length() == 0 )
123
            return null;
124
            return null;
124
125
125
        EList defns = getResultSetDefinitions();
126
        EList<ResultSetDefinition> defns = getResultSetDefinitions();
126
        for( int i = 0; i < defns.size(); i++)
127
        for( int i = 0; i < defns.size(); i++)
127
        {
128
        {
128
            ResultSetDefinition defn = (ResultSetDefinition) defns.get( i );
129
            ResultSetDefinition defn = defns.get( i );
129
            if( resultSetName.equals( defn.getName() ) )
130
            if( resultSetName.equals( defn.getName() ) )
130
                return defn;
131
                return defn;
131
        }
132
        }
Lines 161-171 Link Here
161
     * <!-- end-user-doc -->
162
     * <!-- end-user-doc -->
162
     * @generated
163
     * @generated
163
     */
164
     */
164
    public EList getResultSetDefinitions()
165
    public EList<ResultSetDefinition> getResultSetDefinitions()
165
    {
166
    {
166
        if( m_resultSetDefinitions == null )
167
        if( m_resultSetDefinitions == null )
167
        {
168
        {
168
            m_resultSetDefinitions = new EObjectContainmentEList(
169
            m_resultSetDefinitions = new EObjectContainmentEList<ResultSetDefinition>(
169
                    ResultSetDefinition.class, this,
170
                    ResultSetDefinition.class, this,
170
                    DesignPackage.RESULT_SETS__RESULT_SET_DEFINITIONS );
171
                    DesignPackage.RESULT_SETS__RESULT_SET_DEFINITIONS );
171
        }
172
        }
Lines 233-245 Link Here
233
     * <!-- end-user-doc -->
234
     * <!-- end-user-doc -->
234
     * @generated
235
     * @generated
235
     */
236
     */
237
    @Override
236
    public NotificationChain eInverseRemove( InternalEObject otherEnd,
238
    public NotificationChain eInverseRemove( InternalEObject otherEnd,
237
            int featureID, NotificationChain msgs )
239
            int featureID, NotificationChain msgs )
238
    {
240
    {
239
        switch( featureID )
241
        switch( featureID )
240
        {
242
        {
241
        case DesignPackage.RESULT_SETS__RESULT_SET_DEFINITIONS:
243
        case DesignPackage.RESULT_SETS__RESULT_SET_DEFINITIONS:
242
            return ((InternalEList) getResultSetDefinitions()).basicRemove(
244
            return ((InternalEList<?>) getResultSetDefinitions()).basicRemove(
243
                    otherEnd, msgs );
245
                    otherEnd, msgs );
244
        }
246
        }
245
        return super.eInverseRemove( otherEnd, featureID, msgs );
247
        return super.eInverseRemove( otherEnd, featureID, msgs );
Lines 250-255 Link Here
250
     * <!-- end-user-doc -->
252
     * <!-- end-user-doc -->
251
     * @generated
253
     * @generated
252
     */
254
     */
255
    @Override
253
    public Object eGet( int featureID, boolean resolve, boolean coreType )
256
    public Object eGet( int featureID, boolean resolve, boolean coreType )
254
    {
257
    {
255
        switch( featureID )
258
        switch( featureID )
Lines 267-279 Link Here
267
     * <!-- end-user-doc -->
270
     * <!-- end-user-doc -->
268
     * @generated
271
     * @generated
269
     */
272
     */
273
    @SuppressWarnings("unchecked")
274
    @Override
270
    public void eSet( int featureID, Object newValue )
275
    public void eSet( int featureID, Object newValue )
271
    {
276
    {
272
        switch( featureID )
277
        switch( featureID )
273
        {
278
        {
274
        case DesignPackage.RESULT_SETS__RESULT_SET_DEFINITIONS:
279
        case DesignPackage.RESULT_SETS__RESULT_SET_DEFINITIONS:
275
            getResultSetDefinitions().clear();
280
            getResultSetDefinitions().clear();
276
            getResultSetDefinitions().addAll( (Collection) newValue );
281
            getResultSetDefinitions().addAll(
282
                    (Collection<? extends ResultSetDefinition>) newValue );
277
            return;
283
            return;
278
        case DesignPackage.RESULT_SETS__DERIVED_META_DATA:
284
        case DesignPackage.RESULT_SETS__DERIVED_META_DATA:
279
            setDerivedMetaData( ((Boolean) newValue).booleanValue() );
285
            setDerivedMetaData( ((Boolean) newValue).booleanValue() );
Lines 287-292 Link Here
287
     * <!-- end-user-doc -->
293
     * <!-- end-user-doc -->
288
     * @generated
294
     * @generated
289
     */
295
     */
296
    @Override
290
    public void eUnset( int featureID )
297
    public void eUnset( int featureID )
291
    {
298
    {
292
        switch( featureID )
299
        switch( featureID )
Lines 306-311 Link Here
306
     * <!-- end-user-doc -->
313
     * <!-- end-user-doc -->
307
     * @generated
314
     * @generated
308
     */
315
     */
316
    @Override
309
    public boolean eIsSet( int featureID )
317
    public boolean eIsSet( int featureID )
310
    {
318
    {
311
        switch( featureID )
319
        switch( featureID )
Lines 324-329 Link Here
324
     * <!-- end-user-doc -->
332
     * <!-- end-user-doc -->
325
     * @generated
333
     * @generated
326
     */
334
     */
335
    @Override
327
    public String toString()
336
    public String toString()
328
    {
337
    {
329
        if( eIsProxy() )
338
        if( eIsProxy() )
(-)src/org/eclipse/datatools/connectivity/oda/design/impl/PropertiesImpl.java (-10 / +17 lines)
Lines 1-6 Link Here
1
/**
1
/**
2
 *************************************************************************
2
 *************************************************************************
3
 * Copyright (c) 2005, 2007 Actuate Corporation.
3
 * Copyright (c) 2005, 2009 Actuate Corporation.
4
 * All rights reserved. This program and the accompanying materials
4
 * All rights reserved. This program and the accompanying materials
5
 * are made available under the terms of the Eclipse Public License v1.0
5
 * are made available under the terms of the Eclipse Public License v1.0
6
 * which accompanies this distribution, and is available at
6
 * which accompanies this distribution, and is available at
Lines 50-56 Link Here
50
     * <!-- end-user-doc -->
50
     * <!-- end-user-doc -->
51
     * @generated
51
     * @generated
52
     */
52
     */
53
    public static final String copyright = "Copyright (c) 2005, 2007 Actuate Corporation"; //$NON-NLS-1$
53
    public static final String copyright = "Copyright (c) 2005, 2009 Actuate Corporation"; //$NON-NLS-1$
54
54
55
    /**
55
    /**
56
     * The cached value of the '{@link #getProperties() <em>Properties</em>}' containment reference list.
56
     * The cached value of the '{@link #getProperties() <em>Properties</em>}' containment reference list.
Lines 60-66 Link Here
60
     * @generated
60
     * @generated
61
     * @ordered
61
     * @ordered
62
     */
62
     */
63
    protected EList m_properties = null;
63
    protected EList<Property> m_properties;
64
64
65
    /**
65
    /**
66
     * <!-- begin-user-doc -->
66
     * <!-- begin-user-doc -->
Lines 77-82 Link Here
77
     * <!-- end-user-doc -->
77
     * <!-- end-user-doc -->
78
     * @generated
78
     * @generated
79
     */
79
     */
80
    @Override
80
    protected EClass eStaticClass()
81
    protected EClass eStaticClass()
81
    {
82
    {
82
        return DesignPackage.Literals.PROPERTIES;
83
        return DesignPackage.Literals.PROPERTIES;
Lines 91-100 Link Here
91
        if( isEmpty() )
92
        if( isEmpty() )
92
            return null;
93
            return null;
93
94
94
        Iterator iter = getProperties().iterator();
95
        Iterator<Property> iter = getProperties().iterator();
95
        while( iter.hasNext() )
96
        while( iter.hasNext() )
96
        {
97
        {
97
            Property prop = (Property) iter.next();
98
            Property prop = iter.next();
98
            if( propName.equalsIgnoreCase( prop.getName() ) )
99
            if( propName.equalsIgnoreCase( prop.getName() ) )
99
                return prop; // matching property name
100
                return prop; // matching property name
100
        }
101
        }
Lines 158-169 Link Here
158
     * <!-- end-user-doc -->
159
     * <!-- end-user-doc -->
159
     * @generated
160
     * @generated
160
     */
161
     */
161
    public EList getProperties()
162
    public EList<Property> getProperties()
162
    {
163
    {
163
        if( m_properties == null )
164
        if( m_properties == null )
164
        {
165
        {
165
            m_properties = new EObjectContainmentEList( Property.class, this,
166
            m_properties = new EObjectContainmentEList<Property>(
166
                    DesignPackage.PROPERTIES__PROPERTIES );
167
                    Property.class, this, DesignPackage.PROPERTIES__PROPERTIES );
167
        }
168
        }
168
        return m_properties;
169
        return m_properties;
169
    }
170
    }
Lines 173-185 Link Here
173
     * <!-- end-user-doc -->
174
     * <!-- end-user-doc -->
174
     * @generated
175
     * @generated
175
     */
176
     */
177
    @Override
176
    public NotificationChain eInverseRemove( InternalEObject otherEnd,
178
    public NotificationChain eInverseRemove( InternalEObject otherEnd,
177
            int featureID, NotificationChain msgs )
179
            int featureID, NotificationChain msgs )
178
    {
180
    {
179
        switch( featureID )
181
        switch( featureID )
180
        {
182
        {
181
        case DesignPackage.PROPERTIES__PROPERTIES:
183
        case DesignPackage.PROPERTIES__PROPERTIES:
182
            return ((InternalEList) getProperties()).basicRemove( otherEnd,
184
            return ((InternalEList<?>) getProperties()).basicRemove( otherEnd,
183
                    msgs );
185
                    msgs );
184
        }
186
        }
185
        return super.eInverseRemove( otherEnd, featureID, msgs );
187
        return super.eInverseRemove( otherEnd, featureID, msgs );
Lines 190-195 Link Here
190
     * <!-- end-user-doc -->
192
     * <!-- end-user-doc -->
191
     * @generated
193
     * @generated
192
     */
194
     */
195
    @Override
193
    public Object eGet( int featureID, boolean resolve, boolean coreType )
196
    public Object eGet( int featureID, boolean resolve, boolean coreType )
194
    {
197
    {
195
        switch( featureID )
198
        switch( featureID )
Lines 205-217 Link Here
205
     * <!-- end-user-doc -->
208
     * <!-- end-user-doc -->
206
     * @generated
209
     * @generated
207
     */
210
     */
211
    @SuppressWarnings("unchecked")
212
    @Override
208
    public void eSet( int featureID, Object newValue )
213
    public void eSet( int featureID, Object newValue )
209
    {
214
    {
210
        switch( featureID )
215
        switch( featureID )
211
        {
216
        {
212
        case DesignPackage.PROPERTIES__PROPERTIES:
217
        case DesignPackage.PROPERTIES__PROPERTIES:
213
            getProperties().clear();
218
            getProperties().clear();
214
            getProperties().addAll( (Collection) newValue );
219
            getProperties().addAll( (Collection<? extends Property>) newValue );
215
            return;
220
            return;
216
        }
221
        }
217
        super.eSet( featureID, newValue );
222
        super.eSet( featureID, newValue );
Lines 222-227 Link Here
222
     * <!-- end-user-doc -->
227
     * <!-- end-user-doc -->
223
     * @generated
228
     * @generated
224
     */
229
     */
230
    @Override
225
    public void eUnset( int featureID )
231
    public void eUnset( int featureID )
226
    {
232
    {
227
        switch( featureID )
233
        switch( featureID )
Lines 238-243 Link Here
238
     * <!-- end-user-doc -->
244
     * <!-- end-user-doc -->
239
     * @generated
245
     * @generated
240
     */
246
     */
247
    @Override
241
    public boolean eIsSet( int featureID )
248
    public boolean eIsSet( int featureID )
242
    {
249
    {
243
        switch( featureID )
250
        switch( featureID )
(-)src/org/eclipse/datatools/connectivity/oda/design/impl/DesignerStateContentImpl.java (-2 / +8 lines)
Lines 1-6 Link Here
1
/**
1
/**
2
 *************************************************************************
2
 *************************************************************************
3
 * Copyright (c) 2005, 2007 Actuate Corporation.
3
 * Copyright (c) 2005, 2009 Actuate Corporation.
4
 * All rights reserved. This program and the accompanying materials
4
 * All rights reserved. This program and the accompanying materials
5
 * are made available under the terms of the Eclipse Public License v1.0
5
 * are made available under the terms of the Eclipse Public License v1.0
6
 * which accompanies this distribution, and is available at
6
 * which accompanies this distribution, and is available at
Lines 44-50 Link Here
44
     * <!-- end-user-doc -->
44
     * <!-- end-user-doc -->
45
     * @generated
45
     * @generated
46
     */
46
     */
47
    public static final String copyright = "Copyright (c) 2005, 2007 Actuate Corporation"; //$NON-NLS-1$
47
    public static final String copyright = "Copyright (c) 2005, 2009 Actuate Corporation"; //$NON-NLS-1$
48
48
49
    /**
49
    /**
50
     * The default value of the '{@link #getStateContentAsString() <em>State Content As String</em>}' attribute.
50
     * The default value of the '{@link #getStateContentAsString() <em>State Content As String</em>}' attribute.
Lines 101-106 Link Here
101
     * <!-- end-user-doc -->
101
     * <!-- end-user-doc -->
102
     * @generated
102
     * @generated
103
     */
103
     */
104
    @Override
104
    protected EClass eStaticClass()
105
    protected EClass eStaticClass()
105
    {
106
    {
106
        return DesignPackage.Literals.DESIGNER_STATE_CONTENT;
107
        return DesignPackage.Literals.DESIGNER_STATE_CONTENT;
Lines 189-194 Link Here
189
     * <!-- end-user-doc -->
190
     * <!-- end-user-doc -->
190
     * @generated
191
     * @generated
191
     */
192
     */
193
    @Override
192
    public Object eGet( int featureID, boolean resolve, boolean coreType )
194
    public Object eGet( int featureID, boolean resolve, boolean coreType )
193
    {
195
    {
194
        switch( featureID )
196
        switch( featureID )
Lines 206-211 Link Here
206
     * <!-- end-user-doc -->
208
     * <!-- end-user-doc -->
207
     * @generated
209
     * @generated
208
     */
210
     */
211
    @Override
209
    public void eSet( int featureID, Object newValue )
212
    public void eSet( int featureID, Object newValue )
210
    {
213
    {
211
        switch( featureID )
214
        switch( featureID )
Lines 225-230 Link Here
225
     * <!-- end-user-doc -->
228
     * <!-- end-user-doc -->
226
     * @generated
229
     * @generated
227
     */
230
     */
231
    @Override
228
    public void eUnset( int featureID )
232
    public void eUnset( int featureID )
229
    {
233
    {
230
        switch( featureID )
234
        switch( featureID )
Lines 244-249 Link Here
244
     * <!-- end-user-doc -->
248
     * <!-- end-user-doc -->
245
     * @generated
249
     * @generated
246
     */
250
     */
251
    @Override
247
    public boolean eIsSet( int featureID )
252
    public boolean eIsSet( int featureID )
248
    {
253
    {
249
        switch( featureID )
254
        switch( featureID )
Lines 265-270 Link Here
265
     * <!-- end-user-doc -->
270
     * <!-- end-user-doc -->
266
     * @generated
271
     * @generated
267
     */
272
     */
273
    @Override
268
    public String toString()
274
    public String toString()
269
    {
275
    {
270
        if( eIsProxy() )
276
        if( eIsProxy() )
(-)src/org/eclipse/datatools/connectivity/oda/design/impl/ResourceIdentifiersImpl.java (-7 / +13 lines)
Lines 1-6 Link Here
1
/**
1
/**
2
 *************************************************************************
2
 *************************************************************************
3
 * Copyright (c) 2008 Actuate Corporation.
3
 * Copyright (c) 2008, 2009 Actuate Corporation.
4
 * All rights reserved. This program and the accompanying materials
4
 * All rights reserved. This program and the accompanying materials
5
 * are made available under the terms of the Eclipse Public License v1.0
5
 * are made available under the terms of the Eclipse Public License v1.0
6
 * which accompanies this distribution, and is available at
6
 * which accompanies this distribution, and is available at
Lines 41-47 Link Here
41
 * </p>
41
 * </p>
42
 *
42
 *
43
 * @generated
43
 * @generated
44
 * @since DTP 1.6.1
44
 * @since DTP 1.7
45
 */
45
 */
46
public class ResourceIdentifiersImpl extends EObjectImpl implements
46
public class ResourceIdentifiersImpl extends EObjectImpl implements
47
        ResourceIdentifiers
47
        ResourceIdentifiers
Lines 51-57 Link Here
51
     * <!-- end-user-doc -->
51
     * <!-- end-user-doc -->
52
     * @generated
52
     * @generated
53
     */
53
     */
54
    public static final String copyright = "Copyright (c) 2008 Actuate Corporation"; //$NON-NLS-1$
54
    public static final String copyright = "Copyright (c) 2008, 2009 Actuate Corporation"; //$NON-NLS-1$
55
55
56
    /**
56
    /**
57
     * The default value of the '{@link #getApplResourceBaseURIString() <em>Appl Resource Base URI String</em>}' attribute.
57
     * The default value of the '{@link #getApplResourceBaseURIString() <em>Appl Resource Base URI String</em>}' attribute.
Lines 108-113 Link Here
108
     * <!-- end-user-doc -->
108
     * <!-- end-user-doc -->
109
     * @generated
109
     * @generated
110
     */
110
     */
111
    @Override
111
    protected EClass eStaticClass()
112
    protected EClass eStaticClass()
112
    {
113
    {
113
        return DesignPackage.Literals.RESOURCE_IDENTIFIERS;
114
        return DesignPackage.Literals.RESOURCE_IDENTIFIERS;
Lines 128-135 Link Here
128
     */
129
     */
129
    public void setApplResourceBaseURI( URI baseURI )
130
    public void setApplResourceBaseURI( URI baseURI )
130
    {
131
    {
131
        String baseURIString = ( baseURI != null ) ? baseURI.toString() : null;
132
        String baseURIString = (baseURI != null) ? baseURI.toString() : null;
132
        setApplResourceBaseURIString( baseURIString );        
133
        setApplResourceBaseURIString( baseURIString );
133
    }
134
    }
134
135
135
    /**
136
    /**
Lines 175-181 Link Here
175
     */
176
     */
176
    public void setDesignResourceBaseURI( URI baseURI )
177
    public void setDesignResourceBaseURI( URI baseURI )
177
    {
178
    {
178
        String baseURIString = ( baseURI != null ) ? baseURI.toString() : null;
179
        String baseURIString = (baseURI != null) ? baseURI.toString() : null;
179
        setDesignResourceBaseURIString( baseURIString );
180
        setDesignResourceBaseURIString( baseURIString );
180
    }
181
    }
181
182
Lines 213-218 Link Here
213
     * <!-- end-user-doc -->
214
     * <!-- end-user-doc -->
214
     * @generated
215
     * @generated
215
     */
216
     */
217
    @Override
216
    public Object eGet( int featureID, boolean resolve, boolean coreType )
218
    public Object eGet( int featureID, boolean resolve, boolean coreType )
217
    {
219
    {
218
        switch( featureID )
220
        switch( featureID )
Lines 230-235 Link Here
230
     * <!-- end-user-doc -->
232
     * <!-- end-user-doc -->
231
     * @generated
233
     * @generated
232
     */
234
     */
235
    @Override
233
    public void eSet( int featureID, Object newValue )
236
    public void eSet( int featureID, Object newValue )
234
    {
237
    {
235
        switch( featureID )
238
        switch( featureID )
Lines 249-254 Link Here
249
     * <!-- end-user-doc -->
252
     * <!-- end-user-doc -->
250
     * @generated
253
     * @generated
251
     */
254
     */
255
    @Override
252
    public void eUnset( int featureID )
256
    public void eUnset( int featureID )
253
    {
257
    {
254
        switch( featureID )
258
        switch( featureID )
Lines 268-273 Link Here
268
     * <!-- end-user-doc -->
272
     * <!-- end-user-doc -->
269
     * @generated
273
     * @generated
270
     */
274
     */
275
    @Override
271
    public boolean eIsSet( int featureID )
276
    public boolean eIsSet( int featureID )
272
    {
277
    {
273
        switch( featureID )
278
        switch( featureID )
Lines 289-294 Link Here
289
     * <!-- end-user-doc -->
294
     * <!-- end-user-doc -->
290
     * @generated
295
     * @generated
291
     */
296
     */
297
    @Override
292
    public String toString()
298
    public String toString()
293
    {
299
    {
294
        if( eIsProxy() )
300
        if( eIsProxy() )
Lines 322-326 Link Here
322
328
323
        return null;
329
        return null;
324
    }
330
    }
325
    
331
326
} //ResourceIdentifiersImpl
332
} //ResourceIdentifiersImpl
(-)src/org/eclipse/datatools/connectivity/oda/design/impl/DesignSessionResponseImpl.java (-5 / +12 lines)
Lines 1-6 Link Here
1
/**
1
/**
2
 *************************************************************************
2
 *************************************************************************
3
 * Copyright (c) 2005, 2007 Actuate Corporation.
3
 * Copyright (c) 2005, 2009 Actuate Corporation.
4
 * All rights reserved. This program and the accompanying materials
4
 * All rights reserved. This program and the accompanying materials
5
 * are made available under the terms of the Eclipse Public License v1.0
5
 * are made available under the terms of the Eclipse Public License v1.0
6
 * which accompanies this distribution, and is available at
6
 * which accompanies this distribution, and is available at
Lines 53-59 Link Here
53
     * <!-- end-user-doc -->
53
     * <!-- end-user-doc -->
54
     * @generated
54
     * @generated
55
     */
55
     */
56
    public static final String copyright = "Copyright (c) 2005, 2007 Actuate Corporation"; //$NON-NLS-1$
56
    public static final String copyright = "Copyright (c) 2005, 2009 Actuate Corporation"; //$NON-NLS-1$
57
57
58
    /**
58
    /**
59
     * The default value of the '{@link #getSessionStatus() <em>Session Status</em>}' attribute.
59
     * The default value of the '{@link #getSessionStatus() <em>Session Status</em>}' attribute.
Lines 82-88 Link Here
82
     * @generated
82
     * @generated
83
     * @ordered
83
     * @ordered
84
     */
84
     */
85
    protected boolean m_sessionStatusESet = false;
85
    protected boolean m_sessionStatusESet;
86
86
87
    /**
87
    /**
88
     * The cached value of the '{@link #getDataAccessDesign() <em>Data Access Design</em>}' containment reference.
88
     * The cached value of the '{@link #getDataAccessDesign() <em>Data Access Design</em>}' containment reference.
Lines 92-98 Link Here
92
     * @generated
92
     * @generated
93
     * @ordered
93
     * @ordered
94
     */
94
     */
95
    protected DataAccessDesign m_dataAccessDesign = null;
95
    protected DataAccessDesign m_dataAccessDesign;
96
96
97
    /**
97
    /**
98
     * The cached value of the '{@link #getDesignerState() <em>Designer State</em>}' containment reference.
98
     * The cached value of the '{@link #getDesignerState() <em>Designer State</em>}' containment reference.
Lines 102-108 Link Here
102
     * @generated
102
     * @generated
103
     * @ordered
103
     * @ordered
104
     */
104
     */
105
    protected DesignerState m_designerState = null;
105
    protected DesignerState m_designerState;
106
106
107
    /**
107
    /**
108
     * <!-- begin-user-doc -->
108
     * <!-- begin-user-doc -->
Lines 119-124 Link Here
119
     * <!-- end-user-doc -->
119
     * <!-- end-user-doc -->
120
     * @generated
120
     * @generated
121
     */
121
     */
122
    @Override
122
    protected EClass eStaticClass()
123
    protected EClass eStaticClass()
123
    {
124
    {
124
        return DesignPackage.Literals.DESIGN_SESSION_RESPONSE;
125
        return DesignPackage.Literals.DESIGN_SESSION_RESPONSE;
Lines 358-363 Link Here
358
     * <!-- end-user-doc -->
359
     * <!-- end-user-doc -->
359
     * @generated
360
     * @generated
360
     */
361
     */
362
    @Override
361
    public NotificationChain eInverseRemove( InternalEObject otherEnd,
363
    public NotificationChain eInverseRemove( InternalEObject otherEnd,
362
            int featureID, NotificationChain msgs )
364
            int featureID, NotificationChain msgs )
363
    {
365
    {
Lines 376-381 Link Here
376
     * <!-- end-user-doc -->
378
     * <!-- end-user-doc -->
377
     * @generated
379
     * @generated
378
     */
380
     */
381
    @Override
379
    public Object eGet( int featureID, boolean resolve, boolean coreType )
382
    public Object eGet( int featureID, boolean resolve, boolean coreType )
380
    {
383
    {
381
        switch( featureID )
384
        switch( featureID )
Lines 395-400 Link Here
395
     * <!-- end-user-doc -->
398
     * <!-- end-user-doc -->
396
     * @generated
399
     * @generated
397
     */
400
     */
401
    @Override
398
    public void eSet( int featureID, Object newValue )
402
    public void eSet( int featureID, Object newValue )
399
    {
403
    {
400
        switch( featureID )
404
        switch( featureID )
Lines 417-422 Link Here
417
     * <!-- end-user-doc -->
421
     * <!-- end-user-doc -->
418
     * @generated
422
     * @generated
419
     */
423
     */
424
    @Override
420
    public void eUnset( int featureID )
425
    public void eUnset( int featureID )
421
    {
426
    {
422
        switch( featureID )
427
        switch( featureID )
Lines 439-444 Link Here
439
     * <!-- end-user-doc -->
444
     * <!-- end-user-doc -->
440
     * @generated
445
     * @generated
441
     */
446
     */
447
    @Override
442
    public boolean eIsSet( int featureID )
448
    public boolean eIsSet( int featureID )
443
    {
449
    {
444
        switch( featureID )
450
        switch( featureID )
Lines 458-463 Link Here
458
     * <!-- end-user-doc -->
464
     * <!-- end-user-doc -->
459
     * @generated
465
     * @generated
460
     */
466
     */
467
    @Override
461
    public String toString()
468
    public String toString()
462
    {
469
    {
463
        if( eIsProxy() )
470
        if( eIsProxy() )
(-)src/org/eclipse/datatools/connectivity/oda/design/impl/InputParameterAttributesImpl.java (-4 / +10 lines)
Lines 1-6 Link Here
1
/**
1
/**
2
 *************************************************************************
2
 *************************************************************************
3
 * Copyright (c) 2005, 2007 Actuate Corporation.
3
 * Copyright (c) 2005, 2009 Actuate Corporation.
4
 * All rights reserved. This program and the accompanying materials
4
 * All rights reserved. This program and the accompanying materials
5
 * are made available under the terms of the Eclipse Public License v1.0
5
 * are made available under the terms of the Eclipse Public License v1.0
6
 * which accompanies this distribution, and is available at
6
 * which accompanies this distribution, and is available at
Lines 49-55 Link Here
49
     * <!-- end-user-doc -->
49
     * <!-- end-user-doc -->
50
     * @generated
50
     * @generated
51
     */
51
     */
52
    public static final String copyright = "Copyright (c) 2005, 2007 Actuate Corporation"; //$NON-NLS-1$
52
    public static final String copyright = "Copyright (c) 2005, 2009 Actuate Corporation"; //$NON-NLS-1$
53
53
54
    /**
54
    /**
55
     * The cached value of the '{@link #getElementAttributes() <em>Element Attributes</em>}' containment reference.
55
     * The cached value of the '{@link #getElementAttributes() <em>Element Attributes</em>}' containment reference.
Lines 59-65 Link Here
59
     * @generated
59
     * @generated
60
     * @ordered
60
     * @ordered
61
     */
61
     */
62
    protected InputElementAttributes m_elementAttributes = null;
62
    protected InputElementAttributes m_elementAttributes;
63
63
64
    /**
64
    /**
65
     * The cached value of the '{@link #getUiHints() <em>Ui Hints</em>}' containment reference.
65
     * The cached value of the '{@link #getUiHints() <em>Ui Hints</em>}' containment reference.
Lines 69-75 Link Here
69
     * @generated
69
     * @generated
70
     * @ordered
70
     * @ordered
71
     */
71
     */
72
    protected InputParameterUIHints m_uiHints = null;
72
    protected InputParameterUIHints m_uiHints;
73
73
74
    /**
74
    /**
75
     * <!-- begin-user-doc -->
75
     * <!-- begin-user-doc -->
Lines 86-91 Link Here
86
     * <!-- end-user-doc -->
86
     * <!-- end-user-doc -->
87
     * @generated
87
     * @generated
88
     */
88
     */
89
    @Override
89
    protected EClass eStaticClass()
90
    protected EClass eStaticClass()
90
    {
91
    {
91
        return DesignPackage.Literals.INPUT_PARAMETER_ATTRIBUTES;
92
        return DesignPackage.Literals.INPUT_PARAMETER_ATTRIBUTES;
Lines 254-259 Link Here
254
     * <!-- end-user-doc -->
255
     * <!-- end-user-doc -->
255
     * @generated
256
     * @generated
256
     */
257
     */
258
    @Override
257
    public NotificationChain eInverseRemove( InternalEObject otherEnd,
259
    public NotificationChain eInverseRemove( InternalEObject otherEnd,
258
            int featureID, NotificationChain msgs )
260
            int featureID, NotificationChain msgs )
259
    {
261
    {
Lines 272-277 Link Here
272
     * <!-- end-user-doc -->
274
     * <!-- end-user-doc -->
273
     * @generated
275
     * @generated
274
     */
276
     */
277
    @Override
275
    public Object eGet( int featureID, boolean resolve, boolean coreType )
278
    public Object eGet( int featureID, boolean resolve, boolean coreType )
276
    {
279
    {
277
        switch( featureID )
280
        switch( featureID )
Lines 289-294 Link Here
289
     * <!-- end-user-doc -->
292
     * <!-- end-user-doc -->
290
     * @generated
293
     * @generated
291
     */
294
     */
295
    @Override
292
    public void eSet( int featureID, Object newValue )
296
    public void eSet( int featureID, Object newValue )
293
    {
297
    {
294
        switch( featureID )
298
        switch( featureID )
Lines 308-313 Link Here
308
     * <!-- end-user-doc -->
312
     * <!-- end-user-doc -->
309
     * @generated
313
     * @generated
310
     */
314
     */
315
    @Override
311
    public void eUnset( int featureID )
316
    public void eUnset( int featureID )
312
    {
317
    {
313
        switch( featureID )
318
        switch( featureID )
Lines 327-332 Link Here
327
     * <!-- end-user-doc -->
332
     * <!-- end-user-doc -->
328
     * @generated
333
     * @generated
329
     */
334
     */
335
    @Override
330
    public boolean eIsSet( int featureID )
336
    public boolean eIsSet( int featureID )
331
    {
337
    {
332
        switch( featureID )
338
        switch( featureID )
(-)src/org/eclipse/datatools/connectivity/oda/design/impl/AxisAttributesImpl.java (-4 / +10 lines)
Lines 1-6 Link Here
1
/**
1
/**
2
 *************************************************************************
2
 *************************************************************************
3
 * Copyright (c) 2005, 2007 Actuate Corporation.
3
 * Copyright (c) 2005, 2009 Actuate Corporation.
4
 * All rights reserved. This program and the accompanying materials
4
 * All rights reserved. This program and the accompanying materials
5
 * are made available under the terms of the Eclipse Public License v1.0
5
 * are made available under the terms of the Eclipse Public License v1.0
6
 * which accompanies this distribution, and is available at
6
 * which accompanies this distribution, and is available at
Lines 44-50 Link Here
44
     * <!-- end-user-doc -->
44
     * <!-- end-user-doc -->
45
     * @generated
45
     * @generated
46
     */
46
     */
47
    public static final String copyright = "Copyright (c) 2005, 2007 Actuate Corporation"; //$NON-NLS-1$
47
    public static final String copyright = "Copyright (c) 2005, 2009 Actuate Corporation"; //$NON-NLS-1$
48
48
49
    /**
49
    /**
50
     * The default value of the '{@link #getAxisType() <em>Axis Type</em>}' attribute.
50
     * The default value of the '{@link #getAxisType() <em>Axis Type</em>}' attribute.
Lines 73-79 Link Here
73
     * @generated
73
     * @generated
74
     * @ordered
74
     * @ordered
75
     */
75
     */
76
    protected boolean m_axisTypeESet = false;
76
    protected boolean m_axisTypeESet;
77
77
78
    /**
78
    /**
79
     * The default value of the '{@link #isOnColumnLayout() <em>On Column Layout</em>}' attribute.
79
     * The default value of the '{@link #isOnColumnLayout() <em>On Column Layout</em>}' attribute.
Lines 102-108 Link Here
102
     * @generated
102
     * @generated
103
     * @ordered
103
     * @ordered
104
     */
104
     */
105
    protected boolean m_onColumnLayoutESet = false;
105
    protected boolean m_onColumnLayoutESet;
106
106
107
    /**
107
    /**
108
     * <!-- begin-user-doc -->
108
     * <!-- begin-user-doc -->
Lines 119-124 Link Here
119
     * <!-- end-user-doc -->
119
     * <!-- end-user-doc -->
120
     * @generated
120
     * @generated
121
     */
121
     */
122
    @Override
122
    protected EClass eStaticClass()
123
    protected EClass eStaticClass()
123
    {
124
    {
124
        return DesignPackage.Literals.AXIS_ATTRIBUTES;
125
        return DesignPackage.Literals.AXIS_ATTRIBUTES;
Lines 238-243 Link Here
238
     * <!-- end-user-doc -->
239
     * <!-- end-user-doc -->
239
     * @generated
240
     * @generated
240
     */
241
     */
242
    @Override
241
    public Object eGet( int featureID, boolean resolve, boolean coreType )
243
    public Object eGet( int featureID, boolean resolve, boolean coreType )
242
    {
244
    {
243
        switch( featureID )
245
        switch( featureID )
Lines 255-260 Link Here
255
     * <!-- end-user-doc -->
257
     * <!-- end-user-doc -->
256
     * @generated
258
     * @generated
257
     */
259
     */
260
    @Override
258
    public void eSet( int featureID, Object newValue )
261
    public void eSet( int featureID, Object newValue )
259
    {
262
    {
260
        switch( featureID )
263
        switch( featureID )
Lines 274-279 Link Here
274
     * <!-- end-user-doc -->
277
     * <!-- end-user-doc -->
275
     * @generated
278
     * @generated
276
     */
279
     */
280
    @Override
277
    public void eUnset( int featureID )
281
    public void eUnset( int featureID )
278
    {
282
    {
279
        switch( featureID )
283
        switch( featureID )
Lines 293-298 Link Here
293
     * <!-- end-user-doc -->
297
     * <!-- end-user-doc -->
294
     * @generated
298
     * @generated
295
     */
299
     */
300
    @Override
296
    public boolean eIsSet( int featureID )
301
    public boolean eIsSet( int featureID )
297
    {
302
    {
298
        switch( featureID )
303
        switch( featureID )
Lines 310-315 Link Here
310
     * <!-- end-user-doc -->
315
     * <!-- end-user-doc -->
311
     * @generated
316
     * @generated
312
     */
317
     */
318
    @Override
313
    public String toString()
319
    public String toString()
314
    {
320
    {
315
        if( eIsProxy() )
321
        if( eIsProxy() )
(-)src/org/eclipse/datatools/connectivity/oda/design/impl/OdaDesignSessionImpl.java (-6 / +12 lines)
Lines 1-6 Link Here
1
/**
1
/**
2
 *************************************************************************
2
 *************************************************************************
3
 * Copyright (c) 2005, 2007 Actuate Corporation.
3
 * Copyright (c) 2005, 2009 Actuate Corporation.
4
 * All rights reserved. This program and the accompanying materials
4
 * All rights reserved. This program and the accompanying materials
5
 * are made available under the terms of the Eclipse Public License v1.0
5
 * are made available under the terms of the Eclipse Public License v1.0
6
 * which accompanies this distribution, and is available at
6
 * which accompanies this distribution, and is available at
Lines 53-59 Link Here
53
     * <!-- end-user-doc -->
53
     * <!-- end-user-doc -->
54
     * @generated
54
     * @generated
55
     */
55
     */
56
    public static final String copyright = "Copyright (c) 2005, 2007 Actuate Corporation"; //$NON-NLS-1$
56
    public static final String copyright = "Copyright (c) 2005, 2009 Actuate Corporation"; //$NON-NLS-1$
57
57
58
    /**
58
    /**
59
     * The cached value of the '{@link #getRequest() <em>Request</em>}' containment reference.
59
     * The cached value of the '{@link #getRequest() <em>Request</em>}' containment reference.
Lines 63-69 Link Here
63
     * @generated
63
     * @generated
64
     * @ordered
64
     * @ordered
65
     */
65
     */
66
    protected DesignSessionRequest m_request = null;
66
    protected DesignSessionRequest m_request;
67
67
68
    /**
68
    /**
69
     * The cached value of the '{@link #getResponse() <em>Response</em>}' containment reference.
69
     * The cached value of the '{@link #getResponse() <em>Response</em>}' containment reference.
Lines 73-79 Link Here
73
     * @generated
73
     * @generated
74
     * @ordered
74
     * @ordered
75
     */
75
     */
76
    protected DesignSessionResponse m_response = null;
76
    protected DesignSessionResponse m_response;
77
77
78
    /**
78
    /**
79
     * <!-- begin-user-doc -->
79
     * <!-- begin-user-doc -->
Lines 90-95 Link Here
90
     * <!-- end-user-doc -->
90
     * <!-- end-user-doc -->
91
     * @generated
91
     * @generated
92
     */
92
     */
93
    @Override
93
    protected EClass eStaticClass()
94
    protected EClass eStaticClass()
94
    {
95
    {
95
        return DesignPackage.Literals.ODA_DESIGN_SESSION;
96
        return DesignPackage.Literals.ODA_DESIGN_SESSION;
Lines 107-113 Link Here
107
108
108
        setRequest( newRequest );
109
        setRequest( newRequest );
109
    }
110
    }
110
    
111
111
    /*
112
    /*
112
     * (non-Javadoc)
113
     * (non-Javadoc)
113
     * @see org.eclipse.datatools.connectivity.oda.design.OdaDesignSession#setNewRequest(org.eclipse.datatools.connectivity.oda.design.DataSetDesign)
114
     * @see org.eclipse.datatools.connectivity.oda.design.OdaDesignSession#setNewRequest(org.eclipse.datatools.connectivity.oda.design.DataSetDesign)
Lines 116-122 Link Here
116
    public void setNewRequest( DataSetDesign dataSetDesign )
117
    public void setNewRequest( DataSetDesign dataSetDesign )
117
    {
118
    {
118
        DesignSessionRequest newRequest = DesignFactory.eINSTANCE
119
        DesignSessionRequest newRequest = DesignFactory.eINSTANCE
119
                                            .createDesignSessionRequest();
120
                .createDesignSessionRequest();
120
        newRequest.setNewDataAccessDesign( dataSetDesign );
121
        newRequest.setNewDataAccessDesign( dataSetDesign );
121
122
122
        setRequest( newRequest );
123
        setRequest( newRequest );
Lines 356-361 Link Here
356
     * <!-- end-user-doc -->
357
     * <!-- end-user-doc -->
357
     * @generated
358
     * @generated
358
     */
359
     */
360
    @Override
359
    public NotificationChain eInverseRemove( InternalEObject otherEnd,
361
    public NotificationChain eInverseRemove( InternalEObject otherEnd,
360
            int featureID, NotificationChain msgs )
362
            int featureID, NotificationChain msgs )
361
    {
363
    {
Lines 374-379 Link Here
374
     * <!-- end-user-doc -->
376
     * <!-- end-user-doc -->
375
     * @generated
377
     * @generated
376
     */
378
     */
379
    @Override
377
    public Object eGet( int featureID, boolean resolve, boolean coreType )
380
    public Object eGet( int featureID, boolean resolve, boolean coreType )
378
    {
381
    {
379
        switch( featureID )
382
        switch( featureID )
Lines 391-396 Link Here
391
     * <!-- end-user-doc -->
394
     * <!-- end-user-doc -->
392
     * @generated
395
     * @generated
393
     */
396
     */
397
    @Override
394
    public void eSet( int featureID, Object newValue )
398
    public void eSet( int featureID, Object newValue )
395
    {
399
    {
396
        switch( featureID )
400
        switch( featureID )
Lines 410-415 Link Here
410
     * <!-- end-user-doc -->
414
     * <!-- end-user-doc -->
411
     * @generated
415
     * @generated
412
     */
416
     */
417
    @Override
413
    public void eUnset( int featureID )
418
    public void eUnset( int featureID )
414
    {
419
    {
415
        switch( featureID )
420
        switch( featureID )
Lines 429-434 Link Here
429
     * <!-- end-user-doc -->
434
     * <!-- end-user-doc -->
430
     * @generated
435
     * @generated
431
     */
436
     */
437
    @Override
432
    public boolean eIsSet( int featureID )
438
    public boolean eIsSet( int featureID )
433
    {
439
    {
434
        switch( featureID )
440
        switch( featureID )
(-)src/org/eclipse/datatools/connectivity/oda/design/impl/DataAccessDesignImpl.java (-3 / +9 lines)
Lines 1-6 Link Here
1
/**
1
/**
2
 *************************************************************************
2
 *************************************************************************
3
 * Copyright (c) 2005, 2007 Actuate Corporation.
3
 * Copyright (c) 2005, 2009 Actuate Corporation.
4
 * All rights reserved. This program and the accompanying materials
4
 * All rights reserved. This program and the accompanying materials
5
 * are made available under the terms of the Eclipse Public License v1.0
5
 * are made available under the terms of the Eclipse Public License v1.0
6
 * which accompanies this distribution, and is available at
6
 * which accompanies this distribution, and is available at
Lines 48-54 Link Here
48
     * <!-- end-user-doc -->
48
     * <!-- end-user-doc -->
49
     * @generated
49
     * @generated
50
     */
50
     */
51
    public static final String copyright = "Copyright (c) 2005, 2007 Actuate Corporation"; //$NON-NLS-1$
51
    public static final String copyright = "Copyright (c) 2005, 2009 Actuate Corporation"; //$NON-NLS-1$
52
52
53
    /**
53
    /**
54
     * @generated NOT
54
     * @generated NOT
Lines 63-69 Link Here
63
     * @generated
63
     * @generated
64
     * @ordered
64
     * @ordered
65
     */
65
     */
66
    protected DataSetDesign m_dataSetDesign = null;
66
    protected DataSetDesign m_dataSetDesign;
67
67
68
    /**
68
    /**
69
     * <!-- begin-user-doc -->
69
     * <!-- begin-user-doc -->
Lines 80-85 Link Here
80
     * <!-- end-user-doc -->
80
     * <!-- end-user-doc -->
81
     * @generated
81
     * @generated
82
     */
82
     */
83
    @Override
83
    protected EClass eStaticClass()
84
    protected EClass eStaticClass()
84
    {
85
    {
85
        return DesignPackage.Literals.DATA_ACCESS_DESIGN;
86
        return DesignPackage.Literals.DATA_ACCESS_DESIGN;
Lines 201-206 Link Here
201
     * <!-- end-user-doc -->
202
     * <!-- end-user-doc -->
202
     * @generated
203
     * @generated
203
     */
204
     */
205
    @Override
204
    public NotificationChain eInverseRemove( InternalEObject otherEnd,
206
    public NotificationChain eInverseRemove( InternalEObject otherEnd,
205
            int featureID, NotificationChain msgs )
207
            int featureID, NotificationChain msgs )
206
    {
208
    {
Lines 217-222 Link Here
217
     * <!-- end-user-doc -->
219
     * <!-- end-user-doc -->
218
     * @generated
220
     * @generated
219
     */
221
     */
222
    @Override
220
    public Object eGet( int featureID, boolean resolve, boolean coreType )
223
    public Object eGet( int featureID, boolean resolve, boolean coreType )
221
    {
224
    {
222
        switch( featureID )
225
        switch( featureID )
Lines 232-237 Link Here
232
     * <!-- end-user-doc -->
235
     * <!-- end-user-doc -->
233
     * @generated
236
     * @generated
234
     */
237
     */
238
    @Override
235
    public void eSet( int featureID, Object newValue )
239
    public void eSet( int featureID, Object newValue )
236
    {
240
    {
237
        switch( featureID )
241
        switch( featureID )
Lines 248-253 Link Here
248
     * <!-- end-user-doc -->
252
     * <!-- end-user-doc -->
249
     * @generated
253
     * @generated
250
     */
254
     */
255
    @Override
251
    public void eUnset( int featureID )
256
    public void eUnset( int featureID )
252
    {
257
    {
253
        switch( featureID )
258
        switch( featureID )
Lines 264-269 Link Here
264
     * <!-- end-user-doc -->
269
     * <!-- end-user-doc -->
265
     * @generated
270
     * @generated
266
     */
271
     */
272
    @Override
267
    public boolean eIsSet( int featureID )
273
    public boolean eIsSet( int featureID )
268
    {
274
    {
269
        switch( featureID )
275
        switch( featureID )
(-)src/org/eclipse/datatools/connectivity/oda/design/impl/CustomFilterExpressionImpl.java (-1 lines)
Lines 54-60 Link Here
54
     * <!-- end-user-doc -->
54
     * <!-- end-user-doc -->
55
     * @generated
55
     * @generated
56
     */
56
     */
57
    @SuppressWarnings("hiding")
58
    public static final String copyright = "Copyright (c) 2009 Actuate Corporation"; //$NON-NLS-1$
57
    public static final String copyright = "Copyright (c) 2009 Actuate Corporation"; //$NON-NLS-1$
59
58
60
    /**
59
    /**
(-)src/org/eclipse/datatools/connectivity/oda/design/impl/DesignSessionRequestImpl.java (-6 / +13 lines)
Lines 1-6 Link Here
1
/**
1
/**
2
 *************************************************************************
2
 *************************************************************************
3
 * Copyright (c) 2005, 2007 Actuate Corporation.
3
 * Copyright (c) 2005, 2009 Actuate Corporation.
4
 * All rights reserved. This program and the accompanying materials
4
 * All rights reserved. This program and the accompanying materials
5
 * are made available under the terms of the Eclipse Public License v1.0
5
 * are made available under the terms of the Eclipse Public License v1.0
6
 * which accompanies this distribution, and is available at
6
 * which accompanies this distribution, and is available at
Lines 56-62 Link Here
56
     * <!-- end-user-doc -->
56
     * <!-- end-user-doc -->
57
     * @generated
57
     * @generated
58
     */
58
     */
59
    public static final String copyright = "Copyright (c) 2005, 2007 Actuate Corporation"; //$NON-NLS-1$
59
    public static final String copyright = "Copyright (c) 2005, 2009 Actuate Corporation"; //$NON-NLS-1$
60
60
61
    /**
61
    /**
62
     * The cached value of the '{@link #getDataAccessDesign() <em>Data Access Design</em>}' containment reference.
62
     * The cached value of the '{@link #getDataAccessDesign() <em>Data Access Design</em>}' containment reference.
Lines 66-72 Link Here
66
     * @generated
66
     * @generated
67
     * @ordered
67
     * @ordered
68
     */
68
     */
69
    protected DataAccessDesign m_dataAccessDesign = null;
69
    protected DataAccessDesign m_dataAccessDesign;
70
70
71
    /**
71
    /**
72
     * The default value of the '{@link #isEditable() <em>Editable</em>}' attribute.
72
     * The default value of the '{@link #isEditable() <em>Editable</em>}' attribute.
Lines 95-101 Link Here
95
     * @generated
95
     * @generated
96
     * @ordered
96
     * @ordered
97
     */
97
     */
98
    protected boolean m_editableESet = false;
98
    protected boolean m_editableESet;
99
99
100
    /**
100
    /**
101
     * The cached value of the '{@link #getSessionLocale() <em>Session Locale</em>}' containment reference.
101
     * The cached value of the '{@link #getSessionLocale() <em>Session Locale</em>}' containment reference.
Lines 105-111 Link Here
105
     * @generated
105
     * @generated
106
     * @ordered
106
     * @ordered
107
     */
107
     */
108
    protected Locale m_sessionLocale = null;
108
    protected Locale m_sessionLocale;
109
109
110
    /**
110
    /**
111
     * The cached value of the '{@link #getDesignerState() <em>Designer State</em>}' containment reference.
111
     * The cached value of the '{@link #getDesignerState() <em>Designer State</em>}' containment reference.
Lines 115-121 Link Here
115
     * @generated
115
     * @generated
116
     * @ordered
116
     * @ordered
117
     */
117
     */
118
    protected DesignerState m_designerState = null;
118
    protected DesignerState m_designerState;
119
119
120
    /**
120
    /**
121
     * <!-- begin-user-doc -->
121
     * <!-- begin-user-doc -->
Lines 132-137 Link Here
132
     * <!-- end-user-doc -->
132
     * <!-- end-user-doc -->
133
     * @generated
133
     * @generated
134
     */
134
     */
135
    @Override
135
    protected EClass eStaticClass()
136
    protected EClass eStaticClass()
136
    {
137
    {
137
        return DesignPackage.Literals.DESIGN_SESSION_REQUEST;
138
        return DesignPackage.Literals.DESIGN_SESSION_REQUEST;
Lines 470-475 Link Here
470
     * <!-- end-user-doc -->
471
     * <!-- end-user-doc -->
471
     * @generated
472
     * @generated
472
     */
473
     */
474
    @Override
473
    public NotificationChain eInverseRemove( InternalEObject otherEnd,
475
    public NotificationChain eInverseRemove( InternalEObject otherEnd,
474
            int featureID, NotificationChain msgs )
476
            int featureID, NotificationChain msgs )
475
    {
477
    {
Lines 490-495 Link Here
490
     * <!-- end-user-doc -->
492
     * <!-- end-user-doc -->
491
     * @generated
493
     * @generated
492
     */
494
     */
495
    @Override
493
    public Object eGet( int featureID, boolean resolve, boolean coreType )
496
    public Object eGet( int featureID, boolean resolve, boolean coreType )
494
    {
497
    {
495
        switch( featureID )
498
        switch( featureID )
Lines 511-516 Link Here
511
     * <!-- end-user-doc -->
514
     * <!-- end-user-doc -->
512
     * @generated
515
     * @generated
513
     */
516
     */
517
    @Override
514
    public void eSet( int featureID, Object newValue )
518
    public void eSet( int featureID, Object newValue )
515
    {
519
    {
516
        switch( featureID )
520
        switch( featureID )
Lines 536-541 Link Here
536
     * <!-- end-user-doc -->
540
     * <!-- end-user-doc -->
537
     * @generated
541
     * @generated
538
     */
542
     */
543
    @Override
539
    public void eUnset( int featureID )
544
    public void eUnset( int featureID )
540
    {
545
    {
541
        switch( featureID )
546
        switch( featureID )
Lines 561-566 Link Here
561
     * <!-- end-user-doc -->
566
     * <!-- end-user-doc -->
562
     * @generated
567
     * @generated
563
     */
568
     */
569
    @Override
564
    public boolean eIsSet( int featureID )
570
    public boolean eIsSet( int featureID )
565
    {
571
    {
566
        switch( featureID )
572
        switch( featureID )
Lines 582-587 Link Here
582
     * <!-- end-user-doc -->
588
     * <!-- end-user-doc -->
583
     * @generated
589
     * @generated
584
     */
590
     */
591
    @Override
585
    public String toString()
592
    public String toString()
586
    {
593
    {
587
        if( eIsProxy() )
594
        if( eIsProxy() )
(-)src/org/eclipse/datatools/connectivity/oda/design/impl/ScalarValueDefinitionImpl.java (-2 / +8 lines)
Lines 1-6 Link Here
1
/**
1
/**
2
 *************************************************************************
2
 *************************************************************************
3
 * Copyright (c) 2005, 2007 Actuate Corporation.
3
 * Copyright (c) 2005, 2009 Actuate Corporation.
4
 * All rights reserved. This program and the accompanying materials
4
 * All rights reserved. This program and the accompanying materials
5
 * are made available under the terms of the Eclipse Public License v1.0
5
 * are made available under the terms of the Eclipse Public License v1.0
6
 * which accompanies this distribution, and is available at
6
 * which accompanies this distribution, and is available at
Lines 44-50 Link Here
44
     * <!-- end-user-doc -->
44
     * <!-- end-user-doc -->
45
     * @generated
45
     * @generated
46
     */
46
     */
47
    public static final String copyright = "Copyright (c) 2005, 2007 Actuate Corporation"; //$NON-NLS-1$
47
    public static final String copyright = "Copyright (c) 2005, 2009 Actuate Corporation"; //$NON-NLS-1$
48
48
49
    /**
49
    /**
50
     * The default value of the '{@link #getValue() <em>Value</em>}' attribute.
50
     * The default value of the '{@link #getValue() <em>Value</em>}' attribute.
Lines 101-106 Link Here
101
     * <!-- end-user-doc -->
101
     * <!-- end-user-doc -->
102
     * @generated
102
     * @generated
103
     */
103
     */
104
    @Override
104
    protected EClass eStaticClass()
105
    protected EClass eStaticClass()
105
    {
106
    {
106
        return DesignPackage.Literals.SCALAR_VALUE_DEFINITION;
107
        return DesignPackage.Literals.SCALAR_VALUE_DEFINITION;
Lines 161-166 Link Here
161
     * <!-- end-user-doc -->
162
     * <!-- end-user-doc -->
162
     * @generated
163
     * @generated
163
     */
164
     */
165
    @Override
164
    public Object eGet( int featureID, boolean resolve, boolean coreType )
166
    public Object eGet( int featureID, boolean resolve, boolean coreType )
165
    {
167
    {
166
        switch( featureID )
168
        switch( featureID )
Lines 178-183 Link Here
178
     * <!-- end-user-doc -->
180
     * <!-- end-user-doc -->
179
     * @generated
181
     * @generated
180
     */
182
     */
183
    @Override
181
    public void eSet( int featureID, Object newValue )
184
    public void eSet( int featureID, Object newValue )
182
    {
185
    {
183
        switch( featureID )
186
        switch( featureID )
Lines 197-202 Link Here
197
     * <!-- end-user-doc -->
200
     * <!-- end-user-doc -->
198
     * @generated
201
     * @generated
199
     */
202
     */
203
    @Override
200
    public void eUnset( int featureID )
204
    public void eUnset( int featureID )
201
    {
205
    {
202
        switch( featureID )
206
        switch( featureID )
Lines 216-221 Link Here
216
     * <!-- end-user-doc -->
220
     * <!-- end-user-doc -->
217
     * @generated
221
     * @generated
218
     */
222
     */
223
    @Override
219
    public boolean eIsSet( int featureID )
224
    public boolean eIsSet( int featureID )
220
    {
225
    {
221
        switch( featureID )
226
        switch( featureID )
Lines 235-240 Link Here
235
     * <!-- end-user-doc -->
240
     * <!-- end-user-doc -->
236
     * @generated
241
     * @generated
237
     */
242
     */
243
    @Override
238
    public String toString()
244
    public String toString()
239
    {
245
    {
240
        if( eIsProxy() )
246
        if( eIsProxy() )
(-)src/org/eclipse/datatools/connectivity/oda/design/impl/ValueFormatHintsImpl.java (-6 / +12 lines)
Lines 1-6 Link Here
1
/**
1
/**
2
 *************************************************************************
2
 *************************************************************************
3
 * Copyright (c) 2005, 2007 Actuate Corporation.
3
 * Copyright (c) 2005, 2009 Actuate Corporation.
4
 * All rights reserved. This program and the accompanying materials
4
 * All rights reserved. This program and the accompanying materials
5
 * are made available under the terms of the Eclipse Public License v1.0
5
 * are made available under the terms of the Eclipse Public License v1.0
6
 * which accompanies this distribution, and is available at
6
 * which accompanies this distribution, and is available at
Lines 50-56 Link Here
50
     * <!-- end-user-doc -->
50
     * <!-- end-user-doc -->
51
     * @generated
51
     * @generated
52
     */
52
     */
53
    public static final String copyright = "Copyright (c) 2005, 2007 Actuate Corporation"; //$NON-NLS-1$
53
    public static final String copyright = "Copyright (c) 2005, 2009 Actuate Corporation"; //$NON-NLS-1$
54
54
55
    /**
55
    /**
56
     * The default value of the '{@link #getDisplaySize() <em>Display Size</em>}' attribute.
56
     * The default value of the '{@link #getDisplaySize() <em>Display Size</em>}' attribute.
Lines 79-85 Link Here
79
     * @generated
79
     * @generated
80
     * @ordered
80
     * @ordered
81
     */
81
     */
82
    protected boolean m_displaySizeESet = false;
82
    protected boolean m_displaySizeESet;
83
83
84
    /**
84
    /**
85
     * The default value of the '{@link #getDisplayFormat() <em>Display Format</em>}' attribute.
85
     * The default value of the '{@link #getDisplayFormat() <em>Display Format</em>}' attribute.
Lines 128-134 Link Here
128
     * @generated
128
     * @generated
129
     * @ordered
129
     * @ordered
130
     */
130
     */
131
    protected boolean m_textFormatTypeESet = false;
131
    protected boolean m_textFormatTypeESet;
132
132
133
    /**
133
    /**
134
     * The default value of the '{@link #getHorizontalAlignment() <em>Horizontal Alignment</em>}' attribute.
134
     * The default value of the '{@link #getHorizontalAlignment() <em>Horizontal Alignment</em>}' attribute.
Lines 157-163 Link Here
157
     * @generated
157
     * @generated
158
     * @ordered
158
     * @ordered
159
     */
159
     */
160
    protected boolean m_horizontalAlignmentESet = false;
160
    protected boolean m_horizontalAlignmentESet;
161
161
162
    /**
162
    /**
163
     * The default value of the '{@link #getTextWrapType() <em>Text Wrap Type</em>}' attribute.
163
     * The default value of the '{@link #getTextWrapType() <em>Text Wrap Type</em>}' attribute.
Lines 186-192 Link Here
186
     * @generated
186
     * @generated
187
     * @ordered
187
     * @ordered
188
     */
188
     */
189
    protected boolean m_textWrapTypeESet = false;
189
    protected boolean m_textWrapTypeESet;
190
190
191
    /**
191
    /**
192
     * <!-- begin-user-doc -->
192
     * <!-- begin-user-doc -->
Lines 203-208 Link Here
203
     * <!-- end-user-doc -->
203
     * <!-- end-user-doc -->
204
     * @generated
204
     * @generated
205
     */
205
     */
206
    @Override
206
    protected EClass eStaticClass()
207
    protected EClass eStaticClass()
207
    {
208
    {
208
        return DesignPackage.Literals.VALUE_FORMAT_HINTS;
209
        return DesignPackage.Literals.VALUE_FORMAT_HINTS;
Lines 462-467 Link Here
462
     * <!-- end-user-doc -->
463
     * <!-- end-user-doc -->
463
     * @generated
464
     * @generated
464
     */
465
     */
466
    @Override
465
    public Object eGet( int featureID, boolean resolve, boolean coreType )
467
    public Object eGet( int featureID, boolean resolve, boolean coreType )
466
    {
468
    {
467
        switch( featureID )
469
        switch( featureID )
Lines 485-490 Link Here
485
     * <!-- end-user-doc -->
487
     * <!-- end-user-doc -->
486
     * @generated
488
     * @generated
487
     */
489
     */
490
    @Override
488
    public void eSet( int featureID, Object newValue )
491
    public void eSet( int featureID, Object newValue )
489
    {
492
    {
490
        switch( featureID )
493
        switch( featureID )
Lines 513-518 Link Here
513
     * <!-- end-user-doc -->
516
     * <!-- end-user-doc -->
514
     * @generated
517
     * @generated
515
     */
518
     */
519
    @Override
516
    public void eUnset( int featureID )
520
    public void eUnset( int featureID )
517
    {
521
    {
518
        switch( featureID )
522
        switch( featureID )
Lines 541-546 Link Here
541
     * <!-- end-user-doc -->
545
     * <!-- end-user-doc -->
542
     * @generated
546
     * @generated
543
     */
547
     */
548
    @Override
544
    public boolean eIsSet( int featureID )
549
    public boolean eIsSet( int featureID )
545
    {
550
    {
546
        switch( featureID )
551
        switch( featureID )
Lines 565-570 Link Here
565
     * <!-- end-user-doc -->
570
     * <!-- end-user-doc -->
566
     * @generated
571
     * @generated
567
     */
572
     */
573
    @Override
568
    public String toString()
574
    public String toString()
569
    {
575
    {
570
        if( eIsProxy() )
576
        if( eIsProxy() )
(-)src/org/eclipse/datatools/connectivity/oda/design/impl/DocumentRootImpl.java (-13 / +20 lines)
Lines 1-6 Link Here
1
/**
1
/**
2
 *************************************************************************
2
 *************************************************************************
3
 * Copyright (c) 2005, 2007 Actuate Corporation.
3
 * Copyright (c) 2005, 2009 Actuate Corporation.
4
 * All rights reserved. This program and the accompanying materials
4
 * All rights reserved. This program and the accompanying materials
5
 * are made available under the terms of the Eclipse Public License v1.0
5
 * are made available under the terms of the Eclipse Public License v1.0
6
 * which accompanies this distribution, and is available at
6
 * which accompanies this distribution, and is available at
Lines 54-60 Link Here
54
     * <!-- end-user-doc -->
54
     * <!-- end-user-doc -->
55
     * @generated
55
     * @generated
56
     */
56
     */
57
    public static final String copyright = "Copyright (c) 2005, 2007 Actuate Corporation"; //$NON-NLS-1$
57
    public static final String copyright = "Copyright (c) 2005, 2009 Actuate Corporation"; //$NON-NLS-1$
58
58
59
    /**
59
    /**
60
     * The cached value of the '{@link #getMixed() <em>Mixed</em>}' attribute list.
60
     * The cached value of the '{@link #getMixed() <em>Mixed</em>}' attribute list.
Lines 64-70 Link Here
64
     * @generated
64
     * @generated
65
     * @ordered
65
     * @ordered
66
     */
66
     */
67
    protected FeatureMap m_mixed = null;
67
    protected FeatureMap m_mixed;
68
68
69
    /**
69
    /**
70
     * The cached value of the '{@link #getXMLNSPrefixMap() <em>XMLNS Prefix Map</em>}' map.
70
     * The cached value of the '{@link #getXMLNSPrefixMap() <em>XMLNS Prefix Map</em>}' map.
Lines 74-80 Link Here
74
     * @generated
74
     * @generated
75
     * @ordered
75
     * @ordered
76
     */
76
     */
77
    protected EMap m_xMLNSPrefixMap = null;
77
    protected EMap<String, String> m_xMLNSPrefixMap;
78
78
79
    /**
79
    /**
80
     * The cached value of the '{@link #getXSISchemaLocation() <em>XSI Schema Location</em>}' map.
80
     * The cached value of the '{@link #getXSISchemaLocation() <em>XSI Schema Location</em>}' map.
Lines 84-90 Link Here
84
     * @generated
84
     * @generated
85
     * @ordered
85
     * @ordered
86
     */
86
     */
87
    protected EMap m_xSISchemaLocation = null;
87
    protected EMap<String, String> m_xSISchemaLocation;
88
88
89
    /**
89
    /**
90
     * <!-- begin-user-doc -->
90
     * <!-- begin-user-doc -->
Lines 101-106 Link Here
101
     * <!-- end-user-doc -->
101
     * <!-- end-user-doc -->
102
     * @generated
102
     * @generated
103
     */
103
     */
104
    @Override
104
    protected EClass eStaticClass()
105
    protected EClass eStaticClass()
105
    {
106
    {
106
        return DesignPackage.Literals.DOCUMENT_ROOT;
107
        return DesignPackage.Literals.DOCUMENT_ROOT;
Lines 126-136 Link Here
126
     * <!-- end-user-doc -->
127
     * <!-- end-user-doc -->
127
     * @generated
128
     * @generated
128
     */
129
     */
129
    public EMap getXMLNSPrefixMap()
130
    public EMap<String, String> getXMLNSPrefixMap()
130
    {
131
    {
131
        if( m_xMLNSPrefixMap == null )
132
        if( m_xMLNSPrefixMap == null )
132
        {
133
        {
133
            m_xMLNSPrefixMap = new EcoreEMap(
134
            m_xMLNSPrefixMap = new EcoreEMap<String, String>(
134
                    EcorePackage.Literals.ESTRING_TO_STRING_MAP_ENTRY,
135
                    EcorePackage.Literals.ESTRING_TO_STRING_MAP_ENTRY,
135
                    EStringToStringMapEntryImpl.class, this,
136
                    EStringToStringMapEntryImpl.class, this,
136
                    DesignPackage.DOCUMENT_ROOT__XMLNS_PREFIX_MAP );
137
                    DesignPackage.DOCUMENT_ROOT__XMLNS_PREFIX_MAP );
Lines 143-153 Link Here
143
     * <!-- end-user-doc -->
144
     * <!-- end-user-doc -->
144
     * @generated
145
     * @generated
145
     */
146
     */
146
    public EMap getXSISchemaLocation()
147
    public EMap<String, String> getXSISchemaLocation()
147
    {
148
    {
148
        if( m_xSISchemaLocation == null )
149
        if( m_xSISchemaLocation == null )
149
        {
150
        {
150
            m_xSISchemaLocation = new EcoreEMap(
151
            m_xSISchemaLocation = new EcoreEMap<String, String>(
151
                    EcorePackage.Literals.ESTRING_TO_STRING_MAP_ENTRY,
152
                    EcorePackage.Literals.ESTRING_TO_STRING_MAP_ENTRY,
152
                    EStringToStringMapEntryImpl.class, this,
153
                    EStringToStringMapEntryImpl.class, this,
153
                    DesignPackage.DOCUMENT_ROOT__XSI_SCHEMA_LOCATION );
154
                    DesignPackage.DOCUMENT_ROOT__XSI_SCHEMA_LOCATION );
Lines 196-213 Link Here
196
     * <!-- end-user-doc -->
197
     * <!-- end-user-doc -->
197
     * @generated
198
     * @generated
198
     */
199
     */
200
    @Override
199
    public NotificationChain eInverseRemove( InternalEObject otherEnd,
201
    public NotificationChain eInverseRemove( InternalEObject otherEnd,
200
            int featureID, NotificationChain msgs )
202
            int featureID, NotificationChain msgs )
201
    {
203
    {
202
        switch( featureID )
204
        switch( featureID )
203
        {
205
        {
204
        case DesignPackage.DOCUMENT_ROOT__MIXED:
206
        case DesignPackage.DOCUMENT_ROOT__MIXED:
205
            return ((InternalEList) getMixed()).basicRemove( otherEnd, msgs );
207
            return ((InternalEList<?>) getMixed()).basicRemove( otherEnd, msgs );
206
        case DesignPackage.DOCUMENT_ROOT__XMLNS_PREFIX_MAP:
208
        case DesignPackage.DOCUMENT_ROOT__XMLNS_PREFIX_MAP:
207
            return ((InternalEList) getXMLNSPrefixMap()).basicRemove( otherEnd,
209
            return ((InternalEList<?>) getXMLNSPrefixMap()).basicRemove(
208
                    msgs );
210
                    otherEnd, msgs );
209
        case DesignPackage.DOCUMENT_ROOT__XSI_SCHEMA_LOCATION:
211
        case DesignPackage.DOCUMENT_ROOT__XSI_SCHEMA_LOCATION:
210
            return ((InternalEList) getXSISchemaLocation()).basicRemove(
212
            return ((InternalEList<?>) getXSISchemaLocation()).basicRemove(
211
                    otherEnd, msgs );
213
                    otherEnd, msgs );
212
        case DesignPackage.DOCUMENT_ROOT__ODA_DESIGN_SESSION:
214
        case DesignPackage.DOCUMENT_ROOT__ODA_DESIGN_SESSION:
213
            return basicSetOdaDesignSession( null, msgs );
215
            return basicSetOdaDesignSession( null, msgs );
Lines 220-225 Link Here
220
     * <!-- end-user-doc -->
222
     * <!-- end-user-doc -->
221
     * @generated
223
     * @generated
222
     */
224
     */
225
    @Override
223
    public Object eGet( int featureID, boolean resolve, boolean coreType )
226
    public Object eGet( int featureID, boolean resolve, boolean coreType )
224
    {
227
    {
225
        switch( featureID )
228
        switch( featureID )
Lines 249-254 Link Here
249
     * <!-- end-user-doc -->
252
     * <!-- end-user-doc -->
250
     * @generated
253
     * @generated
251
     */
254
     */
255
    @Override
252
    public void eSet( int featureID, Object newValue )
256
    public void eSet( int featureID, Object newValue )
253
    {
257
    {
254
        switch( featureID )
258
        switch( featureID )
Lines 275-280 Link Here
275
     * <!-- end-user-doc -->
279
     * <!-- end-user-doc -->
276
     * @generated
280
     * @generated
277
     */
281
     */
282
    @Override
278
    public void eUnset( int featureID )
283
    public void eUnset( int featureID )
279
    {
284
    {
280
        switch( featureID )
285
        switch( featureID )
Lines 300-305 Link Here
300
     * <!-- end-user-doc -->
305
     * <!-- end-user-doc -->
301
     * @generated
306
     * @generated
302
     */
307
     */
308
    @Override
303
    public boolean eIsSet( int featureID )
309
    public boolean eIsSet( int featureID )
304
    {
310
    {
305
        switch( featureID )
311
        switch( featureID )
Lines 322-327 Link Here
322
     * <!-- end-user-doc -->
328
     * <!-- end-user-doc -->
323
     * @generated
329
     * @generated
324
     */
330
     */
331
    @Override
325
    public String toString()
332
    public String toString()
326
    {
333
    {
327
        if( eIsProxy() )
334
        if( eIsProxy() )
(-)src/org/eclipse/datatools/connectivity/oda/design/impl/LocaleImpl.java (-3 / +9 lines)
Lines 1-6 Link Here
1
/**
1
/**
2
 *************************************************************************
2
 *************************************************************************
3
 * Copyright (c) 2005, 2007 Actuate Corporation.
3
 * Copyright (c) 2005, 2009 Actuate Corporation.
4
 * All rights reserved. This program and the accompanying materials
4
 * All rights reserved. This program and the accompanying materials
5
 * are made available under the terms of the Eclipse Public License v1.0
5
 * are made available under the terms of the Eclipse Public License v1.0
6
 * which accompanies this distribution, and is available at
6
 * which accompanies this distribution, and is available at
Lines 46-52 Link Here
46
     * <!-- end-user-doc -->
46
     * <!-- end-user-doc -->
47
     * @generated
47
     * @generated
48
     */
48
     */
49
    public static final String copyright = "Copyright (c) 2005, 2007 Actuate Corporation"; //$NON-NLS-1$
49
    public static final String copyright = "Copyright (c) 2005, 2009 Actuate Corporation"; //$NON-NLS-1$
50
50
51
    /**
51
    /**
52
     * The default value of the '{@link #getLanguage() <em>Language</em>}' attribute.
52
     * The default value of the '{@link #getLanguage() <em>Language</em>}' attribute.
Lines 75-81 Link Here
75
     * @generated
75
     * @generated
76
     * @ordered
76
     * @ordered
77
     */
77
     */
78
    protected boolean m_languageESet = false;
78
    protected boolean m_languageESet;
79
79
80
    /**
80
    /**
81
     * The default value of the '{@link #getCountry() <em>Country</em>}' attribute.
81
     * The default value of the '{@link #getCountry() <em>Country</em>}' attribute.
Lines 136-141 Link Here
136
     * <!-- end-user-doc -->
136
     * <!-- end-user-doc -->
137
     * @generated
137
     * @generated
138
     */
138
     */
139
    @Override
139
    protected EClass eStaticClass()
140
    protected EClass eStaticClass()
140
    {
141
    {
141
        return DesignPackage.Literals.LOCALE;
142
        return DesignPackage.Literals.LOCALE;
Lines 330-335 Link Here
330
     * <!-- end-user-doc -->
331
     * <!-- end-user-doc -->
331
     * @generated
332
     * @generated
332
     */
333
     */
334
    @Override
333
    public Object eGet( int featureID, boolean resolve, boolean coreType )
335
    public Object eGet( int featureID, boolean resolve, boolean coreType )
334
    {
336
    {
335
        switch( featureID )
337
        switch( featureID )
Lines 349-354 Link Here
349
     * <!-- end-user-doc -->
351
     * <!-- end-user-doc -->
350
     * @generated
352
     * @generated
351
     */
353
     */
354
    @Override
352
    public void eSet( int featureID, Object newValue )
355
    public void eSet( int featureID, Object newValue )
353
    {
356
    {
354
        switch( featureID )
357
        switch( featureID )
Lines 371-376 Link Here
371
     * <!-- end-user-doc -->
374
     * <!-- end-user-doc -->
372
     * @generated
375
     * @generated
373
     */
376
     */
377
    @Override
374
    public void eUnset( int featureID )
378
    public void eUnset( int featureID )
375
    {
379
    {
376
        switch( featureID )
380
        switch( featureID )
Lines 393-398 Link Here
393
     * <!-- end-user-doc -->
397
     * <!-- end-user-doc -->
394
     * @generated
398
     * @generated
395
     */
399
     */
400
    @Override
396
    public boolean eIsSet( int featureID )
401
    public boolean eIsSet( int featureID )
397
    {
402
    {
398
        switch( featureID )
403
        switch( featureID )
Lines 414-419 Link Here
414
     * <!-- end-user-doc -->
419
     * <!-- end-user-doc -->
415
     * @generated
420
     * @generated
416
     */
421
     */
422
    @Override
417
    public String toString()
423
    public String toString()
418
    {
424
    {
419
        if( eIsProxy() )
425
        if( eIsProxy() )
(-)src/org/eclipse/datatools/connectivity/oda/design/impl/OutputElementAttributesImpl.java (-3 / +10 lines)
Lines 1-6 Link Here
1
/**
1
/**
2
 *************************************************************************
2
 *************************************************************************
3
 * Copyright (c) 2005, 2007 Actuate Corporation.
3
 * Copyright (c) 2005, 2009 Actuate Corporation.
4
 * All rights reserved. This program and the accompanying materials
4
 * All rights reserved. This program and the accompanying materials
5
 * are made available under the terms of the Eclipse Public License v1.0
5
 * are made available under the terms of the Eclipse Public License v1.0
6
 * which accompanies this distribution, and is available at
6
 * which accompanies this distribution, and is available at
Lines 49-55 Link Here
49
     * <!-- end-user-doc -->
49
     * <!-- end-user-doc -->
50
     * @generated
50
     * @generated
51
     */
51
     */
52
    public static final String copyright = "Copyright (c) 2005, 2007 Actuate Corporation"; //$NON-NLS-1$
52
    public static final String copyright = "Copyright (c) 2005, 2009 Actuate Corporation"; //$NON-NLS-1$
53
53
54
    /**
54
    /**
55
     * The default value of the '{@link #getLabel() <em>Label</em>}' attribute.
55
     * The default value of the '{@link #getLabel() <em>Label</em>}' attribute.
Lines 79-85 Link Here
79
     * @generated
79
     * @generated
80
     * @ordered
80
     * @ordered
81
     */
81
     */
82
    protected ValueFormatHints m_formattingHints = null;
82
    protected ValueFormatHints m_formattingHints;
83
83
84
    /**
84
    /**
85
     * The default value of the '{@link #getHelpText() <em>Help Text</em>}' attribute.
85
     * The default value of the '{@link #getHelpText() <em>Help Text</em>}' attribute.
Lines 116-121 Link Here
116
     * <!-- end-user-doc -->
116
     * <!-- end-user-doc -->
117
     * @generated
117
     * @generated
118
     */
118
     */
119
    @Override
119
    protected EClass eStaticClass()
120
    protected EClass eStaticClass()
120
    {
121
    {
121
        return DesignPackage.Literals.OUTPUT_ELEMENT_ATTRIBUTES;
122
        return DesignPackage.Literals.OUTPUT_ELEMENT_ATTRIBUTES;
Lines 257-262 Link Here
257
     * <!-- end-user-doc -->
258
     * <!-- end-user-doc -->
258
     * @generated
259
     * @generated
259
     */
260
     */
261
    @Override
260
    public NotificationChain eInverseRemove( InternalEObject otherEnd,
262
    public NotificationChain eInverseRemove( InternalEObject otherEnd,
261
            int featureID, NotificationChain msgs )
263
            int featureID, NotificationChain msgs )
262
    {
264
    {
Lines 273-278 Link Here
273
     * <!-- end-user-doc -->
275
     * <!-- end-user-doc -->
274
     * @generated
276
     * @generated
275
     */
277
     */
278
    @Override
276
    public Object eGet( int featureID, boolean resolve, boolean coreType )
279
    public Object eGet( int featureID, boolean resolve, boolean coreType )
277
    {
280
    {
278
        switch( featureID )
281
        switch( featureID )
Lines 292-297 Link Here
292
     * <!-- end-user-doc -->
295
     * <!-- end-user-doc -->
293
     * @generated
296
     * @generated
294
     */
297
     */
298
    @Override
295
    public void eSet( int featureID, Object newValue )
299
    public void eSet( int featureID, Object newValue )
296
    {
300
    {
297
        switch( featureID )
301
        switch( featureID )
Lines 314-319 Link Here
314
     * <!-- end-user-doc -->
318
     * <!-- end-user-doc -->
315
     * @generated
319
     * @generated
316
     */
320
     */
321
    @Override
317
    public void eUnset( int featureID )
322
    public void eUnset( int featureID )
318
    {
323
    {
319
        switch( featureID )
324
        switch( featureID )
Lines 336-341 Link Here
336
     * <!-- end-user-doc -->
341
     * <!-- end-user-doc -->
337
     * @generated
342
     * @generated
338
     */
343
     */
344
    @Override
339
    public boolean eIsSet( int featureID )
345
    public boolean eIsSet( int featureID )
340
    {
346
    {
341
        switch( featureID )
347
        switch( featureID )
Lines 357-362 Link Here
357
     * <!-- end-user-doc -->
363
     * <!-- end-user-doc -->
358
     * @generated
364
     * @generated
359
     */
365
     */
366
    @Override
360
    public String toString()
367
    public String toString()
361
    {
368
    {
362
        if( eIsProxy() )
369
        if( eIsProxy() )
(-)src/org/eclipse/datatools/connectivity/oda/design/impl/DataElementUIHintsImpl.java (-2 / +8 lines)
Lines 1-6 Link Here
1
/**
1
/**
2
 *************************************************************************
2
 *************************************************************************
3
 * Copyright (c) 2005, 2007 Actuate Corporation.
3
 * Copyright (c) 2005, 2009 Actuate Corporation.
4
 * All rights reserved. This program and the accompanying materials
4
 * All rights reserved. This program and the accompanying materials
5
 * are made available under the terms of the Eclipse Public License v1.0
5
 * are made available under the terms of the Eclipse Public License v1.0
6
 * which accompanies this distribution, and is available at
6
 * which accompanies this distribution, and is available at
Lines 44-50 Link Here
44
     * <!-- end-user-doc -->
44
     * <!-- end-user-doc -->
45
     * @generated
45
     * @generated
46
     */
46
     */
47
    public static final String copyright = "Copyright (c) 2005, 2007 Actuate Corporation"; //$NON-NLS-1$
47
    public static final String copyright = "Copyright (c) 2005, 2009 Actuate Corporation"; //$NON-NLS-1$
48
48
49
    /**
49
    /**
50
     * The default value of the '{@link #getDisplayName() <em>Display Name</em>}' attribute.
50
     * The default value of the '{@link #getDisplayName() <em>Display Name</em>}' attribute.
Lines 101-106 Link Here
101
     * <!-- end-user-doc -->
101
     * <!-- end-user-doc -->
102
     * @generated
102
     * @generated
103
     */
103
     */
104
    @Override
104
    protected EClass eStaticClass()
105
    protected EClass eStaticClass()
105
    {
106
    {
106
        return DesignPackage.Literals.DATA_ELEMENT_UI_HINTS;
107
        return DesignPackage.Literals.DATA_ELEMENT_UI_HINTS;
Lines 161-166 Link Here
161
     * <!-- end-user-doc -->
162
     * <!-- end-user-doc -->
162
     * @generated
163
     * @generated
163
     */
164
     */
165
    @Override
164
    public Object eGet( int featureID, boolean resolve, boolean coreType )
166
    public Object eGet( int featureID, boolean resolve, boolean coreType )
165
    {
167
    {
166
        switch( featureID )
168
        switch( featureID )
Lines 178-183 Link Here
178
     * <!-- end-user-doc -->
180
     * <!-- end-user-doc -->
179
     * @generated
181
     * @generated
180
     */
182
     */
183
    @Override
181
    public void eSet( int featureID, Object newValue )
184
    public void eSet( int featureID, Object newValue )
182
    {
185
    {
183
        switch( featureID )
186
        switch( featureID )
Lines 197-202 Link Here
197
     * <!-- end-user-doc -->
200
     * <!-- end-user-doc -->
198
     * @generated
201
     * @generated
199
     */
202
     */
203
    @Override
200
    public void eUnset( int featureID )
204
    public void eUnset( int featureID )
201
    {
205
    {
202
        switch( featureID )
206
        switch( featureID )
Lines 216-221 Link Here
216
     * <!-- end-user-doc -->
220
     * <!-- end-user-doc -->
217
     * @generated
221
     * @generated
218
     */
222
     */
223
    @Override
219
    public boolean eIsSet( int featureID )
224
    public boolean eIsSet( int featureID )
220
    {
225
    {
221
        switch( featureID )
226
        switch( featureID )
Lines 235-240 Link Here
235
     * <!-- end-user-doc -->
240
     * <!-- end-user-doc -->
236
     * @generated
241
     * @generated
237
     */
242
     */
243
    @Override
238
    public String toString()
244
    public String toString()
239
    {
245
    {
240
        if( eIsProxy() )
246
        if( eIsProxy() )
(-)src/org/eclipse/datatools/connectivity/oda/design/impl/NameValuePairImpl.java (-2 / +8 lines)
Lines 1-6 Link Here
1
/**
1
/**
2
 *************************************************************************
2
 *************************************************************************
3
 * Copyright (c) 2005, 2007 Actuate Corporation.
3
 * Copyright (c) 2005, 2009 Actuate Corporation.
4
 * All rights reserved. This program and the accompanying materials
4
 * All rights reserved. This program and the accompanying materials
5
 * are made available under the terms of the Eclipse Public License v1.0
5
 * are made available under the terms of the Eclipse Public License v1.0
6
 * which accompanies this distribution, and is available at
6
 * which accompanies this distribution, and is available at
Lines 43-49 Link Here
43
     * <!-- end-user-doc -->
43
     * <!-- end-user-doc -->
44
     * @generated
44
     * @generated
45
     */
45
     */
46
    public static final String copyright = "Copyright (c) 2005, 2007 Actuate Corporation"; //$NON-NLS-1$
46
    public static final String copyright = "Copyright (c) 2005, 2009 Actuate Corporation"; //$NON-NLS-1$
47
47
48
    /**
48
    /**
49
     * The default value of the '{@link #getName() <em>Name</em>}' attribute.
49
     * The default value of the '{@link #getName() <em>Name</em>}' attribute.
Lines 100-105 Link Here
100
     * <!-- end-user-doc -->
100
     * <!-- end-user-doc -->
101
     * @generated
101
     * @generated
102
     */
102
     */
103
    @Override
103
    protected EClass eStaticClass()
104
    protected EClass eStaticClass()
104
    {
105
    {
105
        return DesignPackage.Literals.NAME_VALUE_PAIR;
106
        return DesignPackage.Literals.NAME_VALUE_PAIR;
Lines 158-163 Link Here
158
     * <!-- end-user-doc -->
159
     * <!-- end-user-doc -->
159
     * @generated
160
     * @generated
160
     */
161
     */
162
    @Override
161
    public Object eGet( int featureID, boolean resolve, boolean coreType )
163
    public Object eGet( int featureID, boolean resolve, boolean coreType )
162
    {
164
    {
163
        switch( featureID )
165
        switch( featureID )
Lines 175-180 Link Here
175
     * <!-- end-user-doc -->
177
     * <!-- end-user-doc -->
176
     * @generated
178
     * @generated
177
     */
179
     */
180
    @Override
178
    public void eSet( int featureID, Object newValue )
181
    public void eSet( int featureID, Object newValue )
179
    {
182
    {
180
        switch( featureID )
183
        switch( featureID )
Lines 194-199 Link Here
194
     * <!-- end-user-doc -->
197
     * <!-- end-user-doc -->
195
     * @generated
198
     * @generated
196
     */
199
     */
200
    @Override
197
    public void eUnset( int featureID )
201
    public void eUnset( int featureID )
198
    {
202
    {
199
        switch( featureID )
203
        switch( featureID )
Lines 213-218 Link Here
213
     * <!-- end-user-doc -->
217
     * <!-- end-user-doc -->
214
     * @generated
218
     * @generated
215
     */
219
     */
220
    @Override
216
    public boolean eIsSet( int featureID )
221
    public boolean eIsSet( int featureID )
217
    {
222
    {
218
        switch( featureID )
223
        switch( featureID )
Lines 232-237 Link Here
232
     * <!-- end-user-doc -->
237
     * <!-- end-user-doc -->
233
     * @generated
238
     * @generated
234
     */
239
     */
240
    @Override
235
    public String toString()
241
    public String toString()
236
    {
242
    {
237
        if( eIsProxy() )
243
        if( eIsProxy() )
(-)src/org/eclipse/datatools/connectivity/oda/design/impl/DataSetQueryImpl.java (-2 / +8 lines)
Lines 1-6 Link Here
1
/**
1
/**
2
 *************************************************************************
2
 *************************************************************************
3
 * Copyright (c) 2005, 2007 Actuate Corporation.
3
 * Copyright (c) 2005, 2009 Actuate Corporation.
4
 * All rights reserved. This program and the accompanying materials
4
 * All rights reserved. This program and the accompanying materials
5
 * are made available under the terms of the Eclipse Public License v1.0
5
 * are made available under the terms of the Eclipse Public License v1.0
6
 * which accompanies this distribution, and is available at
6
 * which accompanies this distribution, and is available at
Lines 42-48 Link Here
42
     * <!-- end-user-doc -->
42
     * <!-- end-user-doc -->
43
     * @generated
43
     * @generated
44
     */
44
     */
45
    public static final String copyright = "Copyright (c) 2005, 2007 Actuate Corporation"; //$NON-NLS-1$
45
    public static final String copyright = "Copyright (c) 2005, 2009 Actuate Corporation"; //$NON-NLS-1$
46
46
47
    /**
47
    /**
48
     * The default value of the '{@link #getQueryText() <em>Query Text</em>}' attribute.
48
     * The default value of the '{@link #getQueryText() <em>Query Text</em>}' attribute.
Lines 79-84 Link Here
79
     * <!-- end-user-doc -->
79
     * <!-- end-user-doc -->
80
     * @generated
80
     * @generated
81
     */
81
     */
82
    @Override
82
    protected EClass eStaticClass()
83
    protected EClass eStaticClass()
83
    {
84
    {
84
        return DesignPackage.Literals.DATA_SET_QUERY;
85
        return DesignPackage.Literals.DATA_SET_QUERY;
Lines 114-119 Link Here
114
     * <!-- end-user-doc -->
115
     * <!-- end-user-doc -->
115
     * @generated
116
     * @generated
116
     */
117
     */
118
    @Override
117
    public Object eGet( int featureID, boolean resolve, boolean coreType )
119
    public Object eGet( int featureID, boolean resolve, boolean coreType )
118
    {
120
    {
119
        switch( featureID )
121
        switch( featureID )
Lines 129-134 Link Here
129
     * <!-- end-user-doc -->
131
     * <!-- end-user-doc -->
130
     * @generated
132
     * @generated
131
     */
133
     */
134
    @Override
132
    public void eSet( int featureID, Object newValue )
135
    public void eSet( int featureID, Object newValue )
133
    {
136
    {
134
        switch( featureID )
137
        switch( featureID )
Lines 145-150 Link Here
145
     * <!-- end-user-doc -->
148
     * <!-- end-user-doc -->
146
     * @generated
149
     * @generated
147
     */
150
     */
151
    @Override
148
    public void eUnset( int featureID )
152
    public void eUnset( int featureID )
149
    {
153
    {
150
        switch( featureID )
154
        switch( featureID )
Lines 161-166 Link Here
161
     * <!-- end-user-doc -->
165
     * <!-- end-user-doc -->
162
     * @generated
166
     * @generated
163
     */
167
     */
168
    @Override
164
    public boolean eIsSet( int featureID )
169
    public boolean eIsSet( int featureID )
165
    {
170
    {
166
        switch( featureID )
171
        switch( featureID )
Lines 177-182 Link Here
177
     * <!-- end-user-doc -->
182
     * <!-- end-user-doc -->
178
     * @generated
183
     * @generated
179
     */
184
     */
185
    @Override
180
    public String toString()
186
    public String toString()
181
    {
187
    {
182
        if( eIsProxy() )
188
        if( eIsProxy() )
(-)src/org/eclipse/datatools/connectivity/oda/design/impl/DynamicValuesQueryImpl.java (-4 / +11 lines)
Lines 1-6 Link Here
1
/**
1
/**
2
 *************************************************************************
2
 *************************************************************************
3
 * Copyright (c) 2005, 2007 Actuate Corporation.
3
 * Copyright (c) 2005, 2009 Actuate Corporation.
4
 * All rights reserved. This program and the accompanying materials
4
 * All rights reserved. This program and the accompanying materials
5
 * are made available under the terms of the Eclipse Public License v1.0
5
 * are made available under the terms of the Eclipse Public License v1.0
6
 * which accompanies this distribution, and is available at
6
 * which accompanies this distribution, and is available at
Lines 49-55 Link Here
49
     * <!-- end-user-doc -->
49
     * <!-- end-user-doc -->
50
     * @generated
50
     * @generated
51
     */
51
     */
52
    public static final String copyright = "Copyright (c) 2005, 2007 Actuate Corporation"; //$NON-NLS-1$
52
    public static final String copyright = "Copyright (c) 2005, 2009 Actuate Corporation"; //$NON-NLS-1$
53
53
54
    /**
54
    /**
55
     * The cached value of the '{@link #getDataSetDesign() <em>Data Set Design</em>}' containment reference.
55
     * The cached value of the '{@link #getDataSetDesign() <em>Data Set Design</em>}' containment reference.
Lines 59-65 Link Here
59
     * @generated
59
     * @generated
60
     * @ordered
60
     * @ordered
61
     */
61
     */
62
    protected DataSetDesign m_dataSetDesign = null;
62
    protected DataSetDesign m_dataSetDesign;
63
63
64
    /**
64
    /**
65
     * The default value of the '{@link #isEnabled() <em>Enabled</em>}' attribute.
65
     * The default value of the '{@link #isEnabled() <em>Enabled</em>}' attribute.
Lines 88-94 Link Here
88
     * @generated
88
     * @generated
89
     * @ordered
89
     * @ordered
90
     */
90
     */
91
    protected boolean m_enabledESet = false;
91
    protected boolean m_enabledESet;
92
92
93
    /**
93
    /**
94
     * The default value of the '{@link #getValueColumn() <em>Value Column</em>}' attribute.
94
     * The default value of the '{@link #getValueColumn() <em>Value Column</em>}' attribute.
Lines 145-150 Link Here
145
     * <!-- end-user-doc -->
145
     * <!-- end-user-doc -->
146
     * @generated
146
     * @generated
147
     */
147
     */
148
    @Override
148
    protected EClass eStaticClass()
149
    protected EClass eStaticClass()
149
    {
150
    {
150
        return DesignPackage.Literals.DYNAMIC_VALUES_QUERY;
151
        return DesignPackage.Literals.DYNAMIC_VALUES_QUERY;
Lines 327-332 Link Here
327
     * <!-- end-user-doc -->
328
     * <!-- end-user-doc -->
328
     * @generated
329
     * @generated
329
     */
330
     */
331
    @Override
330
    public NotificationChain eInverseRemove( InternalEObject otherEnd,
332
    public NotificationChain eInverseRemove( InternalEObject otherEnd,
331
            int featureID, NotificationChain msgs )
333
            int featureID, NotificationChain msgs )
332
    {
334
    {
Lines 343-348 Link Here
343
     * <!-- end-user-doc -->
345
     * <!-- end-user-doc -->
344
     * @generated
346
     * @generated
345
     */
347
     */
348
    @Override
346
    public Object eGet( int featureID, boolean resolve, boolean coreType )
349
    public Object eGet( int featureID, boolean resolve, boolean coreType )
347
    {
350
    {
348
        switch( featureID )
351
        switch( featureID )
Lines 364-369 Link Here
364
     * <!-- end-user-doc -->
367
     * <!-- end-user-doc -->
365
     * @generated
368
     * @generated
366
     */
369
     */
370
    @Override
367
    public void eSet( int featureID, Object newValue )
371
    public void eSet( int featureID, Object newValue )
368
    {
372
    {
369
        switch( featureID )
373
        switch( featureID )
Lines 389-394 Link Here
389
     * <!-- end-user-doc -->
393
     * <!-- end-user-doc -->
390
     * @generated
394
     * @generated
391
     */
395
     */
396
    @Override
392
    public void eUnset( int featureID )
397
    public void eUnset( int featureID )
393
    {
398
    {
394
        switch( featureID )
399
        switch( featureID )
Lines 414-419 Link Here
414
     * <!-- end-user-doc -->
419
     * <!-- end-user-doc -->
415
     * @generated
420
     * @generated
416
     */
421
     */
422
    @Override
417
    public boolean eIsSet( int featureID )
423
    public boolean eIsSet( int featureID )
418
    {
424
    {
419
        switch( featureID )
425
        switch( featureID )
Lines 438-443 Link Here
438
     * <!-- end-user-doc -->
444
     * <!-- end-user-doc -->
439
     * @generated
445
     * @generated
440
     */
446
     */
447
    @Override
441
    public String toString()
448
    public String toString()
442
    {
449
    {
443
        if( eIsProxy() )
450
        if( eIsProxy() )
(-)src/org/eclipse/datatools/connectivity/oda/design/impl/PropertyAttributesImpl.java (-4 / +11 lines)
Lines 1-6 Link Here
1
/**
1
/**
2
 *************************************************************************
2
 *************************************************************************
3
 * Copyright (c) 2005, 2007 Actuate Corporation.
3
 * Copyright (c) 2005, 2009 Actuate Corporation.
4
 * All rights reserved. This program and the accompanying materials
4
 * All rights reserved. This program and the accompanying materials
5
 * are made available under the terms of the Eclipse Public License v1.0
5
 * are made available under the terms of the Eclipse Public License v1.0
6
 * which accompanies this distribution, and is available at
6
 * which accompanies this distribution, and is available at
Lines 48-54 Link Here
48
     * <!-- end-user-doc -->
48
     * <!-- end-user-doc -->
49
     * @generated
49
     * @generated
50
     */
50
     */
51
    public static final String copyright = "Copyright (c) 2005, 2007 Actuate Corporation"; //$NON-NLS-1$
51
    public static final String copyright = "Copyright (c) 2005, 2009 Actuate Corporation"; //$NON-NLS-1$
52
52
53
    /**
53
    /**
54
     * The default value of the '{@link #getDisplayName() <em>Display Name</em>}' attribute.
54
     * The default value of the '{@link #getDisplayName() <em>Display Name</em>}' attribute.
Lines 78-84 Link Here
78
     * @generated
78
     * @generated
79
     * @ordered
79
     * @ordered
80
     */
80
     */
81
    protected InputElementAttributes m_elementAttributes = null;
81
    protected InputElementAttributes m_elementAttributes;
82
82
83
    /**
83
    /**
84
     * The default value of the '{@link #isDerivedMetaData() <em>Derived Meta Data</em>}' attribute.
84
     * The default value of the '{@link #isDerivedMetaData() <em>Derived Meta Data</em>}' attribute.
Lines 107-113 Link Here
107
     * @generated
107
     * @generated
108
     * @ordered
108
     * @ordered
109
     */
109
     */
110
    protected boolean m_derivedMetaDataESet = false;
110
    protected boolean m_derivedMetaDataESet;
111
111
112
    /**
112
    /**
113
     * <!-- begin-user-doc -->
113
     * <!-- begin-user-doc -->
Lines 124-129 Link Here
124
     * <!-- end-user-doc -->
124
     * <!-- end-user-doc -->
125
     * @generated
125
     * @generated
126
     */
126
     */
127
    @Override
127
    protected EClass eStaticClass()
128
    protected EClass eStaticClass()
128
    {
129
    {
129
        return DesignPackage.Literals.PROPERTY_ATTRIBUTES;
130
        return DesignPackage.Literals.PROPERTY_ATTRIBUTES;
Lines 284-289 Link Here
284
     * <!-- end-user-doc -->
285
     * <!-- end-user-doc -->
285
     * @generated
286
     * @generated
286
     */
287
     */
288
    @Override
287
    public NotificationChain eInverseRemove( InternalEObject otherEnd,
289
    public NotificationChain eInverseRemove( InternalEObject otherEnd,
288
            int featureID, NotificationChain msgs )
290
            int featureID, NotificationChain msgs )
289
    {
291
    {
Lines 300-305 Link Here
300
     * <!-- end-user-doc -->
302
     * <!-- end-user-doc -->
301
     * @generated
303
     * @generated
302
     */
304
     */
305
    @Override
303
    public Object eGet( int featureID, boolean resolve, boolean coreType )
306
    public Object eGet( int featureID, boolean resolve, boolean coreType )
304
    {
307
    {
305
        switch( featureID )
308
        switch( featureID )
Lines 319-324 Link Here
319
     * <!-- end-user-doc -->
322
     * <!-- end-user-doc -->
320
     * @generated
323
     * @generated
321
     */
324
     */
325
    @Override
322
    public void eSet( int featureID, Object newValue )
326
    public void eSet( int featureID, Object newValue )
323
    {
327
    {
324
        switch( featureID )
328
        switch( featureID )
Lines 341-346 Link Here
341
     * <!-- end-user-doc -->
345
     * <!-- end-user-doc -->
342
     * @generated
346
     * @generated
343
     */
347
     */
348
    @Override
344
    public void eUnset( int featureID )
349
    public void eUnset( int featureID )
345
    {
350
    {
346
        switch( featureID )
351
        switch( featureID )
Lines 363-368 Link Here
363
     * <!-- end-user-doc -->
368
     * <!-- end-user-doc -->
364
     * @generated
369
     * @generated
365
     */
370
     */
371
    @Override
366
    public boolean eIsSet( int featureID )
372
    public boolean eIsSet( int featureID )
367
    {
373
    {
368
        switch( featureID )
374
        switch( featureID )
Lines 383-388 Link Here
383
     * <!-- end-user-doc -->
389
     * <!-- end-user-doc -->
384
     * @generated
390
     * @generated
385
     */
391
     */
392
    @Override
386
    public String toString()
393
    public String toString()
387
    {
394
    {
388
        if( eIsProxy() )
395
        if( eIsProxy() )
(-)src/org/eclipse/datatools/connectivity/oda/design/impl/InputParameterUIHintsImpl.java (-2 / +8 lines)
Lines 1-6 Link Here
1
/**
1
/**
2
 *************************************************************************
2
 *************************************************************************
3
 * Copyright (c) 2005, 2007 Actuate Corporation.
3
 * Copyright (c) 2005, 2009 Actuate Corporation.
4
 * All rights reserved. This program and the accompanying materials
4
 * All rights reserved. This program and the accompanying materials
5
 * are made available under the terms of the Eclipse Public License v1.0
5
 * are made available under the terms of the Eclipse Public License v1.0
6
 * which accompanies this distribution, and is available at
6
 * which accompanies this distribution, and is available at
Lines 43-49 Link Here
43
     * <!-- end-user-doc -->
43
     * <!-- end-user-doc -->
44
     * @generated
44
     * @generated
45
     */
45
     */
46
    public static final String copyright = "Copyright (c) 2005, 2007 Actuate Corporation"; //$NON-NLS-1$
46
    public static final String copyright = "Copyright (c) 2005, 2009 Actuate Corporation"; //$NON-NLS-1$
47
47
48
    /**
48
    /**
49
     * The default value of the '{@link #getGroupPromptDisplayName() <em>Group Prompt Display Name</em>}' attribute.
49
     * The default value of the '{@link #getGroupPromptDisplayName() <em>Group Prompt Display Name</em>}' attribute.
Lines 80-85 Link Here
80
     * <!-- end-user-doc -->
80
     * <!-- end-user-doc -->
81
     * @generated
81
     * @generated
82
     */
82
     */
83
    @Override
83
    protected EClass eStaticClass()
84
    protected EClass eStaticClass()
84
    {
85
    {
85
        return DesignPackage.Literals.INPUT_PARAMETER_UI_HINTS;
86
        return DesignPackage.Literals.INPUT_PARAMETER_UI_HINTS;
Lines 117-122 Link Here
117
     * <!-- end-user-doc -->
118
     * <!-- end-user-doc -->
118
     * @generated
119
     * @generated
119
     */
120
     */
121
    @Override
120
    public Object eGet( int featureID, boolean resolve, boolean coreType )
122
    public Object eGet( int featureID, boolean resolve, boolean coreType )
121
    {
123
    {
122
        switch( featureID )
124
        switch( featureID )
Lines 132-137 Link Here
132
     * <!-- end-user-doc -->
134
     * <!-- end-user-doc -->
133
     * @generated
135
     * @generated
134
     */
136
     */
137
    @Override
135
    public void eSet( int featureID, Object newValue )
138
    public void eSet( int featureID, Object newValue )
136
    {
139
    {
137
        switch( featureID )
140
        switch( featureID )
Lines 148-153 Link Here
148
     * <!-- end-user-doc -->
151
     * <!-- end-user-doc -->
149
     * @generated
152
     * @generated
150
     */
153
     */
154
    @Override
151
    public void eUnset( int featureID )
155
    public void eUnset( int featureID )
152
    {
156
    {
153
        switch( featureID )
157
        switch( featureID )
Lines 164-169 Link Here
164
     * <!-- end-user-doc -->
168
     * <!-- end-user-doc -->
165
     * @generated
169
     * @generated
166
     */
170
     */
171
    @Override
167
    public boolean eIsSet( int featureID )
172
    public boolean eIsSet( int featureID )
168
    {
173
    {
169
        switch( featureID )
174
        switch( featureID )
Lines 181-186 Link Here
181
     * <!-- end-user-doc -->
186
     * <!-- end-user-doc -->
182
     * @generated
187
     * @generated
183
     */
188
     */
189
    @Override
184
    public String toString()
190
    public String toString()
185
    {
191
    {
186
        if( eIsProxy() )
192
        if( eIsProxy() )
(-)src/org/eclipse/datatools/connectivity/oda/design/impl/ParameterDefinitionImpl.java (-10 / +17 lines)
Lines 57-63 Link Here
57
     * <!-- end-user-doc -->
57
     * <!-- end-user-doc -->
58
     * @generated
58
     * @generated
59
     */
59
     */
60
    public static final String copyright = "Copyright (c) 2005, 2007 Actuate Corporation"; //$NON-NLS-1$
60
    public static final String copyright = "Copyright (c) 2005, 2009 Actuate Corporation"; //$NON-NLS-1$
61
61
62
    /**
62
    /**
63
     * The default value of the '{@link #getInOutMode() <em>In Out Mode</em>}' attribute.
63
     * The default value of the '{@link #getInOutMode() <em>In Out Mode</em>}' attribute.
Lines 86-92 Link Here
86
     * @generated
86
     * @generated
87
     * @ordered
87
     * @ordered
88
     */
88
     */
89
    protected boolean m_inOutModeESet = false;
89
    protected boolean m_inOutModeESet;
90
90
91
    /**
91
    /**
92
     * The cached value of the '{@link #getAttributes() <em>Attributes</em>}' containment reference.
92
     * The cached value of the '{@link #getAttributes() <em>Attributes</em>}' containment reference.
Lines 96-102 Link Here
96
     * @generated
96
     * @generated
97
     * @ordered
97
     * @ordered
98
     */
98
     */
99
    protected DataElementAttributes m_attributes = null;
99
    protected DataElementAttributes m_attributes;
100
100
101
    /**
101
    /**
102
     * The cached value of the '{@link #getInputAttributes() <em>Input Attributes</em>}' containment reference.
102
     * The cached value of the '{@link #getInputAttributes() <em>Input Attributes</em>}' containment reference.
Lines 106-112 Link Here
106
     * @generated
106
     * @generated
107
     * @ordered
107
     * @ordered
108
     */
108
     */
109
    protected InputParameterAttributes m_inputAttributes = null;
109
    protected InputParameterAttributes m_inputAttributes;
110
110
111
    /**
111
    /**
112
     * The cached value of the '{@link #getOutputUsageHints() <em>Output Usage Hints</em>}' containment reference.
112
     * The cached value of the '{@link #getOutputUsageHints() <em>Output Usage Hints</em>}' containment reference.
Lines 116-122 Link Here
116
     * @generated
116
     * @generated
117
     * @ordered
117
     * @ordered
118
     */
118
     */
119
    protected OutputElementAttributes m_outputUsageHints = null;
119
    protected OutputElementAttributes m_outputUsageHints;
120
120
121
    /**
121
    /**
122
     * The cached value of the '{@link #getFields() <em>Fields</em>}' containment reference.
122
     * The cached value of the '{@link #getFields() <em>Fields</em>}' containment reference.
Lines 126-132 Link Here
126
     * @generated
126
     * @generated
127
     * @ordered
127
     * @ordered
128
     */
128
     */
129
    protected ParameterFields m_fields = null;
129
    protected ParameterFields m_fields;
130
130
131
    /**
131
    /**
132
     * <!-- begin-user-doc -->
132
     * <!-- begin-user-doc -->
Lines 143-148 Link Here
143
     * <!-- end-user-doc -->
143
     * <!-- end-user-doc -->
144
     * @generated
144
     * @generated
145
     */
145
     */
146
    @Override
146
    protected EClass eStaticClass()
147
    protected EClass eStaticClass()
147
    {
148
    {
148
        return DesignPackage.Literals.PARAMETER_DEFINITION;
149
        return DesignPackage.Literals.PARAMETER_DEFINITION;
Lines 189-196 Link Here
189
        if( getDefaultValueCount() == 0 )
190
        if( getDefaultValueCount() == 0 )
190
            return null;
191
            return null;
191
192
192
        Object firstValue = getDefaultValues().getValues().get(0);
193
        Object firstValue = getDefaultValues().getValues().get( 0 );
193
        return ( firstValue != null ) ? firstValue.toString() : null;
194
        return (firstValue != null) ? firstValue.toString() : null;
194
    }
195
    }
195
196
196
    /* (non-Javadoc)
197
    /* (non-Javadoc)
Lines 203-209 Link Here
203
            return; // ignore specified value
204
            return; // ignore specified value
204
205
205
        InputElementAttributes inputAttributes = getEditableInputElementAttributes();
206
        InputElementAttributes inputAttributes = getEditableInputElementAttributes();
206
        assert( inputAttributes != null );
207
        assert (inputAttributes != null);
207
208
208
        // use deprecated method that takes care of migrating value to a collection
209
        // use deprecated method that takes care of migrating value to a collection
209
        inputAttributes.setDefaultScalarValue( value );
210
        inputAttributes.setDefaultScalarValue( value );
Lines 231-237 Link Here
231
    public int getDefaultValueCount()
232
    public int getDefaultValueCount()
232
    {
233
    {
233
        StaticValues defaultValues = getDefaultValues();
234
        StaticValues defaultValues = getDefaultValues();
234
        return ( defaultValues == null ) ? 0 : defaultValues.count();
235
        return (defaultValues == null) ? 0 : defaultValues.count();
235
    }
236
    }
236
237
237
    /* (non-Javadoc)
238
    /* (non-Javadoc)
Lines 601-606 Link Here
601
     * <!-- end-user-doc -->
602
     * <!-- end-user-doc -->
602
     * @generated
603
     * @generated
603
     */
604
     */
605
    @Override
604
    public NotificationChain eInverseRemove( InternalEObject otherEnd,
606
    public NotificationChain eInverseRemove( InternalEObject otherEnd,
605
            int featureID, NotificationChain msgs )
607
            int featureID, NotificationChain msgs )
606
    {
608
    {
Lines 623-628 Link Here
623
     * <!-- end-user-doc -->
625
     * <!-- end-user-doc -->
624
     * @generated
626
     * @generated
625
     */
627
     */
628
    @Override
626
    public Object eGet( int featureID, boolean resolve, boolean coreType )
629
    public Object eGet( int featureID, boolean resolve, boolean coreType )
627
    {
630
    {
628
        switch( featureID )
631
        switch( featureID )
Lines 646-651 Link Here
646
     * <!-- end-user-doc -->
649
     * <!-- end-user-doc -->
647
     * @generated
650
     * @generated
648
     */
651
     */
652
    @Override
649
    public void eSet( int featureID, Object newValue )
653
    public void eSet( int featureID, Object newValue )
650
    {
654
    {
651
        switch( featureID )
655
        switch( featureID )
Lines 674-679 Link Here
674
     * <!-- end-user-doc -->
678
     * <!-- end-user-doc -->
675
     * @generated
679
     * @generated
676
     */
680
     */
681
    @Override
677
    public void eUnset( int featureID )
682
    public void eUnset( int featureID )
678
    {
683
    {
679
        switch( featureID )
684
        switch( featureID )
Lines 702-707 Link Here
702
     * <!-- end-user-doc -->
707
     * <!-- end-user-doc -->
703
     * @generated
708
     * @generated
704
     */
709
     */
710
    @Override
705
    public boolean eIsSet( int featureID )
711
    public boolean eIsSet( int featureID )
706
    {
712
    {
707
        switch( featureID )
713
        switch( featureID )
Lines 725-730 Link Here
725
     * <!-- end-user-doc -->
731
     * <!-- end-user-doc -->
726
     * @generated
732
     * @generated
727
     */
733
     */
734
    @Override
728
    public String toString()
735
    public String toString()
729
    {
736
    {
730
        if( eIsProxy() )
737
        if( eIsProxy() )

Return to bug 256357