summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKaren Butzke2013-02-19 11:48:46 (EST)
committerKaren Butzke2013-02-19 11:48:46 (EST)
commit3398fe350259a15e6ea38401fa546db57e54dc9d (patch)
tree2ed9aae028fb03fc2a43d240fadf7d6993a1d3ae
parent59f56ca22f3d8ba482067637bf33e41fcfa7d942 (diff)
downloadwebtools.dali-3398fe350259a15e6ea38401fa546db57e54dc9d.zip
webtools.dali-3398fe350259a15e6ea38401fa546db57e54dc9d.tar.gz
webtools.dali-3398fe350259a15e6ea38401fa546db57e54dc9d.tar.bz2
changed some enum defaults to null and removed @generated so we don't regenerate over it. Need the default to be null so we can tell the difference between specified and default. Also prevents unnecessarily writing out of the enum element went adding to the xml.
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlNoSql.java12
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlTenantTableDiscriminator.java12
2 files changed, 8 insertions, 16 deletions
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlNoSql.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlNoSql.java
index 1e87b64..47dcade 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlNoSql.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlNoSql.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2012 Oracle. All rights reserved.
+ * Copyright (c) 2012, 2013 Oracle. 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 http://www.eclipse.org/legal/epl-v10.html.
@@ -54,14 +54,10 @@ public class XmlNoSql extends EBaseObjectImpl implements XmlNoSql_2_4
protected String dataType = DATA_TYPE_EDEFAULT;
/**
- * The default value of the '{@link #getDataFormat() <em>Data Format</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getDataFormat()
- * @generated
- * @ordered
+ * changed this to null and removed the generated flag so emf won't generate over it
+ * we don't want a default for enums, just null if the tag does not exist
*/
- protected static final DataFormatType DATA_FORMAT_EDEFAULT = DataFormatType.XML;
+ protected static final DataFormatType DATA_FORMAT_EDEFAULT = null;
/**
* The cached value of the '{@link #getDataFormat() <em>Data Format</em>}' attribute.
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlTenantTableDiscriminator.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlTenantTableDiscriminator.java
index 61428f8..f8cc36a 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlTenantTableDiscriminator.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/model/src/org/eclipse/jpt/jpa/eclipselink/core/resource/orm/XmlTenantTableDiscriminator.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2012 Oracle. All rights reserved.
+ * Copyright (c) 2012, 2013 Oracle. 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 http://www.eclipse.org/legal/epl-v10.html.
@@ -60,14 +60,10 @@ public class XmlTenantTableDiscriminator extends EBaseObjectImpl implements XmlT
protected String contextProperty = CONTEXT_PROPERTY_EDEFAULT;
/**
- * The default value of the '{@link #getType() <em>Type</em>}' attribute.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see #getType()
- * @generated
- * @ordered
+ * changed this to null and removed the generated flag so emf won't generate over it
+ * we don't want a default for enums, just null if the tag does not exist
*/
- protected static final TenantTableDiscriminatorType TYPE_EDEFAULT = TenantTableDiscriminatorType.SCHEMA;
+ protected static final TenantTableDiscriminatorType TYPE_EDEFAULT = null;
/**
* The cached value of the '{@link #getType() <em>Type</em>}' attribute.