Merge pull request #1 from jayjaybillings/jay/mars

Fixed build errors.
mtaal · Jul 22, 2016 · 23d3c02 · 23d3c02
2 parents 8dbdb7d + 1e40b64
commit 23d3c02
Show file tree

Hide file tree

Showing 97 changed files with 749 additions and 1,098 deletions.
diff --git a/org.eclipse.emf.texo.example1.rcp/META-INF/MANIFEST.MF b/org.eclipse.emf.texo.example1.rcp/META-INF/MANIFEST.MF
@@ -4,8 +4,7 @@ Bundle-Name: TexoRCP
 Bundle-SymbolicName: org.eclipse.emf.texo.example1.rcp;singleton:=true
 Bundle-Version: 1.0.0.0
 Bundle-Activator: org.eclipse.emf.texo.example1.rcp.application.Activator
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
+Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.emf.ecore;bundle-version="2.7.0",
  org.eclipse.emf.ecore.xmi;bundle-version="2.7.0",
  org.eclipse.core.databinding.observable;bundle-version="1.4.0",
@@ -15,13 +14,27 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.core.databinding.property;bundle-version="1.4.0",
  org.eclipse.equinox.ds;bundle-version="1.3.1",
  org.eclipse.emf.databinding;bundle-version="1.2.0",
- org.hsqldb;bundle-version="1.8.1",
  javax.persistence;bundle-version="2.0.3",
  org.eclipse.persistence.jpa;bundle-version="2.3.1",
- org.eclipse.persistence.jpa.osgi;bundle-version="2.3.1",
  org.eclipse.emf.texo;bundle-version="0.1.0",
  org.eclipse.emf.texo.xml;bundle-version="0.1.0",
- org.eclipse.emf.texo.server;bundle-version="0.1.0"
+ org.eclipse.emf.texo.server;bundle-version="0.1.0",
+ osgi.enterprise;bundle-version="4.2.0"
 Service-Component: OSGI-INF/PersistenceService.xml
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Import-Package: org.eclipse.core.commands,
+ org.eclipse.jface,
+ org.eclipse.jface.resource,
+ org.eclipse.jface.viewers,
+ org.eclipse.swt,
+ org.eclipse.swt.custom,
+ org.eclipse.swt.events,
+ org.eclipse.swt.graphics,
+ org.eclipse.swt.layout,
+ org.eclipse.swt.widgets,
+ org.eclipse.ui,
+ org.eclipse.ui.application,
+ org.eclipse.ui.commands,
+ org.eclipse.ui.part,
+ org.eclipse.ui.plugin
diff --git a/...cp/src/org/eclipse/emf/texo/example1/rcp/persistence/model/identifiable/Identifiable.java b/...cp/src/org/eclipse/emf/texo/example1/rcp/persistence/model/identifiable/Identifiable.java
@@ -38,7 +38,7 @@ public class Identifiable {
 
 	/**
 	 * Returns the value of '<em><b>db_Id</b></em>' feature.
-	 * 
+	 *
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * 
 	 * @return the value of '<em><b>db_Id</b></em>' feature
@@ -50,11 +50,11 @@ public Long getDb_Id() {
 
 	/**
 	 * Sets the '{@link Identifiable#getDb_Id() <em>db_Id</em>}' feature.
-	 * 
+	 *
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * 
-	 * @param the
-	 *            new value of the '{@link Identifiable#getDb_Id() db_Id}'
+	 * @param newDb_Id
+	 *            the new value of the '{@link Identifiable#getDb_Id() db_Id}'
 	 *            feature.
 	 * @generated
 	 */
@@ -64,7 +64,7 @@ public void setDb_Id(Long newDb_Id) {
 
 	/**
 	 * Returns the value of '<em><b>db_version</b></em>' feature.
-	 * 
+	 *
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * 
 	 * @return the value of '<em><b>db_version</b></em>' feature
@@ -77,11 +77,11 @@ public Integer getDb_version() {
 	/**
 	 * Sets the '{@link Identifiable#getDb_version() <em>db_version</em>}'
 	 * feature.
-	 * 
+	 *
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * 
-	 * @param the
-	 *            new value of the '{@link Identifiable#getDb_version()
+	 * @param newDb_version
+	 *            the new value of the '{@link Identifiable#getDb_version()
 	 *            db_version}' feature.
 	 * @generated
 	 */
@@ -97,7 +97,6 @@ public void setDb_version(Integer newDb_version) {
 	 */
 	@Override
 	public String toString() {
-		return "Identifiable " + " [db_Id: " + getDb_Id() + "]"
-				+ " [db_version: " + getDb_version() + "]";
+		return "Identifiable " + " [db_Id: " + getDb_Id() + "]" + " [db_version: " + getDb_version() + "]";
 	}
 }
diff --git a/...g/eclipse/emf/texo/example1/rcp/persistence/model/identifiable/IdentifiableInterface.java b/...g/eclipse/emf/texo/example1/rcp/persistence/model/identifiable/IdentifiableInterface.java
@@ -1,21 +1,15 @@
 package org.eclipse.emf.texo.example1.rcp.persistence.model.identifiable;
 
-import javax.persistence.Access;
-import javax.persistence.AccessType;
-import javax.persistence.MappedSuperclass;
-
 /**
  * A representation of the model object '<em><b>IdentifiableInterface</b></em>'.
  * <!-- begin-user-doc --> <!-- end-user-doc -->
  * 
  * @generated
  */
-@MappedSuperclass()
-@Access(AccessType.PROPERTY)
 public interface IdentifiableInterface {
 	/**
 	 * Returns the value of '<em><b>db_Id</em></b>' feature.
-	 * 
+	 *
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * 
 	 * @return the value of '<em><b>db_Id</b></em>' feature
@@ -26,19 +20,19 @@ public interface IdentifiableInterface {
 	/**
 	 * Sets the '{@link IdentifiableInterface#getDb_Id() <em>db_Id</em>}'
 	 * feature.
-	 * 
+	 *
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * 
-	 * @param the
-	 *            new value of the '{@link IdentifiableInterface#getDb_Id()
+	 * @param newDb_Id
+	 *            the new value of the '{@link IdentifiableInterface#getDb_Id()
 	 *            <em>db_Id</em>}' feature.
 	 * @generated
 	 */
 	public void setDb_Id(Long newDb_Id);
 
 	/**
 	 * Returns the value of '<em><b>db_version</em></b>' feature.
-	 * 
+	 *
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * 
 	 * @return the value of '<em><b>db_version</b></em>' feature
@@ -49,11 +43,11 @@ public interface IdentifiableInterface {
 	/**
 	 * Sets the '{@link IdentifiableInterface#getDb_version()
 	 * <em>db_version</em>}' feature.
-	 * 
+	 *
 	 * <!-- begin-user-doc --> <!-- end-user-doc -->
 	 * 
-	 * @param the
-	 *            new value of the '
+	 * @param newDb_version
+	 *            the new value of the '
 	 *            {@link IdentifiableInterface#getDb_version()
 	 *            <em>db_version</em>}' feature.
 	 * @generated