Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrian Vosburgh2013-07-23 23:24:35 +0000
committerBrian Vosburgh2013-07-23 23:24:35 +0000
commiteaa20d0885941d48ec9a96c480f985da05e76e67 (patch)
tree999572459c068cc531b45c9dc28020d9595cf4f1
parent48315c894e75adfde43022add5572d9dbc8a62a2 (diff)
downloadwebtools.dali-eaa20d0885941d48ec9a96c480f985da05e76e67.tar.gz
webtools.dali-eaa20d0885941d48ec9a96c480f985da05e76e67.tar.xz
webtools.dali-eaa20d0885941d48ec9a96c480f985da05e76e67.zip
rename EmbeddedIdMappingComposite to JavaEmbeddedIdMappingComposite
-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/JavaEmbeddedIdMappingComposite.java (renamed from jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/EmbeddedIdMappingComposite.java)10
2 files changed, 7 insertions, 6 deletions
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 c8a420a006..5483aa9f8f 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
@@ -31,7 +31,6 @@ 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.BasicMappingComposite;
-import org.eclipse.jpt.jpa.ui.internal.details.EmbeddedIdMappingComposite;
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;
@@ -91,7 +90,7 @@ public abstract class AbstractJavaUiFactory
Composite parentComposite,
WidgetFactory widgetFactory,
ResourceManager resourceManager) {
- return new EmbeddedIdMappingComposite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
+ return new JavaEmbeddedIdMappingComposite(mappingModel, enabledModel, parentComposite, widgetFactory, resourceManager);
}
public JpaComposite createBasicMappingComposite(
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/EmbeddedIdMappingComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/JavaEmbeddedIdMappingComposite.java
index fe3c725f1f..cae025daab 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/EmbeddedIdMappingComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/java/JavaEmbeddedIdMappingComposite.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2007, 2012 Oracle. All rights reserved.
+ * Copyright (c) 2007, 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.EmbeddedIdMapping;
+import org.eclipse.jpt.jpa.ui.internal.details.AbstractEmbeddedIdMappingComposite;
+import org.eclipse.jpt.jpa.ui.internal.details.EmbeddedMappingOverridesComposite;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Control;
-public class EmbeddedIdMappingComposite
+public class JavaEmbeddedIdMappingComposite
extends AbstractEmbeddedIdMappingComposite<EmbeddedIdMapping>
{
- public EmbeddedIdMappingComposite(
+ public JavaEmbeddedIdMappingComposite(
PropertyValueModel<? extends EmbeddedIdMapping> mappingModel,
PropertyValueModel<Boolean> enabledModel,
Composite parentComposite,

Back to the top