Skip to main content
summaryrefslogtreecommitdiffstats
path: root/jpa
diff options
context:
space:
mode:
authorkmoore2012-03-21 14:27:58 +0000
committerkmoore2012-03-21 14:27:58 +0000
commit7fa729187005992fe97741fbb60dc0c60f6e7eee (patch)
tree0b6659488777d84ce47fff889c9003494507a859 /jpa
parentae75bbed5c862dcd0b95cc1ab2a955e8e64bc56f (diff)
downloadwebtools.dali-7fa729187005992fe97741fbb60dc0c60f6e7eee.tar.gz
webtools.dali-7fa729187005992fe97741fbb60dc0c60f6e7eee.tar.xz
webtools.dali-7fa729187005992fe97741fbb60dc0c60f6e7eee.zip
Bug 374898 - some attribute mapping level refactorings are not happening in an eclipselink-orm.xml
Diffstat (limited to 'jpa')
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmElementCollectionMapping2_0.java18
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkArrayMapping2_3.java19
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkBasicMapping.java18
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkIdMapping.java18
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkManyToManyMapping.java19
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkOneToManyMapping.java19
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkVersionMapping.java18
7 files changed, 108 insertions, 21 deletions
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmElementCollectionMapping2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmElementCollectionMapping2_0.java
index 7e95f9eac9..184167e1c2 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmElementCollectionMapping2_0.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmElementCollectionMapping2_0.java
@@ -122,18 +122,30 @@ public class EclipseLinkOrmElementCollectionMapping2_0
//************ refactoring ************
@Override
+ @SuppressWarnings("unchecked")
public Iterable<ReplaceEdit> createMoveTypeEdits(IType originalType, IPackageFragment newPackage) {
- return this.converterContainer.createMoveTypeEdits(originalType, newPackage);
+ return new CompositeIterable<ReplaceEdit>(
+ super.createMoveTypeEdits(originalType, newPackage),
+ this.converterContainer.createMoveTypeEdits(originalType, newPackage)
+ );
}
@Override
+ @SuppressWarnings("unchecked")
public Iterable<ReplaceEdit> createRenamePackageEdits(IPackageFragment originalPackage, String newName) {
- return this.converterContainer.createRenamePackageEdits(originalPackage, newName);
+ return new CompositeIterable<ReplaceEdit>(
+ super.createRenamePackageEdits(originalPackage, newName),
+ this.converterContainer.createRenamePackageEdits(originalPackage, newName)
+ );
}
@Override
+ @SuppressWarnings("unchecked")
public Iterable<ReplaceEdit> createRenameTypeEdits(IType originalType, String newName) {
- return this.converterContainer.createRenameTypeEdits(originalType, newName);
+ return new CompositeIterable<ReplaceEdit>(
+ super.createRenameTypeEdits(originalType, newName),
+ this.converterContainer.createRenameTypeEdits(originalType, newName)
+ );
}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkArrayMapping2_3.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkArrayMapping2_3.java
index 07f369517a..fcfe9537db 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkArrayMapping2_3.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkArrayMapping2_3.java
@@ -13,6 +13,7 @@ import java.util.List;
import org.eclipse.jdt.core.IPackageFragment;
import org.eclipse.jdt.core.IType;
import org.eclipse.jpt.common.utility.internal.iterables.ArrayIterable;
+import org.eclipse.jpt.common.utility.internal.iterables.CompositeIterable;
import org.eclipse.jpt.jpa.core.context.Converter;
import org.eclipse.jpt.jpa.core.context.ReadOnlyBaseColumn;
import org.eclipse.jpt.jpa.core.context.ReadOnlyNamedColumn;
@@ -307,18 +308,30 @@ public class OrmEclipseLinkArrayMapping2_3
//************ refactoring ************
@Override
+ @SuppressWarnings("unchecked")
public Iterable<ReplaceEdit> createMoveTypeEdits(IType originalType, IPackageFragment newPackage) {
- return this.converterContainer.createMoveTypeEdits(originalType, newPackage);
+ return new CompositeIterable<ReplaceEdit>(
+ super.createMoveTypeEdits(originalType, newPackage),
+ this.converterContainer.createMoveTypeEdits(originalType, newPackage)
+ );
}
@Override
+ @SuppressWarnings("unchecked")
public Iterable<ReplaceEdit> createRenamePackageEdits(IPackageFragment originalPackage, String newName) {
- return this.converterContainer.createRenamePackageEdits(originalPackage, newName);
+ return new CompositeIterable<ReplaceEdit>(
+ super.createRenamePackageEdits(originalPackage, newName),
+ this.converterContainer.createRenamePackageEdits(originalPackage, newName)
+ );
}
@Override
+ @SuppressWarnings("unchecked")
public Iterable<ReplaceEdit> createRenameTypeEdits(IType originalType, String newName) {
- return this.converterContainer.createRenameTypeEdits(originalType, newName);
+ return new CompositeIterable<ReplaceEdit>(
+ super.createRenameTypeEdits(originalType, newName),
+ this.converterContainer.createRenameTypeEdits(originalType, newName)
+ );
}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkBasicMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkBasicMapping.java
index c95c48e496..7bb026f2d1 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkBasicMapping.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkBasicMapping.java
@@ -120,18 +120,30 @@ public class OrmEclipseLinkBasicMapping
//************ refactoring ************
@Override
+ @SuppressWarnings("unchecked")
public Iterable<ReplaceEdit> createMoveTypeEdits(IType originalType, IPackageFragment newPackage) {
- return this.converterContainer.createMoveTypeEdits(originalType, newPackage);
+ return new CompositeIterable<ReplaceEdit>(
+ super.createMoveTypeEdits(originalType, newPackage),
+ this.converterContainer.createMoveTypeEdits(originalType, newPackage)
+ );
}
@Override
+ @SuppressWarnings("unchecked")
public Iterable<ReplaceEdit> createRenamePackageEdits(IPackageFragment originalPackage, String newName) {
- return this.converterContainer.createRenamePackageEdits(originalPackage, newName);
+ return new CompositeIterable<ReplaceEdit>(
+ super.createRenamePackageEdits(originalPackage, newName),
+ this.converterContainer.createRenamePackageEdits(originalPackage, newName)
+ );
}
@Override
+ @SuppressWarnings("unchecked")
public Iterable<ReplaceEdit> createRenameTypeEdits(IType originalType, String newName) {
- return this.converterContainer.createRenameTypeEdits(originalType, newName);
+ return new CompositeIterable<ReplaceEdit>(
+ super.createRenameTypeEdits(originalType, newName),
+ this.converterContainer.createRenameTypeEdits(originalType, newName)
+ );
}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkIdMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkIdMapping.java
index 7e7847d221..c6373d412b 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkIdMapping.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkIdMapping.java
@@ -116,18 +116,30 @@ public class OrmEclipseLinkIdMapping
//************ refactoring ************
@Override
+ @SuppressWarnings("unchecked")
public Iterable<ReplaceEdit> createMoveTypeEdits(IType originalType, IPackageFragment newPackage) {
- return this.converterContainer.createMoveTypeEdits(originalType, newPackage);
+ return new CompositeIterable<ReplaceEdit>(
+ super.createMoveTypeEdits(originalType, newPackage),
+ this.converterContainer.createMoveTypeEdits(originalType, newPackage)
+ );
}
@Override
+ @SuppressWarnings("unchecked")
public Iterable<ReplaceEdit> createRenamePackageEdits(IPackageFragment originalPackage, String newName) {
- return this.converterContainer.createRenamePackageEdits(originalPackage, newName);
+ return new CompositeIterable<ReplaceEdit>(
+ super.createRenamePackageEdits(originalPackage, newName),
+ this.converterContainer.createRenamePackageEdits(originalPackage, newName)
+ );
}
@Override
+ @SuppressWarnings("unchecked")
public Iterable<ReplaceEdit> createRenameTypeEdits(IType originalType, String newName) {
- return this.converterContainer.createRenameTypeEdits(originalType, newName);
+ return new CompositeIterable<ReplaceEdit>(
+ super.createRenameTypeEdits(originalType, newName),
+ this.converterContainer.createRenameTypeEdits(originalType, newName)
+ );
}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkManyToManyMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkManyToManyMapping.java
index 42988ff64e..0910c4df1f 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkManyToManyMapping.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkManyToManyMapping.java
@@ -15,6 +15,7 @@ import org.eclipse.jdt.core.IType;
import org.eclipse.jpt.common.core.internal.utility.JDTTools;
import org.eclipse.jpt.common.core.utility.TextRange;
import org.eclipse.jpt.common.utility.internal.StringTools;
+import org.eclipse.jpt.common.utility.internal.iterables.CompositeIterable;
import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentAttribute;
import org.eclipse.jpt.jpa.core.internal.context.orm.AbstractOrmManyToManyMapping;
import org.eclipse.jpt.jpa.eclipselink.core.context.EclipseLinkAccessType;
@@ -102,18 +103,30 @@ public class OrmEclipseLinkManyToManyMapping
//************ refactoring ************
@Override
+ @SuppressWarnings("unchecked")
public Iterable<ReplaceEdit> createMoveTypeEdits(IType originalType, IPackageFragment newPackage) {
- return this.converterContainer.createMoveTypeEdits(originalType, newPackage);
+ return new CompositeIterable<ReplaceEdit>(
+ super.createMoveTypeEdits(originalType, newPackage),
+ this.converterContainer.createMoveTypeEdits(originalType, newPackage)
+ );
}
@Override
+ @SuppressWarnings("unchecked")
public Iterable<ReplaceEdit> createRenamePackageEdits(IPackageFragment originalPackage, String newName) {
- return this.converterContainer.createRenamePackageEdits(originalPackage, newName);
+ return new CompositeIterable<ReplaceEdit>(
+ super.createRenamePackageEdits(originalPackage, newName),
+ this.converterContainer.createRenamePackageEdits(originalPackage, newName)
+ );
}
@Override
+ @SuppressWarnings("unchecked")
public Iterable<ReplaceEdit> createRenameTypeEdits(IType originalType, String newName) {
- return this.converterContainer.createRenameTypeEdits(originalType, newName);
+ return new CompositeIterable<ReplaceEdit>(
+ super.createRenameTypeEdits(originalType, newName),
+ this.converterContainer.createRenameTypeEdits(originalType, newName)
+ );
}
// ********** validation **********
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkOneToManyMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkOneToManyMapping.java
index 571ee0fe0e..4468c91467 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkOneToManyMapping.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkOneToManyMapping.java
@@ -15,6 +15,7 @@ import org.eclipse.jdt.core.IType;
import org.eclipse.jpt.common.core.internal.utility.JDTTools;
import org.eclipse.jpt.common.core.utility.TextRange;
import org.eclipse.jpt.common.utility.internal.StringTools;
+import org.eclipse.jpt.common.utility.internal.iterables.CompositeIterable;
import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentAttribute;
import org.eclipse.jpt.jpa.core.internal.context.orm.AbstractOrmOneToManyMapping;
import org.eclipse.jpt.jpa.core.jpa2.context.orm.OrmOneToManyRelationship2_0;
@@ -131,18 +132,30 @@ public class OrmEclipseLinkOneToManyMapping
//************ refactoring ************
@Override
+ @SuppressWarnings("unchecked")
public Iterable<ReplaceEdit> createMoveTypeEdits(IType originalType, IPackageFragment newPackage) {
- return this.converterContainer.createMoveTypeEdits(originalType, newPackage);
+ return new CompositeIterable<ReplaceEdit>(
+ super.createMoveTypeEdits(originalType, newPackage),
+ this.converterContainer.createMoveTypeEdits(originalType, newPackage)
+ );
}
@Override
+ @SuppressWarnings("unchecked")
public Iterable<ReplaceEdit> createRenamePackageEdits(IPackageFragment originalPackage, String newName) {
- return this.converterContainer.createRenamePackageEdits(originalPackage, newName);
+ return new CompositeIterable<ReplaceEdit>(
+ super.createRenamePackageEdits(originalPackage, newName),
+ this.converterContainer.createRenamePackageEdits(originalPackage, newName)
+ );
}
@Override
+ @SuppressWarnings("unchecked")
public Iterable<ReplaceEdit> createRenameTypeEdits(IType originalType, String newName) {
- return this.converterContainer.createRenameTypeEdits(originalType, newName);
+ return new CompositeIterable<ReplaceEdit>(
+ super.createRenameTypeEdits(originalType, newName),
+ this.converterContainer.createRenameTypeEdits(originalType, newName)
+ );
}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkVersionMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkVersionMapping.java
index 4e5b307288..e243c6ecaf 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkVersionMapping.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/OrmEclipseLinkVersionMapping.java
@@ -118,18 +118,30 @@ public class OrmEclipseLinkVersionMapping
//************ refactoring ************
@Override
+ @SuppressWarnings("unchecked")
public Iterable<ReplaceEdit> createMoveTypeEdits(IType originalType, IPackageFragment newPackage) {
- return this.converterContainer.createMoveTypeEdits(originalType, newPackage);
+ return new CompositeIterable<ReplaceEdit>(
+ super.createMoveTypeEdits(originalType, newPackage),
+ this.converterContainer.createMoveTypeEdits(originalType, newPackage)
+ );
}
@Override
+ @SuppressWarnings("unchecked")
public Iterable<ReplaceEdit> createRenamePackageEdits(IPackageFragment originalPackage, String newName) {
- return this.converterContainer.createRenamePackageEdits(originalPackage, newName);
+ return new CompositeIterable<ReplaceEdit>(
+ super.createRenamePackageEdits(originalPackage, newName),
+ this.converterContainer.createRenamePackageEdits(originalPackage, newName)
+ );
}
@Override
+ @SuppressWarnings("unchecked")
public Iterable<ReplaceEdit> createRenameTypeEdits(IType originalType, String newName) {
- return this.converterContainer.createRenameTypeEdits(originalType, newName);
+ return new CompositeIterable<ReplaceEdit>(
+ super.createRenameTypeEdits(originalType, newName),
+ this.converterContainer.createRenameTypeEdits(originalType, newName)
+ );
}

Back to the top