summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKaren Butzke2012-11-15 11:17:19 (EST)
committerKaren Butzke2012-11-16 12:09:54 (EST)
commit9aac2034a035b5dd91d1eef619df75e218607f09 (patch)
treee0fc7f2d9368d0696513cfe8c7ff52808bf572e0
parent7cfcd24e88317897df16c5a581592db4a54ebb20 (diff)
downloadwebtools.dali-9aac2034a035b5dd91d1eef619df75e218607f09.zip
webtools.dali-9aac2034a035b5dd91d1eef619df75e218607f09.tar.gz
webtools.dali-9aac2034a035b5dd91d1eef619df75e218607f09.tar.bz2
jpt.common.core move EMF generated code to model/src
-rw-r--r--common/plugins/org.eclipse.jpt.common.core/.classpath5
-rw-r--r--common/plugins/org.eclipse.jpt.common.core/build.properties3
-rw-r--r--common/plugins/org.eclipse.jpt.common.core/model/common.genmodel2
-rw-r--r--common/plugins/org.eclipse.jpt.common.core/model/src/org/eclipse/jpt/common/core/resource/xml/CommonFactory.java (renamed from common/plugins/org.eclipse.jpt.common.core/src/org/eclipse/jpt/common/core/resource/xml/CommonFactory.java)1
-rw-r--r--common/plugins/org.eclipse.jpt.common.core/model/src/org/eclipse/jpt/common/core/resource/xml/CommonPackage.java (renamed from common/plugins/org.eclipse.jpt.common.core/src/org/eclipse/jpt/common/core/resource/xml/CommonPackage.java)1
-rw-r--r--common/plugins/org.eclipse.jpt.common.core/model/src/org/eclipse/jpt/common/core/resource/xml/ERootObject.java (renamed from common/plugins/org.eclipse.jpt.common.core/src/org/eclipse/jpt/common/core/resource/xml/ERootObject.java)0
-rw-r--r--common/plugins/org.eclipse.jpt.common.core/model/src/org/eclipse/jpt/common/core/resource/xml/ERootObjectImpl.java (renamed from common/plugins/org.eclipse.jpt.common.core/src/org/eclipse/jpt/common/core/resource/xml/ERootObjectImpl.java)1
7 files changed, 8 insertions, 5 deletions
diff --git a/common/plugins/org.eclipse.jpt.common.core/.classpath b/common/plugins/org.eclipse.jpt.common.core/.classpath
index 84e5b0b..d2bce40 100644
--- a/common/plugins/org.eclipse.jpt.common.core/.classpath
+++ b/common/plugins/org.eclipse.jpt.common.core/.classpath
@@ -1,6 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src"/>
+ <classpathentry kind="src" path="model/src">
+ <attributes>
+ <attribute name="ignore_optional_problems" value="true"/>
+ </attributes>
+ </classpathentry>
<classpathentry kind="src" path="property_files"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins">
diff --git a/common/plugins/org.eclipse.jpt.common.core/build.properties b/common/plugins/org.eclipse.jpt.common.core/build.properties
index 8dedd9e..5f88984 100644
--- a/common/plugins/org.eclipse.jpt.common.core/build.properties
+++ b/common/plugins/org.eclipse.jpt.common.core/build.properties
@@ -8,7 +8,8 @@
# Oracle - initial API and implementation
################################################################################
source.. = src/,\
- property_files/
+ model/src/,\
+ property_files/
output.. = bin/
bin.includes = .,\
META-INF/,\
diff --git a/common/plugins/org.eclipse.jpt.common.core/model/common.genmodel b/common/plugins/org.eclipse.jpt.common.core/model/common.genmodel
index 3f102ce..668ad8b 100644
--- a/common/plugins/org.eclipse.jpt.common.core/model/common.genmodel
+++ b/common/plugins/org.eclipse.jpt.common.core/model/common.genmodel
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
- xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.eclipse.jpt.common.core/src" creationCommands="false"
+ xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.eclipse.jpt.common.core/model/src" creationCommands="false"
creationIcons="false" editDirectory="" editorDirectory="" modelPluginID="org.eclipse.jpt.common.core"
modelName="Core" editPluginClass="" editorPluginClass="" updateClasspath="false"
rootExtendsInterface="org.eclipse.jpt.common.core.resource.xml.EBaseObject" rootExtendsClass="org.eclipse.jpt.common.core.resource.xml.EBaseObjectImpl"
diff --git a/common/plugins/org.eclipse.jpt.common.core/src/org/eclipse/jpt/common/core/resource/xml/CommonFactory.java b/common/plugins/org.eclipse.jpt.common.core/model/src/org/eclipse/jpt/common/core/resource/xml/CommonFactory.java
index 0a27d0b..254d60e 100644
--- a/common/plugins/org.eclipse.jpt.common.core/src/org/eclipse/jpt/common/core/resource/xml/CommonFactory.java
+++ b/common/plugins/org.eclipse.jpt.common.core/model/src/org/eclipse/jpt/common/core/resource/xml/CommonFactory.java
@@ -31,7 +31,6 @@ import org.eclipse.emf.ecore.plugin.EcorePlugin;
* @see org.eclipse.jpt.common.core.resource.xml.CommonPackage
* @generated
*/
-@SuppressWarnings("nls")
public class CommonFactory extends EFactoryImpl
{
/**
diff --git a/common/plugins/org.eclipse.jpt.common.core/src/org/eclipse/jpt/common/core/resource/xml/CommonPackage.java b/common/plugins/org.eclipse.jpt.common.core/model/src/org/eclipse/jpt/common/core/resource/xml/CommonPackage.java
index 7c371d3..e9cfc1a 100644
--- a/common/plugins/org.eclipse.jpt.common.core/src/org/eclipse/jpt/common/core/resource/xml/CommonPackage.java
+++ b/common/plugins/org.eclipse.jpt.common.core/model/src/org/eclipse/jpt/common/core/resource/xml/CommonPackage.java
@@ -36,7 +36,6 @@ import org.eclipse.emf.ecore.impl.EPackageImpl;
* @model kind="package"
* @generated
*/
-@SuppressWarnings("nls")
public class CommonPackage extends EPackageImpl
{
/**
diff --git a/common/plugins/org.eclipse.jpt.common.core/src/org/eclipse/jpt/common/core/resource/xml/ERootObject.java b/common/plugins/org.eclipse.jpt.common.core/model/src/org/eclipse/jpt/common/core/resource/xml/ERootObject.java
index 0117173..0117173 100644
--- a/common/plugins/org.eclipse.jpt.common.core/src/org/eclipse/jpt/common/core/resource/xml/ERootObject.java
+++ b/common/plugins/org.eclipse.jpt.common.core/model/src/org/eclipse/jpt/common/core/resource/xml/ERootObject.java
diff --git a/common/plugins/org.eclipse.jpt.common.core/src/org/eclipse/jpt/common/core/resource/xml/ERootObjectImpl.java b/common/plugins/org.eclipse.jpt.common.core/model/src/org/eclipse/jpt/common/core/resource/xml/ERootObjectImpl.java
index 0daa0d7..85bb0b1 100644
--- a/common/plugins/org.eclipse.jpt.common.core/src/org/eclipse/jpt/common/core/resource/xml/ERootObjectImpl.java
+++ b/common/plugins/org.eclipse.jpt.common.core/model/src/org/eclipse/jpt/common/core/resource/xml/ERootObjectImpl.java
@@ -40,7 +40,6 @@ import org.eclipse.wst.common.internal.emf.resource.Translator;
* @model kind="class" abstract="true"
* @generated
*/
-@SuppressWarnings("nls")
public abstract class ERootObjectImpl extends EBaseObjectImpl implements ERootObject
{
/**