Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrian Vosburgh2013-07-23 23:39:55 +0000
committerBrian Vosburgh2013-07-23 23:39:55 +0000
commit929bd778605d3497b77484d7a0f876ae4526c033 (patch)
treefad1a31e2d6b361acb595e787196d4bc2958c79d /jpa/plugins
parent9fc0e10852885e23c42bf75528cf3aa307f6c73f (diff)
downloadwebtools.dali-929bd778605d3497b77484d7a0f876ae4526c033.tar.gz
webtools.dali-929bd778605d3497b77484d7a0f876ae4526c033.tar.xz
webtools.dali-929bd778605d3497b77484d7a0f876ae4526c033.zip
rename IdMappingComposite to JavaIdMappingComposite
Diffstat (limited to 'jpa/plugins')
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/IdMappingGenerationComposite.java6
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/AbstractJavaUiFactory.java3
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/JavaIdMappingComposite.java (renamed from jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/IdMappingComposite.java)10
3 files changed, 7 insertions, 12 deletions
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/IdMappingGenerationComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/IdMappingGenerationComposite.java
index 9483933778..de756d663a 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/IdMappingGenerationComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/IdMappingGenerationComposite.java
@@ -84,12 +84,6 @@ import org.eclipse.ui.forms.widgets.Section;
* | --------------------------------------------------------------------- |
* -----------------------------------------------------------------------------</pre>
*
- * @see IdMapping
- * @see GeneratedValueComposite
- * @see TableGeneratorComposite
- * @see SequenceGeneratorComposite
- * @see IdMappingComposite - The parent container
- *
* @version 2.2
* @since 1.0
*/
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/AbstractJavaUiFactory.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/AbstractJavaUiFactory.java
index 5671ba1152..f524dac061 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/AbstractJavaUiFactory.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/AbstractJavaUiFactory.java
@@ -30,7 +30,6 @@ import org.eclipse.jpt.jpa.core.context.java.JavaEntity;
import org.eclipse.jpt.jpa.core.context.java.JavaMappedSuperclass;
import org.eclipse.jpt.jpa.ui.details.JpaComposite;
import org.eclipse.jpt.jpa.ui.details.JpaUiFactory;
-import org.eclipse.jpt.jpa.ui.internal.details.IdMappingComposite;
import org.eclipse.jpt.jpa.ui.internal.details.ManyToManyMappingComposite;
import org.eclipse.jpt.jpa.ui.internal.details.ManyToOneMappingComposite;
import org.eclipse.jpt.jpa.ui.internal.details.OneToManyMappingComposite;
@@ -80,7 +79,7 @@ public abstract class AbstractJavaUiFactory
Composite parentComposite,
WidgetFactory widgetFactory,
ResourceManager resourceManager) {
- return new IdMappingComposite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
+ return new JavaIdMappingComposite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
}
public JpaComposite createEmbeddedIdMappingComposite(
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/IdMappingComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/JavaIdMappingComposite.java
index 086c5f09bc..34441d5cce 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/IdMappingComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/JavaIdMappingComposite.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.
@@ -7,19 +7,21 @@
* Contributors:
* Oracle - initial API and implementation
******************************************************************************/
-package org.eclipse.jpt.jpa.ui.internal.details;
+package org.eclipse.jpt.jpa.ui.internal.details.java;
import org.eclipse.jface.resource.ResourceManager;
import org.eclipse.jpt.common.ui.WidgetFactory;
import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
import org.eclipse.jpt.jpa.core.context.IdMapping;
+import org.eclipse.jpt.jpa.ui.internal.details.AbstractIdMappingComposite;
+import org.eclipse.jpt.jpa.ui.internal.details.ColumnComposite;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
-public class IdMappingComposite
+public class JavaIdMappingComposite
extends AbstractIdMappingComposite<IdMapping>
{
- public IdMappingComposite(
+ public JavaIdMappingComposite(
PropertyValueModel<? extends IdMapping> mappingModel,
PropertyValueModel<Boolean> enabledModel,
Composite parentComposite,

Back to the top