Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Fullbright2013-04-23 20:27:40 +0000
committerPaul Fullbright2013-04-23 20:27:40 +0000
commit9bcddf79b69c4f8c86e09a34e6545ea6587372fb (patch)
tree04e7fcaa1bf4e4b84b2da71a49bdf680e7ee906f /jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core
parent12adc829d427d8fce7ca2a9382031e8dffe5c9bb (diff)
downloadwebtools.dali-9bcddf79b69c4f8c86e09a34e6545ea6587372fb.tar.gz
webtools.dali-9bcddf79b69c4f8c86e09a34e6545ea6587372fb.tar.xz
webtools.dali-9bcddf79b69c4f8c86e09a34e6545ea6587372fb.zip
use correct enum value of CACHE_ID, not CACHE_KEY
Diffstat (limited to 'jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core')
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/eclipseLinkResourceModels.genmodel2
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/eclipselink_orm.ecore2
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_1/CacheKeyType_2_1.java20
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_1/EclipseLinkOrmV2_1Package.java2
4 files changed, 12 insertions, 14 deletions
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/eclipseLinkResourceModels.genmodel b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/eclipseLinkResourceModels.genmodel
index b050792127..c10a5dd257 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/eclipseLinkResourceModels.genmodel
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/eclipseLinkResourceModels.genmodel
@@ -322,7 +322,7 @@
ecorePackage="eclipselink_orm.ecore#//v2_1">
<genEnums typeSafeEnumCompatible="false" ecoreEnum="eclipselink_orm.ecore#//v2_1/CacheKeyType_2_1">
<genEnumLiterals ecoreEnumLiteral="eclipselink_orm.ecore#//v2_1/CacheKeyType_2_1/ID_VALUE"/>
- <genEnumLiterals ecoreEnumLiteral="eclipselink_orm.ecore#//v2_1/CacheKeyType_2_1/CACHE_KEY"/>
+ <genEnumLiterals ecoreEnumLiteral="eclipselink_orm.ecore#//v2_1/CacheKeyType_2_1/CACHE_ID"/>
<genEnumLiterals ecoreEnumLiteral="eclipselink_orm.ecore#//v2_1/CacheKeyType_2_1/AUTO"/>
</genEnums>
<genEnums typeSafeEnumCompatible="false" ecoreEnum="eclipselink_orm.ecore#//v2_1/BatchFetchType_2_1">
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/eclipselink_orm.ecore b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/eclipselink_orm.ecore
index 579d9c0a0c..5d67a27ae7 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/eclipselink_orm.ecore
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/eclipselink_orm.ecore
@@ -439,7 +439,7 @@
</eClassifiers>
<eClassifiers xsi:type="ecore:EEnum" name="CacheKeyType_2_1">
<eLiterals name="ID_VALUE" literal="ID_VALUE"/>
- <eLiterals name="CACHE_KEY" value="1"/>
+ <eLiterals name="CACHE_ID" value="1" literal="CACHE_ID"/>
<eLiterals name="AUTO" value="2"/>
</eClassifiers>
<eClassifiers xsi:type="ecore:EEnum" name="BatchFetchType_2_1">
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_1/CacheKeyType_2_1.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_1/CacheKeyType_2_1.java
index 6d36604765..cc5c1199bb 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_1/CacheKeyType_2_1.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_1/CacheKeyType_2_1.java
@@ -38,16 +38,14 @@ public enum CacheKeyType_2_1 implements Enumerator
ID_VALUE(0, "ID_VALUE", "ID_VALUE"),
/**
- * The '<em><b>CACHE KEY</b></em>' literal object.
+ * The '<em><b>CACHE ID</b></em>' literal object.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see #CACHE_KEY_VALUE
+ * @see #CACHE_ID_VALUE
* @generated
* @ordered
*/
- CACHE_KEY(1, "CACHE_KEY", "CACHE_KEY"),
-
- /**
+ CACHE_ID(1, "CACHE_ID", "CACHE_ID"), /**
* The '<em><b>AUTO</b></em>' literal object.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -73,19 +71,19 @@ public enum CacheKeyType_2_1 implements Enumerator
public static final int ID_VALUE_VALUE = 0;
/**
- * The '<em><b>CACHE KEY</b></em>' literal value.
+ * The '<em><b>CACHE ID</b></em>' literal value.
* <!-- begin-user-doc -->
* <p>
- * If the meaning of '<em><b>CACHE KEY</b></em>' literal object isn't clear,
+ * If the meaning of '<em><b>CACHE ID</b></em>' literal object isn't clear,
* there really should be more of a description here...
* </p>
* <!-- end-user-doc -->
- * @see #CACHE_KEY
+ * @see #CACHE_ID
* @model
* @generated
* @ordered
*/
- public static final int CACHE_KEY_VALUE = 1;
+ public static final int CACHE_ID_VALUE = 1;
/**
* The '<em><b>AUTO</b></em>' literal value.
@@ -112,7 +110,7 @@ public enum CacheKeyType_2_1 implements Enumerator
new CacheKeyType_2_1[]
{
ID_VALUE,
- CACHE_KEY,
+ CACHE_ID,
AUTO,
};
@@ -173,7 +171,7 @@ public enum CacheKeyType_2_1 implements Enumerator
switch (value)
{
case ID_VALUE_VALUE: return ID_VALUE;
- case CACHE_KEY_VALUE: return CACHE_KEY;
+ case CACHE_ID_VALUE: return CACHE_ID;
case AUTO_VALUE: return AUTO;
}
return null;
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_1/EclipseLinkOrmV2_1Package.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_1/EclipseLinkOrmV2_1Package.java
index 1c10a2167a..1a7c312fed 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_1/EclipseLinkOrmV2_1Package.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/v2_1/EclipseLinkOrmV2_1Package.java
@@ -1638,7 +1638,7 @@ public class EclipseLinkOrmV2_1Package extends EPackageImpl
// Initialize enums and add enum literals
initEEnum(cacheKeyType_2_1EEnum, CacheKeyType_2_1.class, "CacheKeyType_2_1");
addEEnumLiteral(cacheKeyType_2_1EEnum, CacheKeyType_2_1.ID_VALUE);
- addEEnumLiteral(cacheKeyType_2_1EEnum, CacheKeyType_2_1.CACHE_KEY);
+ addEEnumLiteral(cacheKeyType_2_1EEnum, CacheKeyType_2_1.CACHE_ID);
addEEnumLiteral(cacheKeyType_2_1EEnum, CacheKeyType_2_1.AUTO);
initEEnum(batchFetchType_2_1EEnum, BatchFetchType_2_1.class, "BatchFetchType_2_1");

Back to the top