diff -r 5b9d4d8641ce -r ae255c9aa552 sysperfana/perfinvestigator/com.nokia.carbide.cpp.pi.util/src/com/nokia/carbide/cpp/internal/pi/util/config/gen/PIConfig/PIConfigPackage.java
--- a/sysperfana/perfinvestigator/com.nokia.carbide.cpp.pi.util/src/com/nokia/carbide/cpp/internal/pi/util/config/gen/PIConfig/PIConfigPackage.java	Wed Jun 23 14:49:59 2010 +0300
+++ b/sysperfana/perfinvestigator/com.nokia.carbide.cpp.pi.util/src/com/nokia/carbide/cpp/internal/pi/util/config/gen/PIConfig/PIConfigPackage.java	Wed Jun 23 15:05:09 2010 +0300
@@ -45,7 +45,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	String eNAME = "PIConfig";
+	static final String E_NAME = "PIConfig";
 
 	/**
 	 * The package namespace URI.
@@ -53,7 +53,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	String eNS_URI = "platform:/resource/com.nokia.carbide.cpp.pi.util/schema/PIConfig.xsd";
+	static final String E_NS_URI = "platform:/resource/com.nokia.carbide.cpp.pi.util/schema/PIConfig.xsd";
 
 	/**
 	 * The package namespace name.
@@ -61,7 +61,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	String eNS_PREFIX = "PIConfig";
+	static final String E_NS_PREFIX = "PIConfig";
 
 	/**
 	 * The singleton instance of the package.
@@ -69,7 +69,7 @@
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	PIConfigPackage eINSTANCE = com.nokia.carbide.cpp.internal.pi.util.config.gen.PIConfig.impl.PIConfigPackageImpl.init();
+	static final PIConfigPackage E_INSTANCE = com.nokia.carbide.cpp.internal.pi.util.config.gen.PIConfig.impl.PIConfigPackageImpl.init();
 
 	/**
 	 * The meta object id for the '{@link com.nokia.carbide.cpp.pi.util.config.gen.PIConfig.impl.ButtonEventProfileListTypeImpl <em>Button Event Profile List Type</em>}' class.
@@ -79,7 +79,7 @@
 	 * @see com.nokia.carbide.cpp.pi.util.config.gen.PIConfig.impl.PIConfigPackageImpl#getButtonEventProfileListType()
 	 * @generated
 	 */
-	int BUTTON_EVENT_PROFILE_LIST_TYPE = 0;
+	static final int BUTTON_EVENT_PROFILE_LIST_TYPE = 0;
 
 	/**
 	 * The feature id for the '<em><b>Button Event Profile</b></em>' containment reference list.
@@ -88,7 +88,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int BUTTON_EVENT_PROFILE_LIST_TYPE__BUTTON_EVENT_PROFILE = 0;
+	static final int BUTTON_EVENT_PROFILE_LIST_TYPE__BUTTON_EVENT_PROFILE = 0;
 
 	/**
 	 * The feature id for the '<em><b>Button Event Profile Version</b></em>' attribute.
@@ -97,7 +97,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int BUTTON_EVENT_PROFILE_LIST_TYPE__BUTTON_EVENT_PROFILE_VERSION = 1;
+	static final int BUTTON_EVENT_PROFILE_LIST_TYPE__BUTTON_EVENT_PROFILE_VERSION = 1;
 
 	/**
 	 * The number of structural features of the '<em>Button Event Profile List Type</em>' class.
@@ -106,7 +106,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int BUTTON_EVENT_PROFILE_LIST_TYPE_FEATURE_COUNT = 2;
+	static final int BUTTON_EVENT_PROFILE_LIST_TYPE_FEATURE_COUNT = 2;
 
 	/**
 	 * The meta object id for the '{@link com.nokia.carbide.cpp.pi.util.config.gen.PIConfig.impl.ButtonEventProfileTypeImpl <em>Button Event Profile Type</em>}' class.
@@ -116,7 +116,7 @@
 	 * @see com.nokia.carbide.cpp.pi.util.config.gen.PIConfig.impl.PIConfigPackageImpl#getButtonEventProfileType()
 	 * @generated
 	 */
-	int BUTTON_EVENT_PROFILE_TYPE = 1;
+	static final int BUTTON_EVENT_PROFILE_TYPE = 1;
 
 	/**
 	 * The feature id for the '<em><b>Mapping</b></em>' containment reference list.
@@ -125,7 +125,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int BUTTON_EVENT_PROFILE_TYPE__MAPPING = 0;
+	static final int BUTTON_EVENT_PROFILE_TYPE__MAPPING = 0;
 
 	/**
 	 * The feature id for the '<em><b>Profile Id</b></em>' attribute.
@@ -134,7 +134,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int BUTTON_EVENT_PROFILE_TYPE__PROFILE_ID = 1;
+	static final int BUTTON_EVENT_PROFILE_TYPE__PROFILE_ID = 1;
 
 	/**
 	 * The number of structural features of the '<em>Button Event Profile Type</em>' class.
@@ -143,7 +143,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int BUTTON_EVENT_PROFILE_TYPE_FEATURE_COUNT = 2;
+	static final int BUTTON_EVENT_PROFILE_TYPE_FEATURE_COUNT = 2;
 
 	/**
 	 * The meta object id for the '{@link com.nokia.carbide.cpp.pi.util.config.gen.PIConfig.impl.DocumentRootImpl <em>Document Root</em>}' class.
@@ -153,7 +153,7 @@
 	 * @see com.nokia.carbide.cpp.pi.util.config.gen.PIConfig.impl.PIConfigPackageImpl#getDocumentRoot()
 	 * @generated
 	 */
-	int DOCUMENT_ROOT = 2;
+	static final int DOCUMENT_ROOT = 2;
 
 	/**
 	 * The feature id for the '<em><b>Mixed</b></em>' attribute list.
@@ -162,7 +162,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int DOCUMENT_ROOT__MIXED = 0;
+	static final int DOCUMENT_ROOT__MIXED = 0;
 
 	/**
 	 * The feature id for the '<em><b>XMLNS Prefix Map</b></em>' map.
@@ -171,7 +171,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int DOCUMENT_ROOT__XMLNS_PREFIX_MAP = 1;
+	static final int DOCUMENT_ROOT__XMLNS_PREFIX_MAP = 1;
 
 	/**
 	 * The feature id for the '<em><b>XSI Schema Location</b></em>' map.
@@ -180,7 +180,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int DOCUMENT_ROOT__XSI_SCHEMA_LOCATION = 2;
+	static final int DOCUMENT_ROOT__XSI_SCHEMA_LOCATION = 2;
 
 	/**
 	 * The feature id for the '<em><b>Button Event Profile List</b></em>' containment reference.
@@ -189,7 +189,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int DOCUMENT_ROOT__BUTTON_EVENT_PROFILE_LIST = 3;
+	static final int DOCUMENT_ROOT__BUTTON_EVENT_PROFILE_LIST = 3;
 
 	/**
 	 * The number of structural features of the '<em>Document Root</em>' class.
@@ -198,7 +198,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int DOCUMENT_ROOT_FEATURE_COUNT = 4;
+	static final int DOCUMENT_ROOT_FEATURE_COUNT = 4;
 
 	/**
 	 * The meta object id for the '{@link com.nokia.carbide.cpp.pi.util.config.gen.PIConfig.impl.MappingTypeImpl <em>Mapping Type</em>}' class.
@@ -208,7 +208,7 @@
 	 * @see com.nokia.carbide.cpp.pi.util.config.gen.PIConfig.impl.PIConfigPackageImpl#getMappingType()
 	 * @generated
 	 */
-	int MAPPING_TYPE = 3;
+	static final int MAPPING_TYPE = 3;
 
 	/**
 	 * The feature id for the '<em><b>Enum String</b></em>' attribute.
@@ -217,7 +217,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int MAPPING_TYPE__ENUM_STRING = 0;
+	static final int MAPPING_TYPE__ENUM_STRING = 0;
 
 	/**
 	 * The feature id for the '<em><b>Key Code</b></em>' attribute.
@@ -226,7 +226,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int MAPPING_TYPE__KEY_CODE = 1;
+	static final int MAPPING_TYPE__KEY_CODE = 1;
 
 	/**
 	 * The feature id for the '<em><b>Label</b></em>' attribute.
@@ -235,7 +235,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int MAPPING_TYPE__LABEL = 2;
+	static final int MAPPING_TYPE__LABEL = 2;
 
 	/**
 	 * The number of structural features of the '<em>Mapping Type</em>' class.
@@ -244,7 +244,7 @@
 	 * @generated
 	 * @ordered
 	 */
-	int MAPPING_TYPE_FEATURE_COUNT = 3;
+	static final int MAPPING_TYPE_FEATURE_COUNT = 3;
 
 
 	/**
@@ -438,7 +438,7 @@
 		 * @see com.nokia.carbide.cpp.pi.util.config.gen.PIConfig.impl.PIConfigPackageImpl#getButtonEventProfileListType()
 		 * @generated
 		 */
-		EClass BUTTON_EVENT_PROFILE_LIST_TYPE = eINSTANCE.getButtonEventProfileListType();
+		EClass BUTTON_EVENT_PROFILE_LIST_TYPE = E_INSTANCE.getButtonEventProfileListType();
 
 		/**
 		 * The meta object literal for the '<em><b>Button Event Profile</b></em>' containment reference list feature.
@@ -446,7 +446,7 @@
 		 * <!-- end-user-doc -->
 		 * @generated
 		 */
-		EReference BUTTON_EVENT_PROFILE_LIST_TYPE__BUTTON_EVENT_PROFILE = eINSTANCE.getButtonEventProfileListType_ButtonEventProfile();
+		EReference BUTTON_EVENT_PROFILE_LIST_TYPE__BUTTON_EVENT_PROFILE = E_INSTANCE.getButtonEventProfileListType_ButtonEventProfile();
 
 		/**
 		 * The meta object literal for the '<em><b>Button Event Profile Version</b></em>' attribute feature.
@@ -454,7 +454,7 @@
 		 * <!-- end-user-doc -->
 		 * @generated
 		 */
-		EAttribute BUTTON_EVENT_PROFILE_LIST_TYPE__BUTTON_EVENT_PROFILE_VERSION = eINSTANCE.getButtonEventProfileListType_ButtonEventProfileVersion();
+		EAttribute BUTTON_EVENT_PROFILE_LIST_TYPE__BUTTON_EVENT_PROFILE_VERSION = E_INSTANCE.getButtonEventProfileListType_ButtonEventProfileVersion();
 
 		/**
 		 * The meta object literal for the '{@link com.nokia.carbide.cpp.pi.util.config.gen.PIConfig.impl.ButtonEventProfileTypeImpl <em>Button Event Profile Type</em>}' class.
@@ -464,7 +464,7 @@
 		 * @see com.nokia.carbide.cpp.pi.util.config.gen.PIConfig.impl.PIConfigPackageImpl#getButtonEventProfileType()
 		 * @generated
 		 */
-		EClass BUTTON_EVENT_PROFILE_TYPE = eINSTANCE.getButtonEventProfileType();
+		EClass BUTTON_EVENT_PROFILE_TYPE = E_INSTANCE.getButtonEventProfileType();
 
 		/**
 		 * The meta object literal for the '<em><b>Mapping</b></em>' containment reference list feature.
@@ -472,7 +472,7 @@
 		 * <!-- end-user-doc -->
 		 * @generated
 		 */
-		EReference BUTTON_EVENT_PROFILE_TYPE__MAPPING = eINSTANCE.getButtonEventProfileType_Mapping();
+		EReference BUTTON_EVENT_PROFILE_TYPE__MAPPING = E_INSTANCE.getButtonEventProfileType_Mapping();
 
 		/**
 		 * The meta object literal for the '<em><b>Profile Id</b></em>' attribute feature.
@@ -480,7 +480,7 @@
 		 * <!-- end-user-doc -->
 		 * @generated
 		 */
-		EAttribute BUTTON_EVENT_PROFILE_TYPE__PROFILE_ID = eINSTANCE.getButtonEventProfileType_ProfileId();
+		EAttribute BUTTON_EVENT_PROFILE_TYPE__PROFILE_ID = E_INSTANCE.getButtonEventProfileType_ProfileId();
 
 		/**
 		 * The meta object literal for the '{@link com.nokia.carbide.cpp.pi.util.config.gen.PIConfig.impl.DocumentRootImpl <em>Document Root</em>}' class.
@@ -490,7 +490,7 @@
 		 * @see com.nokia.carbide.cpp.pi.util.config.gen.PIConfig.impl.PIConfigPackageImpl#getDocumentRoot()
 		 * @generated
 		 */
-		EClass DOCUMENT_ROOT = eINSTANCE.getDocumentRoot();
+		EClass DOCUMENT_ROOT = E_INSTANCE.getDocumentRoot();
 
 		/**
 		 * The meta object literal for the '<em><b>Mixed</b></em>' attribute list feature.
@@ -498,7 +498,7 @@
 		 * <!-- end-user-doc -->
 		 * @generated
 		 */
-		EAttribute DOCUMENT_ROOT__MIXED = eINSTANCE.getDocumentRoot_Mixed();
+		EAttribute DOCUMENT_ROOT__MIXED = E_INSTANCE.getDocumentRoot_Mixed();
 
 		/**
 		 * The meta object literal for the '<em><b>XMLNS Prefix Map</b></em>' map feature.
@@ -506,7 +506,7 @@
 		 * <!-- end-user-doc -->
 		 * @generated
 		 */
-		EReference DOCUMENT_ROOT__XMLNS_PREFIX_MAP = eINSTANCE.getDocumentRoot_XMLNSPrefixMap();
+		EReference DOCUMENT_ROOT__XMLNS_PREFIX_MAP = E_INSTANCE.getDocumentRoot_XMLNSPrefixMap();
 
 		/**
 		 * The meta object literal for the '<em><b>XSI Schema Location</b></em>' map feature.
@@ -514,7 +514,7 @@
 		 * <!-- end-user-doc -->
 		 * @generated
 		 */
-		EReference DOCUMENT_ROOT__XSI_SCHEMA_LOCATION = eINSTANCE.getDocumentRoot_XSISchemaLocation();
+		EReference DOCUMENT_ROOT__XSI_SCHEMA_LOCATION = E_INSTANCE.getDocumentRoot_XSISchemaLocation();
 
 		/**
 		 * The meta object literal for the '<em><b>Button Event Profile List</b></em>' containment reference feature.
@@ -522,7 +522,7 @@
 		 * <!-- end-user-doc -->
 		 * @generated
 		 */
-		EReference DOCUMENT_ROOT__BUTTON_EVENT_PROFILE_LIST = eINSTANCE.getDocumentRoot_ButtonEventProfileList();
+		EReference DOCUMENT_ROOT__BUTTON_EVENT_PROFILE_LIST = E_INSTANCE.getDocumentRoot_ButtonEventProfileList();
 
 		/**
 		 * The meta object literal for the '{@link com.nokia.carbide.cpp.pi.util.config.gen.PIConfig.impl.MappingTypeImpl <em>Mapping Type</em>}' class.
@@ -532,7 +532,7 @@
 		 * @see com.nokia.carbide.cpp.pi.util.config.gen.PIConfig.impl.PIConfigPackageImpl#getMappingType()
 		 * @generated
 		 */
-		EClass MAPPING_TYPE = eINSTANCE.getMappingType();
+		EClass MAPPING_TYPE = E_INSTANCE.getMappingType();
 
 		/**
 		 * The meta object literal for the '<em><b>Enum String</b></em>' attribute feature.
@@ -540,7 +540,7 @@
 		 * <!-- end-user-doc -->
 		 * @generated
 		 */
-		EAttribute MAPPING_TYPE__ENUM_STRING = eINSTANCE.getMappingType_EnumString();
+		EAttribute MAPPING_TYPE__ENUM_STRING = E_INSTANCE.getMappingType_EnumString();
 
 		/**
 		 * The meta object literal for the '<em><b>Key Code</b></em>' attribute feature.
@@ -548,7 +548,7 @@
 		 * <!-- end-user-doc -->
 		 * @generated
 		 */
-		EAttribute MAPPING_TYPE__KEY_CODE = eINSTANCE.getMappingType_KeyCode();
+		EAttribute MAPPING_TYPE__KEY_CODE = E_INSTANCE.getMappingType_KeyCode();
 
 		/**
 		 * The meta object literal for the '<em><b>Label</b></em>' attribute feature.
@@ -556,7 +556,7 @@
 		 * <!-- end-user-doc -->
 		 * @generated
 		 */
-		EAttribute MAPPING_TYPE__LABEL = eINSTANCE.getMappingType_Label();
+		EAttribute MAPPING_TYPE__LABEL = E_INSTANCE.getMappingType_Label();
 
 	}