Attachment 133054 Details for Bug 256357 – Patch - upgrade ODA design model to EMF 2.4.x

[patch] Patch - upgrade ODA design model to EMF 2.4.x

256357_odaDesign_patch.txt (text/plain), 202.76 KB, created by Linda Chan

on 2009-04-23 23:33:40 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Linda Chan

Created: 2009-04-23 23:33:40 EDT

Size: 202.76 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.datatools.connectivity.oda.design
>Index: src/org/eclipse/datatools/connectivity/oda/design/TextFormatType.java
>===================================================================
>RCS file: /cvsroot/datatools/org.eclipse.datatools.connectivity/plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/TextFormatType.java,v
>retrieving revision 1.2
>diff -u -r1.2 TextFormatType.java
>--- src/org/eclipse/datatools/connectivity/oda/design/TextFormatType.java	11 Apr 2007 02:59:53 -0000	1.2
>+++ src/org/eclipse/datatools/connectivity/oda/design/TextFormatType.java	24 Apr 2009 03:18:25 -0000
>@@ -1,6 +1,6 @@
> /**
> *************************************************************************
>- * Copyright (c) 2005, 2007 Actuate Corporation.
>+ * Copyright (c) 2005, 2009 Actuate Corporation.
> * All rights reserved. This program and the accompanying materials
> * are made available under the terms of the Eclipse Public License v1.0
> * which accompanies this distribution, and is available at
>@@ -19,7 +19,7 @@
> import java.util.Collections;
> import java.util.List;
> 
>-import org.eclipse.emf.common.util.AbstractEnumerator;
>+import org.eclipse.emf.common.util.Enumerator;
> 
> /**
> * 
>@@ -30,83 +30,76 @@
> * 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.
> * 
> * @see org.eclipse.datatools.connectivity.oda.design.DesignPackage#getTextFormatType()
>- * @model
>+ * @model extendedMetaData="name='TextFormatType'"
> * @generated
> */
>-public final class TextFormatType extends AbstractEnumerator
>-{
>+public enum TextFormatType implements Enumerator {
> /**
>+ * The 'Plain' literal object.
> * 
> * 
>+ * @see #PLAIN
> * @generated
>+ * @ordered
> */
>- public static final String copyright = "Copyright (c) 2005, 2007 Actuate Corporation"; //$NON-NLS-1$
>-
>+ PLAIN_LITERAL(0, "Plain", "Plain"), //$NON-NLS-1$ //$NON-NLS-2$
> /**
>- * The 'Plain' literal value.
>+ * The 'HTML' literal object.
> * 
> * 
>- * @see #PLAIN_LITERAL
>- * @model name="Plain"
>+ * @see #HTML
> * @generated
> * @ordered
> */
>- public static final int PLAIN = 0;
>-
>+ HTML_LITERAL(1, "HTML", "HTML"), //$NON-NLS-1$ //$NON-NLS-2$
> /**
>- * The 'HTML' literal value.
>+ * The 'RTF' literal object.
> * 
> * 
>- * @see #HTML_LITERAL
>- * @model
>+ * @see #RTF
> * @generated
> * @ordered
> */
>- public static final int HTML = 1;
>-
>+ RTF_LITERAL(2, "RTF", "RTF"); //$NON-NLS-1$ //$NON-NLS-2$
> /**
>- * The 'RTF' literal value.
> * 
> * 
>- * @see #RTF_LITERAL
>- * @model
> * @generated
>- * @ordered
> */
>- public static final int RTF = 2;
>+ public static final String copyright = "Copyright (c) 2005, 2009 Actuate Corporation"; //$NON-NLS-1$
> 
> /**
>- * The 'Plain' literal object.
>+ * The 'Plain' literal value.
> * 
> * 
>- * @see #PLAIN
>+ * @see #PLAIN_LITERAL
>+ * @model name="Plain"
> * @generated
> * @ordered
> */
>- public static final TextFormatType PLAIN_LITERAL = new TextFormatType(
>- PLAIN, "Plain", "Plain" ); //$NON-NLS-1$ //$NON-NLS-2$
>+ public static final int PLAIN = 0;
> 
> /**
>- * The 'HTML' literal object.
>+ * The 'HTML' literal value.
> * 
> * 
>- * @see #HTML
>+ * @see #HTML_LITERAL
>+ * @model
> * @generated
> * @ordered
> */
>- public static final TextFormatType HTML_LITERAL = new TextFormatType( HTML,
>- "HTML", "HTML" ); //$NON-NLS-1$ //$NON-NLS-2$
>+ public static final int HTML = 1;
> 
> /**
>- * The 'RTF' literal object.
>+ * The 'RTF' literal value.
> * 
> * 
>- * @see #RTF
>+ * @see #RTF_LITERAL
>+ * @model
> * @generated
> * @ordered
> */
>- public static final TextFormatType RTF_LITERAL = new TextFormatType( RTF,
>- "RTF", "RTF" ); //$NON-NLS-1$ //$NON-NLS-2$
>+ public static final int RTF = 2;
> 
> /**
> * An array of all the 'Text Format Type' enumerators.
>@@ -123,8 +116,8 @@
> * 
> * @generated
> */
>- public static final List VALUES = Collections.unmodifiableList( Arrays
>- .asList( VALUES_ARRAY ) );
>+ public static final List<TextFormatType> VALUES = Collections
>+ .unmodifiableList( Arrays.asList( VALUES_ARRAY ) );
> 
> /**
> * Returns the 'Text Format Type' literal with the specified literal value.
>@@ -185,6 +178,27 @@
> }
> 
> /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ private final int value;
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ private final String name;
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ private final String literal;
>+
>+ /**
> * Only this class can construct instances.
> * 
> * 
>@@ -192,7 +206,50 @@
> */
> private TextFormatType( int value, String name, String literal )
> {
>- super( value, name, literal );
>+ this.value = value;
>+ this.name = name;
>+ this.literal = literal;
> }
> 
>-} //TextFormatType
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public int getValue()
>+ {
>+ return value;
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public String getName()
>+ {
>+ return name;
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public String getLiteral()
>+ {
>+ return literal;
>+ }
>+
>+ /**
>+ * Returns the literal value of the enumerator, which is its string representation.
>+ * 
>+ * 
>+ * @generated
>+ */
>+ @Override
>+ public String toString()
>+ {
>+ return literal;
>+ }
>+}
>Index: src/org/eclipse/datatools/connectivity/oda/design/ResultSets.java
>===================================================================
>RCS file: /cvsroot/datatools/org.eclipse.datatools.connectivity/plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/ResultSets.java,v
>retrieving revision 1.3
>diff -u -r1.3 ResultSets.java
>--- src/org/eclipse/datatools/connectivity/oda/design/ResultSets.java	11 Apr 2007 02:59:53 -0000	1.3
>+++ src/org/eclipse/datatools/connectivity/oda/design/ResultSets.java	24 Apr 2009 03:18:25 -0000
>@@ -1,6 +1,6 @@
> /**
> *************************************************************************
>- * Copyright (c) 2005, 2007 Actuate Corporation.
>+ * Copyright (c) 2005, 2009 Actuate Corporation.
> * All rights reserved. This program and the accompanying materials
> * are made available under the terms of the Eclipse Public License v1.0
> * which accompanies this distribution, and is available at
>@@ -46,7 +46,7 @@
> * 
> * @generated
> */
>- String copyright = "Copyright (c) 2005, 2007 Actuate Corporation"; //$NON-NLS-1$
>+ String copyright = "Copyright (c) 2005, 2009 Actuate Corporation"; //$NON-NLS-1$
> 
> /**
> * Finds and returns a named result set definition that
>@@ -89,11 +89,11 @@
> * 
> * @return the value of the 'Result Set Definitions' containment reference list.
> * @see org.eclipse.datatools.connectivity.oda.design.DesignPackage#getResultSets_ResultSetDefinitions()
>- * @model type="org.eclipse.datatools.connectivity.oda.design.ResultSetDefinition" containment="true" required="true"
>+ * @model containment="true" required="true"
> * extendedMetaData="kind='element' name='resultSetDefinitions' namespace='##targetNamespace'"
> * @generated
> */
>- EList getResultSetDefinitions();
>+ EList<ResultSetDefinition> getResultSetDefinitions();
> 
> /**
> * Returns the value of the 'Derived Meta Data' attribute.
>@@ -108,7 +108,7 @@
> * @see #unsetDerivedMetaData()
> * @see #setDerivedMetaData(boolean)
> * @see org.eclipse.datatools.connectivity.oda.design.DesignPackage#getResultSets_DerivedMetaData()
>- * @model default="true" unique="false" unsettable="true" dataType="org.eclipse.emf.ecore.xml.type.Boolean"
>+ * @model default="true" unsettable="true" dataType="org.eclipse.emf.ecore.xml.type.Boolean"
> * extendedMetaData="kind='attribute' name='derivedMetaData'"
> * @generated
> */
>Index: src/org/eclipse/datatools/connectivity/oda/design/Properties.java
>===================================================================
>RCS file: /cvsroot/datatools/org.eclipse.datatools.connectivity/plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/Properties.java,v
>retrieving revision 1.7
>diff -u -r1.7 Properties.java
>--- src/org/eclipse/datatools/connectivity/oda/design/Properties.java	11 Apr 2007 02:59:53 -0000	1.7
>+++ src/org/eclipse/datatools/connectivity/oda/design/Properties.java	24 Apr 2009 03:18:25 -0000
>@@ -1,6 +1,6 @@
> /**
> *************************************************************************
>- * Copyright (c) 2005, 2007 Actuate Corporation.
>+ * Copyright (c) 2005, 2009 Actuate Corporation.
> * All rights reserved. This program and the accompanying materials
> * are made available under the terms of the Eclipse Public License v1.0
> * which accompanies this distribution, and is available at
>@@ -45,7 +45,7 @@
> * 
> * @generated
> */
>- String copyright = "Copyright (c) 2005, 2007 Actuate Corporation"; //$NON-NLS-1$
>+ String copyright = "Copyright (c) 2005, 2009 Actuate Corporation"; //$NON-NLS-1$
> 
> /**
> * Finds and returns the Property with the
>@@ -101,10 +101,10 @@
> * 
> * @return the value of the 'Properties' containment reference list.
> * @see org.eclipse.datatools.connectivity.oda.design.DesignPackage#getProperties_Properties()
>- * @model type="org.eclipse.datatools.connectivity.oda.design.Property" containment="true" required="true"
>+ * @model containment="true" required="true"
> * extendedMetaData="kind='element' name='properties' namespace='##targetNamespace'"
> * @generated
> */
>- EList getProperties();
>+ EList<Property> getProperties();
> 
> } // Properties
>Index: src/org/eclipse/datatools/connectivity/oda/design/ParameterFields.java
>===================================================================
>RCS file: /cvsroot/datatools/org.eclipse.datatools.connectivity/plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/ParameterFields.java,v
>retrieving revision 1.2
>diff -u -r1.2 ParameterFields.java
>--- src/org/eclipse/datatools/connectivity/oda/design/ParameterFields.java	11 Apr 2007 02:59:53 -0000	1.2
>+++ src/org/eclipse/datatools/connectivity/oda/design/ParameterFields.java	24 Apr 2009 03:18:25 -0000
>@@ -1,6 +1,6 @@
> /**
> *************************************************************************
>- * Copyright (c) 2005, 2007 Actuate Corporation.
>+ * Copyright (c) 2005, 2009 Actuate Corporation.
> * All rights reserved. This program and the accompanying materials
> * are made available under the terms of the Eclipse Public License v1.0
> * which accompanies this distribution, and is available at
>@@ -45,7 +45,7 @@
> * 
> * @generated
> */
>- String copyright = "Copyright (c) 2005, 2007 Actuate Corporation"; //$NON-NLS-1$
>+ String copyright = "Copyright (c) 2005, 2009 Actuate Corporation"; //$NON-NLS-1$
> 
> /**
> * Returns the value of the 'Field Collection' containment reference list.
>@@ -54,10 +54,10 @@
> * 
> * @return the value of the 'Field Collection' containment reference list.
> * @see org.eclipse.datatools.connectivity.oda.design.DesignPackage#getParameterFields_FieldCollection()
>- * @model type="org.eclipse.datatools.connectivity.oda.design.ParameterFieldDefinition" containment="true" required="true"
>- * extendedMetaData="kind='element' name='fields' namespace='##targetNamespace'"
>+ * @model containment="true" required="true"
>+ * extendedMetaData="kind='element' name='fieldCollection' namespace='##targetNamespace'"
> * @generated
> */
>- EList getFieldCollection();
>+ EList<ParameterFieldDefinition> getFieldCollection();
> 
> } // ParameterFields
>Index: src/org/eclipse/datatools/connectivity/oda/design/ResourceIdentifiers.java
>===================================================================
>RCS file: /cvsroot/datatools/org.eclipse.datatools.connectivity/plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/ResourceIdentifiers.java,v
>retrieving revision 1.1
>diff -u -r1.1 ResourceIdentifiers.java
>--- src/org/eclipse/datatools/connectivity/oda/design/ResourceIdentifiers.java	23 Jul 2008 04:12:27 -0000	1.1
>+++ src/org/eclipse/datatools/connectivity/oda/design/ResourceIdentifiers.java	24 Apr 2009 03:18:25 -0000
>@@ -1,6 +1,6 @@
> /**
> *************************************************************************
>- * Copyright (c) 2008 Actuate Corporation.
>+ * Copyright (c) 2008, 2009 Actuate Corporation.
> * All rights reserved. This program and the accompanying materials
> * are made available under the terms of the Eclipse Public License v1.0
> * which accompanies this distribution, and is available at
>@@ -20,7 +20,6 @@
> import org.eclipse.emf.ecore.EObject;
> 
> /**
>- * Experimental
> * 
> * A representation of the model object 'Resource Identifiers'.
> * 
>@@ -40,7 +39,7 @@
> * @see org.eclipse.datatools.connectivity.oda.design.DesignPackage#getResourceIdentifiers()
> * @model extendedMetaData="name='ResourceIdentifiers' kind='elementOnly'"
> * @generated
>- * @since DTP 1.6.1
>+ * @since DTP 1.7
> */
> public interface ResourceIdentifiers extends EObject
> {
>@@ -49,7 +48,7 @@
> * 
> * @generated
> */
>- String copyright = "Copyright (c) 2008 Actuate Corporation"; //$NON-NLS-1$
>+ String copyright = "Copyright (c) 2008, 2009 Actuate Corporation"; //$NON-NLS-1$
> 
> /**
> * Returns the value of the 'Appl Resource Base URI String' attribute in URI form.
>@@ -58,7 +57,7 @@
> * @generated NOT
> */
> URI getApplResourceBaseURI();
>- 
>+
> /**
> * Sets the value of the 'Appl Resource Base URI String' attribute in URI form.
> * @param baseURI the base URI of general purpose resources of an ODA consumer application
>@@ -78,7 +77,7 @@
> * @see #getApplResourceBaseURI()
> * @see #setApplResourceBaseURIString(String)
> * @see org.eclipse.datatools.connectivity.oda.design.DesignPackage#getResourceIdentifiers_ApplResourceBaseURIString()
>- * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.String"
>+ * @model dataType="org.eclipse.emf.ecore.xml.type.String"
> * extendedMetaData="kind='element' name='applResourceBaseURIString' namespace='##targetNamespace'"
> * @generated
> */
>@@ -102,7 +101,7 @@
> * @generated NOT
> */
> URI getDesignResourceBaseURI();
>- 
>+
> /**
> * Sets the value of the 'Design Resource Base URI String' attribute in URI form.
> * @param baseURI the base URI of design resources of an ODA consumer application
>@@ -122,7 +121,7 @@
> * @see #getDesignResourceBaseURI()
> * @see #setDesignResourceBaseURIString(String)
> * @see org.eclipse.datatools.connectivity.oda.design.DesignPackage#getResourceIdentifiers_DesignResourceBaseURIString()
>- * @model unique="false" dataType="org.eclipse.emf.ecore.xml.type.String"
>+ * @model dataType="org.eclipse.emf.ecore.xml.type.String"
> * extendedMetaData="kind='element' name='designResourceBaseURIString' namespace='##targetNamespace'"
> * @generated
> */
>Index: src/org/eclipse/datatools/connectivity/oda/design/TextWrapType.java
>===================================================================
>RCS file: /cvsroot/datatools/org.eclipse.datatools.connectivity/plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/TextWrapType.java,v
>retrieving revision 1.2
>diff -u -r1.2 TextWrapType.java
>--- src/org/eclipse/datatools/connectivity/oda/design/TextWrapType.java	11 Apr 2007 02:59:53 -0000	1.2
>+++ src/org/eclipse/datatools/connectivity/oda/design/TextWrapType.java	24 Apr 2009 03:18:25 -0000
>@@ -1,6 +1,6 @@
> /**
> *************************************************************************
>- * Copyright (c) 2005, 2007 Actuate Corporation.
>+ * Copyright (c) 2005, 2009 Actuate Corporation.
> * All rights reserved. This program and the accompanying materials
> * are made available under the terms of the Eclipse Public License v1.0
> * which accompanies this distribution, and is available at
>@@ -19,7 +19,7 @@
> import java.util.Collections;
> import java.util.List;
> 
>-import org.eclipse.emf.common.util.AbstractEnumerator;
>+import org.eclipse.emf.common.util.Enumerator;
> 
> /**
> * 
>@@ -30,61 +30,56 @@
> * 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).
> * 
> * @see org.eclipse.datatools.connectivity.oda.design.DesignPackage#getTextWrapType()
>- * @model
>+ * @model extendedMetaData="name='TextWrapType'"
> * @generated
> */
>-public final class TextWrapType extends AbstractEnumerator
>-{
>+public enum TextWrapType implements Enumerator {
> /**
>+ * The 'None' literal object.
> * 
> * 
>+ * @see #NONE
> * @generated
>+ * @ordered
> */
>- public static final String copyright = "Copyright (c) 2005, 2007 Actuate Corporation"; //$NON-NLS-1$
>-
>+ NONE_LITERAL(0, "None", "None"), //$NON-NLS-1$ //$NON-NLS-2$
> /**
>- * The 'None' literal value.
>+ * The 'Word' literal object.
> * 
> * 
>- * @see #NONE_LITERAL
>- * @model name="None"
>+ * @see #WORD
> * @generated
> * @ordered
> */
>- public static final int NONE = 0;
>-
>+ WORD_LITERAL(1, "Word", "Word"); //$NON-NLS-1$ //$NON-NLS-2$
> /**
>- * The 'Word' literal value.
> * 
> * 
>- * @see #WORD_LITERAL
>- * @model name="Word"
> * @generated
>- * @ordered
> */
>- public static final int WORD = 1;
>+ public static final String copyright = "Copyright (c) 2005, 2009 Actuate Corporation"; //$NON-NLS-1$
> 
> /**
>- * The 'None' literal object.
>+ * The 'None' literal value.
> * 
> * 
>- * @see #NONE
>+ * @see #NONE_LITERAL
>+ * @model name="None"
> * @generated
> * @ordered
> */
>- public static final TextWrapType NONE_LITERAL = new TextWrapType( NONE,
>- "None", "None" ); //$NON-NLS-1$ //$NON-NLS-2$
>+ public static final int NONE = 0;
> 
> /**
>- * The 'Word' literal object.
>+ * The 'Word' literal value.
> * 
> * 
>- * @see #WORD
>+ * @see #WORD_LITERAL
>+ * @model name="Word"
> * @generated
> * @ordered
> */
>- public static final TextWrapType WORD_LITERAL = new TextWrapType( WORD,
>- "Word", "Word" ); //$NON-NLS-1$ //$NON-NLS-2$
>+ public static final int WORD = 1;
> 
> /**
> * An array of all the 'Text Wrap Type' enumerators.
>@@ -101,8 +96,8 @@
> * 
> * @generated
> */
>- public static final List VALUES = Collections.unmodifiableList( Arrays
>- .asList( VALUES_ARRAY ) );
>+ public static final List<TextWrapType> VALUES = Collections
>+ .unmodifiableList( Arrays.asList( VALUES_ARRAY ) );
> 
> /**
> * Returns the 'Text Wrap Type' literal with the specified literal value.
>@@ -161,6 +156,27 @@
> }
> 
> /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ private final int value;
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ private final String name;
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ private final String literal;
>+
>+ /**
> * Only this class can construct instances.
> * 
> * 
>@@ -168,7 +184,50 @@
> */
> private TextWrapType( int value, String name, String literal )
> {
>- super( value, name, literal );
>+ this.value = value;
>+ this.name = name;
>+ this.literal = literal;
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public int getValue()
>+ {
>+ return value;
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public String getName()
>+ {
>+ return name;
> }
> 
>-} //TextWrapType
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public String getLiteral()
>+ {
>+ return literal;
>+ }
>+
>+ /**
>+ * Returns the literal value of the enumerator, which is its string representation.
>+ * 
>+ * 
>+ * @generated
>+ */
>+ @Override
>+ public String toString()
>+ {
>+ return literal;
>+ }
>+}
>Index: src/org/eclipse/datatools/connectivity/oda/design/ScalarValueChoices.java
>===================================================================
>RCS file: /cvsroot/datatools/org.eclipse.datatools.connectivity/plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/ScalarValueChoices.java,v
>retrieving revision 1.2
>diff -u -r1.2 ScalarValueChoices.java
>--- src/org/eclipse/datatools/connectivity/oda/design/ScalarValueChoices.java	11 Apr 2007 02:59:53 -0000	1.2
>+++ src/org/eclipse/datatools/connectivity/oda/design/ScalarValueChoices.java	24 Apr 2009 03:18:25 -0000
>@@ -1,6 +1,6 @@
> /**
> *************************************************************************
>- * Copyright (c) 2005, 2007 Actuate Corporation.
>+ * Copyright (c) 2005, 2009 Actuate Corporation.
> * All rights reserved. This program and the accompanying materials
> * are made available under the terms of the Eclipse Public License v1.0
> * which accompanies this distribution, and is available at
>@@ -45,7 +45,7 @@
> * 
> * @generated
> */
>- String copyright = "Copyright (c) 2005, 2007 Actuate Corporation"; //$NON-NLS-1$
>+ String copyright = "Copyright (c) 2005, 2009 Actuate Corporation"; //$NON-NLS-1$
> 
> /**
> * Returns the value of the 'Scalar Values' containment reference list.
>@@ -54,10 +54,10 @@
> * 
> * @return the value of the 'Scalar Values' containment reference list.
> * @see org.eclipse.datatools.connectivity.oda.design.DesignPackage#getScalarValueChoices_ScalarValues()
>- * @model type="org.eclipse.datatools.connectivity.oda.design.ScalarValueDefinition" containment="true" required="true"
>+ * @model containment="true" required="true"
> * extendedMetaData="kind='element' name='scalarValues' namespace='##targetNamespace'"
> * @generated
> */
>- EList getScalarValues();
>+ EList<ScalarValueDefinition> getScalarValues();
> 
> } // ScalarValueChoices
>Index: src/org/eclipse/datatools/connectivity/oda/design/ElementNullability.java
>===================================================================
>RCS file: /cvsroot/datatools/org.eclipse.datatools.connectivity/plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/ElementNullability.java,v
>retrieving revision 1.2
>diff -u -r1.2 ElementNullability.java
>--- src/org/eclipse/datatools/connectivity/oda/design/ElementNullability.java	11 Apr 2007 02:59:53 -0000	1.2
>+++ src/org/eclipse/datatools/connectivity/oda/design/ElementNullability.java	24 Apr 2009 03:18:25 -0000
>@@ -1,6 +1,6 @@
> /**
> *************************************************************************
>- * Copyright (c) 2005, 2007 Actuate Corporation.
>+ * Copyright (c) 2005, 2009 Actuate Corporation.
> * All rights reserved. This program and the accompanying materials
> * are made available under the terms of the Eclipse Public License v1.0
> * which accompanies this distribution, and is available at
>@@ -19,7 +19,7 @@
> import java.util.Collections;
> import java.util.List;
> 
>-import org.eclipse.emf.common.util.AbstractEnumerator;
>+import org.eclipse.emf.common.util.Enumerator;
> 
> /**
> * 
>@@ -30,83 +30,76 @@
> * Indicates whether a data element's value can be null.
> * 
> * @see org.eclipse.datatools.connectivity.oda.design.DesignPackage#getElementNullability()
>- * @model
>+ * @model extendedMetaData="name='ElementNullability'"
> * @generated
> */
>-public final class ElementNullability extends AbstractEnumerator
>-{
>+public enum ElementNullability implements Enumerator {
> /**
>+ * The 'Unknown' literal object.
> * 
> * 
>+ * @see #UNKNOWN
> * @generated
>+ * @ordered
> */
>- public static final String copyright = "Copyright (c) 2005, 2007 Actuate Corporation"; //$NON-NLS-1$
>-
>+ UNKNOWN_LITERAL(0, "Unknown", "Unknown"), //$NON-NLS-1$ //$NON-NLS-2$
> /**
>- * The 'Unknown' literal value.
>+ * The 'Nullable' literal object.
> * 
> * 
>- * @see #UNKNOWN_LITERAL
>- * @model name="Unknown"
>+ * @see #NULLABLE
> * @generated
> * @ordered
> */
>- public static final int UNKNOWN = 0;
>-
>+ NULLABLE_LITERAL(1, "Nullable", "Nullable"), //$NON-NLS-1$ //$NON-NLS-2$
> /**
>- * The 'Nullable' literal value.
>+ * The 'Not Nullable' literal object.
> * 
> * 
>- * @see #NULLABLE_LITERAL
>- * @model name="Nullable"
>+ * @see #NOT_NULLABLE
> * @generated
> * @ordered
> */
>- public static final int NULLABLE = 1;
>-
>+ NOT_NULLABLE_LITERAL(2, "NotNullable", "NotNullable"); //$NON-NLS-1$ //$NON-NLS-2$
> /**
>- * The 'Not Nullable' literal value.
> * 
> * 
>- * @see #NOT_NULLABLE_LITERAL
>- * @model name="NotNullable"
> * @generated
>- * @ordered
> */
>- public static final int NOT_NULLABLE = 2;
>+ public static final String copyright = "Copyright (c) 2005, 2009 Actuate Corporation"; //$NON-NLS-1$
> 
> /**
>- * The 'Unknown' literal object.
>+ * The 'Unknown' literal value.
> * 
> * 
>- * @see #UNKNOWN
>+ * @see #UNKNOWN_LITERAL
>+ * @model name="Unknown"
> * @generated
> * @ordered
> */
>- public static final ElementNullability UNKNOWN_LITERAL = new ElementNullability(
>- UNKNOWN, "Unknown", "Unknown" ); //$NON-NLS-1$ //$NON-NLS-2$
>+ public static final int UNKNOWN = 0;
> 
> /**
>- * The 'Nullable' literal object.
>+ * The 'Nullable' literal value.
> * 
> * 
>- * @see #NULLABLE
>+ * @see #NULLABLE_LITERAL
>+ * @model name="Nullable"
> * @generated
> * @ordered
> */
>- public static final ElementNullability NULLABLE_LITERAL = new ElementNullability(
>- NULLABLE, "Nullable", "Nullable" ); //$NON-NLS-1$ //$NON-NLS-2$
>+ public static final int NULLABLE = 1;
> 
> /**
>- * The 'Not Nullable' literal object.
>+ * The 'Not Nullable' literal value.
> * 
> * 
>- * @see #NOT_NULLABLE
>+ * @see #NOT_NULLABLE_LITERAL
>+ * @model name="NotNullable"
> * @generated
> * @ordered
> */
>- public static final ElementNullability NOT_NULLABLE_LITERAL = new ElementNullability(
>- NOT_NULLABLE, "NotNullable", "NotNullable" ); //$NON-NLS-1$ //$NON-NLS-2$
>+ public static final int NOT_NULLABLE = 2;
> 
> /**
> * An array of all the 'Element Nullability' enumerators.
>@@ -123,8 +116,8 @@
> * 
> * @generated
> */
>- public static final List VALUES = Collections.unmodifiableList( Arrays
>- .asList( VALUES_ARRAY ) );
>+ public static final List<ElementNullability> VALUES = Collections
>+ .unmodifiableList( Arrays.asList( VALUES_ARRAY ) );
> 
> /**
> * Returns the 'Element Nullability' literal with the specified literal value.
>@@ -185,6 +178,27 @@
> }
> 
> /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ private final int value;
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ private final String name;
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ private final String literal;
>+
>+ /**
> * Only this class can construct instances.
> * 
> * 
>@@ -192,7 +206,50 @@
> */
> private ElementNullability( int value, String name, String literal )
> {
>- super( value, name, literal );
>+ this.value = value;
>+ this.name = name;
>+ this.literal = literal;
> }
> 
>-} //ElementNullability
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public int getValue()
>+ {
>+ return value;
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public String getName()
>+ {
>+ return name;
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public String getLiteral()
>+ {
>+ return literal;
>+ }
>+
>+ /**
>+ * Returns the literal value of the enumerator, which is its string representation.
>+ * 
>+ * 
>+ * @generated
>+ */
>+ @Override
>+ public String toString()
>+ {
>+ return literal;
>+ }
>+}
>Index: src/org/eclipse/datatools/connectivity/oda/design/InputPromptControlStyle.java
>===================================================================
>RCS file: /cvsroot/datatools/org.eclipse.datatools.connectivity/plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/InputPromptControlStyle.java,v
>retrieving revision 1.2
>diff -u -r1.2 InputPromptControlStyle.java
>--- src/org/eclipse/datatools/connectivity/oda/design/InputPromptControlStyle.java	11 Apr 2007 02:59:53 -0000	1.2
>+++ src/org/eclipse/datatools/connectivity/oda/design/InputPromptControlStyle.java	24 Apr 2009 03:18:25 -0000
>@@ -1,6 +1,6 @@
> /**
> *************************************************************************
>- * Copyright (c) 2005, 2007 Actuate Corporation.
>+ * Copyright (c) 2005, 2009 Actuate Corporation.
> * All rights reserved. This program and the accompanying materials
> * are made available under the terms of the Eclipse Public License v1.0
> * which accompanies this distribution, and is available at
>@@ -19,7 +19,7 @@
> import java.util.Collections;
> import java.util.List;
> 
>-import org.eclipse.emf.common.util.AbstractEnumerator;
>+import org.eclipse.emf.common.util.Enumerator;
> 
> /**
> * 
>@@ -30,128 +30,117 @@
> * The style of UI control for prompting user to input a value.
> * 
> * @see org.eclipse.datatools.connectivity.oda.design.DesignPackage#getInputPromptControlStyle()
>- * @model
>+ * @model extendedMetaData="name='InputPromptControlStyle'"
> * @generated
> */
>-public final class InputPromptControlStyle extends AbstractEnumerator
>-{
>+public enum InputPromptControlStyle implements Enumerator {
> /**
>+ * The 'Text Field' literal object.
> * 
> * 
>+ * @see #TEXT_FIELD
> * @generated
>+ * @ordered
> */
>- public static final String copyright = "Copyright (c) 2005, 2007 Actuate Corporation"; //$NON-NLS-1$
>-
>+ TEXT_FIELD_LITERAL(0, "TextField", "TextField"), //$NON-NLS-1$ //$NON-NLS-2$
> /**
>- * The 'Text Field' literal value.
>+ * The 'Selectable List' literal object.
> * 
> * 
>- * @see #TEXT_FIELD_LITERAL
>- * @model name="TextField"
>+ * @see #SELECTABLE_LIST
> * @generated
> * @ordered
> */
>- public static final int TEXT_FIELD = 0;
>-
>+ SELECTABLE_LIST_LITERAL(1, "SelectableList", "SelectableList"), //$NON-NLS-1$ //$NON-NLS-2$
> /**
>- * The 'Selectable List' literal value.
>+ * The 'Selectable List With Text Field' literal object.
> * 
> * 
>- * @see #SELECTABLE_LIST_LITERAL
>- * @model name="SelectableList"
>+ * @see #SELECTABLE_LIST_WITH_TEXT_FIELD
> * @generated
> * @ordered
> */
>- public static final int SELECTABLE_LIST = 1;
>-
>+ SELECTABLE_LIST_WITH_TEXT_FIELD_LITERAL(2, "SelectableListWithTextField", //$NON-NLS-1$
>+ "SelectableListWithTextField"), //$NON-NLS-1$
> /**
>- * The 'Selectable List With Text Field' literal value.
>+ * The 'Check Box' literal object.
> * 
> * 
>- * @see #SELECTABLE_LIST_WITH_TEXT_FIELD_LITERAL
>- * @model name="SelectableListWithTextField"
>+ * @see #CHECK_BOX
> * @generated
> * @ordered
> */
>- public static final int SELECTABLE_LIST_WITH_TEXT_FIELD = 2;
>-
>+ CHECK_BOX_LITERAL(3, "CheckBox", "CheckBox"), //$NON-NLS-1$ //$NON-NLS-2$
> /**
>- * The 'Check Box' literal value.
>+ * The 'Radio Button' literal object.
> * 
> * 
>- * @see #CHECK_BOX_LITERAL
>- * @model name="CheckBox"
>+ * @see #RADIO_BUTTON
> * @generated
> * @ordered
> */
>- public static final int CHECK_BOX = 3;
>-
>+ RADIO_BUTTON_LITERAL(4, "RadioButton", "RadioButton"); //$NON-NLS-1$ //$NON-NLS-2$
> /**
>- * The 'Radio Button' literal value.
> * 
> * 
>- * @see #RADIO_BUTTON_LITERAL
>- * @model name="RadioButton"
> * @generated
>- * @ordered
> */
>- public static final int RADIO_BUTTON = 4;
>+ public static final String copyright = "Copyright (c) 2005, 2009 Actuate Corporation"; //$NON-NLS-1$
> 
> /**
>- * The 'Text Field' literal object.
>+ * The 'Text Field' literal value.
> * 
> * 
>- * @see #TEXT_FIELD
>+ * @see #TEXT_FIELD_LITERAL
>+ * @model name="TextField"
> * @generated
> * @ordered
> */
>- public static final InputPromptControlStyle TEXT_FIELD_LITERAL = new InputPromptControlStyle(
>- TEXT_FIELD, "TextField", "TextField" ); //$NON-NLS-1$ //$NON-NLS-2$
>+ public static final int TEXT_FIELD = 0;
> 
> /**
>- * The 'Selectable List' literal object.
>+ * The 'Selectable List' literal value.
> * 
> * 
>- * @see #SELECTABLE_LIST
>+ * @see #SELECTABLE_LIST_LITERAL
>+ * @model name="SelectableList"
> * @generated
> * @ordered
> */
>- public static final InputPromptControlStyle SELECTABLE_LIST_LITERAL = new InputPromptControlStyle(
>- SELECTABLE_LIST, "SelectableList", "SelectableList" ); //$NON-NLS-1$ //$NON-NLS-2$
>+ public static final int SELECTABLE_LIST = 1;
> 
> /**
>- * The 'Selectable List With Text Field' literal object.
>+ * The 'Selectable List With Text Field' literal value.
> * 
> * 
>- * @see #SELECTABLE_LIST_WITH_TEXT_FIELD
>+ * @see #SELECTABLE_LIST_WITH_TEXT_FIELD_LITERAL
>+ * @model name="SelectableListWithTextField"
> * @generated
> * @ordered
> */
>- public static final InputPromptControlStyle SELECTABLE_LIST_WITH_TEXT_FIELD_LITERAL = new InputPromptControlStyle(
>- SELECTABLE_LIST_WITH_TEXT_FIELD,
>- "SelectableListWithTextField", "SelectableListWithTextField" ); //$NON-NLS-1$ //$NON-NLS-2$
>+ public static final int SELECTABLE_LIST_WITH_TEXT_FIELD = 2;
> 
> /**
>- * The 'Check Box' literal object.
>+ * The 'Check Box' literal value.
> * 
> * 
>- * @see #CHECK_BOX
>+ * @see #CHECK_BOX_LITERAL
>+ * @model name="CheckBox"
> * @generated
> * @ordered
> */
>- public static final InputPromptControlStyle CHECK_BOX_LITERAL = new InputPromptControlStyle(
>- CHECK_BOX, "CheckBox", "CheckBox" ); //$NON-NLS-1$ //$NON-NLS-2$
>+ public static final int CHECK_BOX = 3;
> 
> /**
>- * The 'Radio Button' literal object.
>+ * The 'Radio Button' literal value.
> * 
> * 
>- * @see #RADIO_BUTTON
>+ * @see #RADIO_BUTTON_LITERAL
>+ * @model name="RadioButton"
> * @generated
> * @ordered
> */
>- public static final InputPromptControlStyle RADIO_BUTTON_LITERAL = new InputPromptControlStyle(
>- RADIO_BUTTON, "RadioButton", "RadioButton" ); //$NON-NLS-1$ //$NON-NLS-2$
>+ public static final int RADIO_BUTTON = 4;
> 
> /**
> * An array of all the 'Input Prompt Control Style' enumerators.
>@@ -170,8 +159,8 @@
> * 
> * @generated
> */
>- public static final List VALUES = Collections.unmodifiableList( Arrays
>- .asList( VALUES_ARRAY ) );
>+ public static final List<InputPromptControlStyle> VALUES = Collections
>+ .unmodifiableList( Arrays.asList( VALUES_ARRAY ) );
> 
> /**
> * Returns the 'Input Prompt Control Style' literal with the specified literal value.
>@@ -236,6 +225,27 @@
> }
> 
> /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ private final int value;
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ private final String name;
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ private final String literal;
>+
>+ /**
> * Only this class can construct instances.
> * 
> * 
>@@ -243,7 +253,50 @@
> */
> private InputPromptControlStyle( int value, String name, String literal )
> {
>- super( value, name, literal );
>+ this.value = value;
>+ this.name = name;
>+ this.literal = literal;
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public int getValue()
>+ {
>+ return value;
> }
> 
>-} //InputPromptControlStyle
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public String getName()
>+ {
>+ return name;
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public String getLiteral()
>+ {
>+ return literal;
>+ }
>+
>+ /**
>+ * Returns the literal value of the enumerator, which is its string representation.
>+ * 
>+ * 
>+ * @generated
>+ */
>+ @Override
>+ public String toString()
>+ {
>+ return literal;
>+ }
>+}
>Index: src/org/eclipse/datatools/connectivity/oda/design/ParameterMode.java
>===================================================================
>RCS file: /cvsroot/datatools/org.eclipse.datatools.connectivity/plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/ParameterMode.java,v
>retrieving revision 1.2
>diff -u -r1.2 ParameterMode.java
>--- src/org/eclipse/datatools/connectivity/oda/design/ParameterMode.java	11 Apr 2007 02:59:53 -0000	1.2
>+++ src/org/eclipse/datatools/connectivity/oda/design/ParameterMode.java	24 Apr 2009 03:18:25 -0000
>@@ -1,6 +1,6 @@
> /**
> *************************************************************************
>- * Copyright (c) 2005, 2007 Actuate Corporation.
>+ * Copyright (c) 2005, 2009 Actuate Corporation.
> * All rights reserved. This program and the accompanying materials
> * are made available under the terms of the Eclipse Public License v1.0
> * which accompanies this distribution, and is available at
>@@ -19,7 +19,7 @@
> import java.util.Collections;
> import java.util.List;
> 
>-import org.eclipse.emf.common.util.AbstractEnumerator;
>+import org.eclipse.emf.common.util.Enumerator;
> 
> /**
> * 
>@@ -30,83 +30,76 @@
> * Indicates whether a parameter is of input and/or output mode.
> * 
> * @see org.eclipse.datatools.connectivity.oda.design.DesignPackage#getParameterMode()
>- * @model
>+ * @model extendedMetaData="name='ParameterMode'"
> * @generated
> */
>-public final class ParameterMode extends AbstractEnumerator
>-{
>+public enum ParameterMode implements Enumerator {
> /**
>+ * The 'In' literal object.
> * 
> * 
>+ * @see #IN
> * @generated
>+ * @ordered
> */
>- public static final String copyright = "Copyright (c) 2005, 2007 Actuate Corporation"; //$NON-NLS-1$
>-
>+ IN_LITERAL(0, "In", "In"), //$NON-NLS-1$ //$NON-NLS-2$
> /**
>- * The 'In' literal value.
>+ * The 'Out' literal object.
> * 
> * 
>- * @see #IN_LITERAL
>- * @model name="In"
>+ * @see #OUT
> * @generated
> * @ordered
> */
>- public static final int IN = 0;
>-
>+ OUT_LITERAL(1, "Out", "Out"), //$NON-NLS-1$ //$NON-NLS-2$
> /**
>- * The 'Out' literal value.
>+ * The 'In Out' literal object.
> * 
> * 
>- * @see #OUT_LITERAL
>- * @model name="Out"
>+ * @see #IN_OUT
> * @generated
> * @ordered
> */
>- public static final int OUT = 1;
>-
>+ IN_OUT_LITERAL(2, "InOut", "InOut"); //$NON-NLS-1$ //$NON-NLS-2$
> /**
>- * The 'In Out' literal value.
> * 
> * 
>- * @see #IN_OUT_LITERAL
>- * @model name="InOut"
> * @generated
>- * @ordered
> */
>- public static final int IN_OUT = 2;
>+ public static final String copyright = "Copyright (c) 2005, 2009 Actuate Corporation"; //$NON-NLS-1$
> 
> /**
>- * The 'In' literal object.
>+ * The 'In' literal value.
> * 
> * 
>- * @see #IN
>+ * @see #IN_LITERAL
>+ * @model name="In"
> * @generated
> * @ordered
> */
>- public static final ParameterMode IN_LITERAL = new ParameterMode( IN,
>- "In", "In" ); //$NON-NLS-1$ //$NON-NLS-2$
>+ public static final int IN = 0;
> 
> /**
>- * The 'Out' literal object.
>+ * The 'Out' literal value.
> * 
> * 
>- * @see #OUT
>+ * @see #OUT_LITERAL
>+ * @model name="Out"
> * @generated
> * @ordered
> */
>- public static final ParameterMode OUT_LITERAL = new ParameterMode( OUT,
>- "Out", "Out" ); //$NON-NLS-1$ //$NON-NLS-2$
>+ public static final int OUT = 1;
> 
> /**
>- * The 'In Out' literal object.
>+ * The 'In Out' literal value.
> * 
> * 
>- * @see #IN_OUT
>+ * @see #IN_OUT_LITERAL
>+ * @model name="InOut"
> * @generated
> * @ordered
> */
>- public static final ParameterMode IN_OUT_LITERAL = new ParameterMode(
>- IN_OUT, "InOut", "InOut" ); //$NON-NLS-1$ //$NON-NLS-2$
>+ public static final int IN_OUT = 2;
> 
> /**
> * An array of all the 'Parameter Mode' enumerators.
>@@ -123,8 +116,8 @@
> * 
> * @generated
> */
>- public static final List VALUES = Collections.unmodifiableList( Arrays
>- .asList( VALUES_ARRAY ) );
>+ public static final List<ParameterMode> VALUES = Collections
>+ .unmodifiableList( Arrays.asList( VALUES_ARRAY ) );
> 
> /**
> * Returns the 'Parameter Mode' literal with the specified literal value.
>@@ -185,6 +178,27 @@
> }
> 
> /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ private final int value;
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ private final String name;
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ private final String literal;
>+
>+ /**
> * Only this class can construct instances.
> * 
> * 
>@@ -192,7 +206,50 @@
> */
> private ParameterMode( int value, String name, String literal )
> {
>- super( value, name, literal );
>+ this.value = value;
>+ this.name = name;
>+ this.literal = literal;
> }
> 
>-} //ParameterMode
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public int getValue()
>+ {
>+ return value;
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public String getName()
>+ {
>+ return name;
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public String getLiteral()
>+ {
>+ return literal;
>+ }
>+
>+ /**
>+ * Returns the literal value of the enumerator, which is its string representation.
>+ * 
>+ * 
>+ * @generated
>+ */
>+ @Override
>+ public String toString()
>+ {
>+ return literal;
>+ }
>+}
>Index: src/org/eclipse/datatools/connectivity/oda/design/DataSetParameters.java
>===================================================================
>RCS file: /cvsroot/datatools/org.eclipse.datatools.connectivity/plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/DataSetParameters.java,v
>retrieving revision 1.2
>diff -u -r1.2 DataSetParameters.java
>--- src/org/eclipse/datatools/connectivity/oda/design/DataSetParameters.java	11 Apr 2007 02:59:53 -0000	1.2
>+++ src/org/eclipse/datatools/connectivity/oda/design/DataSetParameters.java	24 Apr 2009 03:18:25 -0000
>@@ -1,6 +1,6 @@
> /**
> *************************************************************************
>- * Copyright (c) 2005, 2007 Actuate Corporation.
>+ * Copyright (c) 2005, 2009 Actuate Corporation.
> * All rights reserved. This program and the accompanying materials
> * are made available under the terms of the Eclipse Public License v1.0
> * which accompanies this distribution, and is available at
>@@ -46,7 +46,7 @@
> * 
> * @generated
> */
>- String copyright = "Copyright (c) 2005, 2007 Actuate Corporation"; //$NON-NLS-1$
>+ String copyright = "Copyright (c) 2005, 2009 Actuate Corporation"; //$NON-NLS-1$
> 
> /**
> * Returns the value of the 'Parameter Definitions' containment reference list.
>@@ -55,11 +55,11 @@
> * 
> * @return the value of the 'Parameter Definitions' containment reference list.
> * @see org.eclipse.datatools.connectivity.oda.design.DesignPackage#getDataSetParameters_ParameterDefinitions()
>- * @model type="org.eclipse.datatools.connectivity.oda.design.ParameterDefinition" containment="true" required="true"
>+ * @model containment="true" required="true"
> * extendedMetaData="kind='element' name='parameterDefinitions' namespace='##targetNamespace'"
> * @generated
> */
>- EList getParameterDefinitions();
>+ EList<ParameterDefinition> getParameterDefinitions();
> 
> /**
> * Returns the value of the 'Derived Meta Data' attribute.
>@@ -74,7 +74,7 @@
> * @see #unsetDerivedMetaData()
> * @see #setDerivedMetaData(boolean)
> * @see org.eclipse.datatools.connectivity.oda.design.DesignPackage#getDataSetParameters_DerivedMetaData()
>- * @model default="true" unique="false" unsettable="true" dataType="org.eclipse.emf.ecore.xml.type.Boolean"
>+ * @model default="true" unsettable="true" dataType="org.eclipse.emf.ecore.xml.type.Boolean"
> * extendedMetaData="kind='attribute' name='derivedMetaData'"
> * @generated
> */
>Index: src/org/eclipse/datatools/connectivity/oda/design/AxisType.java
>===================================================================
>RCS file: /cvsroot/datatools/org.eclipse.datatools.connectivity/plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/AxisType.java,v
>retrieving revision 1.2
>diff -u -r1.2 AxisType.java
>--- src/org/eclipse/datatools/connectivity/oda/design/AxisType.java	11 Apr 2007 02:59:53 -0000	1.2
>+++ src/org/eclipse/datatools/connectivity/oda/design/AxisType.java	24 Apr 2009 03:18:25 -0000
>@@ -1,6 +1,6 @@
> /**
> *************************************************************************
>- * Copyright (c) 2005, 2007 Actuate Corporation.
>+ * Copyright (c) 2005, 2009 Actuate Corporation.
> * All rights reserved. This program and the accompanying materials
> * are made available under the terms of the Eclipse Public License v1.0
> * which accompanies this distribution, and is available at
>@@ -19,7 +19,7 @@
> import java.util.Collections;
> import java.util.List;
> 
>-import org.eclipse.emf.common.util.AbstractEnumerator;
>+import org.eclipse.emf.common.util.Enumerator;
> 
> /**
> * 
>@@ -30,83 +30,76 @@
> * Axis type of a result set column.
> * 
> * @see org.eclipse.datatools.connectivity.oda.design.DesignPackage#getAxisType()
>- * @model
>+ * @model extendedMetaData="name='AxisType'"
> * @generated
> */
>-public final class AxisType extends AbstractEnumerator
>-{
>+public enum AxisType implements Enumerator {
> /**
>+ * The 'Dimension Member' literal object.
> * 
> * 
>+ * @see #DIMENSION_MEMBER
> * @generated
>+ * @ordered
> */
>- public static final String copyright = "Copyright (c) 2005, 2007 Actuate Corporation"; //$NON-NLS-1$
>-
>+ DIMENSION_MEMBER_LITERAL(0, "DimensionMember", "DimensionMember"), //$NON-NLS-1$ //$NON-NLS-2$
> /**
>- * The 'Dimension Member' literal value.
>+ * The 'Dimension Attribute' literal object.
> * 
> * 
>- * @see #DIMENSION_MEMBER_LITERAL
>- * @model name="DimensionMember"
>+ * @see #DIMENSION_ATTRIBUTE
> * @generated
> * @ordered
> */
>- public static final int DIMENSION_MEMBER = 0;
>-
>+ DIMENSION_ATTRIBUTE_LITERAL(1, "DimensionAttribute", "DimensionAttribute"), //$NON-NLS-1$ //$NON-NLS-2$
> /**
>- * The 'Dimension Attribute' literal value.
>+ * The 'Measure' literal object.
> * 
> * 
>- * @see #DIMENSION_ATTRIBUTE_LITERAL
>- * @model name="DimensionAttribute"
>+ * @see #MEASURE
> * @generated
> * @ordered
> */
>- public static final int DIMENSION_ATTRIBUTE = 1;
>-
>+ MEASURE_LITERAL(2, "Measure", "Measure"); //$NON-NLS-1$ //$NON-NLS-2$
> /**
>- * The 'Measure' literal value.
> * 
> * 
>- * @see #MEASURE_LITERAL
>- * @model name="Measure"
> * @generated
>- * @ordered
> */
>- public static final int MEASURE = 2;
>+ public static final String copyright = "Copyright (c) 2005, 2009 Actuate Corporation"; //$NON-NLS-1$
> 
> /**
>- * The 'Dimension Member' literal object.
>+ * The 'Dimension Member' literal value.
> * 
> * 
>- * @see #DIMENSION_MEMBER
>+ * @see #DIMENSION_MEMBER_LITERAL
>+ * @model name="DimensionMember"
> * @generated
> * @ordered
> */
>- public static final AxisType DIMENSION_MEMBER_LITERAL = new AxisType(
>- DIMENSION_MEMBER, "DimensionMember", "DimensionMember" ); //$NON-NLS-1$ //$NON-NLS-2$
>+ public static final int DIMENSION_MEMBER = 0;
> 
> /**
>- * The 'Dimension Attribute' literal object.
>+ * The 'Dimension Attribute' literal value.
> * 
> * 
>- * @see #DIMENSION_ATTRIBUTE
>+ * @see #DIMENSION_ATTRIBUTE_LITERAL
>+ * @model name="DimensionAttribute"
> * @generated
> * @ordered
> */
>- public static final AxisType DIMENSION_ATTRIBUTE_LITERAL = new AxisType(
>- DIMENSION_ATTRIBUTE, "DimensionAttribute", "DimensionAttribute" ); //$NON-NLS-1$ //$NON-NLS-2$
>+ public static final int DIMENSION_ATTRIBUTE = 1;
> 
> /**
>- * The 'Measure' literal object.
>+ * The 'Measure' literal value.
> * 
> * 
>- * @see #MEASURE
>+ * @see #MEASURE_LITERAL
>+ * @model name="Measure"
> * @generated
> * @ordered
> */
>- public static final AxisType MEASURE_LITERAL = new AxisType( MEASURE,
>- "Measure", "Measure" ); //$NON-NLS-1$ //$NON-NLS-2$
>+ public static final int MEASURE = 2;
> 
> /**
> * An array of all the 'Axis Type' enumerators.
>@@ -123,8 +116,8 @@
> * 
> * @generated
> */
>- public static final List VALUES = Collections.unmodifiableList( Arrays
>- .asList( VALUES_ARRAY ) );
>+ public static final List<AxisType> VALUES = Collections
>+ .unmodifiableList( Arrays.asList( VALUES_ARRAY ) );
> 
> /**
> * Returns the 'Axis Type' literal with the specified literal value.
>@@ -185,6 +178,27 @@
> }
> 
> /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ private final int value;
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ private final String name;
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ private final String literal;
>+
>+ /**
> * Only this class can construct instances.
> * 
> * 
>@@ -192,7 +206,50 @@
> */
> private AxisType( int value, String name, String literal )
> {
>- super( value, name, literal );
>+ this.value = value;
>+ this.name = name;
>+ this.literal = literal;
> }
> 
>-} //AxisType
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public int getValue()
>+ {
>+ return value;
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public String getName()
>+ {
>+ return name;
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public String getLiteral()
>+ {
>+ return literal;
>+ }
>+
>+ /**
>+ * Returns the literal value of the enumerator, which is its string representation.
>+ * 
>+ * 
>+ * @generated
>+ */
>+ @Override
>+ public String toString()
>+ {
>+ return literal;
>+ }
>+}
>Index: src/org/eclipse/datatools/connectivity/oda/design/ParameterDefinition.java
>===================================================================
>RCS file: /cvsroot/datatools/org.eclipse.datatools.connectivity/plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/ParameterDefinition.java,v
>retrieving revision 1.7
>diff -u -r1.7 ParameterDefinition.java
>--- src/org/eclipse/datatools/connectivity/oda/design/ParameterDefinition.java	14 Apr 2009 02:13:18 -0000	1.7
>+++ src/org/eclipse/datatools/connectivity/oda/design/ParameterDefinition.java	24 Apr 2009 03:18:25 -0000
>@@ -22,7 +22,7 @@
> * 
> *
> * 
>- * Top-level parameter definition. Parameter could be scalar or complex type.
>+ * Top-level parameter definition; may be input and/or output mode. Parameter may be of scalar or complex type.
> * 
> *
> * 
>@@ -47,7 +47,7 @@
> * 
> * @generated
> */
>- String copyright = "Copyright (c) 2005, 2007 Actuate Corporation"; //$NON-NLS-1$
>+ String copyright = "Copyright (c) 2005, 2009 Actuate Corporation"; //$NON-NLS-1$
> 
> /**
> * Indicates whether this parameter is defined to take input value.
>@@ -114,7 +114,7 @@
> * @generated NOT
> */
> int getDefaultValueCount();
>- 
>+
> /**
> * A convenience method to append a default value to this parameter's default value collection.
> * It is the responsibility of the caller to ensure compatible type of value object
>@@ -124,7 +124,7 @@
> * @generated NOT
> */
> void addDefaultValue( Object aValue );
>- 
>+
> /**
> * Returns the value of the 'In Out Mode' attribute.
> * The default value is <code>"In"</code>.
>@@ -137,7 +137,7 @@
> * @see #unsetInOutMode()
> * @see #setInOutMode(ParameterMode)
> * @see org.eclipse.datatools.connectivity.oda.design.DesignPackage#getParameterDefinition_InOutMode()
>- * @model default="In" unique="false" unsettable="true" required="true"
>+ * @model default="In" unsettable="true"
> * extendedMetaData="kind='element' name='inOutMode' namespace='##targetNamespace'"
> * @generated
> */
>Index: src/org/eclipse/datatools/connectivity/oda/design/SessionStatus.java
>===================================================================
>RCS file: /cvsroot/datatools/org.eclipse.datatools.connectivity/plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/SessionStatus.java,v
>retrieving revision 1.2
>diff -u -r1.2 SessionStatus.java
>--- src/org/eclipse/datatools/connectivity/oda/design/SessionStatus.java	11 Apr 2007 02:59:53 -0000	1.2
>+++ src/org/eclipse/datatools/connectivity/oda/design/SessionStatus.java	24 Apr 2009 03:18:25 -0000
>@@ -1,6 +1,6 @@
> /**
> *************************************************************************
>- * Copyright (c) 2005, 2007 Actuate Corporation.
>+ * Copyright (c) 2005, 2009 Actuate Corporation.
> * All rights reserved. This program and the accompanying materials
> * are made available under the terms of the Eclipse Public License v1.0
> * which accompanies this distribution, and is available at
>@@ -19,7 +19,7 @@
> import java.util.Collections;
> import java.util.List;
> 
>-import org.eclipse.emf.common.util.AbstractEnumerator;
>+import org.eclipse.emf.common.util.Enumerator;
> 
> /**
> * 
>@@ -30,105 +30,96 @@
> * Indicates to ODA host designer on how to proceed after an ODA design session exits.
> * 
> * @see org.eclipse.datatools.connectivity.oda.design.DesignPackage#getSessionStatus()
>- * @model
>+ * @model extendedMetaData="name='SessionStatus'"
> * @generated
> */
>-public final class SessionStatus extends AbstractEnumerator
>-{
>+public enum SessionStatus implements Enumerator {
> /**
>+ * The 'Ok' literal object.
> * 
> * 
>+ * @see #OK
> * @generated
>+ * @ordered
> */
>- public static final String copyright = "Copyright (c) 2005, 2007 Actuate Corporation"; //$NON-NLS-1$
>-
>+ OK_LITERAL(0, "Ok", "Ok"), //$NON-NLS-1$ //$NON-NLS-2$
> /**
>- * The 'Ok' literal value.
>+ * The 'User Cancelled' literal object.
> * 
> * 
>- * @see #OK_LITERAL
>- * @model name="Ok"
>+ * @see #USER_CANCELLED
> * @generated
> * @ordered
> */
>- public static final int OK = 0;
>-
>+ USER_CANCELLED_LITERAL(1, "UserCancelled", "UserCancelled"), //$NON-NLS-1$ //$NON-NLS-2$
> /**
>- * The 'User Cancelled' literal value.
>+ * The 'Login Failed' literal object.
> * 
> * 
>- * @see #USER_CANCELLED_LITERAL
>- * @model name="UserCancelled"
>+ * @see #LOGIN_FAILED
> * @generated
> * @ordered
> */
>- public static final int USER_CANCELLED = 1;
>-
>+ LOGIN_FAILED_LITERAL(2, "LoginFailed", "LoginFailed"), //$NON-NLS-1$ //$NON-NLS-2$
> /**
>- * The 'Login Failed' literal value.
>+ * The 'Error' literal object.
> * 
> * 
>- * @see #LOGIN_FAILED_LITERAL
>- * @model name="LoginFailed"
>+ * @see #ERROR
> * @generated
> * @ordered
> */
>- public static final int LOGIN_FAILED = 2;
>-
>+ ERROR_LITERAL(3, "Error", "Error"); //$NON-NLS-1$ //$NON-NLS-2$
> /**
>- * The 'Error' literal value.
> * 
> * 
>- * @see #ERROR_LITERAL
>- * @model name="Error"
> * @generated
>- * @ordered
> */
>- public static final int ERROR = 3;
>+ public static final String copyright = "Copyright (c) 2005, 2009 Actuate Corporation"; //$NON-NLS-1$
> 
> /**
>- * The 'Ok' literal object.
>+ * The 'Ok' literal value.
> * 
> * 
>- * @see #OK
>+ * @see #OK_LITERAL
>+ * @model name="Ok"
> * @generated
> * @ordered
> */
>- public static final SessionStatus OK_LITERAL = new SessionStatus( OK,
>- "Ok", "Ok" ); //$NON-NLS-1$ //$NON-NLS-2$
>+ public static final int OK = 0;
> 
> /**
>- * The 'User Cancelled' literal object.
>+ * The 'User Cancelled' literal value.
> * 
> * 
>- * @see #USER_CANCELLED
>+ * @see #USER_CANCELLED_LITERAL
>+ * @model name="UserCancelled"
> * @generated
> * @ordered
> */
>- public static final SessionStatus USER_CANCELLED_LITERAL = new SessionStatus(
>- USER_CANCELLED, "UserCancelled", "UserCancelled" ); //$NON-NLS-1$ //$NON-NLS-2$
>+ public static final int USER_CANCELLED = 1;
> 
> /**
>- * The 'Login Failed' literal object.
>+ * The 'Login Failed' literal value.
> * 
> * 
>- * @see #LOGIN_FAILED
>+ * @see #LOGIN_FAILED_LITERAL
>+ * @model name="LoginFailed"
> * @generated
> * @ordered
> */
>- public static final SessionStatus LOGIN_FAILED_LITERAL = new SessionStatus(
>- LOGIN_FAILED, "LoginFailed", "LoginFailed" ); //$NON-NLS-1$ //$NON-NLS-2$
>+ public static final int LOGIN_FAILED = 2;
> 
> /**
>- * The 'Error' literal object.
>+ * The 'Error' literal value.
> * 
> * 
>- * @see #ERROR
>+ * @see #ERROR_LITERAL
>+ * @model name="Error"
> * @generated
> * @ordered
> */
>- public static final SessionStatus ERROR_LITERAL = new SessionStatus( ERROR,
>- "Error", "Error" ); //$NON-NLS-1$ //$NON-NLS-2$
>+ public static final int ERROR = 3;
> 
> /**
> * An array of all the 'Session Status' enumerators.
>@@ -145,8 +136,8 @@
> * 
> * @generated
> */
>- public static final List VALUES = Collections.unmodifiableList( Arrays
>- .asList( VALUES_ARRAY ) );
>+ public static final List<SessionStatus> VALUES = Collections
>+ .unmodifiableList( Arrays.asList( VALUES_ARRAY ) );
> 
> /**
> * Returns the 'Session Status' literal with the specified literal value.
>@@ -209,6 +200,27 @@
> }
> 
> /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ private final int value;
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ private final String name;
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ private final String literal;
>+
>+ /**
> * Only this class can construct instances.
> * 
> * 
>@@ -216,7 +228,50 @@
> */
> private SessionStatus( int value, String name, String literal )
> {
>- super( value, name, literal );
>+ this.value = value;
>+ this.name = name;
>+ this.literal = literal;
> }
> 
>-} //SessionStatus
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public int getValue()
>+ {
>+ return value;
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public String getName()
>+ {
>+ return name;
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public String getLiteral()
>+ {
>+ return literal;
>+ }
>+
>+ /**
>+ * Returns the literal value of the enumerator, which is its string representation.
>+ * 
>+ * 
>+ * @generated
>+ */
>+ @Override
>+ public String toString()
>+ {
>+ return literal;
>+ }
>+}
>Index: src/org/eclipse/datatools/connectivity/oda/design/DocumentRoot.java
>===================================================================
>RCS file: /cvsroot/datatools/org.eclipse.datatools.connectivity/plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/DocumentRoot.java,v
>retrieving revision 1.2
>diff -u -r1.2 DocumentRoot.java
>--- src/org/eclipse/datatools/connectivity/oda/design/DocumentRoot.java	11 Apr 2007 02:59:53 -0000	1.2
>+++ src/org/eclipse/datatools/connectivity/oda/design/DocumentRoot.java	24 Apr 2009 03:18:25 -0000
>@@ -1,6 +1,6 @@
> /**
> *************************************************************************
>- * Copyright (c) 2005, 2007 Actuate Corporation.
>+ * Copyright (c) 2005, 2009 Actuate Corporation.
> * All rights reserved. This program and the accompanying materials
> * are made available under the terms of the Eclipse Public License v1.0
> * which accompanies this distribution, and is available at
>@@ -46,7 +46,7 @@
> * 
> * @generated
> */
>- String copyright = "Copyright (c) 2005, 2007 Actuate Corporation"; //$NON-NLS-1$
>+ String copyright = "Copyright (c) 2005, 2009 Actuate Corporation"; //$NON-NLS-1$
> 
> /**
> * Returns the value of the 'Mixed' attribute list.
>@@ -69,11 +69,11 @@
> * 
> * @return the value of the 'XMLNS Prefix Map' map.
> * @see org.eclipse.datatools.connectivity.oda.design.DesignPackage#getDocumentRoot_XMLNSPrefixMap()
>- * @model mapType="org.eclipse.emf.ecore.EStringToStringMapEntry" keyType="java.lang.String" valueType="java.lang.String" transient="true"
>+ * @model mapType="org.eclipse.emf.ecore.EStringToStringMapEntry<org.eclipse.emf.ecore.EString, org.eclipse.emf.ecore.EString>" transient="true"
> * extendedMetaData="kind='attribute' name='xmlns:prefix'"
> * @generated
> */
>- EMap getXMLNSPrefixMap();
>+ EMap<String, String> getXMLNSPrefixMap();
> 
> /**
> * Returns the value of the 'XSI Schema Location' map.
>@@ -83,11 +83,11 @@
> * 
> * @return the value of the 'XSI Schema Location' map.
> * @see org.eclipse.datatools.connectivity.oda.design.DesignPackage#getDocumentRoot_XSISchemaLocation()
>- * @model mapType="org.eclipse.emf.ecore.EStringToStringMapEntry" keyType="java.lang.String" valueType="java.lang.String" transient="true"
>+ * @model mapType="org.eclipse.emf.ecore.EStringToStringMapEntry<org.eclipse.emf.ecore.EString, org.eclipse.emf.ecore.EString>" transient="true"
> * extendedMetaData="kind='attribute' name='xsi:schemaLocation'"
> * @generated
> */
>- EMap getXSISchemaLocation();
>+ EMap<String, String> getXSISchemaLocation();
> 
> /**
> * Returns the value of the 'Oda Design Session' containment reference.
>Index: src/org/eclipse/datatools/connectivity/oda/design/OdaComplexDataType.java
>===================================================================
>RCS file: /cvsroot/datatools/org.eclipse.datatools.connectivity/plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/OdaComplexDataType.java,v
>retrieving revision 1.2
>diff -u -r1.2 OdaComplexDataType.java
>--- src/org/eclipse/datatools/connectivity/oda/design/OdaComplexDataType.java	11 Apr 2007 02:59:53 -0000	1.2
>+++ src/org/eclipse/datatools/connectivity/oda/design/OdaComplexDataType.java	24 Apr 2009 03:18:25 -0000
>@@ -1,6 +1,6 @@
> /**
> *************************************************************************
>- * Copyright (c) 2005, 2007 Actuate Corporation.
>+ * Copyright (c) 2005, 2009 Actuate Corporation.
> * All rights reserved. This program and the accompanying materials
> * are made available under the terms of the Eclipse Public License v1.0
> * which accompanies this distribution, and is available at
>@@ -19,7 +19,7 @@
> import java.util.Collections;
> import java.util.List;
> 
>-import org.eclipse.emf.common.util.AbstractEnumerator;
>+import org.eclipse.emf.common.util.Enumerator;
> 
> /**
> * 
>@@ -30,61 +30,56 @@
> * ODA complex data types.
> * 
> * @see org.eclipse.datatools.connectivity.oda.design.DesignPackage#getOdaComplexDataType()
>- * @model
>+ * @model extendedMetaData="name='OdaComplexDataType'"
> * @generated
> */
>-public final class OdaComplexDataType extends AbstractEnumerator
>-{
>+public enum OdaComplexDataType implements Enumerator {
> /**
>+ * The 'Structure' literal object.
> * 
> * 
>+ * @see #STRUCTURE
> * @generated
>+ * @ordered
> */
>- public static final String copyright = "Copyright (c) 2005, 2007 Actuate Corporation"; //$NON-NLS-1$
>-
>+ STRUCTURE_LITERAL(0, "Structure", "Structure"), //$NON-NLS-1$ //$NON-NLS-2$
> /**
>- * The 'Structure' literal value.
>+ * The 'Table' literal object.
> * 
> * 
>- * @see #STRUCTURE_LITERAL
>- * @model name="Structure"
>+ * @see #TABLE
> * @generated
> * @ordered
> */
>- public static final int STRUCTURE = 0;
>-
>+ TABLE_LITERAL(1, "Table", "Table"); //$NON-NLS-1$ //$NON-NLS-2$
> /**
>- * The 'Table' literal value.
> * 
> * 
>- * @see #TABLE_LITERAL
>- * @model name="Table"
> * @generated
>- * @ordered
> */
>- public static final int TABLE = 1;
>+ public static final String copyright = "Copyright (c) 2005, 2009 Actuate Corporation"; //$NON-NLS-1$
> 
> /**
>- * The 'Structure' literal object.
>+ * The 'Structure' literal value.
> * 
> * 
>- * @see #STRUCTURE
>+ * @see #STRUCTURE_LITERAL
>+ * @model name="Structure"
> * @generated
> * @ordered
> */
>- public static final OdaComplexDataType STRUCTURE_LITERAL = new OdaComplexDataType(
>- STRUCTURE, "Structure", "Structure" ); //$NON-NLS-1$ //$NON-NLS-2$
>+ public static final int STRUCTURE = 0;
> 
> /**
>- * The 'Table' literal object.
>+ * The 'Table' literal value.
> * 
> * 
>- * @see #TABLE
>+ * @see #TABLE_LITERAL
>+ * @model name="Table"
> * @generated
> * @ordered
> */
>- public static final OdaComplexDataType TABLE_LITERAL = new OdaComplexDataType(
>- TABLE, "Table", "Table" ); //$NON-NLS-1$ //$NON-NLS-2$
>+ public static final int TABLE = 1;
> 
> /**
> * An array of all the 'Oda Complex Data Type' enumerators.
>@@ -101,8 +96,8 @@
> * 
> * @generated
> */
>- public static final List VALUES = Collections.unmodifiableList( Arrays
>- .asList( VALUES_ARRAY ) );
>+ public static final List<OdaComplexDataType> VALUES = Collections
>+ .unmodifiableList( Arrays.asList( VALUES_ARRAY ) );
> 
> /**
> * Returns the 'Oda Complex Data Type' literal with the specified literal value.
>@@ -161,6 +156,27 @@
> }
> 
> /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ private final int value;
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ private final String name;
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ private final String literal;
>+
>+ /**
> * Only this class can construct instances.
> * 
> * 
>@@ -168,7 +184,50 @@
> */
> private OdaComplexDataType( int value, String name, String literal )
> {
>- super( value, name, literal );
>+ this.value = value;
>+ this.name = name;
>+ this.literal = literal;
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public int getValue()
>+ {
>+ return value;
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public String getName()
>+ {
>+ return name;
> }
> 
>-} //OdaComplexDataType
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public String getLiteral()
>+ {
>+ return literal;
>+ }
>+
>+ /**
>+ * Returns the literal value of the enumerator, which is its string representation.
>+ * 
>+ * 
>+ * @generated
>+ */
>+ @Override
>+ public String toString()
>+ {
>+ return literal;
>+ }
>+}
>Index: src/org/eclipse/datatools/connectivity/oda/design/HorizontalAlignment.java
>===================================================================
>RCS file: /cvsroot/datatools/org.eclipse.datatools.connectivity/plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/HorizontalAlignment.java,v
>retrieving revision 1.2
>diff -u -r1.2 HorizontalAlignment.java
>--- src/org/eclipse/datatools/connectivity/oda/design/HorizontalAlignment.java	11 Apr 2007 02:59:53 -0000	1.2
>+++ src/org/eclipse/datatools/connectivity/oda/design/HorizontalAlignment.java	24 Apr 2009 03:18:25 -0000
>@@ -1,6 +1,6 @@
> /**
> *************************************************************************
>- * Copyright (c) 2005, 2007 Actuate Corporation.
>+ * Copyright (c) 2005, 2009 Actuate Corporation.
> * All rights reserved. This program and the accompanying materials
> * are made available under the terms of the Eclipse Public License v1.0
> * which accompanies this distribution, and is available at
>@@ -19,7 +19,7 @@
> import java.util.Collections;
> import java.util.List;
> 
>-import org.eclipse.emf.common.util.AbstractEnumerator;
>+import org.eclipse.emf.common.util.Enumerator;
> 
> /**
> * 
>@@ -30,105 +30,96 @@
> * Horizontal display alignment of the data value.
> * 
> * @see org.eclipse.datatools.connectivity.oda.design.DesignPackage#getHorizontalAlignment()
>- * @model
>+ * @model extendedMetaData="name='HorizontalAlignment'"
> * @generated
> */
>-public final class HorizontalAlignment extends AbstractEnumerator
>-{
>+public enum HorizontalAlignment implements Enumerator {
> /**
>+ * The 'Automatic' literal object.
> * 
> * 
>+ * @see #AUTOMATIC
> * @generated
>+ * @ordered
> */
>- public static final String copyright = "Copyright (c) 2005, 2007 Actuate Corporation"; //$NON-NLS-1$
>-
>+ AUTOMATIC_LITERAL(0, "Automatic", "Automatic"), //$NON-NLS-1$ //$NON-NLS-2$
> /**
>- * The 'Automatic' literal value.
>+ * The 'Left' literal object.
> * 
> * 
>- * @see #AUTOMATIC_LITERAL
>- * @model name="Automatic"
>+ * @see #LEFT
> * @generated
> * @ordered
> */
>- public static final int AUTOMATIC = 0;
>-
>+ LEFT_LITERAL(1, "Left", "Left"), //$NON-NLS-1$ //$NON-NLS-2$
> /**
>- * The 'Left' literal value.
>+ * The 'Center' literal object.
> * 
> * 
>- * @see #LEFT_LITERAL
>- * @model name="Left"
>+ * @see #CENTER
> * @generated
> * @ordered
> */
>- public static final int LEFT = 1;
>-
>+ CENTER_LITERAL(2, "Center", "Center"), //$NON-NLS-1$ //$NON-NLS-2$
> /**
>- * The 'Center' literal value.
>+ * The 'Right' literal object.
> * 
> * 
>- * @see #CENTER_LITERAL
>- * @model name="Center"
>+ * @see #RIGHT
> * @generated
> * @ordered
> */
>- public static final int CENTER = 2;
>-
>+ RIGHT_LITERAL(3, "Right", "Right"); //$NON-NLS-1$ //$NON-NLS-2$
> /**
>- * The 'Right' literal value.
> * 
> * 
>- * @see #RIGHT_LITERAL
>- * @model name="Right"
> * @generated
>- * @ordered
> */
>- public static final int RIGHT = 3;
>+ public static final String copyright = "Copyright (c) 2005, 2009 Actuate Corporation"; //$NON-NLS-1$
> 
> /**
>- * The 'Automatic' literal object.
>+ * The 'Automatic' literal value.
> * 
> * 
>- * @see #AUTOMATIC
>+ * @see #AUTOMATIC_LITERAL
>+ * @model name="Automatic"
> * @generated
> * @ordered
> */
>- public static final HorizontalAlignment AUTOMATIC_LITERAL = new HorizontalAlignment(
>- AUTOMATIC, "Automatic", "Automatic" ); //$NON-NLS-1$ //$NON-NLS-2$
>+ public static final int AUTOMATIC = 0;
> 
> /**
>- * The 'Left' literal object.
>+ * The 'Left' literal value.
> * 
> * 
>- * @see #LEFT
>+ * @see #LEFT_LITERAL
>+ * @model name="Left"
> * @generated
> * @ordered
> */
>- public static final HorizontalAlignment LEFT_LITERAL = new HorizontalAlignment(
>- LEFT, "Left", "Left" ); //$NON-NLS-1$ //$NON-NLS-2$
>+ public static final int LEFT = 1;
> 
> /**
>- * The 'Center' literal object.
>+ * The 'Center' literal value.
> * 
> * 
>- * @see #CENTER
>+ * @see #CENTER_LITERAL
>+ * @model name="Center"
> * @generated
> * @ordered
> */
>- public static final HorizontalAlignment CENTER_LITERAL = new HorizontalAlignment(
>- CENTER, "Center", "Center" ); //$NON-NLS-1$ //$NON-NLS-2$
>+ public static final int CENTER = 2;
> 
> /**
>- * The 'Right' literal object.
>+ * The 'Right' literal value.
> * 
> * 
>- * @see #RIGHT
>+ * @see #RIGHT_LITERAL
>+ * @model name="Right"
> * @generated
> * @ordered
> */
>- public static final HorizontalAlignment RIGHT_LITERAL = new HorizontalAlignment(
>- RIGHT, "Right", "Right" ); //$NON-NLS-1$ //$NON-NLS-2$
>+ public static final int RIGHT = 3;
> 
> /**
> * An array of all the 'Horizontal Alignment' enumerators.
>@@ -145,8 +136,8 @@
> * 
> * @generated
> */
>- public static final List VALUES = Collections.unmodifiableList( Arrays
>- .asList( VALUES_ARRAY ) );
>+ public static final List<HorizontalAlignment> VALUES = Collections
>+ .unmodifiableList( Arrays.asList( VALUES_ARRAY ) );
> 
> /**
> * Returns the 'Horizontal Alignment' literal with the specified literal value.
>@@ -209,6 +200,27 @@
> }
> 
> /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ private final int value;
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ private final String name;
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ private final String literal;
>+
>+ /**
> * Only this class can construct instances.
> * 
> * 
>@@ -216,7 +228,50 @@
> */
> private HorizontalAlignment( int value, String name, String literal )
> {
>- super( value, name, literal );
>+ this.value = value;
>+ this.name = name;
>+ this.literal = literal;
> }
> 
>-} //HorizontalAlignment
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public int getValue()
>+ {
>+ return value;
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public String getName()
>+ {
>+ return name;
>+ }
>+
>+ /**
>+ * 
>+ * 
>+ * @generated
>+ */
>+ public String getLiteral()
>+ {
>+ return literal;
>+ }
>+
>+ /**
>+ * Returns the literal value of the enumerator, which is its string representation.
>+ * 
>+ * 
>+ * @generated
>+ */
>+ @Override
>+ public String toString()
>+ {
>+ return literal;
>+ }
>+}
>Index: src/org/eclipse/datatools/connectivity/oda/design/ResultSetColumns.java
>===================================================================
>RCS file: /cvsroot/datatools/org.eclipse.datatools.connectivity/plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/ResultSetColumns.java,v
>retrieving revision 1.2
>diff -u -r1.2 ResultSetColumns.java
>--- src/org/eclipse/datatools/connectivity/oda/design/ResultSetColumns.java	11 Apr 2007 02:59:53 -0000	1.2
>+++ src/org/eclipse/datatools/connectivity/oda/design/ResultSetColumns.java	24 Apr 2009 03:18:25 -0000
>@@ -1,6 +1,6 @@
> /**
> *************************************************************************
>- * Copyright (c) 2005, 2007 Actuate Corporation.
>+ * Copyright (c) 2005, 2009 Actuate Corporation.
> * All rights reserved. This program and the accompanying materials
> * are made available under the terms of the Eclipse Public License v1.0
> * which accompanies this distribution, and is available at
>@@ -45,7 +45,7 @@
> * 
> * @generated
> */
>- String copyright = "Copyright (c) 2005, 2007 Actuate Corporation"; //$NON-NLS-1$
>+ String copyright = "Copyright (c) 2005, 2009 Actuate Corporation"; //$NON-NLS-1$
> 
> /**
> * Returns the value of the 'Result Column Definitions' containment reference list.
>@@ -54,10 +54,10 @@
> * 
> * @return the value of the 'Result Column Definitions' containment reference list.
> * @see org.eclipse.datatools.connectivity.oda.design.DesignPackage#getResultSetColumns_ResultColumnDefinitions()
>- * @model type="org.eclipse.datatools.connectivity.oda.design.ColumnDefinition" containment="true" required="true"
>+ * @model containment="true" required="true"
> * extendedMetaData="kind='element' name='resultColumnDefinitions' namespace='##targetNamespace'"
> * @generated
> */
>- EList getResultColumnDefinitions();
>+ EList<ColumnDefinition> getResultColumnDefinitions();
> 
> } // ResultSetColumns
>Index: src/org/eclipse/datatools/connectivity/oda/design/impl/DataSourceDesignImpl.java
>===================================================================
>RCS file: /cvsroot/datatools/org.eclipse.datatools.connectivity/plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/DataSourceDesignImpl.java,v
>retrieving revision 1.13
>diff -u -r1.13 DataSourceDesignImpl.java
>--- src/org/eclipse/datatools/connectivity/oda/design/impl/DataSourceDesignImpl.java	23 Jul 2008 04:12:28 -0000	1.13
>+++ src/org/eclipse/datatools/connectivity/oda/design/impl/DataSourceDesignImpl.java	24 Apr 2009 03:18:26 -0000
>@@ -1,6 +1,6 @@
> /**
> *************************************************************************
>- * Copyright (c) 2005, 2008 Actuate Corporation.
>+ * Copyright (c) 2005, 2009 Actuate Corporation.
> * All rights reserved. This program and the accompanying materials
> * are made available under the terms of the Eclipse Public License v1.0
> * which accompanies this distribution, and is available at
>@@ -63,7 +63,7 @@
> * 
> * @generated
> */
>- public static final String copyright = "Copyright (c) 2005, 2008 Actuate Corporation"; //$NON-NLS-1$
>+ public static final String copyright = "Copyright (c) 2005, 2009 Actuate Corporation"; //$NON-NLS-1$
> 
> /**
> * The default value of the '{@link #getName() Name}' attribute.
>@@ -153,7 +153,7 @@
> * @generated
> * @ordered
> */
>- protected Properties m_publicProperties = null;
>+ protected Properties m_publicProperties;
> 
> /**
> * The cached value of the '{@link #getPrivateProperties() Private Properties}' containment reference.
>@@ -163,7 +163,7 @@
> * @generated
> * @ordered
> */
>- protected Properties m_privateProperties = null;
>+ protected Properties m_privateProperties;
> 
> /**
> * The default value of the '{@link #getLinkedProfileName() Linked Profile Name}' attribute.
>@@ -215,7 +215,7 @@
> * @generated
> * @ordered
> */
>- protected ResourceIdentifiers m_hostResourceIdentifiers = null;
>+ protected ResourceIdentifiers m_hostResourceIdentifiers;
> 
> /**
> * property name for storing linked profile instance's name
>@@ -246,6 +246,7 @@
> * 
> * @generated
> */
>+ @Override
> protected EClass eStaticClass()
> {
> return DesignPackage.Literals.DATA_SOURCE_DESIGN;
>@@ -771,6 +772,7 @@
> * 
> * @generated
> */
>+ @Override
> public NotificationChain eInverseRemove( InternalEObject otherEnd,
> int featureID, NotificationChain msgs )
> {
>@@ -791,6 +793,7 @@
> * 
> * @generated
> */
>+ @Override
> public Object eGet( int featureID, boolean resolve, boolean coreType )
> {
> switch( featureID )
>@@ -822,6 +825,7 @@
> * 
> * @generated
> */
>+ @Override
> public void eSet( int featureID, Object newValue )
> {
> switch( featureID )
>@@ -862,6 +866,7 @@
> * 
> * @generated
> */
>+ @Override
> public void eUnset( int featureID )
> {
> switch( featureID )
>@@ -902,6 +907,7 @@
> * 
> * @generated
> */
>+ @Override
> public boolean eIsSet( int featureID )
> {
> switch( featureID )
>@@ -990,6 +996,7 @@
> * 
> * @generated
> */
>+ @Override
> public String toString()
> {
> if( eIsProxy() )
>Index: src/org/eclipse/datatools/connectivity/oda/design/impl/DesignerStateImpl.java
>===================================================================
>RCS file: /cvsroot/datatools/org.eclipse.datatools.connectivity/plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/DesignerStateImpl.java,v
>retrieving revision 1.4
>diff -u -r1.4 DesignerStateImpl.java
>--- src/org/eclipse/datatools/connectivity/oda/design/impl/DesignerStateImpl.java	11 Apr 2007 02:59:52 -0000	1.4
>+++ src/org/eclipse/datatools/connectivity/oda/design/impl/DesignerStateImpl.java	24 Apr 2009 03:18:26 -0000
>@@ -1,6 +1,6 @@
> /**
> *************************************************************************
>- * Copyright (c) 2005, 2007 Actuate Corporation.
>+ * Copyright (c) 2005, 2009 Actuate Corporation.
> * All rights reserved. This program and the accompanying materials
> * are made available under the terms of the Eclipse Public License v1.0
> * which accompanies this distribution, and is available at
>@@ -47,7 +47,7 @@
> * 
> * @generated
> */
>- public static final String copyright = "Copyright (c) 2005, 2007 Actuate Corporation"; //$NON-NLS-1$
>+ public static final String copyright = "Copyright (c) 2005, 2009 Actuate Corporation"; //$NON-NLS-1$
> 
> /**
> * The default value of the '{@link #getVersion() Version}' attribute.
>@@ -77,7 +77,7 @@
> * @generated
> * @ordered
> */
>- protected DesignerStateContent m_stateContent = null;
>+ protected DesignerStateContent m_stateContent;
> 
> /**
> * 
>@@ -94,6 +94,7 @@
> * 
> * @generated
> */
>+ @Override
> protected EClass eStaticClass()
> {
> return DesignPackage.Literals.DESIGNER_STATE;
>@@ -223,6 +224,7 @@
> * 
> * @generated
> */
>+ @Override
> public NotificationChain eInverseRemove( InternalEObject otherEnd,
> int featureID, NotificationChain msgs )
> {
>@@ -239,6 +241,7 @@
> * 
> * @generated
> */
>+ @Override
> public Object eGet( int featureID, boolean resolve, boolean coreType )
> {
> switch( featureID )
>@@ -256,6 +259,7 @@
> * 
> * @generated
> */
>+ @Override
> public void eSet( int featureID, Object newValue )
> {
> switch( featureID )
>@@ -275,6 +279,7 @@
> * 
> * @generated
> */
>+ @Override
> public void eUnset( int featureID )
> {
> switch( featureID )
>@@ -294,6 +299,7 @@
> * 
> * @generated
> */
>+ @Override
> public boolean eIsSet( int featureID )
> {
> switch( featureID )
>@@ -312,6 +318,7 @@
> * 
> * @generated
> */
>+ @Override
> public String toString()
> {
> if( eIsProxy() )
>Index: src/org/eclipse/datatools/connectivity/oda/design/impl/PropertyImpl.java
>===================================================================
>RCS file: /cvsroot/datatools/org.eclipse.datatools.connectivity/plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/PropertyImpl.java,v
>retrieving revision 1.5
>diff -u -r1.5 PropertyImpl.java
>--- src/org/eclipse/datatools/connectivity/oda/design/impl/PropertyImpl.java	11 Apr 2007 02:59:52 -0000	1.5
>+++ src/org/eclipse/datatools/connectivity/oda/design/impl/PropertyImpl.java	24 Apr 2009 03:18:26 -0000
>@@ -1,6 +1,6 @@
> /**
> *************************************************************************
>- * Copyright (c) 2005, 2007 Actuate Corporation.
>+ * Copyright (c) 2005, 2009 Actuate Corporation.
> * All rights reserved. This program and the accompanying materials
> * are made available under the terms of the Eclipse Public License v1.0
> * which accompanies this distribution, and is available at
>@@ -48,7 +48,7 @@
> * 
> * @generated
> */
>- public static final String copyright = "Copyright (c) 2005, 2007 Actuate Corporation"; //$NON-NLS-1$
>+ public static final String copyright = "Copyright (c) 2005, 2009 Actuate Corporation"; //$NON-NLS-1$
> 
> /**
> * The cached value of the '{@link #getNameValue() Name Value}' containment reference.
>@@ -58,7 +58,7 @@
> * @generated
> * @ordered
> */
>- protected NameValuePair m_nameValue = null;
>+ protected NameValuePair m_nameValue;
> 
> /**
> * The cached value of the '{@link #getDesignAttributes() Design Attributes}' containment reference.
>@@ -68,7 +68,7 @@
> * @generated
> * @ordered
> */
>- protected PropertyAttributes m_designAttributes = null;
>+ protected PropertyAttributes m_designAttributes;
> 
> /**
> * 
>@@ -85,6 +85,7 @@
> * 
> * @generated
> */
>+ @Override
> protected EClass eStaticClass()
> {
> return DesignPackage.Literals.PROPERTY;
>@@ -257,6 +258,7 @@
> * 
> * @generated
> */
>+ @Override
> public NotificationChain eInverseRemove( InternalEObject otherEnd,
> int featureID, NotificationChain msgs )
> {
>@@ -275,6 +277,7 @@
> * 
> * @generated
> */
>+ @Override
> public Object eGet( int featureID, boolean resolve, boolean coreType )
> {
> switch( featureID )
>@@ -292,6 +295,7 @@
> * 
> * @generated
> */
>+ @Override
> public void eSet( int featureID, Object newValue )
> {
> switch( featureID )
>@@ -311,6 +315,7 @@
> * 
> * @generated
> */
>+ @Override
> public void eUnset( int featureID )
> {
> switch( featureID )
>@@ -330,6 +335,7 @@
> * 
> * @generated
> */
>+ @Override
> public boolean eIsSet( int featureID )
> {
> switch( featureID )
>Index: src/org/eclipse/datatools/connectivity/oda/design/impl/DynamicFilterExpressionImpl.java
>===================================================================
>RCS file: /cvsroot/datatools/org.eclipse.datatools.connectivity/plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/DynamicFilterExpressionImpl.java,v
>retrieving revision 1.2
>diff -u -r1.2 DynamicFilterExpressionImpl.java
>--- src/org/eclipse/datatools/connectivity/oda/design/impl/DynamicFilterExpressionImpl.java	14 Apr 2009 02:13:18 -0000	1.2
>+++ src/org/eclipse/datatools/connectivity/oda/design/impl/DynamicFilterExpressionImpl.java	24 Apr 2009 03:18:26 -0000
>@@ -55,7 +55,6 @@
> * 
> * @generated
> */
>- @SuppressWarnings("hiding")
> public static final String copyright = "Copyright (c) 2009 Actuate Corporation"; //$NON-NLS-1$
> 
> /**
>Index: src/org/eclipse/datatools/connectivity/oda/design/impl/ParameterFieldDefinitionImpl.java
>===================================================================
>RCS file: /cvsroot/datatools/org.eclipse.datatools.connectivity/plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/ParameterFieldDefinitionImpl.java,v
>retrieving revision 1.2
>diff -u -r1.2 ParameterFieldDefinitionImpl.java
>--- src/org/eclipse/datatools/connectivity/oda/design/impl/ParameterFieldDefinitionImpl.java	11 Apr 2007 02:59:52 -0000	1.2
>+++ src/org/eclipse/datatools/connectivity/oda/design/impl/ParameterFieldDefinitionImpl.java	24 Apr 2009 03:18:26 -0000
>@@ -1,6 +1,6 @@
> /**
> *************************************************************************
>- * Copyright (c) 2005, 2007 Actuate Corporation.
>+ * Copyright (c) 2005, 2009 Actuate Corporation.
> * All rights reserved. This program and the accompanying materials
> * are made available under the terms of the Eclipse Public License v1.0
> * which accompanies this distribution, and is available at
>@@ -53,7 +53,7 @@
> * 
> * @generated
> */
>- public static final String copyright = "Copyright (c) 2005, 2007 Actuate Corporation"; //$NON-NLS-1$
>+ public static final String copyright = "Copyright (c) 2005, 2009 Actuate Corporation"; //$NON-NLS-1$
> 
> /**
> * The cached value of the '{@link #getAttributes() Attributes}' containment reference.
>@@ -63,7 +63,7 @@
> * @generated
> * @ordered
> */
>- protected DataElementAttributes m_attributes = null;
>+ protected DataElementAttributes m_attributes;
> 
> /**
> * The cached value of the '{@link #getInputAttributes() Input Attributes}' containment reference.
>@@ -73,7 +73,7 @@
> * @generated
> * @ordered
> */
>- protected InputElementAttributes m_inputAttributes = null;
>+ protected InputElementAttributes m_inputAttributes;
> 
> /**
> * The cached value of the '{@link #getOutputUsageHints() Output Usage Hints}' containment reference.
>@@ -83,7 +83,7 @@
> * @generated
> * @ordered
> */
>- protected OutputElementAttributes m_outputUsageHints = null;
>+ protected OutputElementAttributes m_outputUsageHints;
> 
> /**
> * 
>@@ -100,6 +100,7 @@
> * 
> * @generated
> */
>+ @Override
> protected EClass eStaticClass()
> {
> return DesignPackage.Literals.PARAMETER_FIELD_DEFINITION;
>@@ -345,6 +346,7 @@
> * 
> * @generated
> */
>+ @Override
> public NotificationChain eInverseRemove( InternalEObject otherEnd,
> int featureID, NotificationChain msgs )
> {
>@@ -365,6 +367,7 @@
> * 
> * @generated
> */
>+ @Override
> public Object eGet( int featureID, boolean resolve, boolean coreType )
> {
> switch( featureID )
>@@ -384,6 +387,7 @@
> * 
> * @generated
> */
>+ @Override
> public void eSet( int featureID, Object newValue )
> {
> switch( featureID )
>@@ -406,6 +410,7 @@
> * 
> * @generated
> */
>+ @Override
> public void eUnset( int featureID )
> {
> switch( featureID )
>@@ -428,6 +433,7 @@
> * 
> * @generated
> */
>+ @Override
> public boolean eIsSet( int featureID )
> {
> switch( featureID )
>Index: src/org/eclipse/datatools/connectivity/oda/design/impl/ColumnDefinitionImpl.java
>===================================================================
>RCS file: /cvsroot/datatools/org.eclipse.datatools.connectivity/plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/ColumnDefinitionImpl.java,v
>retrieving revision 1.2
>diff -u -r1.2 ColumnDefinitionImpl.java
>--- src/org/eclipse/datatools/connectivity/oda/design/impl/ColumnDefinitionImpl.java	11 Apr 2007 02:59:52 -0000	1.2
>+++ src/org/eclipse/datatools/connectivity/oda/design/impl/ColumnDefinitionImpl.java	24 Apr 2009 03:18:25 -0000
>@@ -1,6 +1,6 @@
> /**
> *************************************************************************
>- * Copyright (c) 2005, 2007 Actuate Corporation.
>+ * Copyright (c) 2005, 2009 Actuate Corporation.
> * All rights reserved. This program and the accompanying materials
> * are made available under the terms of the Eclipse Public License v1.0
> * which accompanies this distribution, and is available at
>@@ -50,7 +50,7 @@
> * 
> * @generated
> */
>- public static final String copyright = "Copyright (c) 2005, 2007 Actuate Corporation"; //$NON-NLS-1$
>+ public static final String copyright = "Copyright (c) 2005, 2009 Actuate Corporation"; //$NON-NLS-1$
> 
> /**
> * The cached value of the '{@link #getAttributes() Attributes}' containment reference.
>@@ -60,7 +60,7 @@
> * @generated
> * @ordered
> */
>- protected DataElementAttributes m_attributes = null;
>+ protected DataElementAttributes m_attributes;
> 
> /**
> * The cached value of the '{@link #getUsageHints() Usage Hints}' containment reference.
>@@ -70,7 +70,7 @@
> * @generated
> * @ordered
> */
>- protected OutputElementAttributes m_usageHints = null;
>+ protected OutputElementAttributes m_usageHints;
> 
> /**
> * The cached value of the '{@link #getMultiDimensionAttributes() Multi Dimension Attributes}' containment reference.
>@@ -80,7 +80,7 @@
> * @generated
> * @ordered
> */
>- protected AxisAttributes m_multiDimensionAttributes = null;
>+ protected AxisAttributes m_multiDimensionAttributes;
> 
> /**
> * 
>@@ -97,6 +97,7 @@
> * 
> * @generated
> */
>+ @Override
> protected EClass eStaticClass()
> {
> return DesignPackage.Literals.COLUMN_DEFINITION;
>@@ -308,6 +309,7 @@
> * 
> * @generated
> */
>+ @Override
> public NotificationChain eInverseRemove( InternalEObject otherEnd,
> int featureID, NotificationChain msgs )
> {
>@@ -328,6 +330,7 @@
> * 
> * @generated
> */
>+ @Override
> public Object eGet( int featureID, boolean resolve, boolean coreType )
> {
> switch( featureID )
>@@ -347,6 +350,7 @@
> * 
> * @generated
> */
>+ @Override
> public void eSet( int featureID, Object newValue )
> {
> switch( featureID )
>@@ -369,6 +373,7 @@
> * 
> * @generated
> */
>+ @Override
> public void eUnset( int featureID )
> {
> switch( featureID )
>@@ -391,6 +396,7 @@
> * 
> * @generated
> */
>+ @Override
> public boolean eIsSet( int featureID )
> {
> switch( featureID )
>Index: src/org/eclipse/datatools/connectivity/oda/design/impl/ParameterFieldsImpl.java
>===================================================================
>RCS file: /cvsroot/datatools/org.eclipse.datatools.connectivity/plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/ParameterFieldsImpl.java,v
>retrieving revision 1.2
>diff -u -r1.2 ParameterFieldsImpl.java
>--- src/org/eclipse/datatools/connectivity/oda/design/impl/ParameterFieldsImpl.java	11 Apr 2007 02:59:52 -0000	1.2
>+++ src/org/eclipse/datatools/connectivity/oda/design/impl/ParameterFieldsImpl.java	24 Apr 2009 03:18:26 -0000
>@@ -1,6 +1,6 @@
> /**
> *************************************************************************
>- * Copyright (c) 2005, 2007 Actuate Corporation.
>+ * Copyright (c) 2005, 2009 Actuate Corporation.
> * All rights reserved. This program and the accompanying materials
> * are made available under the terms of the Eclipse Public License v1.0
> * which accompanies this distribution, and is available at
>@@ -48,7 +48,7 @@
> * 
> * @generated
> */
>- public static final String copyright = "Copyright (c) 2005, 2007 Actuate Corporation"; //$NON-NLS-1$
>+ public static final String copyright = "Copyright (c) 2005, 2009 Actuate Corporation"; //$NON-NLS-1$
> 
> /**
> * The cached value of the '{@link #getFieldCollection() Field Collection}' containment reference list.
>@@ -58,7 +58,7 @@
> * @generated
> * @ordered
> */
>- protected EList m_fieldCollection = null;
>+ protected EList<ParameterFieldDefinition> m_fieldCollection;
> 
> /**
> * 
>@@ -75,6 +75,7 @@
> * 
> * @generated
> */
>+ @Override
> protected EClass eStaticClass()
> {
> return DesignPackage.Literals.PARAMETER_FIELDS;
>@@ -85,11 +86,11 @@
> * 
> * @generated
> */
>- public EList getFieldCollection()
>+ public EList<ParameterFieldDefinition> getFieldCollection()
> {
> if( m_fieldCollection == null )
> {
>- m_fieldCollection = new EObjectContainmentEList(
>+ m_fieldCollection = new EObjectContainmentEList<ParameterFieldDefinition>(
> ParameterFieldDefinition.class, this,
> DesignPackage.PARAMETER_FIELDS__FIELD_COLLECTION );
> }
>@@ -101,13 +102,14 @@
> * 
> * @generated
> */
>+ @Override
> public NotificationChain eInverseRemove( InternalEObject otherEnd,
> int featureID, NotificationChain msgs )
> {
> switch( featureID )
> {
> case DesignPackage.PARAMETER_FIELDS__FIELD_COLLECTION:
>- return ((InternalEList) getFieldCollection()).basicRemove(
>+ return ((InternalEList<?>) getFieldCollection()).basicRemove(
> otherEnd, msgs );
> }
> return super.eInverseRemove( otherEnd, featureID, msgs );
>@@ -118,6 +120,7 @@
> * 
> * @generated
> */
>+ @Override
> public Object eGet( int featureID, boolean resolve, boolean coreType )
> {
> switch( featureID )
>@@ -133,13 +136,16 @@
> * 
> * @generated
> */
>+ @SuppressWarnings("unchecked")
>+ @Override
> public void eSet( int featureID, Object newValue )
> {
> switch( featureID )
> {
> case DesignPackage.PARAMETER_FIELDS__FIELD_COLLECTION:
> getFieldCollection().clear();
>- getFieldCollection().addAll( (Collection) newValue );
>+ getFieldCollection().addAll(
>+ (Collection<? extends ParameterFieldDefinition>) newValue );
> return;
> }
> super.eSet( featureID, newValue );
>@@ -150,6 +156,7 @@
> * 
> * @generated
> */
>+ @Override
> public void eUnset( int featureID )
> {
> switch( featureID )
>@@ -166,6 +173,7 @@
> * 
> * @generated
> */
>+ @Override
> public boolean eIsSet( int featureID )
> {
> switch( featureID )
>Index: src/org/eclipse/datatools/connectivity/oda/design/impl/DataSetParametersImpl.java
>===================================================================
>RCS file: /cvsroot/datatools/org.eclipse.datatools.connectivity/plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/DataSetParametersImpl.java,v
>retrieving revision 1.2
>diff -u -r1.2 DataSetParametersImpl.java
>--- src/org/eclipse/datatools/connectivity/oda/design/impl/DataSetParametersImpl.java	11 Apr 2007 02:59:52 -0000	1.2
>+++ src/org/eclipse/datatools/connectivity/oda/design/impl/DataSetParametersImpl.java	24 Apr 2009 03:18:25 -0000
>@@ -1,6 +1,6 @@
> /**
> *************************************************************************
>- * Copyright (c) 2005, 2007 Actuate Corporation.
>+ * Copyright (c) 2005, 2009 Actuate Corporation.
> * All rights reserved. This program and the accompanying materials
> * are made available under the terms of the Eclipse Public License v1.0
> * which accompanies this distribution, and is available at
>@@ -52,7 +52,7 @@
> * 
> * @generated
> */
>- public static final String copyright = "Copyright (c) 2005, 2007 Actuate Corporation"; //$NON-NLS-1$
>+ public static final String copyright = "Copyright (c) 2005, 2009 Actuate Corporation"; //$NON-NLS-1$
> 
> /**
> * The cached value of the '{@link #getParameterDefinitions() Parameter Definitions}' containment reference list.
>@@ -62,7 +62,7 @@
> * @generated
> * @ordered
> */
>- protected EList m_parameterDefinitions = null;
>+ protected EList<ParameterDefinition> m_parameterDefinitions;
> 
> /**
> * The default value of the '{@link #isDerivedMetaData() Derived Meta Data}' attribute.
>@@ -91,7 +91,7 @@
> * @generated
> * @ordered
> */
>- protected boolean m_derivedMetaDataESet = false;
>+ protected boolean m_derivedMetaDataESet;
> 
> /**
> * 
>@@ -108,6 +108,7 @@
> * 
> * @generated
> */
>+ @Override
> protected EClass eStaticClass()
> {
> return DesignPackage.Literals.DATA_SET_PARAMETERS;
>@@ -118,11 +119,11 @@
> * 
> * @generated
> */
>- public EList getParameterDefinitions()
>+ public EList<ParameterDefinition> getParameterDefinitions()
> {
> if( m_parameterDefinitions == null )
> {
>- m_parameterDefinitions = new EObjectContainmentEList(
>+ m_parameterDefinitions = new EObjectContainmentEList<ParameterDefinition>(
> ParameterDefinition.class, this,
> DesignPackage.DATA_SET_PARAMETERS__PARAMETER_DEFINITIONS );
> }
>@@ -190,13 +191,14 @@
> * 
> * @generated
> */
>+ @Override
> public NotificationChain eInverseRemove( InternalEObject otherEnd,
> int featureID, NotificationChain msgs )
> {
> switch( featureID )
> {
> case DesignPackage.DATA_SET_PARAMETERS__PARAMETER_DEFINITIONS:
>- return ((InternalEList) getParameterDefinitions()).basicRemove(
>+ return ((InternalEList<?>) getParameterDefinitions()).basicRemove(
> otherEnd, msgs );
> }
> return super.eInverseRemove( otherEnd, featureID, msgs );
>@@ -207,6 +209,7 @@
> * 
> * @generated
> */
>+ @Override
> public Object eGet( int featureID, boolean resolve, boolean coreType )
> {
> switch( featureID )
>@@ -224,13 +227,16 @@
> * 
> * @generated
> */
>+ @SuppressWarnings("unchecked")
>+ @Override
> public void eSet( int featureID, Object newValue )
> {
> switch( featureID )
> {
> case DesignPackage.DATA_SET_PARAMETERS__PARAMETER_DEFINITIONS:
> getParameterDefinitions().clear();
>- getParameterDefinitions().addAll( (Collection) newValue );
>+ getParameterDefinitions().addAll(
>+ (Collection<? extends ParameterDefinition>) newValue );
> return;
> case DesignPackage.DATA_SET_PARAMETERS__DERIVED_META_DATA:
> setDerivedMetaData( ((Boolean) newValue).booleanValue() );
>@@ -244,6 +250,7 @@
> * 
> * @generated
> */
>+ @Override
> public void eUnset( int featureID )
> {
> switch( featureID )
>@@ -263,6 +270,7 @@
> * 
> * @generated
> */
>+ @Override
> public boolean eIsSet( int featureID )
> {
> switch( featureID )
>@@ -281,6 +289,7 @@
> * 
> * @generated
> */
>+ @Override
> public String toString()
> {
> if( eIsProxy() )
>Index: src/org/eclipse/datatools/connectivity/oda/design/impl/DataElementAttributesImpl.java
>===================================================================
>RCS file: /cvsroot/datatools/org.eclipse.datatools.connectivity/plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/DataElementAttributesImpl.java,v
>retrieving revision 1.9
>diff -u -r1.9 DataElementAttributesImpl.java
>--- src/org/eclipse/datatools/connectivity/oda/design/impl/DataElementAttributesImpl.java	9 May 2007 10:15:19 -0000	1.9
>+++ src/org/eclipse/datatools/connectivity/oda/design/impl/DataElementAttributesImpl.java	24 Apr 2009 03:18:25 -0000
>@@ -1,6 +1,6 @@
> /**
> *************************************************************************
>- * Copyright (c) 2005, 2007 Actuate Corporation.
>+ * Copyright (c) 2005, 2009 Actuate Corporation.
> * All rights reserved. This program and the accompanying materials
> * are made available under the terms of the Eclipse Public License v1.0
> * which accompanies this distribution, and is available at
>@@ -55,7 +55,7 @@
> * 
> * @generated
> */
>- public static final String copyright = "Copyright (c) 2005, 2007 Actuate Corporation"; //$NON-NLS-1$
>+ public static final String copyright = "Copyright (c) 2005, 2009 Actuate Corporation"; //$NON-NLS-1$
> 
> /**
> * @generated NOT
>@@ -109,7 +109,7 @@
> * @generated
> * @ordered
> */
>- protected boolean m_positionESet = false;
>+ protected boolean m_positionESet;
> 
> /**
> * The default value of the '{@link #getNativeDataTypeCode() Native Data Type Code}' attribute.
>@@ -138,7 +138,7 @@
> * @generated
> * @ordered
> */
>- protected boolean m_nativeDataTypeCodeESet = false;
>+ protected boolean m_nativeDataTypeCodeESet;
> 
> /**
> * The default value of the '{@link #getPrecision() Precision}' attribute.
>@@ -167,7 +167,7 @@
> * @generated
> * @ordered
> */
>- protected boolean m_precisionESet = false;
>+ protected boolean m_precisionESet;
> 
> /**
> * The default value of the '{@link #getScale() Scale}' attribute.
>@@ -196,7 +196,7 @@
> * @generated
> * @ordered
> */
>- protected boolean m_scaleESet = false;
>+ protected boolean m_scaleESet;
> 
> /**
> * The default value of the '{@link #getNullability() Nullability}' attribute.
>@@ -225,7 +225,7 @@
> * @generated
> * @ordered
> */
>- protected boolean m_nullabilityESet = false;
>+ protected boolean m_nullabilityESet;
> 
> /**
> * The cached value of the '{@link #getUiHints() Ui Hints}' containment reference.
>@@ -235,7 +235,7 @@
> * @generated
> * @ordered
> */
>- protected DataElementUIHints m_uiHints = null;
>+ protected DataElementUIHints m_uiHints;
> 
> /**
> * 
>@@ -252,6 +252,7 @@
> * 
> * @generated
> */
>+ @Override
> protected EClass eStaticClass()
> {
> return DesignPackage.Literals.DATA_ELEMENT_ATTRIBUTES;
>@@ -367,7 +368,7 @@
> {
> return m_name;
> }
>- 
>+
> /*
> * (non-Javadoc)
> * @see org.eclipse.datatools.connectivity.oda.design.DataElementAttributes#setName(java.lang.String)
>@@ -376,10 +377,10 @@
> public void setName( String newName )
> {
> if( newName == null )
>- newName = EMPTY_STR; // cannot be null per design definition
>+ newName = EMPTY_STR; // cannot be null per design definition
> setNameGen( newName );
> }
>- 
>+
> /**
> * 
> * 
>@@ -761,6 +762,7 @@
> * 
> * @generated
> */
>+ @Override
> public NotificationChain eInverseRemove( InternalEObject otherEnd,
> int featureID, NotificationChain msgs )
> {
>@@ -777,6 +779,7 @@
> * 
> * @generated
> */
>+ @Override
> public Object eGet( int featureID, boolean resolve, boolean coreType )
> {
> switch( featureID )
>@@ -804,6 +807,7 @@
> * 
> * @generated
> */
>+ @Override
> public void eSet( int featureID, Object newValue )
> {
> switch( featureID )
>@@ -838,6 +842,7 @@
> * 
> * @generated
> */
>+ @Override
> public void eUnset( int featureID )
> {
> switch( featureID )
>@@ -872,6 +877,7 @@
> * 
> * @generated
> */
>+ @Override
> public boolean eIsSet( int featureID )
> {
> switch( featureID )
>@@ -900,6 +906,7 @@
> * 
> * @generated
> */
>+ @Override
> public String toString()
> {
> if( eIsProxy() )
>Index: src/org/eclipse/datatools/connectivity/oda/design/impl/ResultSetColumnsImpl.java
>===================================================================
>RCS file: /cvsroot/datatools/org.eclipse.datatools.connectivity/plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/ResultSetColumnsImpl.java,v
>retrieving revision 1.2
>diff -u -r1.2 ResultSetColumnsImpl.java
>--- src/org/eclipse/datatools/connectivity/oda/design/impl/ResultSetColumnsImpl.java	11 Apr 2007 02:59:52 -0000	1.2
>+++ src/org/eclipse/datatools/connectivity/oda/design/impl/ResultSetColumnsImpl.java	24 Apr 2009 03:18:26 -0000
>@@ -1,6 +1,6 @@
> /**
> *************************************************************************
>- * Copyright (c) 2005, 2007 Actuate Corporation.
>+ * Copyright (c) 2005, 2009 Actuate Corporation.
> * All rights reserved. This program and the accompanying materials
> * are made available under the terms of the Eclipse Public License v1.0
> * which accompanies this distribution, and is available at
>@@ -49,7 +49,7 @@
> * 
> * @generated
> */
>- public static final String copyright = "Copyright (c) 2005, 2007 Actuate Corporation"; //$NON-NLS-1$
>+ public static final String copyright = "Copyright (c) 2005, 2009 Actuate Corporation"; //$NON-NLS-1$
> 
> /**
> * The cached value of the '{@link #getResultColumnDefinitions() Result Column Definitions}' containment reference list.
>@@ -59,7 +59,7 @@
> * @generated
> * @ordered
> */
>- protected EList m_resultColumnDefinitions = null;
>+ protected EList<ColumnDefinition> m_resultColumnDefinitions;
> 
> /**
> * 
>@@ -76,6 +76,7 @@
> * 
> * @generated
> */
>+ @Override
> protected EClass eStaticClass()
> {
> return DesignPackage.Literals.RESULT_SET_COLUMNS;
>@@ -86,11 +87,11 @@
> * 
> * @generated
> */
>- public EList getResultColumnDefinitions()
>+ public EList<ColumnDefinition> getResultColumnDefinitions()
> {
> if( m_resultColumnDefinitions == null )
> {
>- m_resultColumnDefinitions = new EObjectContainmentEList(
>+ m_resultColumnDefinitions = new EObjectContainmentEList<ColumnDefinition>(
> ColumnDefinition.class, this,
> DesignPackage.RESULT_SET_COLUMNS__RESULT_COLUMN_DEFINITIONS );
> }
>@@ -102,14 +103,15 @@
> * 
> * @generated
> */
>+ @Override
> public NotificationChain eInverseRemove( InternalEObject otherEnd,
> int featureID, NotificationChain msgs )
> {
> switch( featureID )
> {
> case DesignPackage.RESULT_SET_COLUMNS__RESULT_COLUMN_DEFINITIONS:
>- return ((InternalEList) getResultColumnDefinitions()).basicRemove(
>- otherEnd, msgs );
>+ return ((InternalEList<?>) getResultColumnDefinitions())
>+ .basicRemove( otherEnd, msgs );
> }
> return super.eInverseRemove( otherEnd, featureID, msgs );
> }
>@@ -119,6 +121,7 @@
> * 
> * @generated
> */
>+ @Override
> public Object eGet( int featureID, boolean resolve, boolean coreType )
> {
> switch( featureID )
>@@ -134,13 +137,16 @@
> * 
> * @generated
> */
>+ @SuppressWarnings("unchecked")
>+ @Override
> public void eSet( int featureID, Object newValue )
> {
> switch( featureID )
> {
> case DesignPackage.RESULT_SET_COLUMNS__RESULT_COLUMN_DEFINITIONS:
> getResultColumnDefinitions().clear();
>- getResultColumnDefinitions().addAll( (Collection) newValue );
>+ getResultColumnDefinitions().addAll(
>+ (Collection<? extends ColumnDefinition>) newValue );
> return;
> }
> super.eSet( featureID, newValue );
>@@ -151,6 +157,7 @@
> * 
> * @generated
> */
>+ @Override
> public void eUnset( int featureID )
> {
> switch( featureID )
>@@ -167,6 +174,7 @@
> * 
> * @generated
> */
>+ @Override
> public boolean eIsSet( int featureID )
> {
> switch( featureID )
>Index: src/org/eclipse/datatools/connectivity/oda/design/impl/ScalarValueChoicesImpl.java
>===================================================================
>RCS file: /cvsroot/datatools/org.eclipse.datatools.connectivity/plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/ScalarValueChoicesImpl.java,v
>retrieving revision 1.2
>diff -u -r1.2 ScalarValueChoicesImpl.java
>--- src/org/eclipse/datatools/connectivity/oda/design/impl/ScalarValueChoicesImpl.java	11 Apr 2007 02:59:52 -0000	1.2
>+++ src/org/eclipse/datatools/connectivity/oda/design/impl/ScalarValueChoicesImpl.java	24 Apr 2009 03:18:26 -0000
>@@ -1,6 +1,6 @@
> /**
> *************************************************************************
>- * Copyright (c) 2005, 2007 Actuate Corporation.
>+ * Copyright (c) 2005, 2009 Actuate Corporation.
> * All rights reserved. This program and the accompanying materials
> * are made available under the terms of the Eclipse Public License v1.0
> * which accompanies this distribution, and is available at
>@@ -49,7 +49,7 @@
> * 
> * @generated
> */
>- public static final String copyright = "Copyright (c) 2005, 2007 Actuate Corporation"; //$NON-NLS-1$
>+ public static final String copyright = "Copyright (c) 2005, 2009 Actuate Corporation"; //$NON-NLS-1$
> 
> /**
> * The cached value of the '{@link #getScalarValues() Scalar Values}' containment reference list.
>@@ -59,7 +59,7 @@
> * @generated
> * @ordered
> */
>- protected EList m_scalarValues = null;
>+ protected EList<ScalarValueDefinition> m_scalarValues;
> 
> /**
> * 
>@@ -76,6 +76,7 @@
> * 
> * @generated
> */
>+ @Override
> protected EClass eStaticClass()
> {
> return DesignPackage.Literals.SCALAR_VALUE_CHOICES;
>@@ -86,11 +87,11 @@
> * 
> * @generated
> */
>- public EList getScalarValues()
>+ public EList<ScalarValueDefinition> getScalarValues()
> {
> if( m_scalarValues == null )
> {
>- m_scalarValues = new EObjectContainmentEList(
>+ m_scalarValues = new EObjectContainmentEList<ScalarValueDefinition>(
> ScalarValueDefinition.class, this,
> DesignPackage.SCALAR_VALUE_CHOICES__SCALAR_VALUES );
> }
>@@ -102,14 +103,15 @@
> * 
> * @generated
> */
>+ @Override
> public NotificationChain eInverseRemove( InternalEObject otherEnd,
> int featureID, NotificationChain msgs )
> {
> switch( featureID )
> {
> case DesignPackage.SCALAR_VALUE_CHOICES__SCALAR_VALUES:
>- return ((InternalEList) getScalarValues()).basicRemove( otherEnd,
>- msgs );
>+ return ((InternalEList<?>) getScalarValues()).basicRemove(
>+ otherEnd, msgs );
> }
> return super.eInverseRemove( otherEnd, featureID, msgs );
> }
>@@ -119,6 +121,7 @@
> * 
> * @generated
> */
>+ @Override
> public Object eGet( int featureID, boolean resolve, boolean coreType )
> {
> switch( featureID )
>@@ -134,13 +137,16 @@
> * 
> * @generated
> */
>+ @SuppressWarnings("unchecked")
>+ @Override
> public void eSet( int featureID, Object newValue )
> {
> switch( featureID )
> {
> case DesignPackage.SCALAR_VALUE_CHOICES__SCALAR_VALUES:
> getScalarValues().clear();
>- getScalarValues().addAll( (Collection) newValue );
>+ getScalarValues().addAll(
>+ (Collection<? extends ScalarValueDefinition>) newValue );
> return;
> }
> super.eSet( featureID, newValue );
>@@ -151,6 +157,7 @@
> * 
> * @generated
> */
>+ @Override
> public void eUnset( int featureID )
> {
> switch( featureID )
>@@ -167,6 +174,7 @@
> * 
> * @generated
> */
>+ @Override
> public boolean eIsSet( int featureID )
> {
> switch( featureID )
>Index: src/org/eclipse/datatools/connectivity/oda/design/impl/ResultSetsImpl.java
>===================================================================
>RCS file: /cvsroot/datatools/org.eclipse.datatools.connectivity/plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/ResultSetsImpl.java,v
>retrieving revision 1.3
>diff -u -r1.3 ResultSetsImpl.java
>--- src/org/eclipse/datatools/connectivity/oda/design/impl/ResultSetsImpl.java	11 Apr 2007 02:59:52 -0000	1.3
>+++ src/org/eclipse/datatools/connectivity/oda/design/impl/ResultSetsImpl.java	24 Apr 2009 03:18:26 -0000
>@@ -1,6 +1,6 @@
> /**
> *************************************************************************
>- * Copyright (c) 2005, 2007 Actuate Corporation.
>+ * Copyright (c) 2005, 2009 Actuate Corporation.
> * All rights reserved. This program and the accompanying materials
> * are made available under the terms of the Eclipse Public License v1.0
> * which accompanies this distribution, and is available at
>@@ -51,7 +51,7 @@
> * 
> * @generated
> */
>- public static final String copyright = "Copyright (c) 2005, 2007 Actuate Corporation"; //$NON-NLS-1$
>+ public static final String copyright = "Copyright (c) 2005, 2009 Actuate Corporation"; //$NON-NLS-1$
> 
> /**
> * The cached value of the '{@link #getResultSetDefinitions() Result Set Definitions}' containment reference list.
>@@ -61,7 +61,7 @@
> * @generated
> * @ordered
> */
>- protected EList m_resultSetDefinitions = null;
>+ protected EList<ResultSetDefinition> m_resultSetDefinitions;
> 
> /**
> * The default value of the '{@link #isDerivedMetaData() Derived Meta Data}' attribute.
>@@ -90,7 +90,7 @@
> * @generated
> * @ordered
> */
>- protected boolean m_derivedMetaDataESet = false;
>+ protected boolean m_derivedMetaDataESet;
> 
> /**
> * 
>@@ -107,6 +107,7 @@
> * 
> * @generated
> */
>+ @Override
> protected EClass eStaticClass()
> {
> return DesignPackage.Literals.RESULT_SETS;
>@@ -122,10 +123,10 @@
> || resultSetName.length() == 0 )
> return null;
> 
>- EList defns = getResultSetDefinitions();
>+ EList<ResultSetDefinition> defns = getResultSetDefinitions();
> for( int i = 0; i < defns.size(); i++)
> {
>- ResultSetDefinition defn = (ResultSetDefinition) defns.get( i );
>+ ResultSetDefinition defn = defns.get( i );
> if( resultSetName.equals( defn.getName() ) )
> return defn;
> }
>@@ -161,11 +162,11 @@
> * 
> * @generated
> */
>- public EList getResultSetDefinitions()
>+ public EList<ResultSetDefinition> getResultSetDefinitions()
> {
> if( m_resultSetDefinitions == null )
> {
>- m_resultSetDefinitions = new EObjectContainmentEList(
>+ m_resultSetDefinitions = new EObjectContainmentEList<ResultSetDefinition>(
> ResultSetDefinition.class, this,
> DesignPackage.RESULT_SETS__RESULT_SET_DEFINITIONS );
> }
>@@ -233,13 +234,14 @@
> * 
> * @generated
> */
>+ @Override
> public NotificationChain eInverseRemove( InternalEObject otherEnd,
> int featureID, NotificationChain msgs )
> {
> switch( featureID )
> {
> case DesignPackage.RESULT_SETS__RESULT_SET_DEFINITIONS:
>- return ((InternalEList) getResultSetDefinitions()).basicRemove(
>+ return ((InternalEList<?>) getResultSetDefinitions()).basicRemove(
> otherEnd, msgs );
> }
> return super.eInverseRemove( otherEnd, featureID, msgs );
>@@ -250,6 +252,7 @@
> * 
> * @generated
> */
>+ @Override
> public Object eGet( int featureID, boolean resolve, boolean coreType )
> {
> switch( featureID )
>@@ -267,13 +270,16 @@
> * 
> * @generated
> */
>+ @SuppressWarnings("unchecked")
>+ @Override
> public void eSet( int featureID, Object newValue )
> {
> switch( featureID )
> {
> case DesignPackage.RESULT_SETS__RESULT_SET_DEFINITIONS:
> getResultSetDefinitions().clear();
>- getResultSetDefinitions().addAll( (Collection) newValue );
>+ getResultSetDefinitions().addAll(
>+ (Collection<? extends ResultSetDefinition>) newValue );
> return;
> case DesignPackage.RESULT_SETS__DERIVED_META_DATA:
> setDerivedMetaData( ((Boolean) newValue).booleanValue() );
>@@ -287,6 +293,7 @@
> * 
> * @generated
> */
>+ @Override
> public void eUnset( int featureID )
> {
> switch( featureID )
>@@ -306,6 +313,7 @@
> * 
> * @generated
> */
>+ @Override
> public boolean eIsSet( int featureID )
> {
> switch( featureID )
>@@ -324,6 +332,7 @@
> * 
> * @generated
> */
>+ @Override
> public String toString()
> {
> if( eIsProxy() )
>Index: src/org/eclipse/datatools/connectivity/oda/design/impl/PropertiesImpl.java
>===================================================================
>RCS file: /cvsroot/datatools/org.eclipse.datatools.connectivity/plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/PropertiesImpl.java,v
>retrieving revision 1.6
>diff -u -r1.6 PropertiesImpl.java
>--- src/org/eclipse/datatools/connectivity/oda/design/impl/PropertiesImpl.java	11 Apr 2007 02:59:52 -0000	1.6
>+++ src/org/eclipse/datatools/connectivity/oda/design/impl/PropertiesImpl.java	24 Apr 2009 03:18:26 -0000
>@@ -1,6 +1,6 @@
> /**
> *************************************************************************
>- * Copyright (c) 2005, 2007 Actuate Corporation.
>+ * Copyright (c) 2005, 2009 Actuate Corporation.
> * All rights reserved. This program and the accompanying materials
> * are made available under the terms of the Eclipse Public License v1.0
> * which accompanies this distribution, and is available at
>@@ -50,7 +50,7 @@
> * 
> * @generated
> */
>- public static final String copyright = "Copyright (c) 2005, 2007 Actuate Corporation"; //$NON-NLS-1$
>+ public static final String copyright = "Copyright (c) 2005, 2009 Actuate Corporation"; //$NON-NLS-1$
> 
> /**
> * The cached value of the '{@link #getProperties() Properties}' containment reference list.
>@@ -60,7 +60,7 @@
> * @generated
> * @ordered
> */
>- protected EList m_properties = null;
>+ protected EList<Property> m_properties;
> 
> /**
> * 
>@@ -77,6 +77,7 @@
> * 
> * @generated
> */
>+ @Override
> protected EClass eStaticClass()
> {
> return DesignPackage.Literals.PROPERTIES;
>@@ -91,10 +92,10 @@
> if( isEmpty() )
> return null;
> 
>- Iterator iter = getProperties().iterator();
>+ Iterator<Property> iter = getProperties().iterator();
> while( iter.hasNext() )
> {
>- Property prop = (Property) iter.next();
>+ Property prop = iter.next();
> if( propName.equalsIgnoreCase( prop.getName() ) )
> return prop; // matching property name
> }
>@@ -158,12 +159,12 @@
> * 
> * @generated
> */
>- public EList getProperties()
>+ public EList<Property> getProperties()
> {
> if( m_properties == null )
> {
>- m_properties = new EObjectContainmentEList( Property.class, this,
>- DesignPackage.PROPERTIES__PROPERTIES );
>+ m_properties = new EObjectContainmentEList<Property>(
>+ Property.class, this, DesignPackage.PROPERTIES__PROPERTIES );
> }
> return m_properties;
> }
>@@ -173,13 +174,14 @@
> * 
> * @generated
> */
>+ @Override
> public NotificationChain eInverseRemove( InternalEObject otherEnd,
> int featureID, NotificationChain msgs )
> {
> switch( featureID )
> {
> case DesignPackage.PROPERTIES__PROPERTIES:
>- return ((InternalEList) getProperties()).basicRemove( otherEnd,
>+ return ((InternalEList<?>) getProperties()).basicRemove( otherEnd,
> msgs );
> }
> return super.eInverseRemove( otherEnd, featureID, msgs );
>@@ -190,6 +192,7 @@
> * 
> * @generated
> */
>+ @Override
> public Object eGet( int featureID, boolean resolve, boolean coreType )
> {
> switch( featureID )
>@@ -205,13 +208,15 @@
> * 
> * @generated
> */
>+ @SuppressWarnings("unchecked")
>+ @Override
> public void eSet( int featureID, Object newValue )
> {
> switch( featureID )
> {
> case DesignPackage.PROPERTIES__PROPERTIES:
> getProperties().clear();
>- getProperties().addAll( (Collection) newValue );
>+ getProperties().addAll( (Collection<? extends Property>) newValue );
> return;
> }
> super.eSet( featureID, newValue );
>@@ -222,6 +227,7 @@
> * 
> * @generated
> */
>+ @Override
> public void eUnset( int featureID )
> {
> switch( featureID )
>@@ -238,6 +244,7 @@
> * 
> * @generated
> */
>+ @Override
> public boolean eIsSet( int featureID )
> {
> switch( featureID )
>Index: src/org/eclipse/datatools/connectivity/oda/design/impl/DesignerStateContentImpl.java
>===================================================================
>RCS file: /cvsroot/datatools/org.eclipse.datatools.connectivity/plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/DesignerStateContentImpl.java,v
>retrieving revision 1.4
>diff -u -r1.4 DesignerStateContentImpl.java
>--- src/org/eclipse/datatools/connectivity/oda/design/impl/DesignerStateContentImpl.java	11 Apr 2007 02:59:52 -0000	1.4
>+++ src/org/eclipse/datatools/connectivity/oda/design/impl/DesignerStateContentImpl.java	24 Apr 2009 03:18:26 -0000
>@@ -1,6 +1,6 @@
> /**
> *************************************************************************
>- * Copyright (c) 2005, 2007 Actuate Corporation.
>+ * Copyright (c) 2005, 2009 Actuate Corporation.
> * All rights reserved. This program and the accompanying materials
> * are made available under the terms of the Eclipse Public License v1.0
> * which accompanies this distribution, and is available at
>@@ -44,7 +44,7 @@
> * 
> * @generated
> */
>- public static final String copyright = "Copyright (c) 2005, 2007 Actuate Corporation"; //$NON-NLS-1$
>+ public static final String copyright = "Copyright (c) 2005, 2009 Actuate Corporation"; //$NON-NLS-1$
> 
> /**
> * The default value of the '{@link #getStateContentAsString() State Content As String}' attribute.
>@@ -101,6 +101,7 @@
> * 
> * @generated
> */
>+ @Override
> protected EClass eStaticClass()
> {
> return DesignPackage.Literals.DESIGNER_STATE_CONTENT;
>@@ -189,6 +190,7 @@
> * 
> * @generated
> */
>+ @Override
> public Object eGet( int featureID, boolean resolve, boolean coreType )
> {
> switch( featureID )
>@@ -206,6 +208,7 @@
> * 
> * @generated
> */
>+ @Override
> public void eSet( int featureID, Object newValue )
> {
> switch( featureID )
>@@ -225,6 +228,7 @@
> * 
> * @generated
> */
>+ @Override
> public void eUnset( int featureID )
> {
> switch( featureID )
>@@ -244,6 +248,7 @@
> * 
> * @generated
> */
>+ @Override
> public boolean eIsSet( int featureID )
> {
> switch( featureID )
>@@ -265,6 +270,7 @@
> * 
> * @generated
> */
>+ @Override
> public String toString()
> {
> if( eIsProxy() )
>Index: src/org/eclipse/datatools/connectivity/oda/design/impl/ResourceIdentifiersImpl.java
>===================================================================
>RCS file: /cvsroot/datatools/org.eclipse.datatools.connectivity/plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/ResourceIdentifiersImpl.java,v
>retrieving revision 1.1
>diff -u -r1.1 ResourceIdentifiersImpl.java
>--- src/org/eclipse/datatools/connectivity/oda/design/impl/ResourceIdentifiersImpl.java	23 Jul 2008 04:12:27 -0000	1.1
>+++ src/org/eclipse/datatools/connectivity/oda/design/impl/ResourceIdentifiersImpl.java	24 Apr 2009 03:18:26 -0000
>@@ -1,6 +1,6 @@
> /**
> *************************************************************************
>- * Copyright (c) 2008 Actuate Corporation.
>+ * Copyright (c) 2008, 2009 Actuate Corporation.
> * All rights reserved. This program and the accompanying materials
> * are made available under the terms of the Eclipse Public License v1.0
> * which accompanies this distribution, and is available at
>@@ -41,7 +41,7 @@
> * 
> *
> * @generated
>- * @since DTP 1.6.1
>+ * @since DTP 1.7
> */
> public class ResourceIdentifiersImpl extends EObjectImpl implements
> ResourceIdentifiers
>@@ -51,7 +51,7 @@
> * 
> * @generated
> */
>- public static final String copyright = "Copyright (c) 2008 Actuate Corporation"; //$NON-NLS-1$
>+ public static final String copyright = "Copyright (c) 2008, 2009 Actuate Corporation"; //$NON-NLS-1$
> 
> /**
> * The default value of the '{@link #getApplResourceBaseURIString() Appl Resource Base URI String}' attribute.
>@@ -108,6 +108,7 @@
> * 
> * @generated
> */
>+ @Override
> protected EClass eStaticClass()
> {
> return DesignPackage.Literals.RESOURCE_IDENTIFIERS;
>@@ -128,8 +129,8 @@
> */
> public void setApplResourceBaseURI( URI baseURI )
> {
>- String baseURIString = ( baseURI != null ) ? baseURI.toString() : null;
>- setApplResourceBaseURIString( baseURIString ); 
>+ String baseURIString = (baseURI != null) ? baseURI.toString() : null;
>+ setApplResourceBaseURIString( baseURIString );
> }
> 
> /**
>@@ -175,7 +176,7 @@
> */
> public void setDesignResourceBaseURI( URI baseURI )
> {
>- String baseURIString = ( baseURI != null ) ? baseURI.toString() : null;
>+ String baseURIString = (baseURI != null) ? baseURI.toString() : null;
> setDesignResourceBaseURIString( baseURIString );
> }
> 
>@@ -213,6 +214,7 @@
> * 
> * @generated
> */
>+ @Override
> public Object eGet( int featureID, boolean resolve, boolean coreType )
> {
> switch( featureID )
>@@ -230,6 +232,7 @@
> * 
> * @generated
> */
>+ @Override
> public void eSet( int featureID, Object newValue )
> {
> switch( featureID )
>@@ -249,6 +252,7 @@
> * 
> * @generated
> */
>+ @Override
> public void eUnset( int featureID )
> {
> switch( featureID )
>@@ -268,6 +272,7 @@
> * 
> * @generated
> */
>+ @Override
> public boolean eIsSet( int featureID )
> {
> switch( featureID )
>@@ -289,6 +294,7 @@
> * 
> * @generated
> */
>+ @Override
> public String toString()
> {
> if( eIsProxy() )
>@@ -322,5 +328,5 @@
> 
> return null;
> }
>- 
>+
> } //ResourceIdentifiersImpl
>\ No newline at end of file
>Index: src/org/eclipse/datatools/connectivity/oda/design/impl/DesignSessionResponseImpl.java
>===================================================================
>RCS file: /cvsroot/datatools/org.eclipse.datatools.connectivity/plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/DesignSessionResponseImpl.java,v
>retrieving revision 1.4
>diff -u -r1.4 DesignSessionResponseImpl.java
>--- src/org/eclipse/datatools/connectivity/oda/design/impl/DesignSessionResponseImpl.java	11 Apr 2007 02:59:52 -0000	1.4
>+++ src/org/eclipse/datatools/connectivity/oda/design/impl/DesignSessionResponseImpl.java	24 Apr 2009 03:18:26 -0000
>@@ -1,6 +1,6 @@
> /**
> *************************************************************************
>- * Copyright (c) 2005, 2007 Actuate Corporation.
>+ * Copyright (c) 2005, 2009 Actuate Corporation.
> * All rights reserved. This program and the accompanying materials
> * are made available under the terms of the Eclipse Public License v1.0
> * which accompanies this distribution, and is available at
>@@ -53,7 +53,7 @@
> * 
> * @generated
> */
>- public static final String copyright = "Copyright (c) 2005, 2007 Actuate Corporation"; //$NON-NLS-1$
>+ public static final String copyright = "Copyright (c) 2005, 2009 Actuate Corporation"; //$NON-NLS-1$
> 
> /**
> * The default value of the '{@link #getSessionStatus() Session Status}' attribute.
>@@ -82,7 +82,7 @@
> * @generated
> * @ordered
> */
>- protected boolean m_sessionStatusESet = false;
>+ protected boolean m_sessionStatusESet;
> 
> /**
> * The cached value of the '{@link #getDataAccessDesign() Data Access Design}' containment reference.
>@@ -92,7 +92,7 @@
> * @generated
> * @ordered
> */
>- protected DataAccessDesign m_dataAccessDesign = null;
>+ protected DataAccessDesign m_dataAccessDesign;
> 
> /**
> * The cached value of the '{@link #getDesignerState() Designer State}' containment reference.
>@@ -102,7 +102,7 @@
> * @generated
> * @ordered
> */
>- protected DesignerState m_designerState = null;
>+ protected DesignerState m_designerState;
> 
> /**
> * 
>@@ -119,6 +119,7 @@
> * 
> * @generated
> */
>+ @Override
> protected EClass eStaticClass()
> {
> return DesignPackage.Literals.DESIGN_SESSION_RESPONSE;
>@@ -358,6 +359,7 @@
> * 
> * @generated
> */
>+ @Override
> public NotificationChain eInverseRemove( InternalEObject otherEnd,
> int featureID, NotificationChain msgs )
> {
>@@ -376,6 +378,7 @@
> * 
> * @generated
> */
>+ @Override
> public Object eGet( int featureID, boolean resolve, boolean coreType )
> {
> switch( featureID )
>@@ -395,6 +398,7 @@
> * 
> * @generated
> */
>+ @Override
> public void eSet( int featureID, Object newValue )
> {
> switch( featureID )
>@@ -417,6 +421,7 @@
> * 
> * @generated
> */
>+ @Override
> public void eUnset( int featureID )
> {
> switch( featureID )
>@@ -439,6 +444,7 @@
> * 
> * @generated
> */
>+ @Override
> public boolean eIsSet( int featureID )
> {
> switch( featureID )
>@@ -458,6 +464,7 @@
> * 
> * @generated
> */
>+ @Override
> public String toString()
> {
> if( eIsProxy() )
>Index: src/org/eclipse/datatools/connectivity/oda/design/impl/InputParameterAttributesImpl.java
>===================================================================
>RCS file: /cvsroot/datatools/org.eclipse.datatools.connectivity/plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/InputParameterAttributesImpl.java,v
>retrieving revision 1.3
>diff -u -r1.3 InputParameterAttributesImpl.java
>--- src/org/eclipse/datatools/connectivity/oda/design/impl/InputParameterAttributesImpl.java	11 Apr 2007 02:59:52 -0000	1.3
>+++ src/org/eclipse/datatools/connectivity/oda/design/impl/InputParameterAttributesImpl.java	24 Apr 2009 03:18:26 -0000
>@@ -1,6 +1,6 @@
> /**
> *************************************************************************
>- * Copyright (c) 2005, 2007 Actuate Corporation.
>+ * Copyright (c) 2005, 2009 Actuate Corporation.
> * All rights reserved. This program and the accompanying materials
> * are made available under the terms of the Eclipse Public License v1.0
> * which accompanies this distribution, and is available at
>@@ -49,7 +49,7 @@
> * 
> * @generated
> */
>- public static final String copyright = "Copyright (c) 2005, 2007 Actuate Corporation"; //$NON-NLS-1$
>+ public static final String copyright = "Copyright (c) 2005, 2009 Actuate Corporation"; //$NON-NLS-1$
> 
> /**
> * The cached value of the '{@link #getElementAttributes() Element Attributes}' containment reference.
>@@ -59,7 +59,7 @@
> * @generated
> * @ordered
> */
>- protected InputElementAttributes m_elementAttributes = null;
>+ protected InputElementAttributes m_elementAttributes;
> 
> /**
> * The cached value of the '{@link #getUiHints() Ui Hints}' containment reference.
>@@ -69,7 +69,7 @@
> * @generated
> * @ordered
> */
>- protected InputParameterUIHints m_uiHints = null;
>+ protected InputParameterUIHints m_uiHints;
> 
> /**
> * 
>@@ -86,6 +86,7 @@
> * 
> * @generated
> */
>+ @Override
> protected EClass eStaticClass()
> {
> return DesignPackage.Literals.INPUT_PARAMETER_ATTRIBUTES;
>@@ -254,6 +255,7 @@
> * 
> * @generated
> */
>+ @Override
> public NotificationChain eInverseRemove( InternalEObject otherEnd,
> int featureID, NotificationChain msgs )
> {
>@@ -272,6 +274,7 @@
> * 
> * @generated
> */
>+ @Override
> public Object eGet( int featureID, boolean resolve, boolean coreType )
> {
> switch( featureID )
>@@ -289,6 +292,7 @@
> * 
> * @generated
> */
>+ @Override
> public void eSet( int featureID, Object newValue )
> {
> switch( featureID )
>@@ -308,6 +312,7 @@
> * 
> * @generated
> */
>+ @Override
> public void eUnset( int featureID )
> {
> switch( featureID )
>@@ -327,6 +332,7 @@
> * 
> * @generated
> */
>+ @Override
> public boolean eIsSet( int featureID )
> {
> switch( featureID )
>Index: src/org/eclipse/datatools/connectivity/oda/design/impl/AxisAttributesImpl.java
>===================================================================
>RCS file: /cvsroot/datatools/org.eclipse.datatools.connectivity/plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/AxisAttributesImpl.java,v
>retrieving revision 1.2
>diff -u -r1.2 AxisAttributesImpl.java
>--- src/org/eclipse/datatools/connectivity/oda/design/impl/AxisAttributesImpl.java	11 Apr 2007 02:59:52 -0000	1.2
>+++ src/org/eclipse/datatools/connectivity/oda/design/impl/AxisAttributesImpl.java	24 Apr 2009 03:18:25 -0000
>@@ -1,6 +1,6 @@
> /**
> *************************************************************************
>- * Copyright (c) 2005, 2007 Actuate Corporation.
>+ * Copyright (c) 2005, 2009 Actuate Corporation.
> * All rights reserved. This program and the accompanying materials
> * are made available under the terms of the Eclipse Public License v1.0
> * which accompanies this distribution, and is available at
>@@ -44,7 +44,7 @@
> * 
> * @generated
> */
>- public static final String copyright = "Copyright (c) 2005, 2007 Actuate Corporation"; //$NON-NLS-1$
>+ public static final String copyright = "Copyright (c) 2005, 2009 Actuate Corporation"; //$NON-NLS-1$
> 
> /**
> * The default value of the '{@link #getAxisType() Axis Type}' attribute.
>@@ -73,7 +73,7 @@
> * @generated
> * @ordered
> */
>- protected boolean m_axisTypeESet = false;
>+ protected boolean m_axisTypeESet;
> 
> /**
> * The default value of the '{@link #isOnColumnLayout() On Column Layout}' attribute.
>@@ -102,7 +102,7 @@
> * @generated
> * @ordered
> */
>- protected boolean m_onColumnLayoutESet = false;
>+ protected boolean m_onColumnLayoutESet;
> 
> /**
> * 
>@@ -119,6 +119,7 @@
> * 
> * @generated
> */
>+ @Override
> protected EClass eStaticClass()
> {
> return DesignPackage.Literals.AXIS_ATTRIBUTES;
>@@ -238,6 +239,7 @@
> * 
> * @generated
> */
>+ @Override
> public Object eGet( int featureID, boolean resolve, boolean coreType )
> {
> switch( featureID )
>@@ -255,6 +257,7 @@
> * 
> * @generated
> */
>+ @Override
> public void eSet( int featureID, Object newValue )
> {
> switch( featureID )
>@@ -274,6 +277,7 @@
> * 
> * @generated
> */
>+ @Override
> public void eUnset( int featureID )
> {
> switch( featureID )
>@@ -293,6 +297,7 @@
> * 
> * @generated
> */
>+ @Override
> public boolean eIsSet( int featureID )
> {
> switch( featureID )
>@@ -310,6 +315,7 @@
> * 
> * @generated
> */
>+ @Override
> public String toString()
> {
> if( eIsProxy() )
>Index: src/org/eclipse/datatools/connectivity/oda/design/impl/OdaDesignSessionImpl.java
>===================================================================
>RCS file: /cvsroot/datatools/org.eclipse.datatools.connectivity/plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/OdaDesignSessionImpl.java,v
>retrieving revision 1.8
>diff -u -r1.8 OdaDesignSessionImpl.java
>--- src/org/eclipse/datatools/connectivity/oda/design/impl/OdaDesignSessionImpl.java	11 Apr 2007 09:18:37 -0000	1.8
>+++ src/org/eclipse/datatools/connectivity/oda/design/impl/OdaDesignSessionImpl.java	24 Apr 2009 03:18:26 -0000
>@@ -1,6 +1,6 @@
> /**
> *************************************************************************
>- * Copyright (c) 2005, 2007 Actuate Corporation.
>+ * Copyright (c) 2005, 2009 Actuate Corporation.
> * All rights reserved. This program and the accompanying materials
> * are made available under the terms of the Eclipse Public License v1.0
> * which accompanies this distribution, and is available at
>@@ -53,7 +53,7 @@
> * 
> * @generated
> */
>- public static final String copyright = "Copyright (c) 2005, 2007 Actuate Corporation"; //$NON-NLS-1$
>+ public static final String copyright = "Copyright (c) 2005, 2009 Actuate Corporation"; //$NON-NLS-1$
> 
> /**
> * The cached value of the '{@link #getRequest() Request}' containment reference.
>@@ -63,7 +63,7 @@
> * @generated
> * @ordered
> */
>- protected DesignSessionRequest m_request = null;
>+ protected DesignSessionRequest m_request;
> 
> /**
> * The cached value of the '{@link #getResponse() Response}' containment reference.
>@@ -73,7 +73,7 @@
> * @generated
> * @ordered
> */
>- protected DesignSessionResponse m_response = null;
>+ protected DesignSessionResponse m_response;
> 
> /**
> * 
>@@ -90,6 +90,7 @@
> * 
> * @generated
> */
>+ @Override
> protected EClass eStaticClass()
> {
> return DesignPackage.Literals.ODA_DESIGN_SESSION;
>@@ -107,7 +108,7 @@
> 
> setRequest( newRequest );
> }
>- 
>+
> /*
> * (non-Javadoc)
> * @see org.eclipse.datatools.connectivity.oda.design.OdaDesignSession#setNewRequest(org.eclipse.datatools.connectivity.oda.design.DataSetDesign)
>@@ -116,7 +117,7 @@
> public void setNewRequest( DataSetDesign dataSetDesign )
> {
> DesignSessionRequest newRequest = DesignFactory.eINSTANCE
>- .createDesignSessionRequest();
>+ .createDesignSessionRequest();
> newRequest.setNewDataAccessDesign( dataSetDesign );
> 
> setRequest( newRequest );
>@@ -356,6 +357,7 @@
> * 
> * @generated
> */
>+ @Override
> public NotificationChain eInverseRemove( InternalEObject otherEnd,
> int featureID, NotificationChain msgs )
> {
>@@ -374,6 +376,7 @@
> * 
> * @generated
> */
>+ @Override
> public Object eGet( int featureID, boolean resolve, boolean coreType )
> {
> switch( featureID )
>@@ -391,6 +394,7 @@
> * 
> * @generated
> */
>+ @Override
> public void eSet( int featureID, Object newValue )
> {
> switch( featureID )
>@@ -410,6 +414,7 @@
> * 
> * @generated
> */
>+ @Override
> public void eUnset( int featureID )
> {
> switch( featureID )
>@@ -429,6 +434,7 @@
> * 
> * @generated
> */
>+ @Override
> public boolean eIsSet( int featureID )
> {
> switch( featureID )
>Index: src/org/eclipse/datatools/connectivity/oda/design/impl/DataAccessDesignImpl.java
>===================================================================
>RCS file: /cvsroot/datatools/org.eclipse.datatools.connectivity/plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/DataAccessDesignImpl.java,v
>retrieving revision 1.6
>diff -u -r1.6 DataAccessDesignImpl.java
>--- src/org/eclipse/datatools/connectivity/oda/design/impl/DataAccessDesignImpl.java	11 Apr 2007 02:59:53 -0000	1.6
>+++ src/org/eclipse/datatools/connectivity/oda/design/impl/DataAccessDesignImpl.java	24 Apr 2009 03:18:25 -0000
>@@ -1,6 +1,6 @@
> /**
> *************************************************************************
>- * Copyright (c) 2005, 2007 Actuate Corporation.
>+ * Copyright (c) 2005, 2009 Actuate Corporation.
> * All rights reserved. This program and the accompanying materials
> * are made available under the terms of the Eclipse Public License v1.0
> * which accompanies this distribution, and is available at
>@@ -48,7 +48,7 @@
> * 
> * @generated
> */
>- public static final String copyright = "Copyright (c) 2005, 2007 Actuate Corporation"; //$NON-NLS-1$
>+ public static final String copyright = "Copyright (c) 2005, 2009 Actuate Corporation"; //$NON-NLS-1$
> 
> /**
> * @generated NOT
>@@ -63,7 +63,7 @@
> * @generated
> * @ordered
> */
>- protected DataSetDesign m_dataSetDesign = null;
>+ protected DataSetDesign m_dataSetDesign;
> 
> /**
> * 
>@@ -80,6 +80,7 @@
> * 
> * @generated
> */
>+ @Override
> protected EClass eStaticClass()
> {
> return DesignPackage.Literals.DATA_ACCESS_DESIGN;
>@@ -201,6 +202,7 @@
> * 
> * @generated
> */
>+ @Override
> public NotificationChain eInverseRemove( InternalEObject otherEnd,
> int featureID, NotificationChain msgs )
> {
>@@ -217,6 +219,7 @@
> * 
> * @generated
> */
>+ @Override
> public Object eGet( int featureID, boolean resolve, boolean coreType )
> {
> switch( featureID )
>@@ -232,6 +235,7 @@
> * 
> * @generated
> */
>+ @Override
> public void eSet( int featureID, Object newValue )
> {
> switch( featureID )
>@@ -248,6 +252,7 @@
> * 
> * @generated
> */
>+ @Override
> public void eUnset( int featureID )
> {
> switch( featureID )
>@@ -264,6 +269,7 @@
> * 
> * @generated
> */
>+ @Override
> public boolean eIsSet( int featureID )
> {
> switch( featureID )
>Index: src/org/eclipse/datatools/connectivity/oda/design/impl/CustomFilterExpressionImpl.java
>===================================================================
>RCS file: /cvsroot/datatools/org.eclipse.datatools.connectivity/plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/CustomFilterExpressionImpl.java,v
>retrieving revision 1.2
>diff -u -r1.2 CustomFilterExpressionImpl.java
>--- src/org/eclipse/datatools/connectivity/oda/design/impl/CustomFilterExpressionImpl.java	14 Apr 2009 02:13:18 -0000	1.2
>+++ src/org/eclipse/datatools/connectivity/oda/design/impl/CustomFilterExpressionImpl.java	24 Apr 2009 03:18:25 -0000
>@@ -54,7 +54,6 @@
> * 
> * @generated
> */
>- @SuppressWarnings("hiding")
> public static final String copyright = "Copyright (c) 2009 Actuate Corporation"; //$NON-NLS-1$
> 
> /**
>Index: src/org/eclipse/datatools/connectivity/oda/design/impl/DesignSessionRequestImpl.java
>===================================================================
>RCS file: /cvsroot/datatools/org.eclipse.datatools.connectivity/plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/DesignSessionRequestImpl.java,v
>retrieving revision 1.5
>diff -u -r1.5 DesignSessionRequestImpl.java
>--- src/org/eclipse/datatools/connectivity/oda/design/impl/DesignSessionRequestImpl.java	11 Apr 2007 02:59:52 -0000	1.5
>+++ src/org/eclipse/datatools/connectivity/oda/design/impl/DesignSessionRequestImpl.java	24 Apr 2009 03:18:26 -0000
>@@ -1,6 +1,6 @@
> /**
> *************************************************************************
>- * Copyright (c) 2005, 2007 Actuate Corporation.
>+ * Copyright (c) 2005, 2009 Actuate Corporation.
> * All rights reserved. This program and the accompanying materials
> * are made available under the terms of the Eclipse Public License v1.0
> * which accompanies this distribution, and is available at
>@@ -56,7 +56,7 @@
> * 
> * @generated
> */
>- public static final String copyright = "Copyright (c) 2005, 2007 Actuate Corporation"; //$NON-NLS-1$
>+ public static final String copyright = "Copyright (c) 2005, 2009 Actuate Corporation"; //$NON-NLS-1$
> 
> /**
> * The cached value of the '{@link #getDataAccessDesign() Data Access Design}' containment reference.
>@@ -66,7 +66,7 @@
> * @generated
> * @ordered
> */
>- protected DataAccessDesign m_dataAccessDesign = null;
>+ protected DataAccessDesign m_dataAccessDesign;
> 
> /**
> * The default value of the '{@link #isEditable() Editable}' attribute.
>@@ -95,7 +95,7 @@
> * @generated
> * @ordered
> */
>- protected boolean m_editableESet = false;
>+ protected boolean m_editableESet;
> 
> /**
> * The cached value of the '{@link #getSessionLocale() Session Locale}' containment reference.
>@@ -105,7 +105,7 @@
> * @generated
> * @ordered
> */
>- protected Locale m_sessionLocale = null;
>+ protected Locale m_sessionLocale;
> 
> /**
> * The cached value of the '{@link #getDesignerState() Designer State}' containment reference.
>@@ -115,7 +115,7 @@
> * @generated
> * @ordered
> */
>- protected DesignerState m_designerState = null;
>+ protected DesignerState m_designerState;
> 
> /**
> * 
>@@ -132,6 +132,7 @@
> * 
> * @generated
> */
>+ @Override
> protected EClass eStaticClass()
> {
> return DesignPackage.Literals.DESIGN_SESSION_REQUEST;
>@@ -470,6 +471,7 @@
> * 
> * @generated
> */
>+ @Override
> public NotificationChain eInverseRemove( InternalEObject otherEnd,
> int featureID, NotificationChain msgs )
> {
>@@ -490,6 +492,7 @@
> * 
> * @generated
> */
>+ @Override
> public Object eGet( int featureID, boolean resolve, boolean coreType )
> {
> switch( featureID )
>@@ -511,6 +514,7 @@
> * 
> * @generated
> */
>+ @Override
> public void eSet( int featureID, Object newValue )
> {
> switch( featureID )
>@@ -536,6 +540,7 @@
> * 
> * @generated
> */
>+ @Override
> public void eUnset( int featureID )
> {
> switch( featureID )
>@@ -561,6 +566,7 @@
> * 
> * @generated
> */
>+ @Override
> public boolean eIsSet( int featureID )
> {
> switch( featureID )
>@@ -582,6 +588,7 @@
> * 
> * @generated
> */
>+ @Override
> public String toString()
> {
> if( eIsProxy() )
>Index: src/org/eclipse/datatools/connectivity/oda/design/impl/ScalarValueDefinitionImpl.java
>===================================================================
>RCS file: /cvsroot/datatools/org.eclipse.datatools.connectivity/plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/ScalarValueDefinitionImpl.java,v
>retrieving revision 1.2
>diff -u -r1.2 ScalarValueDefinitionImpl.java
>--- src/org/eclipse/datatools/connectivity/oda/design/impl/ScalarValueDefinitionImpl.java	11 Apr 2007 02:59:52 -0000	1.2
>+++ src/org/eclipse/datatools/connectivity/oda/design/impl/ScalarValueDefinitionImpl.java	24 Apr 2009 03:18:26 -0000
>@@ -1,6 +1,6 @@
> /**
> *************************************************************************
>- * Copyright (c) 2005, 2007 Actuate Corporation.
>+ * Copyright (c) 2005, 2009 Actuate Corporation.
> * All rights reserved. This program and the accompanying materials
> * are made available under the terms of the Eclipse Public License v1.0
> * which accompanies this distribution, and is available at
>@@ -44,7 +44,7 @@
> * 
> * @generated
> */
>- public static final String copyright = "Copyright (c) 2005, 2007 Actuate Corporation"; //$NON-NLS-1$
>+ public static final String copyright = "Copyright (c) 2005, 2009 Actuate Corporation"; //$NON-NLS-1$
> 
> /**
> * The default value of the '{@link #getValue() Value}' attribute.
>@@ -101,6 +101,7 @@
> * 
> * @generated
> */
>+ @Override
> protected EClass eStaticClass()
> {
> return DesignPackage.Literals.SCALAR_VALUE_DEFINITION;
>@@ -161,6 +162,7 @@
> * 
> * @generated
> */
>+ @Override
> public Object eGet( int featureID, boolean resolve, boolean coreType )
> {
> switch( featureID )
>@@ -178,6 +180,7 @@
> * 
> * @generated
> */
>+ @Override
> public void eSet( int featureID, Object newValue )
> {
> switch( featureID )
>@@ -197,6 +200,7 @@
> * 
> * @generated
> */
>+ @Override
> public void eUnset( int featureID )
> {
> switch( featureID )
>@@ -216,6 +220,7 @@
> * 
> * @generated
> */
>+ @Override
> public boolean eIsSet( int featureID )
> {
> switch( featureID )
>@@ -235,6 +240,7 @@
> * 
> * @generated
> */
>+ @Override
> public String toString()
> {
> if( eIsProxy() )
>Index: src/org/eclipse/datatools/connectivity/oda/design/impl/ValueFormatHintsImpl.java
>===================================================================
>RCS file: /cvsroot/datatools/org.eclipse.datatools.connectivity/plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/ValueFormatHintsImpl.java,v
>retrieving revision 1.3
>diff -u -r1.3 ValueFormatHintsImpl.java
>--- src/org/eclipse/datatools/connectivity/oda/design/impl/ValueFormatHintsImpl.java	11 Apr 2007 02:59:53 -0000	1.3
>+++ src/org/eclipse/datatools/connectivity/oda/design/impl/ValueFormatHintsImpl.java	24 Apr 2009 03:18:26 -0000
>@@ -1,6 +1,6 @@
> /**
> *************************************************************************
>- * Copyright (c) 2005, 2007 Actuate Corporation.
>+ * Copyright (c) 2005, 2009 Actuate Corporation.
> * All rights reserved. This program and the accompanying materials
> * are made available under the terms of the Eclipse Public License v1.0
> * which accompanies this distribution, and is available at
>@@ -50,7 +50,7 @@
> * 
> * @generated
> */
>- public static final String copyright = "Copyright (c) 2005, 2007 Actuate Corporation"; //$NON-NLS-1$
>+ public static final String copyright = "Copyright (c) 2005, 2009 Actuate Corporation"; //$NON-NLS-1$
> 
> /**
> * The default value of the '{@link #getDisplaySize() Display Size}' attribute.
>@@ -79,7 +79,7 @@
> * @generated
> * @ordered
> */
>- protected boolean m_displaySizeESet = false;
>+ protected boolean m_displaySizeESet;
> 
> /**
> * The default value of the '{@link #getDisplayFormat() Display Format}' attribute.
>@@ -128,7 +128,7 @@
> * @generated
> * @ordered
> */
>- protected boolean m_textFormatTypeESet = false;
>+ protected boolean m_textFormatTypeESet;
> 
> /**
> * The default value of the '{@link #getHorizontalAlignment() Horizontal Alignment}' attribute.
>@@ -157,7 +157,7 @@
> * @generated
> * @ordered
> */
>- protected boolean m_horizontalAlignmentESet = false;
>+ protected boolean m_horizontalAlignmentESet;
> 
> /**
> * The default value of the '{@link #getTextWrapType() Text Wrap Type}' attribute.
>@@ -186,7 +186,7 @@
> * @generated
> * @ordered
> */
>- protected boolean m_textWrapTypeESet = false;
>+ protected boolean m_textWrapTypeESet;
> 
> /**
> * 
>@@ -203,6 +203,7 @@
> * 
> * @generated
> */
>+ @Override
> protected EClass eStaticClass()
> {
> return DesignPackage.Literals.VALUE_FORMAT_HINTS;
>@@ -462,6 +463,7 @@
> * 
> * @generated
> */
>+ @Override
> public Object eGet( int featureID, boolean resolve, boolean coreType )
> {
> switch( featureID )
>@@ -485,6 +487,7 @@
> * 
> * @generated
> */
>+ @Override
> public void eSet( int featureID, Object newValue )
> {
> switch( featureID )
>@@ -513,6 +516,7 @@
> * 
> * @generated
> */
>+ @Override
> public void eUnset( int featureID )
> {
> switch( featureID )
>@@ -541,6 +545,7 @@
> * 
> * @generated
> */
>+ @Override
> public boolean eIsSet( int featureID )
> {
> switch( featureID )
>@@ -565,6 +570,7 @@
> * 
> * @generated
> */
>+ @Override
> public String toString()
> {
> if( eIsProxy() )
>Index: src/org/eclipse/datatools/connectivity/oda/design/impl/DocumentRootImpl.java
>===================================================================
>RCS file: /cvsroot/datatools/org.eclipse.datatools.connectivity/plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/DocumentRootImpl.java,v
>retrieving revision 1.2
>diff -u -r1.2 DocumentRootImpl.java
>--- src/org/eclipse/datatools/connectivity/oda/design/impl/DocumentRootImpl.java	11 Apr 2007 02:59:52 -0000	1.2
>+++ src/org/eclipse/datatools/connectivity/oda/design/impl/DocumentRootImpl.java	24 Apr 2009 03:18:26 -0000
>@@ -1,6 +1,6 @@
> /**
> *************************************************************************
>- * Copyright (c) 2005, 2007 Actuate Corporation.
>+ * Copyright (c) 2005, 2009 Actuate Corporation.
> * All rights reserved. This program and the accompanying materials
> * are made available under the terms of the Eclipse Public License v1.0
> * which accompanies this distribution, and is available at
>@@ -54,7 +54,7 @@
> * 
> * @generated
> */
>- public static final String copyright = "Copyright (c) 2005, 2007 Actuate Corporation"; //$NON-NLS-1$
>+ public static final String copyright = "Copyright (c) 2005, 2009 Actuate Corporation"; //$NON-NLS-1$
> 
> /**
> * The cached value of the '{@link #getMixed() Mixed}' attribute list.
>@@ -64,7 +64,7 @@
> * @generated
> * @ordered
> */
>- protected FeatureMap m_mixed = null;
>+ protected FeatureMap m_mixed;
> 
> /**
> * The cached value of the '{@link #getXMLNSPrefixMap() XMLNS Prefix Map}' map.
>@@ -74,7 +74,7 @@
> * @generated
> * @ordered
> */
>- protected EMap m_xMLNSPrefixMap = null;
>+ protected EMap<String, String> m_xMLNSPrefixMap;
> 
> /**
> * The cached value of the '{@link #getXSISchemaLocation() XSI Schema Location}' map.
>@@ -84,7 +84,7 @@
> * @generated
> * @ordered
> */
>- protected EMap m_xSISchemaLocation = null;
>+ protected EMap<String, String> m_xSISchemaLocation;
> 
> /**
> * 
>@@ -101,6 +101,7 @@
> * 
> * @generated
> */
>+ @Override
> protected EClass eStaticClass()
> {
> return DesignPackage.Literals.DOCUMENT_ROOT;
>@@ -126,11 +127,11 @@
> * 
> * @generated
> */
>- public EMap getXMLNSPrefixMap()
>+ public EMap<String, String> getXMLNSPrefixMap()
> {
> if( m_xMLNSPrefixMap == null )
> {
>- m_xMLNSPrefixMap = new EcoreEMap(
>+ m_xMLNSPrefixMap = new EcoreEMap<String, String>(
> EcorePackage.Literals.ESTRING_TO_STRING_MAP_ENTRY,
> EStringToStringMapEntryImpl.class, this,
> DesignPackage.DOCUMENT_ROOT__XMLNS_PREFIX_MAP );
>@@ -143,11 +144,11 @@
> * 
> * @generated
> */
>- public EMap getXSISchemaLocation()
>+ public EMap<String, String> getXSISchemaLocation()
> {
> if( m_xSISchemaLocation == null )
> {
>- m_xSISchemaLocation = new EcoreEMap(
>+ m_xSISchemaLocation = new EcoreEMap<String, String>(
> EcorePackage.Literals.ESTRING_TO_STRING_MAP_ENTRY,
> EStringToStringMapEntryImpl.class, this,
> DesignPackage.DOCUMENT_ROOT__XSI_SCHEMA_LOCATION );
>@@ -196,18 +197,19 @@
> * 
> * @generated
> */
>+ @Override
> public NotificationChain eInverseRemove( InternalEObject otherEnd,
> int featureID, NotificationChain msgs )
> {
> switch( featureID )
> {
> case DesignPackage.DOCUMENT_ROOT__MIXED:
>- return ((InternalEList) getMixed()).basicRemove( otherEnd, msgs );
>+ return ((InternalEList<?>) getMixed()).basicRemove( otherEnd, msgs );
> case DesignPackage.DOCUMENT_ROOT__XMLNS_PREFIX_MAP:
>- return ((InternalEList) getXMLNSPrefixMap()).basicRemove( otherEnd,
>- msgs );
>+ return ((InternalEList<?>) getXMLNSPrefixMap()).basicRemove(
>+ otherEnd, msgs );
> case DesignPackage.DOCUMENT_ROOT__XSI_SCHEMA_LOCATION:
>- return ((InternalEList) getXSISchemaLocation()).basicRemove(
>+ return ((InternalEList<?>) getXSISchemaLocation()).basicRemove(
> otherEnd, msgs );
> case DesignPackage.DOCUMENT_ROOT__ODA_DESIGN_SESSION:
> return basicSetOdaDesignSession( null, msgs );
>@@ -220,6 +222,7 @@
> * 
> * @generated
> */
>+ @Override
> public Object eGet( int featureID, boolean resolve, boolean coreType )
> {
> switch( featureID )
>@@ -249,6 +252,7 @@
> * 
> * @generated
> */
>+ @Override
> public void eSet( int featureID, Object newValue )
> {
> switch( featureID )
>@@ -275,6 +279,7 @@
> * 
> * @generated
> */
>+ @Override
> public void eUnset( int featureID )
> {
> switch( featureID )
>@@ -300,6 +305,7 @@
> * 
> * @generated
> */
>+ @Override
> public boolean eIsSet( int featureID )
> {
> switch( featureID )
>@@ -322,6 +328,7 @@
> * 
> * @generated
> */
>+ @Override
> public String toString()
> {
> if( eIsProxy() )
>Index: src/org/eclipse/datatools/connectivity/oda/design/impl/LocaleImpl.java
>===================================================================
>RCS file: /cvsroot/datatools/org.eclipse.datatools.connectivity/plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/LocaleImpl.java,v
>retrieving revision 1.3
>diff -u -r1.3 LocaleImpl.java
>--- src/org/eclipse/datatools/connectivity/oda/design/impl/LocaleImpl.java	11 Apr 2007 02:59:52 -0000	1.3
>+++ src/org/eclipse/datatools/connectivity/oda/design/impl/LocaleImpl.java	24 Apr 2009 03:18:26 -0000
>@@ -1,6 +1,6 @@
> /**
> *************************************************************************
>- * Copyright (c) 2005, 2007 Actuate Corporation.
>+ * Copyright (c) 2005, 2009 Actuate Corporation.
> * All rights reserved. This program and the accompanying materials
> * are made available under the terms of the Eclipse Public License v1.0
> * which accompanies this distribution, and is available at
>@@ -46,7 +46,7 @@
> * 
> * @generated
> */
>- public static final String copyright = "Copyright (c) 2005, 2007 Actuate Corporation"; //$NON-NLS-1$
>+ public static final String copyright = "Copyright (c) 2005, 2009 Actuate Corporation"; //$NON-NLS-1$
> 
> /**
> * The default value of the '{@link #getLanguage() Language}' attribute.
>@@ -75,7 +75,7 @@
> * @generated
> * @ordered
> */
>- protected boolean m_languageESet = false;
>+ protected boolean m_languageESet;
> 
> /**
> * The default value of the '{@link #getCountry() Country}' attribute.
>@@ -136,6 +136,7 @@
> * 
> * @generated
> */
>+ @Override
> protected EClass eStaticClass()
> {
> return DesignPackage.Literals.LOCALE;
>@@ -330,6 +331,7 @@
> * 
> * @generated
> */
>+ @Override
> public Object eGet( int featureID, boolean resolve, boolean coreType )
> {
> switch( featureID )
>@@ -349,6 +351,7 @@
> * 
> * @generated
> */
>+ @Override
> public void eSet( int featureID, Object newValue )
> {
> switch( featureID )
>@@ -371,6 +374,7 @@
> * 
> * @generated
> */
>+ @Override
> public void eUnset( int featureID )
> {
> switch( featureID )
>@@ -393,6 +397,7 @@
> * 
> * @generated
> */
>+ @Override
> public boolean eIsSet( int featureID )
> {
> switch( featureID )
>@@ -414,6 +419,7 @@
> * 
> * @generated
> */
>+ @Override
> public String toString()
> {
> if( eIsProxy() )
>Index: src/org/eclipse/datatools/connectivity/oda/design/impl/OutputElementAttributesImpl.java
>===================================================================
>RCS file: /cvsroot/datatools/org.eclipse.datatools.connectivity/plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/OutputElementAttributesImpl.java,v
>retrieving revision 1.3
>diff -u -r1.3 OutputElementAttributesImpl.java
>--- src/org/eclipse/datatools/connectivity/oda/design/impl/OutputElementAttributesImpl.java	11 Apr 2007 02:59:52 -0000	1.3
>+++ src/org/eclipse/datatools/connectivity/oda/design/impl/OutputElementAttributesImpl.java	24 Apr 2009 03:18:26 -0000
>@@ -1,6 +1,6 @@
> /**
> *************************************************************************
>- * Copyright (c) 2005, 2007 Actuate Corporation.
>+ * Copyright (c) 2005, 2009 Actuate Corporation.
> * All rights reserved. This program and the accompanying materials
> * are made available under the terms of the Eclipse Public License v1.0
> * which accompanies this distribution, and is available at
>@@ -49,7 +49,7 @@
> * 
> * @generated
> */
>- public static final String copyright = "Copyright (c) 2005, 2007 Actuate Corporation"; //$NON-NLS-1$
>+ public static final String copyright = "Copyright (c) 2005, 2009 Actuate Corporation"; //$NON-NLS-1$
> 
> /**
> * The default value of the '{@link #getLabel() Label}' attribute.
>@@ -79,7 +79,7 @@
> * @generated
> * @ordered
> */
>- protected ValueFormatHints m_formattingHints = null;
>+ protected ValueFormatHints m_formattingHints;
> 
> /**
> * The default value of the '{@link #getHelpText() Help Text}' attribute.
>@@ -116,6 +116,7 @@
> * 
> * @generated
> */
>+ @Override
> protected EClass eStaticClass()
> {
> return DesignPackage.Literals.OUTPUT_ELEMENT_ATTRIBUTES;
>@@ -257,6 +258,7 @@
> * 
> * @generated
> */
>+ @Override
> public NotificationChain eInverseRemove( InternalEObject otherEnd,
> int featureID, NotificationChain msgs )
> {
>@@ -273,6 +275,7 @@
> * 
> * @generated
> */
>+ @Override
> public Object eGet( int featureID, boolean resolve, boolean coreType )
> {
> switch( featureID )
>@@ -292,6 +295,7 @@
> * 
> * @generated
> */
>+ @Override
> public void eSet( int featureID, Object newValue )
> {
> switch( featureID )
>@@ -314,6 +318,7 @@
> * 
> * @generated
> */
>+ @Override
> public void eUnset( int featureID )
> {
> switch( featureID )
>@@ -336,6 +341,7 @@
> * 
> * @generated
> */
>+ @Override
> public boolean eIsSet( int featureID )
> {
> switch( featureID )
>@@ -357,6 +363,7 @@
> * 
> * @generated
> */
>+ @Override
> public String toString()
> {
> if( eIsProxy() )
>Index: src/org/eclipse/datatools/connectivity/oda/design/impl/DataElementUIHintsImpl.java
>===================================================================
>RCS file: /cvsroot/datatools/org.eclipse.datatools.connectivity/plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/DataElementUIHintsImpl.java,v
>retrieving revision 1.2
>diff -u -r1.2 DataElementUIHintsImpl.java
>--- src/org/eclipse/datatools/connectivity/oda/design/impl/DataElementUIHintsImpl.java	11 Apr 2007 02:59:52 -0000	1.2
>+++ src/org/eclipse/datatools/connectivity/oda/design/impl/DataElementUIHintsImpl.java	24 Apr 2009 03:18:25 -0000
>@@ -1,6 +1,6 @@
> /**
> *************************************************************************
>- * Copyright (c) 2005, 2007 Actuate Corporation.
>+ * Copyright (c) 2005, 2009 Actuate Corporation.
> * All rights reserved. This program and the accompanying materials
> * are made available under the terms of the Eclipse Public License v1.0
> * which accompanies this distribution, and is available at
>@@ -44,7 +44,7 @@
> * 
> * @generated
> */
>- public static final String copyright = "Copyright (c) 2005, 2007 Actuate Corporation"; //$NON-NLS-1$
>+ public static final String copyright = "Copyright (c) 2005, 2009 Actuate Corporation"; //$NON-NLS-1$
> 
> /**
> * The default value of the '{@link #getDisplayName() Display Name}' attribute.
>@@ -101,6 +101,7 @@
> * 
> * @generated
> */
>+ @Override
> protected EClass eStaticClass()
> {
> return DesignPackage.Literals.DATA_ELEMENT_UI_HINTS;
>@@ -161,6 +162,7 @@
> * 
> * @generated
> */
>+ @Override
> public Object eGet( int featureID, boolean resolve, boolean coreType )
> {
> switch( featureID )
>@@ -178,6 +180,7 @@
> * 
> * @generated
> */
>+ @Override
> public void eSet( int featureID, Object newValue )
> {
> switch( featureID )
>@@ -197,6 +200,7 @@
> * 
> * @generated
> */
>+ @Override
> public void eUnset( int featureID )
> {
> switch( featureID )
>@@ -216,6 +220,7 @@
> * 
> * @generated
> */
>+ @Override
> public boolean eIsSet( int featureID )
> {
> switch( featureID )
>@@ -235,6 +240,7 @@
> * 
> * @generated
> */
>+ @Override
> public String toString()
> {
> if( eIsProxy() )
>Index: src/org/eclipse/datatools/connectivity/oda/design/impl/NameValuePairImpl.java
>===================================================================
>RCS file: /cvsroot/datatools/org.eclipse.datatools.connectivity/plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/NameValuePairImpl.java,v
>retrieving revision 1.2
>diff -u -r1.2 NameValuePairImpl.java
>--- src/org/eclipse/datatools/connectivity/oda/design/impl/NameValuePairImpl.java	11 Apr 2007 02:59:52 -0000	1.2
>+++ src/org/eclipse/datatools/connectivity/oda/design/impl/NameValuePairImpl.java	24 Apr 2009 03:18:26 -0000
>@@ -1,6 +1,6 @@
> /**
> *************************************************************************
>- * Copyright (c) 2005, 2007 Actuate Corporation.
>+ * Copyright (c) 2005, 2009 Actuate Corporation.
> * All rights reserved. This program and the accompanying materials
> * are made available under the terms of the Eclipse Public License v1.0
> * which accompanies this distribution, and is available at
>@@ -43,7 +43,7 @@
> * 
> * @generated
> */
>- public static final String copyright = "Copyright (c) 2005, 2007 Actuate Corporation"; //$NON-NLS-1$
>+ public static final String copyright = "Copyright (c) 2005, 2009 Actuate Corporation"; //$NON-NLS-1$
> 
> /**
> * The default value of the '{@link #getName() Name}' attribute.
>@@ -100,6 +100,7 @@
> * 
> * @generated
> */
>+ @Override
> protected EClass eStaticClass()
> {
> return DesignPackage.Literals.NAME_VALUE_PAIR;
>@@ -158,6 +159,7 @@
> * 
> * @generated
> */
>+ @Override
> public Object eGet( int featureID, boolean resolve, boolean coreType )
> {
> switch( featureID )
>@@ -175,6 +177,7 @@
> * 
> * @generated
> */
>+ @Override
> public void eSet( int featureID, Object newValue )
> {
> switch( featureID )
>@@ -194,6 +197,7 @@
> * 
> * @generated
> */
>+ @Override
> public void eUnset( int featureID )
> {
> switch( featureID )
>@@ -213,6 +217,7 @@
> * 
> * @generated
> */
>+ @Override
> public boolean eIsSet( int featureID )
> {
> switch( featureID )
>@@ -232,6 +237,7 @@
> * 
> * @generated
> */
>+ @Override
> public String toString()
> {
> if( eIsProxy() )
>Index: src/org/eclipse/datatools/connectivity/oda/design/impl/DataSetQueryImpl.java
>===================================================================
>RCS file: /cvsroot/datatools/org.eclipse.datatools.connectivity/plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/DataSetQueryImpl.java,v
>retrieving revision 1.2
>diff -u -r1.2 DataSetQueryImpl.java
>--- src/org/eclipse/datatools/connectivity/oda/design/impl/DataSetQueryImpl.java	11 Apr 2007 02:59:52 -0000	1.2
>+++ src/org/eclipse/datatools/connectivity/oda/design/impl/DataSetQueryImpl.java	24 Apr 2009 03:18:25 -0000
>@@ -1,6 +1,6 @@
> /**
> *************************************************************************
>- * Copyright (c) 2005, 2007 Actuate Corporation.
>+ * Copyright (c) 2005, 2009 Actuate Corporation.
> * All rights reserved. This program and the accompanying materials
> * are made available under the terms of the Eclipse Public License v1.0
> * which accompanies this distribution, and is available at
>@@ -42,7 +42,7 @@
> * 
> * @generated
> */
>- public static final String copyright = "Copyright (c) 2005, 2007 Actuate Corporation"; //$NON-NLS-1$
>+ public static final String copyright = "Copyright (c) 2005, 2009 Actuate Corporation"; //$NON-NLS-1$
> 
> /**
> * The default value of the '{@link #getQueryText() Query Text}' attribute.
>@@ -79,6 +79,7 @@
> * 
> * @generated
> */
>+ @Override
> protected EClass eStaticClass()
> {
> return DesignPackage.Literals.DATA_SET_QUERY;
>@@ -114,6 +115,7 @@
> * 
> * @generated
> */
>+ @Override
> public Object eGet( int featureID, boolean resolve, boolean coreType )
> {
> switch( featureID )
>@@ -129,6 +131,7 @@
> * 
> * @generated
> */
>+ @Override
> public void eSet( int featureID, Object newValue )
> {
> switch( featureID )
>@@ -145,6 +148,7 @@
> * 
> * @generated
> */
>+ @Override
> public void eUnset( int featureID )
> {
> switch( featureID )
>@@ -161,6 +165,7 @@
> * 
> * @generated
> */
>+ @Override
> public boolean eIsSet( int featureID )
> {
> switch( featureID )
>@@ -177,6 +182,7 @@
> * 
> * @generated
> */
>+ @Override
> public String toString()
> {
> if( eIsProxy() )
>Index: src/org/eclipse/datatools/connectivity/oda/design/impl/DynamicValuesQueryImpl.java
>===================================================================
>RCS file: /cvsroot/datatools/org.eclipse.datatools.connectivity/plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/DynamicValuesQueryImpl.java,v
>retrieving revision 1.2
>diff -u -r1.2 DynamicValuesQueryImpl.java
>--- src/org/eclipse/datatools/connectivity/oda/design/impl/DynamicValuesQueryImpl.java	11 Apr 2007 02:59:52 -0000	1.2
>+++ src/org/eclipse/datatools/connectivity/oda/design/impl/DynamicValuesQueryImpl.java	24 Apr 2009 03:18:26 -0000
>@@ -1,6 +1,6 @@
> /**
> *************************************************************************
>- * Copyright (c) 2005, 2007 Actuate Corporation.
>+ * Copyright (c) 2005, 2009 Actuate Corporation.
> * All rights reserved. This program and the accompanying materials
> * are made available under the terms of the Eclipse Public License v1.0
> * which accompanies this distribution, and is available at
>@@ -49,7 +49,7 @@
> * 
> * @generated
> */
>- public static final String copyright = "Copyright (c) 2005, 2007 Actuate Corporation"; //$NON-NLS-1$
>+ public static final String copyright = "Copyright (c) 2005, 2009 Actuate Corporation"; //$NON-NLS-1$
> 
> /**
> * The cached value of the '{@link #getDataSetDesign() Data Set Design}' containment reference.
>@@ -59,7 +59,7 @@
> * @generated
> * @ordered
> */
>- protected DataSetDesign m_dataSetDesign = null;
>+ protected DataSetDesign m_dataSetDesign;
> 
> /**
> * The default value of the '{@link #isEnabled() Enabled}' attribute.
>@@ -88,7 +88,7 @@
> * @generated
> * @ordered
> */
>- protected boolean m_enabledESet = false;
>+ protected boolean m_enabledESet;
> 
> /**
> * The default value of the '{@link #getValueColumn() Value Column}' attribute.
>@@ -145,6 +145,7 @@
> * 
> * @generated
> */
>+ @Override
> protected EClass eStaticClass()
> {
> return DesignPackage.Literals.DYNAMIC_VALUES_QUERY;
>@@ -327,6 +328,7 @@
> * 
> * @generated
> */
>+ @Override
> public NotificationChain eInverseRemove( InternalEObject otherEnd,
> int featureID, NotificationChain msgs )
> {
>@@ -343,6 +345,7 @@
> * 
> * @generated
> */
>+ @Override
> public Object eGet( int featureID, boolean resolve, boolean coreType )
> {
> switch( featureID )
>@@ -364,6 +367,7 @@
> * 
> * @generated
> */
>+ @Override
> public void eSet( int featureID, Object newValue )
> {
> switch( featureID )
>@@ -389,6 +393,7 @@
> * 
> * @generated
> */
>+ @Override
> public void eUnset( int featureID )
> {
> switch( featureID )
>@@ -414,6 +419,7 @@
> * 
> * @generated
> */
>+ @Override
> public boolean eIsSet( int featureID )
> {
> switch( featureID )
>@@ -438,6 +444,7 @@
> * 
> * @generated
> */
>+ @Override
> public String toString()
> {
> if( eIsProxy() )
>Index: src/org/eclipse/datatools/connectivity/oda/design/impl/PropertyAttributesImpl.java
>===================================================================
>RCS file: /cvsroot/datatools/org.eclipse.datatools.connectivity/plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/PropertyAttributesImpl.java,v
>retrieving revision 1.2
>diff -u -r1.2 PropertyAttributesImpl.java
>--- src/org/eclipse/datatools/connectivity/oda/design/impl/PropertyAttributesImpl.java	11 Apr 2007 02:59:53 -0000	1.2
>+++ src/org/eclipse/datatools/connectivity/oda/design/impl/PropertyAttributesImpl.java	24 Apr 2009 03:18:26 -0000
>@@ -1,6 +1,6 @@
> /**
> *************************************************************************
>- * Copyright (c) 2005, 2007 Actuate Corporation.
>+ * Copyright (c) 2005, 2009 Actuate Corporation.
> * All rights reserved. This program and the accompanying materials
> * are made available under the terms of the Eclipse Public License v1.0
> * which accompanies this distribution, and is available at
>@@ -48,7 +48,7 @@
> * 
> * @generated
> */
>- public static final String copyright = "Copyright (c) 2005, 2007 Actuate Corporation"; //$NON-NLS-1$
>+ public static final String copyright = "Copyright (c) 2005, 2009 Actuate Corporation"; //$NON-NLS-1$
> 
> /**
> * The default value of the '{@link #getDisplayName() Display Name}' attribute.
>@@ -78,7 +78,7 @@
> * @generated
> * @ordered
> */
>- protected InputElementAttributes m_elementAttributes = null;
>+ protected InputElementAttributes m_elementAttributes;
> 
> /**
> * The default value of the '{@link #isDerivedMetaData() Derived Meta Data}' attribute.
>@@ -107,7 +107,7 @@
> * @generated
> * @ordered
> */
>- protected boolean m_derivedMetaDataESet = false;
>+ protected boolean m_derivedMetaDataESet;
> 
> /**
> * 
>@@ -124,6 +124,7 @@
> * 
> * @generated
> */
>+ @Override
> protected EClass eStaticClass()
> {
> return DesignPackage.Literals.PROPERTY_ATTRIBUTES;
>@@ -284,6 +285,7 @@
> * 
> * @generated
> */
>+ @Override
> public NotificationChain eInverseRemove( InternalEObject otherEnd,
> int featureID, NotificationChain msgs )
> {
>@@ -300,6 +302,7 @@
> * 
> * @generated
> */
>+ @Override
> public Object eGet( int featureID, boolean resolve, boolean coreType )
> {
> switch( featureID )
>@@ -319,6 +322,7 @@
> * 
> * @generated
> */
>+ @Override
> public void eSet( int featureID, Object newValue )
> {
> switch( featureID )
>@@ -341,6 +345,7 @@
> * 
> * @generated
> */
>+ @Override
> public void eUnset( int featureID )
> {
> switch( featureID )
>@@ -363,6 +368,7 @@
> * 
> * @generated
> */
>+ @Override
> public boolean eIsSet( int featureID )
> {
> switch( featureID )
>@@ -383,6 +389,7 @@
> * 
> * @generated
> */
>+ @Override
> public String toString()
> {
> if( eIsProxy() )
>Index: src/org/eclipse/datatools/connectivity/oda/design/impl/InputParameterUIHintsImpl.java
>===================================================================
>RCS file: /cvsroot/datatools/org.eclipse.datatools.connectivity/plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/InputParameterUIHintsImpl.java,v
>retrieving revision 1.2
>diff -u -r1.2 InputParameterUIHintsImpl.java
>--- src/org/eclipse/datatools/connectivity/oda/design/impl/InputParameterUIHintsImpl.java	11 Apr 2007 02:59:52 -0000	1.2
>+++ src/org/eclipse/datatools/connectivity/oda/design/impl/InputParameterUIHintsImpl.java	24 Apr 2009 03:18:26 -0000
>@@ -1,6 +1,6 @@
> /**
> *************************************************************************
>- * Copyright (c) 2005, 2007 Actuate Corporation.
>+ * Copyright (c) 2005, 2009 Actuate Corporation.
> * All rights reserved. This program and the accompanying materials
> * are made available under the terms of the Eclipse Public License v1.0
> * which accompanies this distribution, and is available at
>@@ -43,7 +43,7 @@
> * 
> * @generated
> */
>- public static final String copyright = "Copyright (c) 2005, 2007 Actuate Corporation"; //$NON-NLS-1$
>+ public static final String copyright = "Copyright (c) 2005, 2009 Actuate Corporation"; //$NON-NLS-1$
> 
> /**
> * The default value of the '{@link #getGroupPromptDisplayName() Group Prompt Display Name}' attribute.
>@@ -80,6 +80,7 @@
> * 
> * @generated
> */
>+ @Override
> protected EClass eStaticClass()
> {
> return DesignPackage.Literals.INPUT_PARAMETER_UI_HINTS;
>@@ -117,6 +118,7 @@
> * 
> * @generated
> */
>+ @Override
> public Object eGet( int featureID, boolean resolve, boolean coreType )
> {
> switch( featureID )
>@@ -132,6 +134,7 @@
> * 
> * @generated
> */
>+ @Override
> public void eSet( int featureID, Object newValue )
> {
> switch( featureID )
>@@ -148,6 +151,7 @@
> * 
> * @generated
> */
>+ @Override
> public void eUnset( int featureID )
> {
> switch( featureID )
>@@ -164,6 +168,7 @@
> * 
> * @generated
> */
>+ @Override
> public boolean eIsSet( int featureID )
> {
> switch( featureID )
>@@ -181,6 +186,7 @@
> * 
> * @generated
> */
>+ @Override
> public String toString()
> {
> if( eIsProxy() )
>Index: src/org/eclipse/datatools/connectivity/oda/design/impl/ParameterDefinitionImpl.java
>===================================================================
>RCS file: /cvsroot/datatools/org.eclipse.datatools.connectivity/plugins/org.eclipse.datatools.connectivity.oda.design/src/org/eclipse/datatools/connectivity/oda/design/impl/ParameterDefinitionImpl.java,v
>retrieving revision 1.5
>diff -u -r1.5 ParameterDefinitionImpl.java
>--- src/org/eclipse/datatools/connectivity/oda/design/impl/ParameterDefinitionImpl.java	14 Apr 2009 02:13:18 -0000	1.5
>+++ src/org/eclipse/datatools/connectivity/oda/design/impl/ParameterDefinitionImpl.java	24 Apr 2009 03:18:26 -0000
>@@ -57,7 +57,7 @@
> * 
> * @generated
> */
>- public static final String copyright = "Copyright (c) 2005, 2007 Actuate Corporation"; //$NON-NLS-1$
>+ public static final String copyright = "Copyright (c) 2005, 2009 Actuate Corporation"; //$NON-NLS-1$
> 
> /**
> * The default value of the '{@link #getInOutMode() In Out Mode}' attribute.
>@@ -86,7 +86,7 @@
> * @generated
> * @ordered
> */
>- protected boolean m_inOutModeESet = false;
>+ protected boolean m_inOutModeESet;
> 
> /**
> * The cached value of the '{@link #getAttributes() Attributes}' containment reference.
>@@ -96,7 +96,7 @@
> * @generated
> * @ordered
> */
>- protected DataElementAttributes m_attributes = null;
>+ protected DataElementAttributes m_attributes;
> 
> /**
> * The cached value of the '{@link #getInputAttributes() Input Attributes}' containment reference.
>@@ -106,7 +106,7 @@
> * @generated
> * @ordered
> */
>- protected InputParameterAttributes m_inputAttributes = null;
>+ protected InputParameterAttributes m_inputAttributes;
> 
> /**
> * The cached value of the '{@link #getOutputUsageHints() Output Usage Hints}' containment reference.
>@@ -116,7 +116,7 @@
> * @generated
> * @ordered
> */
>- protected OutputElementAttributes m_outputUsageHints = null;
>+ protected OutputElementAttributes m_outputUsageHints;
> 
> /**
> * The cached value of the '{@link #getFields() Fields}' containment reference.
>@@ -126,7 +126,7 @@
> * @generated
> * @ordered
> */
>- protected ParameterFields m_fields = null;
>+ protected ParameterFields m_fields;
> 
> /**
> * 
>@@ -143,6 +143,7 @@
> * 
> * @generated
> */
>+ @Override
> protected EClass eStaticClass()
> {
> return DesignPackage.Literals.PARAMETER_DEFINITION;
>@@ -189,8 +190,8 @@
> if( getDefaultValueCount() == 0 )
> return null;
> 
>- Object firstValue = getDefaultValues().getValues().get(0);
>- return ( firstValue != null ) ? firstValue.toString() : null;
>+ Object firstValue = getDefaultValues().getValues().get( 0 );
>+ return (firstValue != null) ? firstValue.toString() : null;
> }
> 
> /* (non-Javadoc)
>@@ -203,7 +204,7 @@
> return; // ignore specified value
> 
> InputElementAttributes inputAttributes = getEditableInputElementAttributes();
>- assert( inputAttributes != null );
>+ assert (inputAttributes != null);
> 
> // use deprecated method that takes care of migrating value to a collection
> inputAttributes.setDefaultScalarValue( value );
>@@ -231,7 +232,7 @@
> public int getDefaultValueCount()
> {
> StaticValues defaultValues = getDefaultValues();
>- return ( defaultValues == null ) ? 0 : defaultValues.count();
>+ return (defaultValues == null) ? 0 : defaultValues.count();
> }
> 
> /* (non-Javadoc)
>@@ -601,6 +602,7 @@
> * 
> * @generated
> */
>+ @Override
> public NotificationChain eInverseRemove( InternalEObject otherEnd,
> int featureID, NotificationChain msgs )
> {
>@@ -623,6 +625,7 @@
> * 
> * @generated
> */
>+ @Override
> public Object eGet( int featureID, boolean resolve, boolean coreType )
> {
> switch( featureID )
>@@ -646,6 +649,7 @@
> * 
> * @generated
> */
>+ @Override
> public void eSet( int featureID, Object newValue )
> {
> switch( featureID )
>@@ -674,6 +678,7 @@
> * 
> * @generated
> */
>+ @Override
> public void eUnset( int featureID )
> {
> switch( featureID )
>@@ -702,6 +707,7 @@
> * 
> * @generated
> */
>+ @Override
> public boolean eIsSet( int featureID )
> {
> switch( featureID )
>@@ -725,6 +731,7 @@
> * 
> * @generated
> */
>+ @Override
> public String toString()
> {
> if( eIsProxy() )

Actions: View | Diff

Attachments on bug 256357: 133044 | 133054