rename JavaDbGenerator to JavaDatabaseGenerator

5 files changed, 9 insertions, 9 deletions

diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaDbGenerator.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaDatabaseGenerator.java
index 179007c164..073b3879e9 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaDbGenerator.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaDatabaseGenerator.java
@@ -24,7 +24,7 @@ import org.eclipse.jpt.jpa.core.resource.java.DatabaseGeneratorAnnotation;
  * @version 3.3
  * @since 3.3
  */
-public interface JavaDbGenerator 
+public interface JavaDatabaseGenerator 
 	extends JavaGenerator, DatabaseGenerator
 {
 	DatabaseGeneratorAnnotation getGeneratorAnnotation();
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaSequenceGenerator.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaSequenceGenerator.java
index 526d4689c8..7cccb5a3d6 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaSequenceGenerator.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaSequenceGenerator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2006, 2012 Oracle. All rights reserved.
+ * Copyright (c) 2006, 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.
@@ -25,7 +25,7 @@ import org.eclipse.jpt.jpa.core.resource.java.SequenceGeneratorAnnotation;
  * @since 2.0
  */
 public interface JavaSequenceGenerator
-	extends JavaDbGenerator, SequenceGenerator
+	extends JavaDatabaseGenerator, SequenceGenerator
 {
 	SequenceGeneratorAnnotation getGeneratorAnnotation();
 }
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaTableGenerator.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaTableGenerator.java
index 58e43fff89..fd699f5a9e 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaTableGenerator.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaTableGenerator.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2006, 2012 Oracle. All rights reserved.
+ * Copyright (c) 2006, 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.
@@ -25,7 +25,7 @@ import org.eclipse.jpt.jpa.core.resource.java.TableGeneratorAnnotation;
  * @since 2.0
  */
 public interface JavaTableGenerator
-	extends JavaDbGenerator, TableGenerator
+	extends JavaDatabaseGenerator, TableGenerator
 {
 	TableGeneratorAnnotation getGeneratorAnnotation();
 
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaDbGenerator.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaDbGenerator.java
index e255c82bbf..a6aba726a5 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaDbGenerator.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaDbGenerator.java
@@ -12,7 +12,7 @@ package org.eclipse.jpt.jpa.core.internal.context.java;
 import org.eclipse.jpt.common.utility.internal.ObjectTools;
 import org.eclipse.jpt.jpa.core.context.DatabaseGenerator;
 import org.eclipse.jpt.jpa.core.context.Generator;
-import org.eclipse.jpt.jpa.core.context.java.JavaDbGenerator;
+import org.eclipse.jpt.jpa.core.context.java.JavaDatabaseGenerator;
 import org.eclipse.jpt.jpa.core.context.java.JavaGeneratorContainer;
 import org.eclipse.jpt.jpa.core.resource.java.DatabaseGeneratorAnnotation;
 import org.eclipse.jpt.jpa.db.Catalog;
@@ -24,7 +24,7 @@ import org.eclipse.jpt.jpa.db.SchemaContainer;
  */
 public abstract class AbstractJavaDbGenerator<A extends DatabaseGeneratorAnnotation>
 	extends AbstractJavaGenerator<JavaGeneratorContainer, A>
-	implements JavaDbGenerator
+	implements JavaDatabaseGenerator
 {
 	protected Integer specifiedInitialValue;
 	protected int defaultInitialValue;
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmDatabaseGenerator.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmDatabaseGenerator.java
index 56623543e8..815d5bd18d 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmDatabaseGenerator.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmDatabaseGenerator.java
@@ -14,7 +14,7 @@ import org.eclipse.jpt.common.utility.internal.iterable.EmptyIterable;
 import org.eclipse.jpt.jpa.core.context.DatabaseGenerator;
 import org.eclipse.jpt.jpa.core.context.Generator;
 import org.eclipse.jpt.jpa.core.context.JpaContextModel;
-import org.eclipse.jpt.jpa.core.context.java.JavaDbGenerator;
+import org.eclipse.jpt.jpa.core.context.java.JavaDatabaseGenerator;
 import org.eclipse.jpt.jpa.core.resource.orm.XmlGenerator;
 import org.eclipse.jpt.jpa.db.Catalog;
 import org.eclipse.jpt.jpa.db.Database;
@@ -215,7 +215,7 @@ public abstract class AbstractOrmDatabaseGenerator<X extends XmlGenerator>
 
 	// ********** metadata conversion **********
 
-	public void convertFrom(JavaDbGenerator javaGenerator) {
+	public void convertFrom(JavaDatabaseGenerator javaGenerator) {
 		super.convertFrom(javaGenerator);
 		this.setSpecifiedInitialValue(javaGenerator.getSpecifiedInitialValue());
 		this.setSpecifiedAllocationSize(javaGenerator.getSpecifiedAllocationSize());