diff options
| author | Brian Vosburgh | 2012-10-11 04:44:45 +0000 |
|---|---|---|
| committer | Brian Vosburgh | 2012-10-11 04:45:57 +0000 |
| commit | 92e3783462b168cd5c39f28d53df7cf23d145ac5 (patch) | |
| tree | a692757d0c4c38e9c4e02f3571ad0883c07d1c61 /jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse | |
| parent | 75bf5423e2d1c6bf39d697e92380e55f343b9b48 (diff) | |
| download | webtools.dali-92e3783462b168cd5c39f28d53df7cf23d145ac5.tar.gz webtools.dali-92e3783462b168cd5c39f28d53df7cf23d145ac5.tar.xz webtools.dali-92e3783462b168cd5c39f28d53df7cf23d145ac5.zip | |
rework utility classes
Diffstat (limited to 'jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse')
333 files changed, 2083 insertions, 2038 deletions
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/JpaPlatform.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/JpaPlatform.java index ab1609705a..f8030169f6 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/JpaPlatform.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/JpaPlatform.java @@ -19,7 +19,7 @@ import org.eclipse.jpt.jpa.core.context.java.DefaultJavaAttributeMappingDefiniti import org.eclipse.jpt.jpa.core.context.java.JavaAttributeMappingDefinition; import org.eclipse.jpt.jpa.core.context.java.JavaTypeMappingDefinition; import org.eclipse.jpt.jpa.core.jpa2.JpaProject2_0; -import org.eclipse.jpt.jpa.core.platform.JpaPlatformDescription; +import org.eclipse.jpt.jpa.core.platform.JpaPlatformConfig; import org.eclipse.jpt.jpa.db.ConnectionProfileFactory; import org.eclipse.persistence.jpa.jpql.parser.JPQLGrammar; @@ -58,10 +58,10 @@ public interface JpaPlatform String getId(); /** - * Return the JPA platform's description (i.e. the description defined by + * Return the JPA platform's config (i.e. the config defined by * the JPA platform's plug-in extension). */ - JpaPlatformDescription getDescription(); + JpaPlatformConfig getConfig(); /** * Return the JPA platform's version. diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/JpaPreferences.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/JpaPreferences.java index 2da146ad81..339b3782d6 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/JpaPreferences.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/JpaPreferences.java @@ -10,7 +10,7 @@ package org.eclipse.jpt.jpa.core; import org.eclipse.core.resources.IProject; -import org.eclipse.jpt.common.utility.internal.Tools; +import org.eclipse.jpt.common.utility.internal.ObjectTools; import org.eclipse.jpt.jpa.core.internal.plugin.JptJpaCorePlugin; /** @@ -177,7 +177,7 @@ public final class JpaPreferences { } private static boolean getJpqlIdentifierLowercase(String value) { - return Tools.valuesAreEqual(value, JPQL_IDENTIFIER_CASE_VALUE_LOWERCASE); + return ObjectTools.equals(value, JPQL_IDENTIFIER_CASE_VALUE_LOWERCASE); } public static void setJpqlIdentifierLowercase(boolean value) { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/JpaProjectManager.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/JpaProjectManager.java index bd5290c75b..0b2087162b 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/JpaProjectManager.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/JpaProjectManager.java @@ -9,10 +9,10 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core; -import org.eclipse.jpt.common.utility.BooleanReference; import org.eclipse.jpt.common.utility.command.Command; import org.eclipse.jpt.common.utility.command.ExtendedCommandExecutor; import org.eclipse.jpt.common.utility.model.Model; +import org.eclipse.jpt.common.utility.reference.BooleanReference; /** * The JPA project manager holds all the JPA projects in an Eclipse workspace diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/JpaStructureNode.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/JpaStructureNode.java index f73985f8f8..bd0a32d9c7 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/JpaStructureNode.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/JpaStructureNode.java @@ -13,7 +13,7 @@ import java.util.Collection; import org.eclipse.jpt.common.core.JptResourceType; import org.eclipse.jpt.common.core.utility.TextRange; -import org.eclipse.jpt.common.utility.internal.StringTools; +import org.eclipse.jpt.common.utility.internal.ObjectTools; import org.eclipse.jpt.jpa.core.context.JpaContextNode; /** @@ -137,7 +137,7 @@ public interface JpaStructureNode @Override public String toString() { - return StringTools.buildToStringFor(this, this.node); + return ObjectTools.toString(this, this.node); } } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/AssociationOverrideContainer.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/AssociationOverrideContainer.java index 3c14ddb3c5..ab120455c4 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/AssociationOverrideContainer.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/AssociationOverrideContainer.java @@ -9,7 +9,7 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.context; -import org.eclipse.jpt.common.utility.internal.iterables.ListIterable; +import org.eclipse.jpt.common.utility.iterable.ListIterable; /** * Association override container. diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/AttributeOverrideContainer.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/AttributeOverrideContainer.java index d45a10d633..6e57f56331 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/AttributeOverrideContainer.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/AttributeOverrideContainer.java @@ -9,7 +9,7 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.context; -import org.eclipse.jpt.common.utility.internal.iterables.ListIterable; +import org.eclipse.jpt.common.utility.iterable.ListIterable; /** * Attribute override container. diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/Entity.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/Entity.java index 9bff01e452..a95e8dcd55 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/Entity.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/Entity.java @@ -9,7 +9,7 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.context; -import org.eclipse.jpt.common.utility.internal.iterables.ListIterable; +import org.eclipse.jpt.common.utility.iterable.ListIterable; /** * entity diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/Generator.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/Generator.java index ec3ab91c85..63673d80b7 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/Generator.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/Generator.java @@ -10,7 +10,7 @@ package org.eclipse.jpt.jpa.core.context; import org.eclipse.jpt.common.core.utility.TextRange; -import org.eclipse.jpt.common.utility.internal.iterables.ArrayIterable; +import org.eclipse.jpt.common.utility.internal.iterable.ArrayIterable; import org.eclipse.jpt.jpa.core.context.persistence.PersistenceUnit; /** diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/JoinColumnRelationshipStrategy.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/JoinColumnRelationshipStrategy.java index bb80811a70..24189f0687 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/JoinColumnRelationshipStrategy.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/JoinColumnRelationshipStrategy.java @@ -9,7 +9,7 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.context; -import org.eclipse.jpt.common.utility.internal.iterables.ListIterable; +import org.eclipse.jpt.common.utility.iterable.ListIterable; /** * Join column relationship strategy. diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/JoinTable.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/JoinTable.java index f5169be42b..7c8ac54426 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/JoinTable.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/JoinTable.java @@ -9,7 +9,7 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.context; -import org.eclipse.jpt.common.utility.internal.iterables.ListIterable; +import org.eclipse.jpt.common.utility.iterable.ListIterable; /** * Used by many-to-many and one-to-many mappings. diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/JpaNamedContextNode.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/JpaNamedContextNode.java index c831f7d68c..bcce22fad1 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/JpaNamedContextNode.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/JpaNamedContextNode.java @@ -10,8 +10,9 @@ package org.eclipse.jpt.jpa.core.context; import java.io.Serializable; -import org.eclipse.jpt.common.utility.internal.StringTools; -import org.eclipse.jpt.common.utility.internal.Transformer; + +import org.eclipse.jpt.common.utility.internal.ObjectTools; +import org.eclipse.jpt.common.utility.transformer.Transformer; /** * Named context node. Sorta. :-) @@ -57,7 +58,7 @@ public interface JpaNamedContextNode } @Override public String toString() { - return StringTools.buildSingletonToString(this); + return ObjectTools.singletonToString(this); } private static final long serialVersionUID = 1L; private Object readResolve() { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/OverrideContainer.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/OverrideContainer.java index 450f2692d1..597b1cc3f2 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/OverrideContainer.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/OverrideContainer.java @@ -10,7 +10,7 @@ package org.eclipse.jpt.jpa.core.context; import org.eclipse.jpt.common.core.utility.TextRange; -import org.eclipse.jpt.common.utility.internal.iterables.ListIterable; +import org.eclipse.jpt.common.utility.iterable.ListIterable; import org.eclipse.jpt.jpa.core.internal.context.JptValidator; import org.eclipse.jpt.jpa.db.Table; diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/PersistentType.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/PersistentType.java index ed3404dc81..d11bb8ee41 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/PersistentType.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/PersistentType.java @@ -10,10 +10,11 @@ package org.eclipse.jpt.jpa.core.context; import java.util.List; + import org.eclipse.jdt.core.IPackageFragment; import org.eclipse.jpt.common.core.utility.TextRange; import org.eclipse.jpt.common.core.utility.jdt.TypeBinding; -import org.eclipse.jpt.common.utility.internal.iterables.ListIterable; +import org.eclipse.jpt.common.utility.iterable.ListIterable; import org.eclipse.jpt.jpa.core.JpaStructureNode; import org.eclipse.wst.validation.internal.provisional.core.IMessage; import org.eclipse.wst.validation.internal.provisional.core.IReporter; diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/PrimaryKeyJoinColumnRelationshipStrategy.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/PrimaryKeyJoinColumnRelationshipStrategy.java index 3d450d4dfd..6dc4859c29 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/PrimaryKeyJoinColumnRelationshipStrategy.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/PrimaryKeyJoinColumnRelationshipStrategy.java @@ -9,7 +9,7 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.context; -import org.eclipse.jpt.common.utility.internal.iterables.ListIterable; +import org.eclipse.jpt.common.utility.iterable.ListIterable; /** * Primary key join column relationship strategy. diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/Query.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/Query.java index 9ec381ee05..eab3b0743a 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/Query.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/Query.java @@ -10,9 +10,8 @@ package org.eclipse.jpt.jpa.core.context; import org.eclipse.jpt.common.core.utility.TextRange; -import org.eclipse.jpt.common.utility.internal.iterables.ArrayIterable; -import org.eclipse.jpt.common.utility.internal.iterables.ListIterable; - +import org.eclipse.jpt.common.utility.internal.iterable.ArrayIterable; +import org.eclipse.jpt.common.utility.iterable.ListIterable; /** * Named and named native queries. * <p> diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/QueryContainer.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/QueryContainer.java index cdd41e6e47..49afa31485 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/QueryContainer.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/QueryContainer.java @@ -9,7 +9,7 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.context; -import org.eclipse.jpt.common.utility.internal.iterables.ListIterable; +import org.eclipse.jpt.common.utility.iterable.ListIterable; /** * Container for named queries and/or named native queries. diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/ReadOnlyJoinColumnRelationshipStrategy.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/ReadOnlyJoinColumnRelationshipStrategy.java index c29e1f8e7f..8c9caf67c3 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/ReadOnlyJoinColumnRelationshipStrategy.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/ReadOnlyJoinColumnRelationshipStrategy.java @@ -9,7 +9,7 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.context; -import org.eclipse.jpt.common.utility.internal.iterables.ListIterable; +import org.eclipse.jpt.common.utility.iterable.ListIterable; /** diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/ReadOnlyJoinTable.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/ReadOnlyJoinTable.java index b356f98499..618e95a87c 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/ReadOnlyJoinTable.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/ReadOnlyJoinTable.java @@ -9,7 +9,7 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.context; -import org.eclipse.jpt.common.utility.internal.iterables.ListIterable; +import org.eclipse.jpt.common.utility.iterable.ListIterable; /** * Used by association overrides. diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/ReadOnlyPersistentAttribute.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/ReadOnlyPersistentAttribute.java index b92a74923c..2684868df6 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/ReadOnlyPersistentAttribute.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/ReadOnlyPersistentAttribute.java @@ -25,8 +25,8 @@ import org.eclipse.jpt.jpa.core.context.java.JavaPersistentAttribute; * @since ... a while? */ public interface ReadOnlyPersistentAttribute - extends JpaContextNode, JpaStructureNode, ReadOnlyAccessHolder { - + extends JpaContextNode, JpaStructureNode, ReadOnlyAccessHolder +{ // ********** name ********** String getName(); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/ReadOnlyReferenceTable.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/ReadOnlyReferenceTable.java index 23e0917bb2..d070ecc975 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/ReadOnlyReferenceTable.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/ReadOnlyReferenceTable.java @@ -9,7 +9,7 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.context; -import org.eclipse.jpt.common.utility.internal.iterables.ListIterable; +import org.eclipse.jpt.common.utility.iterable.ListIterable; /** * Read-only reference table (i.e. a table that joins with one other table, diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/ReadOnlySecondaryTable.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/ReadOnlySecondaryTable.java index b491f4ac37..1aba5586d9 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/ReadOnlySecondaryTable.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/ReadOnlySecondaryTable.java @@ -9,7 +9,7 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.context; -import org.eclipse.jpt.common.utility.internal.iterables.ListIterable; +import org.eclipse.jpt.common.utility.iterable.ListIterable; /** * Read-only entity secondary table diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/ReadOnlyTable.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/ReadOnlyTable.java index 6cfad5b67b..5c907ae367 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/ReadOnlyTable.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/ReadOnlyTable.java @@ -10,7 +10,7 @@ package org.eclipse.jpt.jpa.core.context; import org.eclipse.jpt.common.core.utility.TextRange; -import org.eclipse.jpt.common.utility.internal.iterables.ListIterable; +import org.eclipse.jpt.common.utility.iterable.ListIterable; import org.eclipse.jpt.jpa.core.internal.context.JptValidator; import org.eclipse.jpt.jpa.db.Catalog; import org.eclipse.jpt.jpa.db.Schema; diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/ReferenceTable.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/ReferenceTable.java index c75590b5bf..5cfef27af8 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/ReferenceTable.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/ReferenceTable.java @@ -9,7 +9,7 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.context; -import org.eclipse.jpt.common.utility.internal.iterables.ListIterable; +import org.eclipse.jpt.common.utility.iterable.ListIterable; /** * Reference table (i.e. a table that joins with one other table, diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/SecondaryTable.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/SecondaryTable.java index bcad4bf174..84295723b7 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/SecondaryTable.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/SecondaryTable.java @@ -9,7 +9,7 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.context; -import org.eclipse.jpt.common.utility.internal.iterables.ListIterable; +import org.eclipse.jpt.common.utility.iterable.ListIterable; /** * entity secondary table diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/Table.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/Table.java index f25f804419..e27d3c72b4 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/Table.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/Table.java @@ -9,7 +9,7 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.context; -import org.eclipse.jpt.common.utility.internal.iterables.ListIterable; +import org.eclipse.jpt.common.utility.iterable.ListIterable; /** * <ul> diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/VirtualJoinColumnRelationshipStrategy.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/VirtualJoinColumnRelationshipStrategy.java index 0905e56be0..1d25d96272 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/VirtualJoinColumnRelationshipStrategy.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/VirtualJoinColumnRelationshipStrategy.java @@ -9,7 +9,7 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.context; -import org.eclipse.jpt.common.utility.internal.iterables.ListIterable; +import org.eclipse.jpt.common.utility.iterable.ListIterable; /** * Virtual join column relationship strategy. diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/VirtualJoinTable.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/VirtualJoinTable.java index 263988cd70..aba6e92dc2 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/VirtualJoinTable.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/VirtualJoinTable.java @@ -9,7 +9,7 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.context; -import org.eclipse.jpt.common.utility.internal.iterables.ListIterable; +import org.eclipse.jpt.common.utility.iterable.ListIterable; /** * Used by association overrides. diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/VirtualReferenceTable.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/VirtualReferenceTable.java index 21a4ec56c7..bfe351ce85 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/VirtualReferenceTable.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/VirtualReferenceTable.java @@ -9,7 +9,7 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.context; -import org.eclipse.jpt.common.utility.internal.iterables.ListIterable; +import org.eclipse.jpt.common.utility.iterable.ListIterable; /** * Virtual reference table diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/VirtualSecondaryTable.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/VirtualSecondaryTable.java index f9275f56f9..e38c0e1618 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/VirtualSecondaryTable.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/VirtualSecondaryTable.java @@ -9,7 +9,7 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.context; -import org.eclipse.jpt.common.utility.internal.iterables.ListIterable; +import org.eclipse.jpt.common.utility.iterable.ListIterable; /** * Virtual secondary table diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/VirtualTable.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/VirtualTable.java index 2f5a64bd31..b1dfd49029 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/VirtualTable.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/VirtualTable.java @@ -9,7 +9,7 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.context; -import org.eclipse.jpt.common.utility.internal.iterables.ListIterable; +import org.eclipse.jpt.common.utility.iterable.ListIterable; /** * Virtual table diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/XmlFile.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/XmlFile.java index 3f090919ba..edac5da7bd 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/XmlFile.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/XmlFile.java @@ -11,7 +11,7 @@ package org.eclipse.jpt.jpa.core.context; import org.eclipse.core.runtime.content.IContentType; import org.eclipse.jpt.common.core.resource.xml.JptXmlResource; -import org.eclipse.jpt.common.utility.internal.Tools; +import org.eclipse.jpt.common.utility.internal.ObjectTools; import org.eclipse.jpt.jpa.core.JpaStructureNode; import org.eclipse.jpt.jpa.core.resource.orm.XmlEntityMappings; @@ -81,7 +81,7 @@ public interface XmlFile public static boolean isLatestSupportedVersion(XmlFile xmlFile) { String xmlFileVersion = xmlFile.getXmlResource().getVersion(); String latestVersion = xmlFile.getJpaProject().getJpaPlatform().getMostRecentSupportedResourceType(xmlFile.getXmlResource().getContentType()).getVersion(); - return Tools.valuesAreEqual(xmlFileVersion, latestVersion); + return ObjectTools.equals(xmlFileVersion, latestVersion); } /** @@ -89,7 +89,7 @@ public interface XmlFile */ public static boolean isGenericMappingFile(XmlFile xmlFile) { IContentType contentType = xmlFile.getXmlResource().getContentType(); - return Tools.valuesAreEqual(contentType, XmlEntityMappings.CONTENT_TYPE); + return ObjectTools.equals(contentType, XmlEntityMappings.CONTENT_TYPE); } private XmlFile_() { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaAssociationOverrideContainer.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaAssociationOverrideContainer.java index 83b9926f8f..11800c236b 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaAssociationOverrideContainer.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaAssociationOverrideContainer.java @@ -9,7 +9,7 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.context.java; -import org.eclipse.jpt.common.utility.internal.iterables.ListIterable; +import org.eclipse.jpt.common.utility.iterable.ListIterable; import org.eclipse.jpt.jpa.core.context.AssociationOverrideContainer; import org.eclipse.jpt.jpa.core.context.Override_; import org.eclipse.jpt.jpa.core.context.ReadOnlyOverrideRelationship; diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaAttributeOverrideContainer.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaAttributeOverrideContainer.java index f05b62af4d..17a7cc3e4c 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaAttributeOverrideContainer.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaAttributeOverrideContainer.java @@ -9,7 +9,7 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.context.java; -import org.eclipse.jpt.common.utility.internal.iterables.ListIterable; +import org.eclipse.jpt.common.utility.iterable.ListIterable; import org.eclipse.jpt.jpa.core.context.AttributeOverrideContainer; import org.eclipse.jpt.jpa.core.context.Override_; import org.eclipse.jpt.jpa.core.context.ReadOnlyColumn; diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaConverter.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaConverter.java index 0a3f5525f7..b85df5075c 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaConverter.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaConverter.java @@ -11,8 +11,8 @@ package org.eclipse.jpt.jpa.core.context.java; import org.eclipse.jpt.common.core.resource.java.Annotation; import org.eclipse.jpt.common.core.resource.java.JavaResourceAttribute; -import org.eclipse.jpt.common.utility.internal.ClassName; -import org.eclipse.jpt.common.utility.internal.StringTools; +import org.eclipse.jpt.common.utility.internal.ClassNameTools; +import org.eclipse.jpt.common.utility.internal.ObjectTools; import org.eclipse.jpt.jpa.core.JpaFactory; import org.eclipse.jpt.jpa.core.context.Converter; import org.eclipse.jpt.jpa.core.internal.context.JptValidator; @@ -148,7 +148,7 @@ public interface JavaConverter @Override public String toString() { - return StringTools.buildToStringFor(this, ClassName.getSimpleName(this.getAnnotationName())); + return ObjectTools.toString(this, ClassNameTools.simpleName(this.getAnnotationName())); } } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaEntity.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaEntity.java index 74eea2c80b..7f3e54351b 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaEntity.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaEntity.java @@ -9,7 +9,7 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.context.java; -import org.eclipse.jpt.common.utility.internal.iterables.ListIterable; +import org.eclipse.jpt.common.utility.iterable.ListIterable; import org.eclipse.jpt.jpa.core.context.Entity; import org.eclipse.jpt.jpa.core.resource.java.EntityAnnotation; diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaJoinColumnRelationshipStrategy.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaJoinColumnRelationshipStrategy.java index f8571d77c1..1f233353c9 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaJoinColumnRelationshipStrategy.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaJoinColumnRelationshipStrategy.java @@ -9,7 +9,7 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.context.java; -import org.eclipse.jpt.common.utility.internal.iterables.ListIterable; +import org.eclipse.jpt.common.utility.iterable.ListIterable; import org.eclipse.jpt.jpa.core.context.JoinColumnRelationshipStrategy; /** diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaJoinTable.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaJoinTable.java index 38644bad90..1f7b6d2407 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaJoinTable.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaJoinTable.java @@ -9,7 +9,7 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.context.java; -import org.eclipse.jpt.common.utility.internal.iterables.ListIterable; +import org.eclipse.jpt.common.utility.iterable.ListIterable; import org.eclipse.jpt.jpa.core.context.JoinTable; import org.eclipse.jpt.jpa.core.resource.java.JoinTableAnnotation; diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaOverrideContainer.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaOverrideContainer.java index 4c991aae40..68e3a4f943 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaOverrideContainer.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaOverrideContainer.java @@ -10,7 +10,7 @@ package org.eclipse.jpt.jpa.core.context.java; import org.eclipse.jpt.common.core.resource.java.JavaResourceMember; -import org.eclipse.jpt.common.utility.internal.iterables.ListIterable; +import org.eclipse.jpt.common.utility.iterable.ListIterable; import org.eclipse.jpt.jpa.core.context.OverrideContainer; import org.eclipse.jpt.jpa.core.context.Override_; import org.eclipse.jpt.jpa.core.context.VirtualOverride; diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaPersistentType.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaPersistentType.java index 9638c03b0c..07ab734616 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaPersistentType.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaPersistentType.java @@ -11,7 +11,7 @@ package org.eclipse.jpt.jpa.core.context.java; import org.eclipse.jpt.common.core.resource.java.JavaResourceAttribute; import org.eclipse.jpt.common.core.resource.java.JavaResourceType; -import org.eclipse.jpt.common.utility.internal.iterables.ListIterable; +import org.eclipse.jpt.common.utility.iterable.ListIterable; import org.eclipse.jpt.jpa.core.context.PersistentType; /** diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaPrimaryKeyJoinColumnRelationshipStrategy.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaPrimaryKeyJoinColumnRelationshipStrategy.java index 003d4fdf02..e497dbafd7 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaPrimaryKeyJoinColumnRelationshipStrategy.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaPrimaryKeyJoinColumnRelationshipStrategy.java @@ -9,7 +9,7 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.context.java; -import org.eclipse.jpt.common.utility.internal.iterables.ListIterable; +import org.eclipse.jpt.common.utility.iterable.ListIterable; import org.eclipse.jpt.jpa.core.context.PrimaryKeyJoinColumnRelationshipStrategy; /** diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaQuery.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaQuery.java index dccc2168b4..0ac9368ffa 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaQuery.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaQuery.java @@ -10,7 +10,7 @@ package org.eclipse.jpt.jpa.core.context.java; import java.util.List; -import org.eclipse.jpt.common.utility.internal.iterables.ListIterable; +import org.eclipse.jpt.common.utility.iterable.ListIterable; import org.eclipse.jpt.jpa.core.context.Query; import org.eclipse.jpt.jpa.core.context.orm.OrmQueryContainer; import org.eclipse.jpt.jpa.core.jpql.JpaJpqlQueryHelper; diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaQueryContainer.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaQueryContainer.java index c2e34066b3..73f7f8cd1c 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaQueryContainer.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaQueryContainer.java @@ -10,7 +10,7 @@ package org.eclipse.jpt.jpa.core.context.java; import org.eclipse.jpt.common.core.resource.java.JavaResourceAnnotatedElement; -import org.eclipse.jpt.common.utility.internal.iterables.ListIterable; +import org.eclipse.jpt.common.utility.iterable.ListIterable; import org.eclipse.jpt.jpa.core.context.QueryContainer; /** diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaReferenceTable.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaReferenceTable.java index b93abfeda9..4b4055b26d 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaReferenceTable.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaReferenceTable.java @@ -9,7 +9,7 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.context.java; -import org.eclipse.jpt.common.utility.internal.iterables.ListIterable; +import org.eclipse.jpt.common.utility.iterable.ListIterable; import org.eclipse.jpt.jpa.core.context.ReferenceTable; import org.eclipse.jpt.jpa.core.resource.java.ReferenceTableAnnotation; diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaSecondaryTable.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaSecondaryTable.java index f36f708557..e70f12a211 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaSecondaryTable.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaSecondaryTable.java @@ -9,7 +9,7 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.context.java; -import org.eclipse.jpt.common.utility.internal.iterables.ListIterable; +import org.eclipse.jpt.common.utility.iterable.ListIterable; import org.eclipse.jpt.jpa.core.context.SecondaryTable; import org.eclipse.jpt.jpa.core.resource.java.SecondaryTableAnnotation; diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaTable.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaTable.java index 93520fc5aa..58140cf2c5 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaTable.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/java/JavaTable.java @@ -9,7 +9,7 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.context.java; -import org.eclipse.jpt.common.utility.internal.iterables.ListIterable; +import org.eclipse.jpt.common.utility.iterable.ListIterable; import org.eclipse.jpt.jpa.core.context.Table; import org.eclipse.jpt.jpa.core.resource.java.BaseTableAnnotation; diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/EntityMappings.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/EntityMappings.java index 3689d199e7..52cd14799f 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/EntityMappings.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/EntityMappings.java @@ -12,7 +12,7 @@ package org.eclipse.jpt.jpa.core.context.orm; import org.eclipse.jdt.core.IPackageFragment; import org.eclipse.jdt.core.IType; import org.eclipse.jpt.common.core.resource.java.JavaResourceAbstractType; -import org.eclipse.jpt.common.utility.internal.iterables.ListIterable; +import org.eclipse.jpt.common.utility.iterable.ListIterable; import org.eclipse.jpt.jpa.core.context.AccessHolder; import org.eclipse.jpt.jpa.core.context.Generator; import org.eclipse.jpt.jpa.core.context.MappingFile; diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmAssociationOverrideContainer.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmAssociationOverrideContainer.java index 5c0bc64a86..1963c6745e 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmAssociationOverrideContainer.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmAssociationOverrideContainer.java @@ -10,7 +10,7 @@ package org.eclipse.jpt.jpa.core.context.orm; import org.eclipse.emf.common.util.EList; -import org.eclipse.jpt.common.utility.internal.iterables.ListIterable; +import org.eclipse.jpt.common.utility.iterable.ListIterable; import org.eclipse.jpt.jpa.core.context.AssociationOverrideContainer; import org.eclipse.jpt.jpa.core.context.Override_; import org.eclipse.jpt.jpa.core.context.VirtualOverride; diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmAttributeOverrideContainer.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmAttributeOverrideContainer.java index 509b250bce..12c5384a56 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmAttributeOverrideContainer.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmAttributeOverrideContainer.java @@ -10,7 +10,7 @@ package org.eclipse.jpt.jpa.core.context.orm; import org.eclipse.emf.common.util.EList; -import org.eclipse.jpt.common.utility.internal.iterables.ListIterable; +import org.eclipse.jpt.common.utility.iterable.ListIterable; import org.eclipse.jpt.jpa.core.context.AttributeOverrideContainer; import org.eclipse.jpt.jpa.core.context.Override_; import org.eclipse.jpt.jpa.core.context.VirtualOverride; diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmEntity.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmEntity.java index 0a2231800d..4819f89e9a 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmEntity.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmEntity.java @@ -9,7 +9,7 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.context.orm; -import org.eclipse.jpt.common.utility.internal.iterables.ListIterable; +import org.eclipse.jpt.common.utility.iterable.ListIterable; import org.eclipse.jpt.jpa.core.context.Entity; import org.eclipse.jpt.jpa.core.context.ReadOnlyPrimaryKeyJoinColumn; import org.eclipse.jpt.jpa.core.context.ReadOnlySecondaryTable; diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmJoinColumnRelationshipStrategy.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmJoinColumnRelationshipStrategy.java index 01ff419caa..9c132b2f67 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmJoinColumnRelationshipStrategy.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmJoinColumnRelationshipStrategy.java @@ -9,7 +9,7 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.context.orm; -import org.eclipse.jpt.common.utility.internal.iterables.ListIterable; +import org.eclipse.jpt.common.utility.iterable.ListIterable; import org.eclipse.jpt.jpa.core.context.JoinColumnRelationshipStrategy; /** diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmJoinTable.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmJoinTable.java index c7ec6c1230..d419a5b00f 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmJoinTable.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmJoinTable.java @@ -9,7 +9,7 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.context.orm; -import org.eclipse.jpt.common.utility.internal.iterables.ListIterable; +import org.eclipse.jpt.common.utility.iterable.ListIterable; import org.eclipse.jpt.jpa.core.context.JoinTable; /** diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmOverrideContainer.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmOverrideContainer.java index fb13329f3d..e90deaaaba 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmOverrideContainer.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmOverrideContainer.java @@ -10,7 +10,7 @@ package org.eclipse.jpt.jpa.core.context.orm; import org.eclipse.emf.common.util.EList; -import org.eclipse.jpt.common.utility.internal.iterables.ListIterable; +import org.eclipse.jpt.common.utility.iterable.ListIterable; import org.eclipse.jpt.jpa.core.context.OverrideContainer; import org.eclipse.jpt.jpa.core.context.Override_; import org.eclipse.jpt.jpa.core.context.VirtualOverride; diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmPersistentType.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmPersistentType.java index 0eee1d821d..f05e77f1fe 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmPersistentType.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmPersistentType.java @@ -11,7 +11,7 @@ package org.eclipse.jpt.jpa.core.context.orm; import org.eclipse.jdt.core.IPackageFragment; import org.eclipse.jdt.core.IType; -import org.eclipse.jpt.common.utility.internal.iterables.ListIterable; +import org.eclipse.jpt.common.utility.iterable.ListIterable; import org.eclipse.jpt.jpa.core.context.PersistentType; import org.eclipse.jpt.jpa.core.context.java.JavaPersistentType; import org.eclipse.text.edits.DeleteEdit; diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmPrimaryKeyJoinColumnRelationshipStrategy.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmPrimaryKeyJoinColumnRelationshipStrategy.java index cb50c1144c..fc50ef7bfc 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmPrimaryKeyJoinColumnRelationshipStrategy.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmPrimaryKeyJoinColumnRelationshipStrategy.java @@ -9,7 +9,7 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.context.orm; -import org.eclipse.jpt.common.utility.internal.iterables.ListIterable; +import org.eclipse.jpt.common.utility.iterable.ListIterable; import org.eclipse.jpt.jpa.core.context.PrimaryKeyJoinColumnRelationshipStrategy; /** diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmQuery.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmQuery.java index 4c58c44727..0cf8fd4966 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmQuery.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmQuery.java @@ -10,7 +10,7 @@ package org.eclipse.jpt.jpa.core.context.orm; import java.util.List; -import org.eclipse.jpt.common.utility.internal.iterables.ListIterable; +import org.eclipse.jpt.common.utility.iterable.ListIterable; import org.eclipse.jpt.jpa.core.context.Query; import org.eclipse.jpt.jpa.core.jpql.JpaJpqlQueryHelper; import org.eclipse.jpt.jpa.core.resource.orm.XmlQuery; diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmQueryContainer.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmQueryContainer.java index 534adeb66a..e014eb5307 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmQueryContainer.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmQueryContainer.java @@ -9,7 +9,7 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.context.orm; -import org.eclipse.jpt.common.utility.internal.iterables.ListIterable; +import org.eclipse.jpt.common.utility.iterable.ListIterable; import org.eclipse.jpt.jpa.core.context.QueryContainer; /** diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmReferenceTable.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmReferenceTable.java index a5118a1231..8d7cacf298 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmReferenceTable.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmReferenceTable.java @@ -9,7 +9,7 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.context.orm; -import org.eclipse.jpt.common.utility.internal.iterables.ListIterable; +import org.eclipse.jpt.common.utility.iterable.ListIterable; import org.eclipse.jpt.jpa.core.context.ReferenceTable; /** diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmSecondaryTable.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmSecondaryTable.java index 93f476b411..0f42a8f7df 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmSecondaryTable.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmSecondaryTable.java @@ -9,7 +9,7 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.context.orm; -import org.eclipse.jpt.common.utility.internal.iterables.ListIterable; +import org.eclipse.jpt.common.utility.iterable.ListIterable; import org.eclipse.jpt.jpa.core.context.ReadOnlySecondaryTable; import org.eclipse.jpt.jpa.core.context.SecondaryTable; import org.eclipse.jpt.jpa.core.resource.orm.XmlSecondaryTable; diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmTable.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmTable.java index 24953211a0..61800e9b80 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmTable.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmTable.java @@ -9,7 +9,7 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.context.orm; -import org.eclipse.jpt.common.utility.internal.iterables.ListIterable; +import org.eclipse.jpt.common.utility.iterable.ListIterable; import org.eclipse.jpt.jpa.core.context.Table; /** diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmVirtualSecondaryTable.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmVirtualSecondaryTable.java index 2e9cdd5081..f1393d9c67 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmVirtualSecondaryTable.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/orm/OrmVirtualSecondaryTable.java @@ -9,7 +9,7 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.context.orm; -import org.eclipse.jpt.common.utility.internal.iterables.ListIterable; +import org.eclipse.jpt.common.utility.iterable.ListIterable; import org.eclipse.jpt.jpa.core.context.VirtualSecondaryTable; import org.eclipse.jpt.jpa.core.context.java.JavaSecondaryTable; diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/persistence/ClassRef.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/persistence/ClassRef.java index 1e5f05f0e0..965b906640 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/persistence/ClassRef.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/persistence/ClassRef.java @@ -11,8 +11,8 @@ package org.eclipse.jpt.jpa.core.context.persistence; import org.eclipse.jdt.core.IPackageFragment; import org.eclipse.jdt.core.IType; -import org.eclipse.jpt.common.utility.internal.AbstractTransformer; -import org.eclipse.jpt.common.utility.internal.Transformer; +import org.eclipse.jpt.common.utility.internal.transformer.AbstractTransformer; +import org.eclipse.jpt.common.utility.transformer.Transformer; import org.eclipse.jpt.jpa.core.JpaStructureNode; import org.eclipse.jpt.jpa.core.context.PersistentType; import org.eclipse.jpt.jpa.core.context.java.JavaPersistentType; diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/persistence/JarFileRef.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/persistence/JarFileRef.java index 0a6bd15430..b74ac23217 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/persistence/JarFileRef.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/persistence/JarFileRef.java @@ -10,8 +10,8 @@ package org.eclipse.jpt.jpa.core.context.persistence; import org.eclipse.core.resources.IFolder; -import org.eclipse.jpt.common.utility.internal.AbstractTransformer; -import org.eclipse.jpt.common.utility.internal.Transformer; +import org.eclipse.jpt.common.utility.internal.transformer.AbstractTransformer; +import org.eclipse.jpt.common.utility.transformer.Transformer; import org.eclipse.jpt.jpa.core.JpaStructureNode; import org.eclipse.jpt.jpa.core.context.java.JarFile; import org.eclipse.jpt.jpa.core.resource.persistence.XmlJarFileRef; diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/persistence/MappingFileRef.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/persistence/MappingFileRef.java index dffa682b94..be29e267d4 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/persistence/MappingFileRef.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/persistence/MappingFileRef.java @@ -14,8 +14,8 @@ import org.eclipse.core.resources.IFolder; import org.eclipse.core.runtime.IPath; import org.eclipse.jdt.core.IPackageFragment; import org.eclipse.jdt.core.IType; -import org.eclipse.jpt.common.utility.internal.AbstractTransformer; -import org.eclipse.jpt.common.utility.internal.Transformer; +import org.eclipse.jpt.common.utility.internal.transformer.AbstractTransformer; +import org.eclipse.jpt.common.utility.transformer.Transformer; import org.eclipse.jpt.jpa.core.JpaStructureNode; import org.eclipse.jpt.jpa.core.context.Generator; import org.eclipse.jpt.jpa.core.context.MappingFile; diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/persistence/Persistence.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/persistence/Persistence.java index 45940485ff..892c954497 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/persistence/Persistence.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/persistence/Persistence.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2007, 2012 Oracle. All rights reserved. + * Copyright (c) 2007, 2011 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. @@ -9,7 +9,7 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.context.persistence; -import org.eclipse.jpt.common.utility.internal.iterables.ListIterable; +import org.eclipse.jpt.common.utility.iterable.ListIterable; import org.eclipse.jpt.jpa.core.context.XmlFile; import org.eclipse.jpt.jpa.core.resource.persistence.XmlPersistence; diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/persistence/PersistenceUnit.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/persistence/PersistenceUnit.java index 8e95b59886..07d0c72b33 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/persistence/PersistenceUnit.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/persistence/PersistenceUnit.java @@ -15,7 +15,7 @@ import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.jdt.core.IPackageFragment; import org.eclipse.jdt.core.IType; -import org.eclipse.jpt.common.utility.internal.iterables.ListIterable; +import org.eclipse.jpt.common.utility.iterable.ListIterable; import org.eclipse.jpt.jpa.core.JpaStructureNode; import org.eclipse.jpt.jpa.core.context.AccessType; import org.eclipse.jpt.jpa.core.context.Embeddable; diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/persistence/PersistentTypeContainer.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/persistence/PersistentTypeContainer.java index 31c9d9c65c..f48a857a84 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/persistence/PersistentTypeContainer.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/persistence/PersistentTypeContainer.java @@ -9,7 +9,7 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.context.persistence; -import org.eclipse.jpt.common.utility.internal.Transformer; +import org.eclipse.jpt.common.utility.transformer.Transformer; import org.eclipse.jpt.jpa.core.context.PersistentType; /** diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/AbstractJpaNode.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/AbstractJpaNode.java index e0a5fb62db..355b777c82 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/AbstractJpaNode.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/AbstractJpaNode.java @@ -20,16 +20,16 @@ import org.eclipse.core.resources.IResource; import org.eclipse.jdt.core.IJavaProject; import org.eclipse.jpt.common.core.internal.utility.PlatformTools; import org.eclipse.jpt.common.core.internal.utility.jdt.JDTModifiedDeclaration.Adapter; -import org.eclipse.jpt.common.utility.internal.CollectionTools; +import org.eclipse.jpt.common.utility.internal.ObjectTools; import org.eclipse.jpt.common.utility.internal.StringTools; -import org.eclipse.jpt.common.utility.internal.Tools; -import org.eclipse.jpt.common.utility.internal.iterables.ListIterable; -import org.eclipse.jpt.common.utility.internal.iterables.LiveCloneIterable; -import org.eclipse.jpt.common.utility.internal.iterables.LiveCloneListIterable; -import org.eclipse.jpt.common.utility.internal.iterators.CloneIterator; +import org.eclipse.jpt.common.utility.internal.collection.CollectionTools; +import org.eclipse.jpt.common.utility.internal.iterable.LiveCloneIterable; +import org.eclipse.jpt.common.utility.internal.iterable.LiveCloneListIterable; +import org.eclipse.jpt.common.utility.internal.iterator.CloneIterator; import org.eclipse.jpt.common.utility.internal.model.AbstractModel; import org.eclipse.jpt.common.utility.internal.model.AspectChangeSupport; import org.eclipse.jpt.common.utility.internal.model.ChangeSupport; +import org.eclipse.jpt.common.utility.iterable.ListIterable; import org.eclipse.jpt.jpa.core.JpaDataSource; import org.eclipse.jpt.jpa.core.JpaFactory; import org.eclipse.jpt.jpa.core.JpaFile; @@ -443,7 +443,7 @@ public abstract class AbstractJpaNode boolean match = false; for (Iterator<C> stream = contextElements.iterator(); stream.hasNext(); ) { C contextElement = stream.next(); - if (Tools.valuesAreEqual(this.getResourceElement(contextElement), resourceElement)) { + if (ObjectTools.equals(this.getResourceElement(contextElement), resourceElement)) { // we don't know the source index because the element has been moved by previously moved elements this.moveContextElement(resourceIndex, contextElement); stream.remove(); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/AbstractJpaPlatformProvider.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/AbstractJpaPlatformProvider.java index 9f844344d1..73df173017 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/AbstractJpaPlatformProvider.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/AbstractJpaPlatformProvider.java @@ -14,7 +14,7 @@ import java.util.HashMap; import java.util.Map; import org.eclipse.jpt.common.core.ContentTypeReference; import org.eclipse.jpt.common.core.JptResourceType; -import org.eclipse.jpt.common.utility.internal.Transformer; +import org.eclipse.jpt.common.utility.transformer.Transformer; import org.eclipse.jpt.jpa.core.JpaPlatformProvider; import org.eclipse.jpt.jpa.core.JpaResourceModelProvider; import org.eclipse.jpt.jpa.core.ResourceDefinition; diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/AbstractJpaProject.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/AbstractJpaProject.java index 7ba70e3478..f483e82450 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/AbstractJpaProject.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/AbstractJpaProject.java @@ -62,16 +62,17 @@ import org.eclipse.jpt.common.core.utility.command.JobCommand; import org.eclipse.jpt.common.core.utility.command.JobCommandExecutor; import org.eclipse.jpt.common.core.utility.command.NotifyingRepeatingJobCommand; import org.eclipse.jpt.common.core.utility.command.RepeatingJobCommand; -import org.eclipse.jpt.common.utility.Filter; +import org.eclipse.jpt.common.utility.filter.Filter; import org.eclipse.jpt.common.utility.internal.BitTools; -import org.eclipse.jpt.common.utility.internal.CollectionTools; +import org.eclipse.jpt.common.utility.internal.ObjectTools; import org.eclipse.jpt.common.utility.internal.StringTools; -import org.eclipse.jpt.common.utility.internal.iterables.ArrayIterable; -import org.eclipse.jpt.common.utility.internal.iterables.CompositeIterable; -import org.eclipse.jpt.common.utility.internal.iterables.EmptyIterable; -import org.eclipse.jpt.common.utility.internal.iterables.FilteringIterable; -import org.eclipse.jpt.common.utility.internal.iterables.LiveCloneIterable; -import org.eclipse.jpt.common.utility.internal.iterables.TransformationIterable; +import org.eclipse.jpt.common.utility.internal.iterable.ArrayIterable; +import org.eclipse.jpt.common.utility.internal.iterable.CompositeIterable; +import org.eclipse.jpt.common.utility.internal.iterable.EmptyIterable; +import org.eclipse.jpt.common.utility.internal.iterable.FilteringIterable; +import org.eclipse.jpt.common.utility.internal.iterable.IterableTools; +import org.eclipse.jpt.common.utility.internal.iterable.LiveCloneIterable; +import org.eclipse.jpt.common.utility.internal.iterable.TransformationIterable; import org.eclipse.jpt.jpa.core.JpaDataSource; import org.eclipse.jpt.jpa.core.JpaFile; import org.eclipse.jpt.jpa.core.JpaPlatform; @@ -341,7 +342,7 @@ public abstract class AbstractJpaProject } @Override public String toString() { - return StringTools.buildToStringFor(this, AbstractJpaProject.this); + return ObjectTools.toString(this, AbstractJpaProject.this); } } @@ -1159,7 +1160,7 @@ public abstract class AbstractJpaProject } @Override public String toString() { - return StringTools.buildToStringFor(this, AbstractJpaProject.this); + return ObjectTools.toString(this, AbstractJpaProject.this); } } @@ -1199,7 +1200,7 @@ public abstract class AbstractJpaProject } protected boolean metamodelSourceFolderNameIsValid() { - return CollectionTools.contains(this.getJavaSourceFolderNames(), this.metamodelSourceFolderName); + return IterableTools.contains(this.getJavaSourceFolderNames(), this.metamodelSourceFolderName); } @@ -1515,7 +1516,7 @@ public abstract class AbstractJpaProject protected void validateLibraryProvider_(List<IMessage> messages) throws CoreException { Map<String, Object> enablementVariables = new HashMap<String, Object>(); enablementVariables.put(JpaLibraryProviderInstallOperationConfig.JPA_PLATFORM_ENABLEMENT_EXP, this.getJpaPlatform().getId()); - enablementVariables.put(JpaLibraryProviderInstallOperationConfig.JPA_PLATFORM_DESCRIPTION_ENABLEMENT_EXP, this.getJpaPlatform().getDescription()); + enablementVariables.put(JpaLibraryProviderInstallOperationConfig.JPA_PLATFORM_DESCRIPTION_ENABLEMENT_EXP, this.getJpaPlatform().getConfig()); ILibraryProvider libraryProvider = LibraryProviderFramework.getCurrentProvider(this.project, JpaProject.FACET); IFacetedProject facetedProject = ProjectFacetsManager.create(this.project); @@ -1533,7 +1534,7 @@ public abstract class AbstractJpaProject protected void validateConnection(List<IMessage> messages) { String cpName = this.dataSource.getConnectionProfileName(); - if (StringTools.stringIsEmpty(cpName)) { + if (StringTools.isBlank(cpName)) { messages.add( DefaultJpaValidationMessages.buildMessage( IMessage.NORMAL_SEVERITY, @@ -1632,7 +1633,7 @@ public abstract class AbstractJpaProject @Override public String toString() { - return StringTools.buildToStringFor(this, AbstractJpaProject.this); + return ObjectTools.toString(this, AbstractJpaProject.this); } } @@ -1684,7 +1685,7 @@ public abstract class AbstractJpaProject } @Override public String toString() { - return StringTools.buildToStringFor(this, AbstractJpaProject.this); + return ObjectTools.toString(this, AbstractJpaProject.this); } } @@ -1766,7 +1767,7 @@ public abstract class AbstractJpaProject } @Override public String toString() { - return StringTools.buildToStringFor(this, AbstractJpaProject.this); + return ObjectTools.toString(this, AbstractJpaProject.this); } } @@ -1890,7 +1891,7 @@ public abstract class AbstractJpaProject @Override public String toString() { - return StringTools.buildToStringFor(this, AbstractJpaProject.this); + return ObjectTools.toString(this, AbstractJpaProject.this); } } @@ -1955,7 +1956,7 @@ public abstract class AbstractJpaProject } @Override public String toString() { - return StringTools.buildToStringFor(this, AbstractJpaProject.this); + return ObjectTools.toString(this, AbstractJpaProject.this); } } @@ -2033,7 +2034,7 @@ public abstract class AbstractJpaProject } @Override public String toString() { - return StringTools.buildToStringFor(this, AbstractJpaProject.this); + return ObjectTools.toString(this, AbstractJpaProject.this); } } @@ -2067,7 +2068,7 @@ public abstract class AbstractJpaProject } @Override public String toString() { - return StringTools.buildToStringFor(this, AbstractJpaProject.this); + return ObjectTools.toString(this, AbstractJpaProject.this); } } @@ -2117,7 +2118,7 @@ public abstract class AbstractJpaProject } @Override public String toString() { - return StringTools.buildToStringFor(this, this.defaultJobName); + return ObjectTools.toString(this, this.defaultJobName); } } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/FileAdapterFactory.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/FileAdapterFactory.java index e6f52aa453..6d2d74f057 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/FileAdapterFactory.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/FileAdapterFactory.java @@ -14,7 +14,7 @@ import org.eclipse.core.resources.IProject; import org.eclipse.core.runtime.IAdapterFactory; import org.eclipse.jpt.common.core.JptResourceModel; import org.eclipse.jpt.common.core.resource.xml.JptXmlResource; -import org.eclipse.jpt.common.utility.internal.StringTools; +import org.eclipse.jpt.common.utility.internal.ObjectTools; import org.eclipse.jpt.jpa.core.JpaFile; import org.eclipse.jpt.jpa.core.JpaProject; @@ -124,7 +124,7 @@ public class FileAdapterFactory @Override public String toString() { - return StringTools.buildToStringFor(this, this.file); + return ObjectTools.toString(this, this.file); } } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/GenericJpaAnnotationDefinitionProvider.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/GenericJpaAnnotationDefinitionProvider.java index e1193d854a..5fdb6e9b11 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/GenericJpaAnnotationDefinitionProvider.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/GenericJpaAnnotationDefinitionProvider.java @@ -12,7 +12,7 @@ package org.eclipse.jpt.jpa.core.internal; import java.util.ArrayList; import org.eclipse.jpt.common.core.resource.java.AnnotationDefinition; import org.eclipse.jpt.common.core.resource.java.NestableAnnotationDefinition; -import org.eclipse.jpt.common.utility.internal.CollectionTools; +import org.eclipse.jpt.common.utility.internal.collection.CollectionTools; import org.eclipse.jpt.jpa.core.JpaAnnotationDefinitionProvider; import org.eclipse.jpt.jpa.core.internal.resource.java.AssociationOverrideAnnotationDefinition; import org.eclipse.jpt.jpa.core.internal.resource.java.AssociationOverridesAnnotationDefinition; diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/GenericJpaPlatform.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/GenericJpaPlatform.java index 41a29d63e6..400831c0d8 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/GenericJpaPlatform.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/GenericJpaPlatform.java @@ -21,7 +21,7 @@ import org.eclipse.jpt.common.core.internal.utility.PlatformTools; import org.eclipse.jpt.common.core.internal.utility.jdt.DefaultAnnotationEditFormatter; import org.eclipse.jpt.common.core.resource.java.JavaResourceCompilationUnit; import org.eclipse.jpt.common.core.utility.jdt.AnnotationEditFormatter; -import org.eclipse.jpt.common.utility.internal.StringTools; +import org.eclipse.jpt.common.utility.internal.ObjectTools; import org.eclipse.jpt.jpa.core.EntityGeneratorDatabaseAnnotationNameBuilder; import org.eclipse.jpt.jpa.core.JpaFactory; import org.eclipse.jpt.jpa.core.JpaFile; @@ -35,7 +35,7 @@ import org.eclipse.jpt.jpa.core.ResourceDefinition; import org.eclipse.jpt.jpa.core.context.java.DefaultJavaAttributeMappingDefinition; import org.eclipse.jpt.jpa.core.context.java.JavaAttributeMappingDefinition; import org.eclipse.jpt.jpa.core.context.java.JavaTypeMappingDefinition; -import org.eclipse.jpt.jpa.core.platform.JpaPlatformDescription; +import org.eclipse.jpt.jpa.core.platform.JpaPlatformConfig; import org.eclipse.jpt.jpa.core.platform.JpaPlatformManager; import org.eclipse.jpt.jpa.db.ConnectionProfileFactory; import org.eclipse.persistence.jpa.jpql.parser.JPQLGrammar; @@ -80,8 +80,8 @@ public class GenericJpaPlatform return this.id; } - public JpaPlatformDescription getDescription() { - return this.getJpaPlatformManager().getJpaPlatformDescription(this.getId()); + public JpaPlatformConfig getConfig() { + return this.getJpaPlatformManager().getJpaPlatformConfig(this.getId()); } private JpaPlatformManager getJpaPlatformManager() { @@ -98,7 +98,7 @@ public class GenericJpaPlatform @Override public String toString() { - return StringTools.buildToStringFor(this, this.id); + return ObjectTools.toString(this, this.id); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/GenericJpaPlatformProvider.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/GenericJpaPlatformProvider.java index 65e8f58e04..9fc9042572 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/GenericJpaPlatformProvider.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/GenericJpaPlatformProvider.java @@ -11,7 +11,7 @@ package org.eclipse.jpt.jpa.core.internal; import java.util.ArrayList; import org.eclipse.jpt.common.core.JptResourceType; -import org.eclipse.jpt.common.utility.internal.CollectionTools; +import org.eclipse.jpt.common.utility.internal.collection.CollectionTools; import org.eclipse.jpt.jpa.core.JpaPlatformProvider; import org.eclipse.jpt.jpa.core.JpaResourceModelProvider; import org.eclipse.jpt.jpa.core.ResourceDefinition; diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/InternalJpaProjectManager.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/InternalJpaProjectManager.java index c84bbbdcc7..687b95de49 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/InternalJpaProjectManager.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/InternalJpaProjectManager.java @@ -42,17 +42,17 @@ import org.eclipse.jpt.common.core.internal.utility.command.SimpleJobCommandExec import org.eclipse.jpt.common.core.internal.utility.command.SingleUseQueueingExtendedJobCommandExecutor; import org.eclipse.jpt.common.core.utility.command.ExtendedJobCommandExecutor; import org.eclipse.jpt.common.core.utility.command.JobCommand; -import org.eclipse.jpt.common.utility.BooleanReference; import org.eclipse.jpt.common.utility.ExceptionHandler; -import org.eclipse.jpt.common.utility.ModifiableObjectReference; import org.eclipse.jpt.common.utility.command.Command; import org.eclipse.jpt.common.utility.command.ExtendedCommandExecutor; -import org.eclipse.jpt.common.utility.internal.StringTools; +import org.eclipse.jpt.common.utility.internal.ObjectTools; import org.eclipse.jpt.common.utility.internal.command.ThreadLocalExtendedCommandExecutor; -import org.eclipse.jpt.common.utility.internal.iterables.EmptyIterable; -import org.eclipse.jpt.common.utility.internal.iterables.SingleElementIterable; -import org.eclipse.jpt.common.utility.internal.iterables.SnapshotCloneIterable; +import org.eclipse.jpt.common.utility.internal.iterable.EmptyIterable; +import org.eclipse.jpt.common.utility.internal.iterable.SingleElementIterable; +import org.eclipse.jpt.common.utility.internal.iterable.SnapshotCloneIterable; import org.eclipse.jpt.common.utility.internal.model.AbstractModel; +import org.eclipse.jpt.common.utility.reference.BooleanReference; +import org.eclipse.jpt.common.utility.reference.ModifiableObjectReference; import org.eclipse.jpt.jpa.core.JpaPlatform; import org.eclipse.jpt.jpa.core.JpaPreferences; import org.eclipse.jpt.jpa.core.JpaProject; @@ -61,7 +61,7 @@ import org.eclipse.jpt.jpa.core.JpaWorkspace; import org.eclipse.jpt.jpa.core.internal.plugin.JptJpaCorePlugin; import org.eclipse.jpt.jpa.core.internal.validation.DefaultJpaValidationMessages; import org.eclipse.jpt.jpa.core.internal.validation.JpaValidationMessages; -import org.eclipse.jpt.jpa.core.platform.JpaPlatformDescription; +import org.eclipse.jpt.jpa.core.platform.JpaPlatformConfig; import org.eclipse.jpt.jpa.core.platform.JpaPlatformManager; import org.eclipse.wst.common.project.facet.core.FacetedProjectFramework; import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion; @@ -654,8 +654,8 @@ public class InternalJpaProjectManager if (jpaFacetVersion == null) { return null; } - JpaPlatformDescription desc = this.jpaWorkspace.getJpaPlatformManager().getDefaultJpaPlatformDescription(jpaFacetVersion); - return (desc == null) ? null : desc.getId(); + JpaPlatformConfig config = this.jpaWorkspace.getJpaPlatformManager().getDefaultJpaPlatformConfig(jpaFacetVersion); + return (config == null) ? null : config.getId(); } private IProjectFacetVersion getJpaFacetVersion(IProject project) { @@ -1042,7 +1042,7 @@ public class InternalJpaProjectManager @Override public String toString() { - return StringTools.buildToStringFor(this, this.jobCommand); + return ObjectTools.toString(this, this.jobCommand); } } @@ -1109,7 +1109,7 @@ public class InternalJpaProjectManager @Override public String toString() { - return StringTools.buildToStringFor(this); + return ObjectTools.toString(this); } } @@ -1281,7 +1281,7 @@ public class InternalJpaProjectManager @Override public String toString() { - return StringTools.buildToStringFor(this); + return ObjectTools.toString(this); } } @@ -1306,7 +1306,7 @@ public class InternalJpaProjectManager @Override public String toString() { - return StringTools.buildToStringFor(this, this.isActive() ? "active" : "inactive"); //$NON-NLS-1$ //$NON-NLS-2$ + return ObjectTools.toString(this, this.isActive() ? "active" : "inactive"); //$NON-NLS-1$ //$NON-NLS-2$ } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/InternalJpaWorkspace.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/InternalJpaWorkspace.java index d4b7546335..2c8ca787aa 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/InternalJpaWorkspace.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/InternalJpaWorkspace.java @@ -10,7 +10,7 @@ package org.eclipse.jpt.jpa.core.internal; import org.eclipse.core.resources.IWorkspace; -import org.eclipse.jpt.common.utility.internal.StringTools; +import org.eclipse.jpt.common.utility.internal.ObjectTools; import org.eclipse.jpt.jpa.core.JpaWorkspace; import org.eclipse.jpt.jpa.core.internal.platform.InternalJpaPlatformManager; import org.eclipse.jpt.jpa.core.internal.plugin.JptJpaCorePlugin; @@ -35,7 +35,7 @@ public class InternalJpaWorkspace } public IWorkspace getWorkspace() { - return workspace; + return this.workspace; } /** @@ -99,6 +99,6 @@ public class InternalJpaWorkspace @Override public String toString() { - return StringTools.buildToStringFor(this, this.workspace); + return ObjectTools.toString(this, this.workspace); } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/JpaAnnotationProvider.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/JpaAnnotationProvider.java index 2bcbb2c023..3af918b86f 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/JpaAnnotationProvider.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/JpaAnnotationProvider.java @@ -17,9 +17,9 @@ import org.eclipse.jpt.common.core.resource.java.JavaResourceAnnotatedElement; import org.eclipse.jpt.common.core.resource.java.NestableAnnotation; import org.eclipse.jpt.common.core.resource.java.NestableAnnotationDefinition; import org.eclipse.jpt.common.core.utility.jdt.AnnotatedElement; -import org.eclipse.jpt.common.utility.internal.iterables.ArrayIterable; -import org.eclipse.jpt.common.utility.internal.iterables.CompositeIterable; -import org.eclipse.jpt.common.utility.internal.iterables.TransformationIterable; +import org.eclipse.jpt.common.utility.internal.iterable.ArrayIterable; +import org.eclipse.jpt.common.utility.internal.iterable.CompositeIterable; +import org.eclipse.jpt.common.utility.internal.iterable.TransformationIterable; import org.eclipse.jpt.jpa.core.JpaAnnotationDefinitionProvider; /** diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/JptResourceModelPropertyTester.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/JptResourceModelPropertyTester.java index f87642b602..84c72d814a 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/JptResourceModelPropertyTester.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/JptResourceModelPropertyTester.java @@ -14,7 +14,7 @@ import org.eclipse.core.resources.IProject; import org.eclipse.core.runtime.content.IContentType; import org.eclipse.jpt.common.core.JptResourceModel; import org.eclipse.jpt.common.core.JptResourceType; -import org.eclipse.jpt.common.utility.internal.Tools; +import org.eclipse.jpt.common.utility.internal.ObjectTools; import org.eclipse.jpt.jpa.core.JpaProject; import org.eclipse.jpt.jpa.core.resource.orm.XmlEntityMappings; @@ -65,7 +65,7 @@ public class JptResourceModelPropertyTester return true; // effectively disable "upgrade" } String latestVersion = jpaProject.getJpaPlatform().getMostRecentSupportedResourceType(resourceType.getContentType()).getVersion(); - return Tools.valuesAreEqual(resourceType.getVersion(), latestVersion); + return ObjectTools.equals(resourceType.getVersion(), latestVersion); } private boolean isGenericMappingFile(JptResourceModel resourceModel) { @@ -80,7 +80,7 @@ public class JptResourceModelPropertyTester return true; // effectively disable "upgrade" } IContentType contentType = resourceType.getContentType(); - return Tools.valuesAreEqual(contentType, XmlEntityMappings.CONTENT_TYPE); + return ObjectTools.equals(contentType, XmlEntityMappings.CONTENT_TYPE); } private JpaProject getJpaProject(IProject project) { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/ProjectAdapterFactory.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/ProjectAdapterFactory.java index 590b2a1f69..e156ea0d7e 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/ProjectAdapterFactory.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/ProjectAdapterFactory.java @@ -12,7 +12,7 @@ package org.eclipse.jpt.jpa.core.internal; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IWorkspace; import org.eclipse.core.runtime.IAdapterFactory; -import org.eclipse.jpt.common.utility.internal.StringTools; +import org.eclipse.jpt.common.utility.internal.ObjectTools; import org.eclipse.jpt.jpa.core.JpaProject; import org.eclipse.jpt.jpa.core.JpaProjectManager; import org.eclipse.wst.validation.internal.provisional.core.IMessage; @@ -123,7 +123,7 @@ public class ProjectAdapterFactory @Override public String toString() { - return StringTools.buildToStringFor(this, this.project); + return ObjectTools.toString(this, this.project); } } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/SimpleJpaProjectConfig.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/SimpleJpaProjectConfig.java index 705e78bfce..1e3dd6904c 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/SimpleJpaProjectConfig.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/SimpleJpaProjectConfig.java @@ -10,7 +10,7 @@ package org.eclipse.jpt.jpa.core.internal; import org.eclipse.core.resources.IProject; -import org.eclipse.jpt.common.utility.internal.StringTools; +import org.eclipse.jpt.common.utility.internal.ObjectTools; import org.eclipse.jpt.jpa.core.JpaPlatform; import org.eclipse.jpt.jpa.core.JpaProject; import org.eclipse.jpt.jpa.core.jpa2.JpaProject2_0; @@ -101,6 +101,6 @@ public class SimpleJpaProjectConfig @Override public String toString() { - return StringTools.buildToStringFor(this, this.project.getName()); + return ObjectTools.toString(this, this.project.getName()); } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/XmlFileAdapterFactory.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/XmlFileAdapterFactory.java index 3b0a966688..f17a991330 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/XmlFileAdapterFactory.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/XmlFileAdapterFactory.java @@ -15,12 +15,14 @@ import org.eclipse.core.runtime.IAdapterFactory; import org.eclipse.jpt.jpa.core.JpaPreferences; import org.eclipse.jpt.jpa.core.JpaWorkspace; import org.eclipse.jpt.jpa.core.context.XmlFile; -import org.eclipse.jpt.jpa.core.platform.JpaPlatformDescription; +import org.eclipse.jpt.jpa.core.platform.JpaPlatformConfig; import org.eclipse.jpt.jpa.core.platform.JpaPlatformManager; -public class XmlFileAdapterFactory implements IAdapterFactory { +public class XmlFileAdapterFactory + implements IAdapterFactory +{ private static final Class<?>[] ADAPTER_LIST = new Class[] { - JpaPlatformDescription.class + JpaPlatformConfig.class }; public Class<?>[] getAdapterList() { @@ -35,14 +37,14 @@ public class XmlFileAdapterFactory implements IAdapterFactory { } private Object getAdapter(IResource resource, Class<?> adapterType) { - if (adapterType == JpaPlatformDescription.class) { - return this.getJpaPlatformDescription(resource); + if (adapterType == JpaPlatformConfig.class) { + return this.getJpaPlatformConfig(resource); } return null; } - private JpaPlatformDescription getJpaPlatformDescription(IResource resource) { - return this.getJpaPlatformManager().getJpaPlatformDescription(JpaPreferences.getJpaPlatformID(resource.getProject())); + private JpaPlatformConfig getJpaPlatformConfig(IResource resource) { + return this.getJpaPlatformManager().getJpaPlatformConfig(JpaPreferences.getJpaPlatformID(resource.getProject())); } private JpaPlatformManager getJpaPlatformManager() { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/AttributeMappingTools.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/AttributeMappingTools.java index 796cb0e144..29c9aca93c 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/AttributeMappingTools.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/AttributeMappingTools.java @@ -9,7 +9,7 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.internal.context; -import org.eclipse.jpt.common.utility.internal.Transformer; +import org.eclipse.jpt.common.utility.transformer.Transformer; import org.eclipse.jpt.jpa.core.context.AttributeMapping; /** diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/ContextContainerTools.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/ContextContainerTools.java index f8c958501b..5cac57de4f 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/ContextContainerTools.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/ContextContainerTools.java @@ -12,8 +12,8 @@ package org.eclipse.jpt.jpa.core.internal.context; import java.util.ArrayList; import java.util.HashSet; import java.util.Iterator; -import org.eclipse.jpt.common.utility.internal.CollectionTools; -import org.eclipse.jpt.common.utility.internal.Tools; +import org.eclipse.jpt.common.utility.internal.ObjectTools; +import org.eclipse.jpt.common.utility.internal.collection.CollectionTools; import org.eclipse.jpt.jpa.core.context.JpaContextNode; /** @@ -102,7 +102,7 @@ public class ContextContainerTools { boolean match = false; for (Iterator<C> stream = contextElements.iterator(); stream.hasNext(); ) { C contextElement = stream.next(); - if (Tools.valuesAreEqual(adapter.getResourceElement(contextElement), resourceElement)) { + if (ObjectTools.equals(adapter.getResourceElement(contextElement), resourceElement)) { // we don't know the source index because the element has been moved by previously moved elements adapter.moveContextElement(resourceIndex, contextElement); stream.remove(); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/JptValidator.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/JptValidator.java index 9b3ecb21a5..9017a4078d 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/JptValidator.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/JptValidator.java @@ -10,7 +10,8 @@ package org.eclipse.jpt.jpa.core.internal.context; import java.util.List; -import org.eclipse.jpt.common.utility.internal.StringTools; + +import org.eclipse.jpt.common.utility.internal.ObjectTools; import org.eclipse.wst.validation.internal.provisional.core.IMessage; import org.eclipse.wst.validation.internal.provisional.core.IReporter; @@ -38,7 +39,7 @@ public interface JptValidator } @Override public String toString() { - return StringTools.buildSingletonToString(this); + return ObjectTools.singletonToString(this); } } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/MappingTools.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/MappingTools.java index 5fe0afea85..89fce5918c 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/MappingTools.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/MappingTools.java @@ -26,12 +26,14 @@ import org.eclipse.jpt.common.core.internal.resource.java.source.SourceNode; import org.eclipse.jpt.common.core.internal.utility.JDTTools; import org.eclipse.jpt.common.core.resource.java.JavaResourceNode; import org.eclipse.jpt.common.utility.internal.ArrayTools; -import org.eclipse.jpt.common.utility.internal.ClassName; -import org.eclipse.jpt.common.utility.internal.CollectionTools; -import org.eclipse.jpt.common.utility.internal.ReflectionTools; -import org.eclipse.jpt.common.utility.internal.Transformer; -import org.eclipse.jpt.common.utility.internal.iterables.FilteringIterable; -import org.eclipse.jpt.common.utility.internal.iterables.TransformationIterable; +import org.eclipse.jpt.common.utility.internal.ClassNameTools; +import org.eclipse.jpt.common.utility.internal.TypeDeclarationTools; +import org.eclipse.jpt.common.utility.internal.collection.CollectionTools; +import org.eclipse.jpt.common.utility.internal.collection.ListTools; +import org.eclipse.jpt.common.utility.internal.iterable.FilteringIterable; +import org.eclipse.jpt.common.utility.internal.iterable.IterableTools; +import org.eclipse.jpt.common.utility.internal.iterable.TransformationIterable; +import org.eclipse.jpt.common.utility.transformer.Transformer; import org.eclipse.jpt.jpa.core.context.AttributeMapping; import org.eclipse.jpt.jpa.core.context.Column; import org.eclipse.jpt.jpa.core.context.ColumnMapping; @@ -69,21 +71,21 @@ public final class MappingTools { return false; } - int arrayDepth = ReflectionTools.getArrayDepthForTypeDeclaration(fullyQualifiedName); + int arrayDepth = TypeDeclarationTools.arrayDepth(fullyQualifiedName); if (arrayDepth > 1) { return false; // multi-dimensional arrays are not supported } if (arrayDepth == 1) { - String elementTypeName = ReflectionTools.getElementTypeNameForTypeDeclaration(fullyQualifiedName, 1); + String elementTypeName = TypeDeclarationTools.elementTypeName(fullyQualifiedName, 1); return elementTypeIsValidForBasicArray(elementTypeName); } // arrayDepth == 0 - if (ClassName.isVariablePrimitive(fullyQualifiedName)) { + if (ClassNameTools.isVariablePrimitive(fullyQualifiedName)) { return true; // any primitive but 'void' } - if (ClassName.isVariablePrimitiveWrapper(fullyQualifiedName)) { + if (ClassNameTools.isVariablePrimitiveWrapper(fullyQualifiedName)) { return true; // any primitive wrapper but 'java.lang.Void' } if (typeIsOtherValidBasicType(fullyQualifiedName)) { @@ -540,7 +542,7 @@ public final class MappingTools { * Returns sorted names of interfaces of the given project */ public static Iterable<String> getSortedJavaInterfaceNames(IJavaProject javaProject) { - return CollectionTools.sort(getJavaInterfaceNames(javaProject)); + return IterableTools.sort(getJavaInterfaceNames(javaProject)); } /** @@ -576,7 +578,7 @@ public final class MappingTools { * Returns sorted names of classes of the given project */ public static Iterable<String> getSortedJavaClassNames(IJavaProject javaProject) { - return CollectionTools.sort(getJavaClassNames(javaProject)); + return IterableTools.sort(getJavaClassNames(javaProject)); } /** @@ -642,7 +644,7 @@ public final class MappingTools { * Returns sorted names of enums in the given project */ public static Iterable<String> getSortedJavaEnumNames(IJavaProject javaProject) { - return CollectionTools.sort(getJavaEnumNames(javaProject)); + return IterableTools.sort(getJavaEnumNames(javaProject)); } /** @@ -673,7 +675,7 @@ public final class MappingTools { * Returns the names of basic array types. */ public static Iterable<String> getBasicArrayTypeNames() { - return CollectionTools.list(BASIC_ARRAY_TYPE_NAMES); + return ListTools.list(BASIC_ARRAY_TYPE_NAMES); } @@ -682,8 +684,8 @@ public final class MappingTools { */ public static Iterable<String> getPrimaryBasicTypeNamesWithoutPrimitives() { List<String> names = new ArrayList<String>(); - names.addAll(CollectionTools.list(PRIMITIVE_WRAPPER_TYPE_NAMES)); - names.addAll(CollectionTools.list(OTHER_VALID_BASIC_TYPE_NAMES)); + CollectionTools.addAll(names, PRIMITIVE_WRAPPER_TYPE_NAMES); + CollectionTools.addAll(names, OTHER_VALID_BASIC_TYPE_NAMES); return names; } @@ -692,9 +694,9 @@ public final class MappingTools { */ public static Iterable<String> getPrimaryBasicTypeNames() { List<String> names = new ArrayList<String>(); - names.addAll(CollectionTools.list(PRIMITIVE_TYPE_NAMES)); - names.addAll(CollectionTools.list(PRIMITIVE_WRAPPER_TYPE_NAMES)); - names.addAll(CollectionTools.list(OTHER_VALID_BASIC_TYPE_NAMES)); + CollectionTools.addAll(names, PRIMITIVE_TYPE_NAMES); + CollectionTools.addAll(names, PRIMITIVE_WRAPPER_TYPE_NAMES); + CollectionTools.addAll(names, OTHER_VALID_BASIC_TYPE_NAMES); return names; } @@ -708,8 +710,8 @@ public final class MappingTools { */ public static Iterable<String> getAllBasicTypeNames() { List<String> names = new ArrayList<String>(); - names.addAll(CollectionTools.list(getPrimaryBasicTypeNames())); - names.addAll(CollectionTools.list(BASIC_ARRAY_TYPE_NAMES)); + CollectionTools.addAll(names, getPrimaryBasicTypeNames()); + CollectionTools.addAll(names, BASIC_ARRAY_TYPE_NAMES); names.add(Enum.class.getSimpleName()); return names; } @@ -719,7 +721,7 @@ public final class MappingTools { */ public static Iterable<String> getCollectionTypeNames() { List<String> names = new ArrayList<String>(); - names.addAll(CollectionTools.list(COLLECTION_TYPE_NAMES)); + CollectionTools.addAll(names, COLLECTION_TYPE_NAMES); return names; } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/TypeMappingTools.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/TypeMappingTools.java index f9b0287c3a..bc40d943f3 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/TypeMappingTools.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/TypeMappingTools.java @@ -9,12 +9,12 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.internal.context; -import org.eclipse.jpt.common.utility.internal.CollectionTools; -import org.eclipse.jpt.common.utility.internal.Transformer; -import org.eclipse.jpt.common.utility.internal.iterables.CompositeIterable; -import org.eclipse.jpt.common.utility.internal.iterables.FilteringIterable; -import org.eclipse.jpt.common.utility.internal.iterables.SubIterableWrapper; -import org.eclipse.jpt.common.utility.internal.iterables.TransformationIterable; +import org.eclipse.jpt.common.utility.internal.iterable.CompositeIterable; +import org.eclipse.jpt.common.utility.internal.iterable.FilteringIterable; +import org.eclipse.jpt.common.utility.internal.iterable.IterableTools; +import org.eclipse.jpt.common.utility.internal.iterable.SubIterableWrapper; +import org.eclipse.jpt.common.utility.internal.iterable.TransformationIterable; +import org.eclipse.jpt.common.utility.transformer.Transformer; import org.eclipse.jpt.jpa.core.MappingKeys; import org.eclipse.jpt.jpa.core.context.AttributeMapping; import org.eclipse.jpt.jpa.core.context.ReadOnlyTable; @@ -41,7 +41,7 @@ public class TypeMappingTools { // the attribute name may be qualified - we test only the first attribute name int dotIndex = attributeName.indexOf('.'); attributeName = (dotIndex == -1) ? attributeName : attributeName.substring(0, dotIndex); - return CollectionTools.contains(getMapsIdDerivedIdAttributeNames(typeMapping), attributeName); + return IterableTools.contains(getMapsIdDerivedIdAttributeNames(typeMapping), attributeName); } /** diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractAccessor.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractAccessor.java index fdc8506ac2..980ab6feee 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractAccessor.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractAccessor.java @@ -18,9 +18,9 @@ import org.eclipse.jpt.common.core.resource.java.JavaResourceType; import org.eclipse.jpt.common.core.resource.java.NestableAnnotation; import org.eclipse.jpt.common.core.utility.TextRange; import org.eclipse.jpt.common.core.utility.jdt.TypeBinding; -import org.eclipse.jpt.common.utility.internal.iterables.EmptyIterable; -import org.eclipse.jpt.common.utility.internal.iterables.EmptyListIterable; -import org.eclipse.jpt.common.utility.internal.iterables.ListIterable; +import org.eclipse.jpt.common.utility.internal.iterable.EmptyIterable; +import org.eclipse.jpt.common.utility.internal.iterable.EmptyListIterable; +import org.eclipse.jpt.common.utility.iterable.ListIterable; import org.eclipse.jpt.jpa.core.context.ReadOnlyPersistentAttribute; import org.eclipse.jpt.jpa.core.context.java.Accessor; diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaAttributeMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaAttributeMapping.java index b67fe399af..92ceac600f 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaAttributeMapping.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaAttributeMapping.java @@ -14,9 +14,9 @@ import java.util.List; import org.eclipse.jpt.common.core.resource.java.Annotation; import org.eclipse.jpt.common.core.resource.java.JavaResourceAttribute; import org.eclipse.jpt.common.core.utility.TextRange; -import org.eclipse.jpt.common.utility.internal.Transformer; -import org.eclipse.jpt.common.utility.internal.iterables.EmptyIterable; -import org.eclipse.jpt.common.utility.internal.iterables.SingleElementIterable; +import org.eclipse.jpt.common.utility.internal.iterable.EmptyIterable; +import org.eclipse.jpt.common.utility.internal.iterable.SingleElementIterable; +import org.eclipse.jpt.common.utility.transformer.Transformer; import org.eclipse.jpt.jpa.core.context.AttributeMapping; import org.eclipse.jpt.jpa.core.context.Column; import org.eclipse.jpt.jpa.core.context.ColumnMapping; diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaBaseColumn.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaBaseColumn.java index 2e8f9695a2..b21d4b41e2 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaBaseColumn.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaBaseColumn.java @@ -11,6 +11,7 @@ package org.eclipse.jpt.jpa.core.internal.context.java; import org.eclipse.jpt.common.core.utility.TextRange; import org.eclipse.jpt.common.utility.internal.StringTools; +import org.eclipse.jpt.common.utility.internal.iterable.TransformationIterable; import org.eclipse.jpt.jpa.core.context.JpaContextNode; import org.eclipse.jpt.jpa.core.context.ReadOnlyBaseColumn; import org.eclipse.jpt.jpa.core.context.java.JavaBaseColumn; @@ -343,7 +344,8 @@ public abstract class AbstractJavaBaseColumn<A extends BaseColumnAnnotation, O e } protected Iterable<String> getJavaCandidateTableNames() { - return StringTools.convertToJavaStringLiteralContents(this.getCandidateTableNames()); + return new TransformationIterable<String, String>(this.getCandidateTableNames(), + StringTools.JAVA_STRING_LITERAL_CONTENT_TRANSFORMER); } public Iterable<String> getCandidateTableNames() { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaBaseEmbeddedMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaBaseEmbeddedMapping.java index f8690c64bc..50e04aef66 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaBaseEmbeddedMapping.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaBaseEmbeddedMapping.java @@ -13,10 +13,10 @@ import java.util.List; import org.eclipse.jpt.common.core.resource.java.Annotation; import org.eclipse.jpt.common.core.resource.java.JavaResourceMember; import org.eclipse.jpt.common.core.utility.TextRange; -import org.eclipse.jpt.common.utility.internal.Transformer; -import org.eclipse.jpt.common.utility.internal.iterables.CompositeIterable; -import org.eclipse.jpt.common.utility.internal.iterables.EmptyIterable; -import org.eclipse.jpt.common.utility.internal.iterables.TransformationIterable; +import org.eclipse.jpt.common.utility.internal.iterable.CompositeIterable; +import org.eclipse.jpt.common.utility.internal.iterable.EmptyIterable; +import org.eclipse.jpt.common.utility.internal.iterable.TransformationIterable; +import org.eclipse.jpt.common.utility.transformer.Transformer; import org.eclipse.jpt.jpa.core.context.AttributeMapping; import org.eclipse.jpt.jpa.core.context.AttributeOverride; import org.eclipse.jpt.jpa.core.context.AttributeOverrideContainer; diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaBasicMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaBasicMapping.java index 04a8236db0..8537ce019d 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaBasicMapping.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaBasicMapping.java @@ -12,9 +12,9 @@ package org.eclipse.jpt.jpa.core.internal.context.java; import java.util.List; import org.eclipse.jpt.common.core.resource.java.Annotation; import org.eclipse.jpt.common.core.resource.java.JavaResourceAttribute; -import org.eclipse.jpt.common.utility.internal.Association; +import org.eclipse.jpt.common.utility.Association; import org.eclipse.jpt.common.utility.internal.SimpleAssociation; -import org.eclipse.jpt.common.utility.internal.iterables.ArrayIterable; +import org.eclipse.jpt.common.utility.internal.iterable.ArrayIterable; import org.eclipse.jpt.jpa.core.JpaFactory; import org.eclipse.jpt.jpa.core.MappingKeys; import org.eclipse.jpt.jpa.core.context.Converter; 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 711cdea1e2..100797d240 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 @@ -9,7 +9,7 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.internal.context.java; -import org.eclipse.jpt.common.utility.internal.Tools; +import org.eclipse.jpt.common.utility.internal.ObjectTools; import org.eclipse.jpt.jpa.core.context.DbGenerator; import org.eclipse.jpt.jpa.core.context.Generator; import org.eclipse.jpt.jpa.core.context.java.JavaDbGenerator; @@ -137,8 +137,8 @@ public abstract class AbstractJavaDbGenerator<A extends DbGeneratorAnnotation> protected boolean isEquivalentTo(DbGenerator generator) { return super.isEquivalentTo(generator) && - Tools.valuesAreEqual(this.specifiedAllocationSize, generator.getSpecifiedAllocationSize()) && - Tools.valuesAreEqual(this.specifiedInitialValue, generator.getSpecifiedInitialValue()); + ObjectTools.equals(this.specifiedAllocationSize, generator.getSpecifiedAllocationSize()) && + ObjectTools.equals(this.specifiedInitialValue, generator.getSpecifiedInitialValue()); } // ********** database stuff ********** diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaEmbeddable.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaEmbeddable.java index 95b5e3d1a7..58d0c14da5 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaEmbeddable.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaEmbeddable.java @@ -9,7 +9,7 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.internal.context.java; -import org.eclipse.jpt.common.utility.internal.iterables.EmptyIterable; +import org.eclipse.jpt.common.utility.internal.iterable.EmptyIterable; import org.eclipse.jpt.jpa.core.MappingKeys; import org.eclipse.jpt.jpa.core.context.Query; import org.eclipse.jpt.jpa.core.context.java.JavaEmbeddable; diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaEmbeddedIdMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaEmbeddedIdMapping.java index 1f1463eaa8..c3ba550fcb 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaEmbeddedIdMapping.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaEmbeddedIdMapping.java @@ -11,17 +11,15 @@ package org.eclipse.jpt.jpa.core.internal.context.java; import java.io.Serializable; import java.util.List; - import org.eclipse.jpt.common.core.internal.utility.JDTTools; import org.eclipse.jpt.common.core.resource.java.JavaResourceType; -import org.eclipse.jpt.common.utility.internal.iterables.EmptyIterable; -import org.eclipse.jpt.common.utility.internal.iterables.FilteringIterable; +import org.eclipse.jpt.common.utility.internal.iterable.EmptyIterable; +import org.eclipse.jpt.common.utility.internal.iterable.FilteringIterable; import org.eclipse.jpt.jpa.core.MappingKeys; import org.eclipse.jpt.jpa.core.context.TypeMapping; import org.eclipse.jpt.jpa.core.context.java.JavaAttributeOverrideContainer; import org.eclipse.jpt.jpa.core.context.java.JavaEmbeddedIdMapping; import org.eclipse.jpt.jpa.core.context.java.JavaPersistentAttribute; -import org.eclipse.jpt.jpa.core.internal.context.java.AbstractJavaBaseEmbeddedMapping; import org.eclipse.jpt.jpa.core.internal.validation.DefaultJpaValidationMessages; import org.eclipse.jpt.jpa.core.internal.validation.JpaValidationMessages; import org.eclipse.jpt.jpa.core.jpa2.context.EmbeddedIdMapping2_0; diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaEmbeddedMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaEmbeddedMapping.java index a8f8dcb6d5..1f5f783c31 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaEmbeddedMapping.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaEmbeddedMapping.java @@ -12,8 +12,8 @@ package org.eclipse.jpt.jpa.core.internal.context.java; import java.util.List; import org.eclipse.jpt.common.core.resource.java.JavaResourceAttribute; import org.eclipse.jpt.common.core.utility.TextRange; -import org.eclipse.jpt.common.utility.internal.iterables.CompositeIterable; -import org.eclipse.jpt.common.utility.internal.iterables.EmptyIterable; +import org.eclipse.jpt.common.utility.internal.iterable.CompositeIterable; +import org.eclipse.jpt.common.utility.internal.iterable.EmptyIterable; import org.eclipse.jpt.jpa.core.MappingKeys; import org.eclipse.jpt.jpa.core.context.AssociationOverride; import org.eclipse.jpt.jpa.core.context.AssociationOverrideContainer; diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaEntity.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaEntity.java index dda338b08b..3f664b53a5 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaEntity.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaEntity.java @@ -16,19 +16,19 @@ import org.eclipse.jpt.common.core.resource.java.JavaResourceMember; import org.eclipse.jpt.common.core.resource.java.JavaResourceType; import org.eclipse.jpt.common.core.resource.java.NestableAnnotation; import org.eclipse.jpt.common.core.utility.TextRange; -import org.eclipse.jpt.common.utility.internal.CollectionTools; -import org.eclipse.jpt.common.utility.internal.NotNullFilter; +import org.eclipse.jpt.common.utility.internal.ObjectTools; import org.eclipse.jpt.common.utility.internal.StringTools; -import org.eclipse.jpt.common.utility.internal.Tools; -import org.eclipse.jpt.common.utility.internal.iterables.CompositeIterable; -import org.eclipse.jpt.common.utility.internal.iterables.EmptyIterable; -import org.eclipse.jpt.common.utility.internal.iterables.EmptyListIterable; -import org.eclipse.jpt.common.utility.internal.iterables.FilteringIterable; -import org.eclipse.jpt.common.utility.internal.iterables.ListIterable; -import org.eclipse.jpt.common.utility.internal.iterables.LiveCloneListIterable; -import org.eclipse.jpt.common.utility.internal.iterables.SingleElementListIterable; -import org.eclipse.jpt.common.utility.internal.iterables.SubListIterableWrapper; -import org.eclipse.jpt.common.utility.internal.iterables.TransformationIterable; +import org.eclipse.jpt.common.utility.internal.filter.NotNullFilter; +import org.eclipse.jpt.common.utility.internal.iterable.CompositeIterable; +import org.eclipse.jpt.common.utility.internal.iterable.EmptyIterable; +import org.eclipse.jpt.common.utility.internal.iterable.EmptyListIterable; +import org.eclipse.jpt.common.utility.internal.iterable.FilteringIterable; +import org.eclipse.jpt.common.utility.internal.iterable.IterableTools; +import org.eclipse.jpt.common.utility.internal.iterable.LiveCloneListIterable; +import org.eclipse.jpt.common.utility.internal.iterable.SingleElementListIterable; +import org.eclipse.jpt.common.utility.internal.iterable.SubListIterableWrapper; +import org.eclipse.jpt.common.utility.internal.iterable.TransformationIterable; +import org.eclipse.jpt.common.utility.iterable.ListIterable; import org.eclipse.jpt.jpa.core.JpaPlatformVariation.Supported; import org.eclipse.jpt.jpa.core.MappingKeys; import org.eclipse.jpt.jpa.core.context.AssociationOverride; @@ -323,8 +323,8 @@ public abstract class AbstractJavaEntity String typeName = this.getPersistentType().getName(); String entityTypeName = entity.getPersistentType().getName(); String rootEntityTypeName = entity.getRootEntity().getPersistentType().getName(); - return Tools.valuesAreDifferent(typeName, entityTypeName) && - Tools.valuesAreEqual(typeName, rootEntityTypeName); + return ObjectTools.notEquals(typeName, entityTypeName) && + ObjectTools.equals(typeName, rootEntityTypeName); } @@ -1044,7 +1044,7 @@ public abstract class AbstractJavaEntity if (tableName != null && tableName.equals(this.getPrimaryTableName())) { return true; } - return CollectionTools.contains(this.getAllAssociatedTableNames(), tableName); + return IterableTools.contains(this.getAllAssociatedTableNames(), tableName); } @@ -1328,7 +1328,7 @@ public abstract class AbstractJavaEntity } protected void validateEntityName(List<IMessage> messages) { - if (StringTools.stringIsEmpty(this.getName())){ + if (StringTools.isBlank(this.getName())){ messages.add( DefaultJpaValidationMessages.buildMessage( IMessage.HIGH_SEVERITY, diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaGenerator.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaGenerator.java index d47ae6e6ca..20178da342 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaGenerator.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaGenerator.java @@ -11,8 +11,8 @@ package org.eclipse.jpt.jpa.core.internal.context.java; import java.util.List; import org.eclipse.jpt.common.core.utility.TextRange; +import org.eclipse.jpt.common.utility.internal.ObjectTools; import org.eclipse.jpt.common.utility.internal.StringTools; -import org.eclipse.jpt.common.utility.internal.Tools; import org.eclipse.jpt.jpa.core.context.Generator; import org.eclipse.jpt.jpa.core.context.JpaNamedContextNode; import org.eclipse.jpt.jpa.core.context.java.JavaGenerator; @@ -75,7 +75,7 @@ public abstract class AbstractJavaGenerator<A extends GeneratorAnnotation> public void validate(List<IMessage> messages, IReporter reporter) { super.validate(messages, reporter); - if (StringTools.stringIsEmpty(this.name)){ + if (StringTools.isBlank(this.name)){ messages.add( DefaultJpaValidationMessages.buildMessage( IMessage.HIGH_SEVERITY, @@ -105,7 +105,7 @@ public abstract class AbstractJavaGenerator<A extends GeneratorAnnotation> } protected boolean isEquivalentTo(Generator generator) { - return Tools.valuesAreEqual(this.name, generator.getName()); + return ObjectTools.equals(this.name, generator.getName()); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaIdMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaIdMapping.java index 91eb0dfebe..a44219f473 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaIdMapping.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaIdMapping.java @@ -14,10 +14,10 @@ import org.eclipse.jpt.common.core.resource.java.Annotation; import org.eclipse.jpt.common.core.resource.java.JavaResourceAttribute; import org.eclipse.jpt.common.core.resource.java.JavaResourceMember; import org.eclipse.jpt.common.core.utility.TextRange; +import org.eclipse.jpt.common.utility.Association; import org.eclipse.jpt.common.utility.internal.ArrayTools; -import org.eclipse.jpt.common.utility.internal.Association; import org.eclipse.jpt.common.utility.internal.SimpleAssociation; -import org.eclipse.jpt.common.utility.internal.iterables.ArrayIterable; +import org.eclipse.jpt.common.utility.internal.iterable.ArrayIterable; import org.eclipse.jpt.jpa.core.JpaFactory; import org.eclipse.jpt.jpa.core.MappingKeys; import org.eclipse.jpt.jpa.core.context.Converter; diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaJoinColumnRelationshipStrategy.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaJoinColumnRelationshipStrategy.java index f8bbed8619..c21301ddd7 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaJoinColumnRelationshipStrategy.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaJoinColumnRelationshipStrategy.java @@ -12,10 +12,10 @@ package org.eclipse.jpt.jpa.core.internal.context.java; import java.util.List; import org.eclipse.jpt.common.core.utility.TextRange; -import org.eclipse.jpt.common.utility.internal.iterables.EmptyIterable; -import org.eclipse.jpt.common.utility.internal.iterables.EmptyListIterable; -import org.eclipse.jpt.common.utility.internal.iterables.ListIterable; -import org.eclipse.jpt.common.utility.internal.iterables.SingleElementListIterable; +import org.eclipse.jpt.common.utility.internal.iterable.EmptyIterable; +import org.eclipse.jpt.common.utility.internal.iterable.EmptyListIterable; +import org.eclipse.jpt.common.utility.internal.iterable.SingleElementListIterable; +import org.eclipse.jpt.common.utility.iterable.ListIterable; import org.eclipse.jpt.jpa.core.context.JoinColumn; import org.eclipse.jpt.jpa.core.context.ReadOnlyJoinColumn; import org.eclipse.jpt.jpa.core.context.ReadOnlyJoinColumnRelationshipStrategy; diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaJoinTableRelationshipStrategy.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaJoinTableRelationshipStrategy.java index 9140486f2b..bab02d8570 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaJoinTableRelationshipStrategy.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaJoinTableRelationshipStrategy.java @@ -12,7 +12,7 @@ package org.eclipse.jpt.jpa.core.internal.context.java; import java.util.List; import org.eclipse.jpt.common.core.utility.TextRange; -import org.eclipse.jpt.common.utility.internal.Tools; +import org.eclipse.jpt.common.utility.internal.ObjectTools; import org.eclipse.jpt.jpa.core.context.ReadOnlyJoinTable; import org.eclipse.jpt.jpa.core.context.ReadOnlyJoinTableRelationshipStrategy; import org.eclipse.jpt.jpa.core.context.ReadOnlyTable; @@ -142,7 +142,7 @@ public abstract class AbstractJavaJoinTableRelationshipStrategy } public boolean tableNameIsInvalid(String tableName) { - return Tools.valuesAreDifferent(this.getTableName(), tableName); + return ObjectTools.notEquals(this.getTableName(), tableName); } public String getColumnTableNotValidDescription() { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaMultiRelationshipMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaMultiRelationshipMapping.java index a7cd61dace..f87629ca36 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaMultiRelationshipMapping.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaMultiRelationshipMapping.java @@ -15,16 +15,17 @@ import org.eclipse.jpt.common.core.resource.java.Annotation; import org.eclipse.jpt.common.core.resource.java.JavaResourceAttribute; import org.eclipse.jpt.common.core.resource.java.NestableAnnotation; import org.eclipse.jpt.common.core.utility.TextRange; -import org.eclipse.jpt.common.utility.internal.Association; +import org.eclipse.jpt.common.utility.Association; +import org.eclipse.jpt.common.utility.internal.ObjectTools; import org.eclipse.jpt.common.utility.internal.SimpleAssociation; import org.eclipse.jpt.common.utility.internal.StringTools; -import org.eclipse.jpt.common.utility.internal.Tools; -import org.eclipse.jpt.common.utility.internal.iterables.ArrayIterable; -import org.eclipse.jpt.common.utility.internal.iterables.EmptyIterable; -import org.eclipse.jpt.common.utility.internal.iterables.EmptyListIterable; -import org.eclipse.jpt.common.utility.internal.iterables.ListIterable; -import org.eclipse.jpt.common.utility.internal.iterables.SingleElementListIterable; -import org.eclipse.jpt.common.utility.internal.iterables.SubListIterableWrapper; +import org.eclipse.jpt.common.utility.internal.iterable.ArrayIterable; +import org.eclipse.jpt.common.utility.internal.iterable.EmptyIterable; +import org.eclipse.jpt.common.utility.internal.iterable.EmptyListIterable; +import org.eclipse.jpt.common.utility.internal.iterable.SingleElementListIterable; +import org.eclipse.jpt.common.utility.internal.iterable.SubListIterableWrapper; +import org.eclipse.jpt.common.utility.internal.iterable.TransformationIterable; +import org.eclipse.jpt.common.utility.iterable.ListIterable; import org.eclipse.jpt.jpa.core.JpaFactory; import org.eclipse.jpt.jpa.core.context.AttributeOverrideContainer; import org.eclipse.jpt.jpa.core.context.Column; @@ -921,7 +922,8 @@ public abstract class AbstractJavaMultiRelationshipMapping<A extends Relationshi } protected Iterable<String> getJavaCandidateMapKeyNames() { - return StringTools.convertToJavaStringLiteralContents(this.getCandidateMapKeyNames()); + return new TransformationIterable<String, String>(this.getCandidateMapKeyNames(), + StringTools.JAVA_STRING_LITERAL_CONTENT_TRANSFORMER); } public Iterable<String> getCandidateMapKeyNames() { @@ -1170,7 +1172,7 @@ public abstract class AbstractJavaMultiRelationshipMapping<A extends Relationshi * the default table name. the table is always the collection table */ public boolean tableNameIsInvalid(String tableName) { - return Tools.valuesAreDifferent(this.getDefaultTableName(), tableName); + return ObjectTools.notEquals(this.getDefaultTableName(), tableName); } public Iterable<String> getAllOverridableNames() { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaNamedColumn.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaNamedColumn.java index 735064c38f..28bb39b0ea 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaNamedColumn.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaNamedColumn.java @@ -12,7 +12,9 @@ package org.eclipse.jpt.jpa.core.internal.context.java; import java.util.List; import org.eclipse.jpt.common.core.utility.TextRange; import org.eclipse.jpt.common.utility.internal.StringTools; -import org.eclipse.jpt.common.utility.internal.iterables.EmptyIterable; +import org.eclipse.jpt.common.utility.internal.iterable.EmptyIterable; +import org.eclipse.jpt.common.utility.internal.iterable.FilteringIterable; +import org.eclipse.jpt.common.utility.internal.iterable.TransformationIterable; import org.eclipse.jpt.jpa.core.context.JpaContextNode; import org.eclipse.jpt.jpa.core.context.ReadOnlyNamedColumn; import org.eclipse.jpt.jpa.core.context.java.JavaNamedColumn; @@ -238,7 +240,8 @@ public abstract class AbstractJavaNamedColumn<A extends NamedColumnAnnotation, O } protected Iterable<String> getJavaCandidateNames() { - return StringTools.convertToJavaStringLiteralContents(this.getCandidateNames()); + return new TransformationIterable<String, String>(this.getCandidateNames(), + StringTools.JAVA_STRING_LITERAL_CONTENT_TRANSFORMER); } protected Iterable<String> getCandidateNames() { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaOverride.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaOverride.java index 95f632bc9e..6d84279561 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaOverride.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaOverride.java @@ -12,6 +12,8 @@ package org.eclipse.jpt.jpa.core.internal.context.java; import java.util.List; import org.eclipse.jpt.common.core.utility.TextRange; import org.eclipse.jpt.common.utility.internal.StringTools; +import org.eclipse.jpt.common.utility.internal.iterable.FilteringIterable; +import org.eclipse.jpt.common.utility.internal.iterable.TransformationIterable; import org.eclipse.jpt.jpa.core.context.ReadOnlyBaseColumn; import org.eclipse.jpt.jpa.core.context.ReadOnlyOverride; import org.eclipse.jpt.jpa.core.context.ReadOnlyTableColumn.Owner; @@ -197,7 +199,8 @@ public abstract class AbstractJavaOverride<C extends JavaOverrideContainer, A ex } protected Iterable<String> getJavaCandidateNames() { - return StringTools.convertToJavaStringLiteralContents(this.getCandidateNames()); + return new TransformationIterable<String, String>(this.getCandidateNames(), + StringTools.JAVA_STRING_LITERAL_CONTENT_TRANSFORMER); } protected abstract Iterable<String> getCandidateNames(); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaPersistentAttribute.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaPersistentAttribute.java index 18c06717a1..4241b52c8f 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaPersistentAttribute.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaPersistentAttribute.java @@ -21,11 +21,11 @@ import org.eclipse.jpt.common.core.resource.java.JavaResourceMethod; import org.eclipse.jpt.common.core.resource.java.JavaResourcePackageFragmentRoot; import org.eclipse.jpt.common.core.utility.TextRange; import org.eclipse.jpt.common.core.utility.jdt.TypeBinding; -import org.eclipse.jpt.common.utility.internal.ClassName; -import org.eclipse.jpt.common.utility.internal.ReflectionTools; -import org.eclipse.jpt.common.utility.internal.Tools; -import org.eclipse.jpt.common.utility.internal.iterables.ArrayIterable; -import org.eclipse.jpt.common.utility.internal.iterables.EmptyIterable; +import org.eclipse.jpt.common.utility.internal.ClassNameTools; +import org.eclipse.jpt.common.utility.internal.ObjectTools; +import org.eclipse.jpt.common.utility.internal.TypeDeclarationTools; +import org.eclipse.jpt.common.utility.internal.iterable.ArrayIterable; +import org.eclipse.jpt.common.utility.internal.iterable.EmptyIterable; import org.eclipse.jpt.jpa.core.JpaFile; import org.eclipse.jpt.jpa.core.JpaStructureNode; import org.eclipse.jpt.jpa.core.context.AccessType; @@ -325,7 +325,7 @@ public abstract class AbstractJavaPersistentAttribute */ protected JavaAttributeMapping buildMapping_(JavaAttributeMappingDefinition definition) { // 'mapping' is null during construction - if ((this.mapping != null) && this.mapping.isDefault() && Tools.valuesAreEqual(this.mapping.getKey(), definition.getKey())) { + if ((this.mapping != null) && this.mapping.isDefault() && ObjectTools.equals(this.mapping.getKey(), definition.getKey())) { this.mapping.updateDefault(); // since nothing here changes, we need to update the mapping's flag return this.mapping; } @@ -355,7 +355,7 @@ public abstract class AbstractJavaPersistentAttribute return null; } for (JavaAttributeMappingDefinition definition : this.getSpecifiedMappingDefinitions()) { - if (Tools.valuesAreEqual(definition.getKey(), key)) { + if (ObjectTools.equals(definition.getKey(), key)) { return definition; } } @@ -403,7 +403,7 @@ public abstract class AbstractJavaPersistentAttribute JavaAttributeMappingDefinition defaultDefinition = this.getDefaultMappingDefinition(); String newDefaultKey = (defaultDefinition == null) ? null : defaultDefinition.getKey(); - if (Tools.valuesAreDifferent(this.mapping.getKey(), newDefaultKey)) { + if (ObjectTools.notEquals(this.mapping.getKey(), newDefaultKey)) { newDefinition = defaultDefinition; // the default mapping has changed - hold on to the definition } this.setDefaultMappingKey(newDefaultKey); @@ -412,7 +412,7 @@ public abstract class AbstractJavaPersistentAttribute String newSpecifiedKey = (specifiedDefinition == null) ? null : specifiedDefinition.getKey(); if (specifiedDefinition != null) { newDefinition = null; // unset definition if it was set from default calculation - if (this.mapping.isDefault() || Tools.valuesAreDifferent(this.mapping.getKey(), newSpecifiedKey)) { + if (this.mapping.isDefault() || ObjectTools.notEquals(this.mapping.getKey(), newSpecifiedKey)) { newDefinition = specifiedDefinition; // mapping is now specified or a different specified } } @@ -494,21 +494,21 @@ public abstract class AbstractJavaPersistentAttribute return false; } - int arrayDepth = ReflectionTools.getArrayDepthForTypeDeclaration(typeName); + int arrayDepth = TypeDeclarationTools.arrayDepth(typeName); if (arrayDepth > 1) { return false; // multi-dimensional arrays are not supported } if (arrayDepth == 1) { - String elementTypeName = ReflectionTools.getElementTypeNameForTypeDeclaration(typeName, 1); + String elementTypeName = TypeDeclarationTools.elementTypeName(typeName, 1); return MappingTools.elementTypeIsValidForBasicArray(elementTypeName); } // arrayDepth == 0 - if (ClassName.isVariablePrimitive(typeName)) { + if (ClassNameTools.isVariablePrimitive(typeName)) { return true; // any primitive but 'void' } - if (ClassName.isVariablePrimitiveWrapper(typeName)) { + if (ClassNameTools.isVariablePrimitiveWrapper(typeName)) { return true; // any primitive wrapper but 'java.lang.Void' } if (MappingTools.typeIsOtherValidBasicType(typeName)) { @@ -530,7 +530,7 @@ public abstract class AbstractJavaPersistentAttribute if (typeName == null) { return null; } - if (ReflectionTools.getArrayDepthForTypeDeclaration(typeName) != 0) { + if (TypeDeclarationTools.arrayDepth(typeName) != 0) { return null; // arrays cannot be entities } if (this.typeIsContainer()) { @@ -684,8 +684,8 @@ public abstract class AbstractJavaPersistentAttribute if (typeName == null) { return MetamodelField.DEFAULT_TYPE_NAME; } - if (ClassName.isPrimitive(typeName)) { - return ClassName.getWrapperClassName(typeName); // ??? + if (ClassNameTools.isPrimitive(typeName)) { + return ClassNameTools.primitiveWrapperClassName(typeName); // ??? } return typeName; } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaPersistentType.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaPersistentType.java index 1dcc75aaab..cf94122ae5 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaPersistentType.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaPersistentType.java @@ -29,19 +29,20 @@ import org.eclipse.jpt.common.core.resource.java.JavaResourceMethod; import org.eclipse.jpt.common.core.resource.java.JavaResourceType; import org.eclipse.jpt.common.core.utility.TextRange; import org.eclipse.jpt.common.core.utility.jdt.TypeBinding; -import org.eclipse.jpt.common.utility.Filter; -import org.eclipse.jpt.common.utility.internal.ClassName; -import org.eclipse.jpt.common.utility.internal.CollectionTools; +import org.eclipse.jpt.common.utility.filter.Filter; +import org.eclipse.jpt.common.utility.internal.ClassNameTools; +import org.eclipse.jpt.common.utility.internal.ObjectTools; import org.eclipse.jpt.common.utility.internal.StringTools; -import org.eclipse.jpt.common.utility.internal.Tools; -import org.eclipse.jpt.common.utility.internal.iterables.ChainIterable; -import org.eclipse.jpt.common.utility.internal.iterables.CompositeIterable; -import org.eclipse.jpt.common.utility.internal.iterables.EmptyIterable; -import org.eclipse.jpt.common.utility.internal.iterables.FilteringIterable; -import org.eclipse.jpt.common.utility.internal.iterables.ListIterable; -import org.eclipse.jpt.common.utility.internal.iterables.LiveCloneListIterable; -import org.eclipse.jpt.common.utility.internal.iterables.SuperListIterableWrapper; -import org.eclipse.jpt.common.utility.internal.iterables.TransformationIterable; +import org.eclipse.jpt.common.utility.internal.collection.CollectionTools; +import org.eclipse.jpt.common.utility.internal.iterable.ChainIterable; +import org.eclipse.jpt.common.utility.internal.iterable.CompositeIterable; +import org.eclipse.jpt.common.utility.internal.iterable.EmptyIterable; +import org.eclipse.jpt.common.utility.internal.iterable.FilteringIterable; +import org.eclipse.jpt.common.utility.internal.iterable.IterableTools; +import org.eclipse.jpt.common.utility.internal.iterable.LiveCloneListIterable; +import org.eclipse.jpt.common.utility.internal.iterable.SuperListIterableWrapper; +import org.eclipse.jpt.common.utility.internal.iterable.TransformationIterable; +import org.eclipse.jpt.common.utility.iterable.ListIterable; import org.eclipse.jpt.jpa.core.JpaFile; import org.eclipse.jpt.jpa.core.JpaStructureNode; import org.eclipse.jpt.jpa.core.context.AccessType; @@ -127,7 +128,7 @@ public abstract class AbstractJavaPersistentType } public String getSimpleName(){ - return ClassName.getSimpleName(this.name); + return ClassNameTools.simpleName(this.name); } protected void setName(String name) { @@ -156,7 +157,7 @@ public abstract class AbstractJavaPersistentType if (spt == null) { return null; } - if (CollectionTools.contains(spt.getInheritanceHierarchy(), this)) { + if (IterableTools.contains(spt.getInheritanceHierarchy(), this)) { return null; // short-circuit in this case, we have circular inheritance } return spt.isMapped() ? spt : spt.getSuperPersistentType(); @@ -308,7 +309,7 @@ public abstract class AbstractJavaPersistentType protected JavaTypeMapping buildMapping(String key) { for (JavaTypeMappingDefinition definition : this.getMappingDefinitions()) { - if (Tools.valuesAreEqual(definition.getKey(), key)) { + if (ObjectTools.equals(definition.getKey(), key)) { Annotation annotation = this.resourceType.setPrimaryAnnotation(definition.getAnnotationName(), definition.getSupportingAnnotationNames()); return definition.buildMapping(this, annotation, this.getJpaFactory()); } @@ -425,7 +426,7 @@ public abstract class AbstractJavaPersistentType return new FilteringIterable<JavaPersistentAttribute>(this.getAttributes()) { @Override protected boolean accept(JavaPersistentAttribute attribute) { - return Tools.valuesAreEqual(attributeName, attribute.getName()); + return ObjectTools.equals(attributeName, attribute.getName()); } }; } @@ -1076,11 +1077,11 @@ public abstract class AbstractJavaPersistentType } public boolean isFor(String typeName) { - return Tools.valuesAreEqual(typeName, this.name); + return ObjectTools.equals(typeName, this.name); } public boolean isIn(IPackageFragment packageFragment) { - return Tools.valuesAreEqual(packageFragment.getElementName(), this.getPackageName()); + return ObjectTools.equals(packageFragment.getElementName(), this.getPackageName()); } protected String getPackageName() { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaQuery.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaQuery.java index 3716584083..1a40d38f26 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaQuery.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaQuery.java @@ -12,10 +12,10 @@ package org.eclipse.jpt.jpa.core.internal.context.java; import java.util.ArrayList; import java.util.List; import org.eclipse.jpt.common.core.utility.TextRange; -import org.eclipse.jpt.common.utility.internal.CollectionTools; +import org.eclipse.jpt.common.utility.internal.ObjectTools; import org.eclipse.jpt.common.utility.internal.StringTools; -import org.eclipse.jpt.common.utility.internal.Tools; -import org.eclipse.jpt.common.utility.internal.iterables.ListIterable; +import org.eclipse.jpt.common.utility.internal.collection.ListTools; +import org.eclipse.jpt.common.utility.iterable.ListIterable; import org.eclipse.jpt.jpa.core.context.JpaContextNode; import org.eclipse.jpt.jpa.core.context.JpaNamedContextNode; import org.eclipse.jpt.jpa.core.context.Query; @@ -197,7 +197,7 @@ public abstract class AbstractJavaQuery<A extends QueryAnnotation> } protected void validateName(List<IMessage> messages) { - if (StringTools.stringIsEmpty(this.name)) { + if (StringTools.isBlank(this.name)) { messages.add( DefaultJpaValidationMessages.buildMessage( IMessage.HIGH_SEVERITY, @@ -211,7 +211,7 @@ public abstract class AbstractJavaQuery<A extends QueryAnnotation> } public void validateQuery(JpaJpqlQueryHelper queryHelper, List<IMessage> messages, IReporter reporter) { - if (StringTools.stringIsEmpty(this.query)){ + if (StringTools.isBlank(this.query)){ messages.add( DefaultJpaValidationMessages.buildMessage( IMessage.HIGH_SEVERITY, @@ -248,15 +248,15 @@ public abstract class AbstractJavaQuery<A extends QueryAnnotation> } protected boolean isEquivalentTo(Query other) { - return Tools.valuesAreEqual(this.name, other.getName()) && - Tools.valuesAreEqual(this.query, other.getQuery()) && + return ObjectTools.equals(this.name, other.getName()) && + ObjectTools.equals(this.query, other.getQuery()) && this.hintsAreEquivalentTo(other); } protected boolean hintsAreEquivalentTo(Query other) { // get fixed lists of the hints - ArrayList<JavaQueryHint> hints1 = CollectionTools.list(this.getHints()); - ArrayList<? extends QueryHint> hints2 = CollectionTools.list(other.getHints()); + ArrayList<JavaQueryHint> hints1 = ListTools.list(this.getHints()); + ArrayList<? extends QueryHint> hints2 = ListTools.list(other.getHints()); if (hints1.size() != hints2.size()) { return false; } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaReadOnlyUniqueConstraint.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaReadOnlyUniqueConstraint.java index a21c330c1c..720f2fd66b 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaReadOnlyUniqueConstraint.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaReadOnlyUniqueConstraint.java @@ -10,7 +10,8 @@ package org.eclipse.jpt.jpa.core.internal.context.java; import java.util.Vector; -import org.eclipse.jpt.common.utility.internal.iterables.LiveCloneIterable; + +import org.eclipse.jpt.common.utility.internal.iterable.LiveCloneIterable; import org.eclipse.jpt.jpa.core.context.JpaContextNode; import org.eclipse.jpt.jpa.core.context.ReadOnlyUniqueConstraint; diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaRelationshipMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaRelationshipMapping.java index f2af92e24a..3d5da11596 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaRelationshipMapping.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaRelationshipMapping.java @@ -13,9 +13,9 @@ import java.util.List; 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.iterables.CompositeIterable; -import org.eclipse.jpt.common.utility.internal.iterables.EmptyIterable; -import org.eclipse.jpt.common.utility.internal.iterables.TransformationIterable; +import org.eclipse.jpt.common.utility.internal.iterable.CompositeIterable; +import org.eclipse.jpt.common.utility.internal.iterable.EmptyIterable; +import org.eclipse.jpt.common.utility.internal.iterable.TransformationIterable; import org.eclipse.jpt.jpa.core.context.AttributeMapping; import org.eclipse.jpt.jpa.core.context.Cascade; import org.eclipse.jpt.jpa.core.context.Entity; diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaSequenceGenerator.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaSequenceGenerator.java index 5fcab0b3f4..ea1d2a62ef 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaSequenceGenerator.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaSequenceGenerator.java @@ -9,9 +9,11 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.internal.context.java; +import org.eclipse.jpt.common.utility.internal.ObjectTools; import org.eclipse.jpt.common.utility.internal.StringTools; -import org.eclipse.jpt.common.utility.internal.Tools; -import org.eclipse.jpt.common.utility.internal.iterables.EmptyIterable; +import org.eclipse.jpt.common.utility.internal.iterable.EmptyIterable; +import org.eclipse.jpt.common.utility.internal.iterable.FilteringIterable; +import org.eclipse.jpt.common.utility.internal.iterable.TransformationIterable; import org.eclipse.jpt.jpa.core.context.DbGenerator; import org.eclipse.jpt.jpa.core.context.SequenceGenerator; import org.eclipse.jpt.jpa.core.context.java.JavaGeneratorContainer; @@ -119,7 +121,8 @@ public abstract class AbstractJavaSequenceGenerator<A extends SequenceGeneratorA } protected Iterable<String> getJavaCandidateSequences() { - return StringTools.convertToJavaStringLiteralContents(this.getCandidateSequences()); + return new TransformationIterable<String, String>(this.getCandidateSequences(), + StringTools.JAVA_STRING_LITERAL_CONTENT_TRANSFORMER); } protected Iterable<String> getCandidateSequences() { @@ -142,7 +145,7 @@ public abstract class AbstractJavaSequenceGenerator<A extends SequenceGeneratorA } protected boolean isEquivalentTo(SequenceGenerator generator) { - return Tools.valuesAreEqual(this.specifiedSequenceName, generator.getSpecifiedSequenceName()); + return ObjectTools.equals(this.specifiedSequenceName, generator.getSpecifiedSequenceName()); } // ********** metadata conversion ********** diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaTable.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaTable.java index bc460ada91..c1d50fec86 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaTable.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaTable.java @@ -13,8 +13,10 @@ import java.util.List; import org.eclipse.jpt.common.core.utility.TextRange; import org.eclipse.jpt.common.utility.internal.NameTools; import org.eclipse.jpt.common.utility.internal.StringTools; -import org.eclipse.jpt.common.utility.internal.iterables.EmptyIterable; -import org.eclipse.jpt.common.utility.internal.iterables.ListIterable; +import org.eclipse.jpt.common.utility.internal.iterable.EmptyIterable; +import org.eclipse.jpt.common.utility.internal.iterable.FilteringIterable; +import org.eclipse.jpt.common.utility.internal.iterable.TransformationIterable; +import org.eclipse.jpt.common.utility.iterable.ListIterable; import org.eclipse.jpt.jpa.core.context.JpaContextNode; import org.eclipse.jpt.jpa.core.context.ReadOnlyTable; import org.eclipse.jpt.jpa.core.context.ReadOnlyUniqueConstraint; @@ -431,7 +433,8 @@ public abstract class AbstractJavaTable<A extends BaseTableAnnotation> } protected Iterable<String> getJavaCandidateNames() { - return StringTools.convertToJavaStringLiteralContents(this.getCandidateNames()); + return new TransformationIterable<String, String>(this.getCandidateNames(), + StringTools.JAVA_STRING_LITERAL_CONTENT_TRANSFORMER); } protected Iterable<String> getCandidateNames() { @@ -444,7 +447,8 @@ public abstract class AbstractJavaTable<A extends BaseTableAnnotation> } protected Iterable<String> getJavaCandidateSchemata() { - return StringTools.convertToJavaStringLiteralContents(this.getCandidateSchemata()); + return new TransformationIterable<String, String>(this.getCandidateSchemata(), + StringTools.JAVA_STRING_LITERAL_CONTENT_TRANSFORMER); } protected Iterable<String> getCandidateSchemata() { @@ -456,7 +460,8 @@ public abstract class AbstractJavaTable<A extends BaseTableAnnotation> } protected Iterable<String> getJavaCandidateCatalogs() { - return StringTools.convertToJavaStringLiteralContents(this.getCandidateCatalogs()); + return new TransformationIterable<String, String>(this.getCandidateCatalogs(), + StringTools.JAVA_STRING_LITERAL_CONTENT_TRANSFORMER); } protected Iterable<String> getCandidateCatalogs() { @@ -517,7 +522,7 @@ public abstract class AbstractJavaTable<A extends BaseTableAnnotation> } protected String buildQualifiedName() { - return NameTools.buildQualifiedDatabaseObjectName(this.getCatalog(), this.getSchema(), this.getName()); + return NameTools.buildQualifiedName(this.getCatalog(), this.getSchema(), this.getName()); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaTypeMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaTypeMapping.java index 2e9b2b4ae7..94ad94512d 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaTypeMapping.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaTypeMapping.java @@ -13,12 +13,12 @@ import java.util.List; import org.eclipse.jpt.common.core.resource.java.Annotation; import org.eclipse.jpt.common.core.resource.java.JavaResourceType; import org.eclipse.jpt.common.core.utility.TextRange; -import org.eclipse.jpt.common.utility.internal.NotNullFilter; -import org.eclipse.jpt.common.utility.internal.Tools; -import org.eclipse.jpt.common.utility.internal.iterables.CompositeIterable; -import org.eclipse.jpt.common.utility.internal.iterables.EmptyIterable; -import org.eclipse.jpt.common.utility.internal.iterables.FilteringIterable; -import org.eclipse.jpt.common.utility.internal.iterables.TransformationIterable; +import org.eclipse.jpt.common.utility.internal.ObjectTools; +import org.eclipse.jpt.common.utility.internal.filter.NotNullFilter; +import org.eclipse.jpt.common.utility.internal.iterable.CompositeIterable; +import org.eclipse.jpt.common.utility.internal.iterable.EmptyIterable; +import org.eclipse.jpt.common.utility.internal.iterable.FilteringIterable; +import org.eclipse.jpt.common.utility.internal.iterable.TransformationIterable; import org.eclipse.jpt.jpa.core.MappingKeys; import org.eclipse.jpt.jpa.core.context.AttributeMapping; import org.eclipse.jpt.jpa.core.context.Column; @@ -180,7 +180,7 @@ public abstract class AbstractJavaTypeMapping<A extends Annotation> return new FilteringIterable<JavaAttributeMapping>(this.getAttributeMappings()) { @Override protected boolean accept(JavaAttributeMapping attributeMapping) { - return Tools.valuesAreEqual(attributeMapping.getKey(), mappingKey); + return ObjectTools.equals(attributeMapping.getKey(), mappingKey); } }; } @@ -201,7 +201,7 @@ public abstract class AbstractJavaTypeMapping<A extends Annotation> return new FilteringIterable<AttributeMapping>(this.getAllAttributeMappings()) { @Override protected boolean accept(AttributeMapping attributeMapping) { - return Tools.valuesAreEqual(attributeMapping.getKey(), mappingKey); + return ObjectTools.equals(attributeMapping.getKey(), mappingKey); } }; } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaVersionMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaVersionMapping.java index bcbcbba082..9bba47613e 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaVersionMapping.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaVersionMapping.java @@ -12,10 +12,10 @@ package org.eclipse.jpt.jpa.core.internal.context.java; import java.util.List; import org.eclipse.jpt.common.core.resource.java.Annotation; import org.eclipse.jpt.common.core.resource.java.JavaResourceAttribute; +import org.eclipse.jpt.common.utility.Association; import org.eclipse.jpt.common.utility.internal.ArrayTools; -import org.eclipse.jpt.common.utility.internal.Association; import org.eclipse.jpt.common.utility.internal.SimpleAssociation; -import org.eclipse.jpt.common.utility.internal.iterables.ArrayIterable; +import org.eclipse.jpt.common.utility.internal.iterable.ArrayIterable; import org.eclipse.jpt.jpa.core.JpaFactory; import org.eclipse.jpt.jpa.core.MappingKeys; import org.eclipse.jpt.jpa.core.context.Converter; diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaVirtualReferenceTable.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaVirtualReferenceTable.java index 756c69a65b..73c7f057e6 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaVirtualReferenceTable.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaVirtualReferenceTable.java @@ -10,10 +10,10 @@ package org.eclipse.jpt.jpa.core.internal.context.java; import java.util.List; -import org.eclipse.jpt.common.utility.internal.iterables.EmptyListIterable; -import org.eclipse.jpt.common.utility.internal.iterables.ListIterable; -import org.eclipse.jpt.common.utility.internal.iterables.SingleElementListIterable; -import org.eclipse.jpt.common.utility.internal.iterables.SuperListIterableWrapper; +import org.eclipse.jpt.common.utility.internal.iterable.EmptyListIterable; +import org.eclipse.jpt.common.utility.internal.iterable.SingleElementListIterable; +import org.eclipse.jpt.common.utility.internal.iterable.SuperListIterableWrapper; +import org.eclipse.jpt.common.utility.iterable.ListIterable; import org.eclipse.jpt.jpa.core.context.JoinColumn; import org.eclipse.jpt.jpa.core.context.JpaContextNode; import org.eclipse.jpt.jpa.core.context.ReadOnlyJoinColumn; diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaVirtualTable.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaVirtualTable.java index d466b44c12..2feabd3142 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaVirtualTable.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaVirtualTable.java @@ -12,8 +12,8 @@ package org.eclipse.jpt.jpa.core.internal.context.java; import java.util.List; import org.eclipse.jpt.common.core.utility.TextRange; import org.eclipse.jpt.common.utility.internal.NameTools; -import org.eclipse.jpt.common.utility.internal.iterables.ListIterable; -import org.eclipse.jpt.common.utility.internal.iterables.SuperListIterableWrapper; +import org.eclipse.jpt.common.utility.internal.iterable.SuperListIterableWrapper; +import org.eclipse.jpt.common.utility.iterable.ListIterable; import org.eclipse.jpt.jpa.core.context.JpaContextNode; import org.eclipse.jpt.jpa.core.context.ReadOnlyTable; import org.eclipse.jpt.jpa.core.context.ReadOnlyUniqueConstraint; @@ -348,6 +348,6 @@ public abstract class AbstractJavaVirtualTable<T extends ReadOnlyTable> } protected String buildQualifiedName() { - return NameTools.buildQualifiedDatabaseObjectName(this.getCatalog(), this.getSchema(), this.getName()); + return NameTools.buildQualifiedName(this.getCatalog(), this.getSchema(), this.getName()); } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/GenericJavaMappedByRelationshipStrategy.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/GenericJavaMappedByRelationshipStrategy.java index 3d5aaf77e4..bdb007e354 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/GenericJavaMappedByRelationshipStrategy.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/GenericJavaMappedByRelationshipStrategy.java @@ -12,8 +12,9 @@ package org.eclipse.jpt.jpa.core.internal.context.java; import java.util.List; import org.eclipse.jpt.common.core.utility.TextRange; import org.eclipse.jpt.common.utility.internal.ArrayTools; +import org.eclipse.jpt.common.utility.internal.ObjectTools; import org.eclipse.jpt.common.utility.internal.StringTools; -import org.eclipse.jpt.common.utility.internal.Tools; +import org.eclipse.jpt.common.utility.internal.iterable.TransformationIterable; import org.eclipse.jpt.jpa.core.context.AttributeMapping; import org.eclipse.jpt.jpa.core.context.Entity; import org.eclipse.jpt.jpa.core.context.MappedByRelationshipStrategy; @@ -138,8 +139,8 @@ public class GenericJavaMappedByRelationshipStrategy String thisEntityName = this.getEntityName(); Entity otherEntity = otherMapping.getResolvedTargetEntity(); String otherEntityName = (otherEntity == null) ? null : otherEntity.getName(); - return Tools.valuesAreEqual(thisEntityName, otherEntityName) && - Tools.valuesAreEqual(this.mappedByAttribute, otherMapping.getName()); + return ObjectTools.equals(thisEntityName, otherEntityName) && + ObjectTools.equals(this.mappedByAttribute, otherMapping.getName()); } protected String getEntityName() { @@ -184,10 +185,10 @@ public class GenericJavaMappedByRelationshipStrategy } protected Iterable<String> getJavaCandidateMappedByAttributeNames() { - return StringTools.convertToJavaStringLiteralContents(this.getCandidateMappedByAttributeNames()); + return new TransformationIterable<String, String>(this.getCandidateMappedByAttributeNames(), + StringTools.JAVA_STRING_LITERAL_CONTENT_TRANSFORMER); } - // ********** validation ********** @Override diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/GenericJavaMappingJoinColumnRelationshipStrategy.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/GenericJavaMappingJoinColumnRelationshipStrategy.java index 7ef971575c..c1c40d63a9 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/GenericJavaMappingJoinColumnRelationshipStrategy.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/GenericJavaMappingJoinColumnRelationshipStrategy.java @@ -12,8 +12,8 @@ package org.eclipse.jpt.jpa.core.internal.context.java; import org.eclipse.jpt.common.core.resource.java.JavaResourceAttribute; import org.eclipse.jpt.common.core.resource.java.NestableAnnotation; import org.eclipse.jpt.common.core.utility.TextRange; -import org.eclipse.jpt.common.utility.internal.iterables.ListIterable; -import org.eclipse.jpt.common.utility.internal.iterables.SubListIterableWrapper; +import org.eclipse.jpt.common.utility.internal.iterable.SubListIterableWrapper; +import org.eclipse.jpt.common.utility.iterable.ListIterable; import org.eclipse.jpt.jpa.core.context.Entity; import org.eclipse.jpt.jpa.core.context.PersistentAttribute; import org.eclipse.jpt.jpa.core.context.ReadOnlyJoinColumn; diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/GenericJavaOverrideJoinColumnRelationshipStrategy.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/GenericJavaOverrideJoinColumnRelationshipStrategy.java index a17fac160b..29c05d92ba 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/GenericJavaOverrideJoinColumnRelationshipStrategy.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/GenericJavaOverrideJoinColumnRelationshipStrategy.java @@ -10,7 +10,7 @@ package org.eclipse.jpt.jpa.core.internal.context.java; import org.eclipse.jpt.common.core.utility.TextRange; -import org.eclipse.jpt.common.utility.internal.iterables.ListIterable; +import org.eclipse.jpt.common.utility.iterable.ListIterable; import org.eclipse.jpt.jpa.core.context.Entity; import org.eclipse.jpt.jpa.core.context.PersistentAttribute; import org.eclipse.jpt.jpa.core.context.ReadOnlyBaseColumn; diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/GenericJavaPrimaryKeyJoinColumnRelationshipStrategy.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/GenericJavaPrimaryKeyJoinColumnRelationshipStrategy.java index 1d5cb6ca24..e581e35a41 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/GenericJavaPrimaryKeyJoinColumnRelationshipStrategy.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/GenericJavaPrimaryKeyJoinColumnRelationshipStrategy.java @@ -13,8 +13,8 @@ import java.util.List; import org.eclipse.jpt.common.core.resource.java.JavaResourceAttribute; import org.eclipse.jpt.common.core.resource.java.NestableAnnotation; import org.eclipse.jpt.common.core.utility.TextRange; -import org.eclipse.jpt.common.utility.internal.iterables.ListIterable; -import org.eclipse.jpt.common.utility.internal.iterables.SubListIterableWrapper; +import org.eclipse.jpt.common.utility.internal.iterable.SubListIterableWrapper; +import org.eclipse.jpt.common.utility.iterable.ListIterable; import org.eclipse.jpt.jpa.core.context.Entity; import org.eclipse.jpt.jpa.core.context.PersistentAttribute; import org.eclipse.jpt.jpa.core.context.PrimaryKeyJoinColumn; diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/GenericJavaVirtualJoinTable.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/GenericJavaVirtualJoinTable.java index 4f48e852d1..d26c172a75 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/GenericJavaVirtualJoinTable.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/GenericJavaVirtualJoinTable.java @@ -11,12 +11,12 @@ package org.eclipse.jpt.jpa.core.internal.context.java; import java.util.List; import org.eclipse.jpt.common.core.utility.TextRange; -import org.eclipse.jpt.common.utility.internal.Tools; -import org.eclipse.jpt.common.utility.internal.iterables.EmptyIterable; -import org.eclipse.jpt.common.utility.internal.iterables.EmptyListIterable; -import org.eclipse.jpt.common.utility.internal.iterables.ListIterable; -import org.eclipse.jpt.common.utility.internal.iterables.SingleElementListIterable; -import org.eclipse.jpt.common.utility.internal.iterables.SuperListIterableWrapper; +import org.eclipse.jpt.common.utility.internal.ObjectTools; +import org.eclipse.jpt.common.utility.internal.iterable.EmptyIterable; +import org.eclipse.jpt.common.utility.internal.iterable.EmptyListIterable; +import org.eclipse.jpt.common.utility.internal.iterable.SingleElementListIterable; +import org.eclipse.jpt.common.utility.internal.iterable.SuperListIterableWrapper; +import org.eclipse.jpt.common.utility.iterable.ListIterable; import org.eclipse.jpt.jpa.core.context.Entity; import org.eclipse.jpt.jpa.core.context.PersistentAttribute; import org.eclipse.jpt.jpa.core.context.ReadOnlyJoinColumn; @@ -253,7 +253,7 @@ public class GenericJavaVirtualJoinTable * the default table name. The table is always the join table. */ public boolean tableNameIsInvalid(String tableName) { - return Tools.valuesAreDifferent(this.getDefaultTableName(), tableName); + return ObjectTools.notEquals(this.getDefaultTableName(), tableName); } /** @@ -264,7 +264,7 @@ public class GenericJavaVirtualJoinTable } public org.eclipse.jpt.jpa.db.Table resolveDbTable(String tableName) { - return Tools.valuesAreEqual(GenericJavaVirtualJoinTable.this.getName(), tableName) ? + return ObjectTools.equals(GenericJavaVirtualJoinTable.this.getName(), tableName) ? GenericJavaVirtualJoinTable.this.getDbTable() : null; } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/JavaBasicMappingDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/JavaBasicMappingDefinition.java index a858697319..7d2b374080 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/JavaBasicMappingDefinition.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/JavaBasicMappingDefinition.java @@ -9,7 +9,7 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.internal.context.java; -import org.eclipse.jpt.common.utility.internal.iterables.ArrayIterable; +import org.eclipse.jpt.common.utility.internal.iterable.ArrayIterable; import org.eclipse.jpt.jpa.core.JpaFactory; import org.eclipse.jpt.jpa.core.MappingKeys; import org.eclipse.jpt.jpa.core.context.java.DefaultJavaAttributeMappingDefinition; diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/JavaEmbeddableDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/JavaEmbeddableDefinition.java index 15b9f51048..eb596f69fe 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/JavaEmbeddableDefinition.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/JavaEmbeddableDefinition.java @@ -10,7 +10,7 @@ package org.eclipse.jpt.jpa.core.internal.context.java; import org.eclipse.jpt.common.core.resource.java.Annotation; -import org.eclipse.jpt.common.utility.internal.iterables.EmptyIterable; +import org.eclipse.jpt.common.utility.internal.iterable.EmptyIterable; import org.eclipse.jpt.jpa.core.JpaFactory; import org.eclipse.jpt.jpa.core.MappingKeys; import org.eclipse.jpt.jpa.core.context.java.JavaEmbeddable; diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/JavaEmbeddedIdMappingDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/JavaEmbeddedIdMappingDefinition.java index 27d7523752..89b0236a31 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/JavaEmbeddedIdMappingDefinition.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/JavaEmbeddedIdMappingDefinition.java @@ -9,7 +9,7 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.internal.context.java; -import org.eclipse.jpt.common.utility.internal.iterables.ArrayIterable; +import org.eclipse.jpt.common.utility.internal.iterable.ArrayIterable; import org.eclipse.jpt.jpa.core.JpaFactory; import org.eclipse.jpt.jpa.core.MappingKeys; import org.eclipse.jpt.jpa.core.context.java.JavaAttributeMapping; diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/JavaEmbeddedMappingDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/JavaEmbeddedMappingDefinition.java index fef316ec16..af06836d7e 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/JavaEmbeddedMappingDefinition.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/JavaEmbeddedMappingDefinition.java @@ -9,7 +9,7 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.internal.context.java; -import org.eclipse.jpt.common.utility.internal.iterables.ArrayIterable; +import org.eclipse.jpt.common.utility.internal.iterable.ArrayIterable; import org.eclipse.jpt.jpa.core.JpaFactory; import org.eclipse.jpt.jpa.core.MappingKeys; import org.eclipse.jpt.jpa.core.context.java.DefaultJavaAttributeMappingDefinition; diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/JavaEntityDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/JavaEntityDefinition.java index 264faad066..12a75ec39f 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/JavaEntityDefinition.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/JavaEntityDefinition.java @@ -10,7 +10,7 @@ package org.eclipse.jpt.jpa.core.internal.context.java; import org.eclipse.jpt.common.core.resource.java.Annotation; -import org.eclipse.jpt.common.utility.internal.iterables.ArrayIterable; +import org.eclipse.jpt.common.utility.internal.iterable.ArrayIterable; import org.eclipse.jpt.jpa.core.JpaFactory; import org.eclipse.jpt.jpa.core.MappingKeys; import org.eclipse.jpt.jpa.core.context.java.JavaEntity; diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/JavaIdMappingDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/JavaIdMappingDefinition.java index 24c22ab227..3a8a633924 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/JavaIdMappingDefinition.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/JavaIdMappingDefinition.java @@ -9,7 +9,7 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.internal.context.java; -import org.eclipse.jpt.common.utility.internal.iterables.ArrayIterable; +import org.eclipse.jpt.common.utility.internal.iterable.ArrayIterable; import org.eclipse.jpt.jpa.core.JpaFactory; import org.eclipse.jpt.jpa.core.MappingKeys; import org.eclipse.jpt.jpa.core.context.java.JavaAttributeMapping; diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/JavaManyToManyMappingDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/JavaManyToManyMappingDefinition.java index e430c5f21b..6737ce3b5d 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/JavaManyToManyMappingDefinition.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/JavaManyToManyMappingDefinition.java @@ -9,7 +9,7 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.internal.context.java; -import org.eclipse.jpt.common.utility.internal.iterables.ArrayIterable; +import org.eclipse.jpt.common.utility.internal.iterable.ArrayIterable; import org.eclipse.jpt.jpa.core.JpaFactory; import org.eclipse.jpt.jpa.core.MappingKeys; import org.eclipse.jpt.jpa.core.context.java.JavaAttributeMapping; diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/JavaManyToOneMappingDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/JavaManyToOneMappingDefinition.java index 316e2747e5..9ca00fad77 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/JavaManyToOneMappingDefinition.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/JavaManyToOneMappingDefinition.java @@ -9,7 +9,7 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.internal.context.java; -import org.eclipse.jpt.common.utility.internal.iterables.ArrayIterable; +import org.eclipse.jpt.common.utility.internal.iterable.ArrayIterable; import org.eclipse.jpt.jpa.core.JpaFactory; import org.eclipse.jpt.jpa.core.MappingKeys; import org.eclipse.jpt.jpa.core.context.java.JavaAttributeMapping; diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/JavaMappedSuperclassDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/JavaMappedSuperclassDefinition.java index d9a40b0814..d250bababf 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/JavaMappedSuperclassDefinition.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/JavaMappedSuperclassDefinition.java @@ -10,7 +10,7 @@ package org.eclipse.jpt.jpa.core.internal.context.java; import org.eclipse.jpt.common.core.resource.java.Annotation; -import org.eclipse.jpt.common.utility.internal.iterables.ArrayIterable; +import org.eclipse.jpt.common.utility.internal.iterable.ArrayIterable; import org.eclipse.jpt.jpa.core.JpaFactory; import org.eclipse.jpt.jpa.core.MappingKeys; import org.eclipse.jpt.jpa.core.context.java.JavaMappedSuperclass; diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/JavaNullTypeMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/JavaNullTypeMapping.java index 66f3bfefeb..5ab251d9dc 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/JavaNullTypeMapping.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/JavaNullTypeMapping.java @@ -12,7 +12,7 @@ package org.eclipse.jpt.jpa.core.internal.context.java; import java.util.List; import org.eclipse.jpt.common.core.resource.java.Annotation; import org.eclipse.jpt.common.core.utility.TextRange; -import org.eclipse.jpt.common.utility.internal.iterables.EmptyIterable; +import org.eclipse.jpt.common.utility.internal.iterable.EmptyIterable; import org.eclipse.jpt.jpa.core.MappingKeys; import org.eclipse.jpt.jpa.core.context.Query; import org.eclipse.jpt.jpa.core.context.java.JavaPersistentType; diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/JavaOneToManyMappingDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/JavaOneToManyMappingDefinition.java index e5562683b5..9b479afed2 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/JavaOneToManyMappingDefinition.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/JavaOneToManyMappingDefinition.java @@ -9,7 +9,7 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.internal.context.java; -import org.eclipse.jpt.common.utility.internal.iterables.ArrayIterable; +import org.eclipse.jpt.common.utility.internal.iterable.ArrayIterable; import org.eclipse.jpt.jpa.core.JpaFactory; import org.eclipse.jpt.jpa.core.MappingKeys; import org.eclipse.jpt.jpa.core.context.java.JavaAttributeMapping; diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/JavaOneToOneMappingDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/JavaOneToOneMappingDefinition.java index 849d052ba5..571a7a373f 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/JavaOneToOneMappingDefinition.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/JavaOneToOneMappingDefinition.java @@ -9,7 +9,7 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.internal.context.java; -import org.eclipse.jpt.common.utility.internal.iterables.ArrayIterable; +import org.eclipse.jpt.common.utility.internal.iterable.ArrayIterable; import org.eclipse.jpt.jpa.core.JpaFactory; import org.eclipse.jpt.jpa.core.MappingKeys; import org.eclipse.jpt.jpa.core.context.java.JavaAttributeMapping; diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/JavaTransientMappingDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/JavaTransientMappingDefinition.java index ca1fcc602d..57e46734a2 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/JavaTransientMappingDefinition.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/JavaTransientMappingDefinition.java @@ -9,7 +9,7 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.internal.context.java; -import org.eclipse.jpt.common.utility.internal.iterables.EmptyIterable; +import org.eclipse.jpt.common.utility.internal.iterable.EmptyIterable; import org.eclipse.jpt.jpa.core.JpaFactory; import org.eclipse.jpt.jpa.core.MappingKeys; import org.eclipse.jpt.jpa.core.context.java.JavaAttributeMapping; diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/JavaVersionMappingDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/JavaVersionMappingDefinition.java index fde7b35990..55ae77a627 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/JavaVersionMappingDefinition.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/JavaVersionMappingDefinition.java @@ -1,73 +1,73 @@ -/******************************************************************************* - * Copyright (c) 2006, 2011 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. - * - * Contributors: - * Oracle - initial API and implementation - ******************************************************************************/ -package org.eclipse.jpt.jpa.core.internal.context.java; - -import org.eclipse.jpt.common.utility.internal.iterables.ArrayIterable; -import org.eclipse.jpt.jpa.core.JpaFactory; -import org.eclipse.jpt.jpa.core.MappingKeys; -import org.eclipse.jpt.jpa.core.context.java.JavaAttributeMapping; -import org.eclipse.jpt.jpa.core.context.java.JavaAttributeMappingDefinition; -import org.eclipse.jpt.jpa.core.context.java.JavaPersistentAttribute; -import org.eclipse.jpt.jpa.core.resource.java.ColumnAnnotation; -import org.eclipse.jpt.jpa.core.resource.java.TemporalAnnotation; -import org.eclipse.jpt.jpa.core.resource.java.VersionAnnotation; - -public class JavaVersionMappingDefinition - implements JavaAttributeMappingDefinition -{ - // singleton - private static final JavaAttributeMappingDefinition INSTANCE = new JavaVersionMappingDefinition(); - - /** - * Return the singleton. - */ - public static JavaAttributeMappingDefinition instance() { - return INSTANCE; - } - - - /** - * Enforce singleton usage - */ - private JavaVersionMappingDefinition() { - super(); - } - - public String getKey() { - return MappingKeys.VERSION_ATTRIBUTE_MAPPING_KEY; - } - - public String getAnnotationName() { - return VersionAnnotation.ANNOTATION_NAME; - } - - public boolean isSpecified(JavaPersistentAttribute persistentAttribute) { - return persistentAttribute.getResourceAttribute().getAnnotation(this.getAnnotationName()) != null; - } - - public Iterable<String> getSupportingAnnotationNames() { - return SUPPORTING_ANNOTATION_NAMES; - } - - private static final String[] SUPPORTING_ANNOTATION_NAMES_ARRAY = new String[] { - ColumnAnnotation.ANNOTATION_NAME, - TemporalAnnotation.ANNOTATION_NAME, - }; - private static final Iterable<String> SUPPORTING_ANNOTATION_NAMES = new ArrayIterable<String>(SUPPORTING_ANNOTATION_NAMES_ARRAY); - - public JavaAttributeMapping buildMapping(JavaPersistentAttribute persistentAttribute, JpaFactory factory) { - return factory.buildJavaVersionMapping(persistentAttribute); - } - - @Override - public String toString() { - return this.getClass().getSimpleName(); - } -} +/*******************************************************************************
+ * Copyright (c) 2006, 2011 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.
+ *
+ * Contributors:
+ * Oracle - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.jpt.jpa.core.internal.context.java;
+
+import org.eclipse.jpt.common.utility.internal.iterable.ArrayIterable;
+import org.eclipse.jpt.jpa.core.JpaFactory;
+import org.eclipse.jpt.jpa.core.MappingKeys;
+import org.eclipse.jpt.jpa.core.context.java.JavaAttributeMapping;
+import org.eclipse.jpt.jpa.core.context.java.JavaAttributeMappingDefinition;
+import org.eclipse.jpt.jpa.core.context.java.JavaPersistentAttribute;
+import org.eclipse.jpt.jpa.core.resource.java.ColumnAnnotation;
+import org.eclipse.jpt.jpa.core.resource.java.TemporalAnnotation;
+import org.eclipse.jpt.jpa.core.resource.java.VersionAnnotation;
+
+public class JavaVersionMappingDefinition
+ implements JavaAttributeMappingDefinition
+{
+ // singleton
+ private static final JavaAttributeMappingDefinition INSTANCE = new JavaVersionMappingDefinition();
+
+ /**
+ * Return the singleton.
+ */
+ public static JavaAttributeMappingDefinition instance() {
+ return INSTANCE;
+ }
+
+
+ /**
+ * Enforce singleton usage
+ */
+ private JavaVersionMappingDefinition() {
+ super();
+ }
+
+ public String getKey() {
+ return MappingKeys.VERSION_ATTRIBUTE_MAPPING_KEY;
+ }
+
+ public String getAnnotationName() {
+ return VersionAnnotation.ANNOTATION_NAME;
+ }
+
+ public boolean isSpecified(JavaPersistentAttribute persistentAttribute) {
+ return persistentAttribute.getResourceAttribute().getAnnotation(this.getAnnotationName()) != null;
+ }
+
+ public Iterable<String> getSupportingAnnotationNames() {
+ return SUPPORTING_ANNOTATION_NAMES;
+ }
+
+ private static final String[] SUPPORTING_ANNOTATION_NAMES_ARRAY = new String[] {
+ ColumnAnnotation.ANNOTATION_NAME,
+ TemporalAnnotation.ANNOTATION_NAME,
+ };
+ private static final Iterable<String> SUPPORTING_ANNOTATION_NAMES = new ArrayIterable<String>(SUPPORTING_ANNOTATION_NAMES_ARRAY);
+
+ public JavaAttributeMapping buildMapping(JavaPersistentAttribute persistentAttribute, JpaFactory factory) {
+ return factory.buildJavaVersionMapping(persistentAttribute);
+ }
+
+ @Override
+ public String toString() {
+ return this.getClass().getSimpleName();
+ }
+}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/PropertyAccessor.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/PropertyAccessor.java index bafc168000..8555c29c09 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/PropertyAccessor.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/PropertyAccessor.java @@ -16,7 +16,7 @@ import org.eclipse.jpt.common.core.resource.java.JavaResourceField; import org.eclipse.jpt.common.core.resource.java.JavaResourceMethod; import org.eclipse.jpt.common.utility.MethodSignature; import org.eclipse.jpt.common.utility.internal.ArrayTools; -import org.eclipse.jpt.common.utility.internal.iterables.ListIterable; +import org.eclipse.jpt.common.utility.iterable.ListIterable; import org.eclipse.jpt.jpa.core.context.AccessType; import org.eclipse.jpt.jpa.core.context.PersistentAttribute; import org.eclipse.jpt.jpa.core.context.PersistentType; diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractEntityMappings.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractEntityMappings.java index 854b3c5f76..dd3a39325d 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractEntityMappings.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractEntityMappings.java @@ -25,16 +25,16 @@ import org.eclipse.jdt.core.IType; import org.eclipse.jpt.common.core.internal.utility.JDTTools; import org.eclipse.jpt.common.core.resource.java.JavaResourceAbstractType; import org.eclipse.jpt.common.core.utility.TextRange; -import org.eclipse.jpt.common.utility.internal.CollectionTools; +import org.eclipse.jpt.common.utility.internal.ObjectTools; import org.eclipse.jpt.common.utility.internal.StringTools; -import org.eclipse.jpt.common.utility.internal.Tools; -import org.eclipse.jpt.common.utility.internal.iterables.CompositeIterable; -import org.eclipse.jpt.common.utility.internal.iterables.EmptyIterable; -import org.eclipse.jpt.common.utility.internal.iterables.ListIterable; -import org.eclipse.jpt.common.utility.internal.iterables.LiveCloneIterable; -import org.eclipse.jpt.common.utility.internal.iterables.LiveCloneListIterable; -import org.eclipse.jpt.common.utility.internal.iterables.SingleElementIterable; -import org.eclipse.jpt.common.utility.internal.iterables.TransformationIterable; +import org.eclipse.jpt.common.utility.internal.collection.ListTools; +import org.eclipse.jpt.common.utility.internal.iterable.CompositeIterable; +import org.eclipse.jpt.common.utility.internal.iterable.EmptyIterable; +import org.eclipse.jpt.common.utility.internal.iterable.LiveCloneIterable; +import org.eclipse.jpt.common.utility.internal.iterable.LiveCloneListIterable; +import org.eclipse.jpt.common.utility.internal.iterable.SingleElementIterable; +import org.eclipse.jpt.common.utility.internal.iterable.TransformationIterable; +import org.eclipse.jpt.common.utility.iterable.ListIterable; import org.eclipse.jpt.jpa.core.JpaFile; import org.eclipse.jpt.jpa.core.JpaStructureNode; import org.eclipse.jpt.jpa.core.MappingKeys; @@ -528,7 +528,7 @@ public abstract class AbstractEntityMappings * append package if the name is not qualified */ public String getFullyQualifiedName(String className) { - if (StringTools.stringIsEmpty(className)) { + if (StringTools.isBlank(className)) { return null; } String primitiveClassName = getPrimitiveClassName(className); @@ -759,7 +759,7 @@ public abstract class AbstractEntityMappings } protected int calculateInsertionIndex(OrmPersistentType ormPersistentType) { - return CollectionTools.insertionIndexOf(this.persistentTypes, ormPersistentType, MAPPING_COMPARATOR); + return ListTools.insertionIndexOf(this.persistentTypes, ormPersistentType, MAPPING_COMPARATOR); } protected static final Comparator<OrmPersistentType> MAPPING_COMPARATOR = @@ -1185,7 +1185,7 @@ public abstract class AbstractEntityMappings } protected Iterable<ReplaceEdit> createRenamePackageEdit(final IPackageFragment originalPackage, final String newName) { - return Tools.valuesAreEqual(this.package_, originalPackage.getElementName()) ? + return ObjectTools.equals(this.package_, originalPackage.getElementName()) ? new SingleElementIterable<ReplaceEdit>(this.xmlEntityMappings.createRenamePackageEdit(newName)) : EmptyIterable.<ReplaceEdit>instance(); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmAttributeMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmAttributeMapping.java index 44894103b2..fa9825fda2 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmAttributeMapping.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmAttributeMapping.java @@ -14,11 +14,11 @@ import java.util.List; import org.eclipse.jdt.core.IPackageFragment; import org.eclipse.jdt.core.IType; import org.eclipse.jpt.common.core.utility.TextRange; +import org.eclipse.jpt.common.utility.internal.ObjectTools; import org.eclipse.jpt.common.utility.internal.StringTools; -import org.eclipse.jpt.common.utility.internal.Tools; -import org.eclipse.jpt.common.utility.internal.Transformer; -import org.eclipse.jpt.common.utility.internal.iterables.EmptyIterable; -import org.eclipse.jpt.common.utility.internal.iterables.SingleElementIterable; +import org.eclipse.jpt.common.utility.internal.iterable.EmptyIterable; +import org.eclipse.jpt.common.utility.internal.iterable.SingleElementIterable; +import org.eclipse.jpt.common.utility.transformer.Transformer; import org.eclipse.jpt.jpa.core.context.AttributeMapping; import org.eclipse.jpt.jpa.core.context.Column; import org.eclipse.jpt.jpa.core.context.ColumnMapping; @@ -392,7 +392,7 @@ public abstract class AbstractOrmAttributeMapping<X extends XmlAttributeMapping> } public AttributeMapping resolveAttributeMapping(String attributeName) { - return Tools.valuesAreEqual(attributeName, this.name) ? this : null; + return ObjectTools.equals(attributeName, this.name) ? this : null; } protected Transformer<String, String> buildQualifierTransformer() { @@ -482,7 +482,7 @@ public abstract class AbstractOrmAttributeMapping<X extends XmlAttributeMapping> // we just check for a name that is either empty or whitespace here; // the name will be null if the 'name' attribute is missing // and there will already be an XSD-driven error - if ((this.name != null) && StringTools.stringIsEmpty(this.name)) { + if ((this.name != null) && StringTools.isBlank(this.name)) { messages.add( DefaultJpaValidationMessages.buildMessage( IMessage.HIGH_SEVERITY, diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmBaseEmbeddedMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmBaseEmbeddedMapping.java index 29da43dc92..c5077cdebb 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmBaseEmbeddedMapping.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmBaseEmbeddedMapping.java @@ -12,10 +12,10 @@ package org.eclipse.jpt.jpa.core.internal.context.orm; import java.util.List; import org.eclipse.emf.common.util.EList; import org.eclipse.jpt.common.core.utility.TextRange; -import org.eclipse.jpt.common.utility.internal.Transformer; -import org.eclipse.jpt.common.utility.internal.iterables.CompositeIterable; -import org.eclipse.jpt.common.utility.internal.iterables.EmptyIterable; -import org.eclipse.jpt.common.utility.internal.iterables.TransformationIterable; +import org.eclipse.jpt.common.utility.internal.iterable.CompositeIterable; +import org.eclipse.jpt.common.utility.internal.iterable.EmptyIterable; +import org.eclipse.jpt.common.utility.internal.iterable.TransformationIterable; +import org.eclipse.jpt.common.utility.transformer.Transformer; import org.eclipse.jpt.jpa.core.context.AttributeMapping; import org.eclipse.jpt.jpa.core.context.AttributeOverride; import org.eclipse.jpt.jpa.core.context.AttributeOverrideContainer; diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmBasicMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmBasicMapping.java index f6190b59e5..a21c663749 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmBasicMapping.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmBasicMapping.java @@ -10,7 +10,7 @@ package org.eclipse.jpt.jpa.core.internal.context.orm; import java.util.List; -import org.eclipse.jpt.common.utility.internal.iterables.ArrayIterable; +import org.eclipse.jpt.common.utility.internal.iterable.ArrayIterable; import org.eclipse.jpt.jpa.core.MappingKeys; import org.eclipse.jpt.jpa.core.context.Converter; import org.eclipse.jpt.jpa.core.context.FetchType; diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmDbGenerator.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmDbGenerator.java index 765043f1b4..b8d56c3b38 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmDbGenerator.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmDbGenerator.java @@ -9,8 +9,8 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.internal.context.orm; -import org.eclipse.jpt.common.utility.internal.Tools; -import org.eclipse.jpt.common.utility.internal.iterables.EmptyIterable; +import org.eclipse.jpt.common.utility.internal.ObjectTools; +import org.eclipse.jpt.common.utility.internal.iterable.EmptyIterable; import org.eclipse.jpt.jpa.core.context.DbGenerator; import org.eclipse.jpt.jpa.core.context.Generator; import org.eclipse.jpt.jpa.core.context.JpaContextNode; @@ -138,8 +138,8 @@ public abstract class AbstractOrmDbGenerator<X extends XmlGenerator> } protected boolean isEquivalentTo(DbGenerator generator) { - return Tools.valuesAreEqual(this.specifiedAllocationSize, generator.getSpecifiedAllocationSize()) && - Tools.valuesAreEqual(this.specifiedInitialValue, generator.getSpecifiedInitialValue()); + return ObjectTools.equals(this.specifiedAllocationSize, generator.getSpecifiedAllocationSize()) && + ObjectTools.equals(this.specifiedInitialValue, generator.getSpecifiedInitialValue()); } // ************* completion proposals ************* diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmEmbeddable.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmEmbeddable.java index ef797b970f..3df02e544f 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmEmbeddable.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmEmbeddable.java @@ -1,109 +1,109 @@ -/******************************************************************************* - * Copyright (c) 2006, 2011 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. - * - * Contributors: - * Oracle - initial API and implementation - ******************************************************************************/ -package org.eclipse.jpt.jpa.core.internal.context.orm; - -import org.eclipse.jpt.common.utility.internal.iterables.EmptyIterable; -import org.eclipse.jpt.jpa.core.MappingKeys; -import org.eclipse.jpt.jpa.core.context.Query; -import org.eclipse.jpt.jpa.core.context.ReadOnlyTable; -import org.eclipse.jpt.jpa.core.context.java.JavaEmbeddable; -import org.eclipse.jpt.jpa.core.context.java.JavaPersistentType; -import org.eclipse.jpt.jpa.core.context.orm.OrmEmbeddable; -import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentType; -import org.eclipse.jpt.jpa.core.resource.orm.XmlEmbeddable; -import org.eclipse.jpt.jpa.core.resource.orm.XmlEntityMappings; - -/** - * <code>orm.xml</code> embeddable type mapping - */ -public abstract class AbstractOrmEmbeddable<X extends XmlEmbeddable> - extends AbstractOrmTypeMapping<X> - implements OrmEmbeddable -{ - protected AbstractOrmEmbeddable(OrmPersistentType parent, X resourceMapping) { - super(parent, resourceMapping); - } - - - // ********** key ********** - - public String getKey() { - return MappingKeys.EMBEDDABLE_TYPE_MAPPING_KEY; - } - - - // ********** id class ********** - - public JavaPersistentType getIdClass() { - return null; - } - - - // ********** tables ********** - - public Iterable<ReadOnlyTable> getAssociatedTables() { - return EmptyIterable.instance(); - } - - public Iterable<ReadOnlyTable> getAllAssociatedTables() { - return EmptyIterable.instance(); - } - - public Iterable<String> getAllAssociatedTableNames() { - return EmptyIterable.instance(); - } - - public boolean tableNameIsInvalid(String tableName) { - return false; - } - - - // ********** Java ********** - - @Override - public JavaEmbeddable getJavaTypeMapping() { - return (JavaEmbeddable) super.getJavaTypeMapping(); - } - - @Override - public JavaEmbeddable getJavaTypeMappingForDefaults() { - return (JavaEmbeddable) super.getJavaTypeMappingForDefaults(); - } - - - // ********** entity mappings ********** - - public int getXmlSequence() { - return 2; - } - - public void addXmlTypeMappingTo(XmlEntityMappings entityMappings) { - entityMappings.getEmbeddables().add(this.xmlTypeMapping); - } - - public void removeXmlTypeMappingFrom(XmlEntityMappings entityMappings) { - entityMappings.getEmbeddables().remove(this.xmlTypeMapping); - } - - - // ********** queries ********** - - public Iterable<Query> getQueries() { - return EmptyIterable.instance(); - } - - - // ********** validation ********** - - @Override - public boolean validatesAgainstDatabase() { - return false; - } -} +/*******************************************************************************
+ * Copyright (c) 2006, 2011 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.
+ *
+ * Contributors:
+ * Oracle - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.jpt.jpa.core.internal.context.orm;
+
+import org.eclipse.jpt.common.utility.internal.iterable.EmptyIterable;
+import org.eclipse.jpt.jpa.core.MappingKeys;
+import org.eclipse.jpt.jpa.core.context.Query;
+import org.eclipse.jpt.jpa.core.context.ReadOnlyTable;
+import org.eclipse.jpt.jpa.core.context.java.JavaEmbeddable;
+import org.eclipse.jpt.jpa.core.context.java.JavaPersistentType;
+import org.eclipse.jpt.jpa.core.context.orm.OrmEmbeddable;
+import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentType;
+import org.eclipse.jpt.jpa.core.resource.orm.XmlEmbeddable;
+import org.eclipse.jpt.jpa.core.resource.orm.XmlEntityMappings;
+
+/**
+ * <code>orm.xml</code> embeddable type mapping
+ */
+public abstract class AbstractOrmEmbeddable<X extends XmlEmbeddable>
+ extends AbstractOrmTypeMapping<X>
+ implements OrmEmbeddable
+{
+ protected AbstractOrmEmbeddable(OrmPersistentType parent, X resourceMapping) {
+ super(parent, resourceMapping);
+ }
+
+
+ // ********** key **********
+
+ public String getKey() {
+ return MappingKeys.EMBEDDABLE_TYPE_MAPPING_KEY;
+ }
+
+
+ // ********** id class **********
+
+ public JavaPersistentType getIdClass() {
+ return null;
+ }
+
+
+ // ********** tables **********
+
+ public Iterable<ReadOnlyTable> getAssociatedTables() {
+ return EmptyIterable.instance();
+ }
+
+ public Iterable<ReadOnlyTable> getAllAssociatedTables() {
+ return EmptyIterable.instance();
+ }
+
+ public Iterable<String> getAllAssociatedTableNames() {
+ return EmptyIterable.instance();
+ }
+
+ public boolean tableNameIsInvalid(String tableName) {
+ return false;
+ }
+
+
+ // ********** Java **********
+
+ @Override
+ public JavaEmbeddable getJavaTypeMapping() {
+ return (JavaEmbeddable) super.getJavaTypeMapping();
+ }
+
+ @Override
+ public JavaEmbeddable getJavaTypeMappingForDefaults() {
+ return (JavaEmbeddable) super.getJavaTypeMappingForDefaults();
+ }
+
+
+ // ********** entity mappings **********
+
+ public int getXmlSequence() {
+ return 2;
+ }
+
+ public void addXmlTypeMappingTo(XmlEntityMappings entityMappings) {
+ entityMappings.getEmbeddables().add(this.xmlTypeMapping);
+ }
+
+ public void removeXmlTypeMappingFrom(XmlEntityMappings entityMappings) {
+ entityMappings.getEmbeddables().remove(this.xmlTypeMapping);
+ }
+
+
+ // ********** queries **********
+
+ public Iterable<Query> getQueries() {
+ return EmptyIterable.instance();
+ }
+
+
+ // ********** validation **********
+
+ @Override
+ public boolean validatesAgainstDatabase() {
+ return false;
+ }
+}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmEntity.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmEntity.java index 3887944d82..191a90363c 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmEntity.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmEntity.java @@ -17,21 +17,22 @@ import org.eclipse.jdt.core.IPackageFragment; import org.eclipse.jdt.core.IType; import org.eclipse.jpt.common.core.resource.java.JavaResourceType; import org.eclipse.jpt.common.core.utility.TextRange; -import org.eclipse.jpt.common.utility.internal.ClassName; -import org.eclipse.jpt.common.utility.internal.CollectionTools; -import org.eclipse.jpt.common.utility.internal.NotNullFilter; +import org.eclipse.jpt.common.utility.internal.ClassNameTools; +import org.eclipse.jpt.common.utility.internal.ObjectTools; import org.eclipse.jpt.common.utility.internal.StringTools; -import org.eclipse.jpt.common.utility.internal.Tools; -import org.eclipse.jpt.common.utility.internal.iterables.CompositeIterable; -import org.eclipse.jpt.common.utility.internal.iterables.EmptyIterable; -import org.eclipse.jpt.common.utility.internal.iterables.EmptyListIterable; -import org.eclipse.jpt.common.utility.internal.iterables.FilteringIterable; -import org.eclipse.jpt.common.utility.internal.iterables.ListIterable; -import org.eclipse.jpt.common.utility.internal.iterables.LiveCloneListIterable; -import org.eclipse.jpt.common.utility.internal.iterables.SingleElementListIterable; -import org.eclipse.jpt.common.utility.internal.iterables.SuperListIterableWrapper; -import org.eclipse.jpt.common.utility.internal.iterables.TransformationIterable; -import org.eclipse.jpt.common.utility.internal.iterators.CompositeIterator; +import org.eclipse.jpt.common.utility.internal.collection.CollectionTools; +import org.eclipse.jpt.common.utility.internal.filter.NotNullFilter; +import org.eclipse.jpt.common.utility.internal.iterable.CompositeIterable; +import org.eclipse.jpt.common.utility.internal.iterable.EmptyIterable; +import org.eclipse.jpt.common.utility.internal.iterable.EmptyListIterable; +import org.eclipse.jpt.common.utility.internal.iterable.FilteringIterable; +import org.eclipse.jpt.common.utility.internal.iterable.IterableTools; +import org.eclipse.jpt.common.utility.internal.iterable.LiveCloneListIterable; +import org.eclipse.jpt.common.utility.internal.iterable.SingleElementListIterable; +import org.eclipse.jpt.common.utility.internal.iterable.SuperListIterableWrapper; +import org.eclipse.jpt.common.utility.internal.iterable.TransformationIterable; +import org.eclipse.jpt.common.utility.internal.iterator.CompositeIterator; +import org.eclipse.jpt.common.utility.iterable.ListIterable; import org.eclipse.jpt.jpa.core.JpaPlatformVariation.Supported; import org.eclipse.jpt.jpa.core.MappingKeys; import org.eclipse.jpt.jpa.core.context.AssociationOverride; @@ -307,7 +308,7 @@ public abstract class AbstractOrmEntity<X extends XmlEntity> return javaEntity.getName(); } String className = this.getClass_(); - return StringTools.stringIsEmpty(className) ? null : ClassName.getSimpleName(className); + return StringTools.isBlank(className) ? null : ClassNameTools.simpleName(className); } @@ -364,8 +365,8 @@ public abstract class AbstractOrmEntity<X extends XmlEntity> String typeName = this.getPersistentType().getName(); String entityTypeName = entity.getPersistentType().getName(); String rootEntityTypeName = entity.getRootEntity().getPersistentType().getName(); - return Tools.valuesAreDifferent(typeName, entityTypeName) && - Tools.valuesAreEqual(typeName, rootEntityTypeName); + return ObjectTools.notEquals(typeName, entityTypeName) && + ObjectTools.equals(typeName, rootEntityTypeName); } @@ -1409,7 +1410,7 @@ public abstract class AbstractOrmEntity<X extends XmlEntity> } public Iterable<ReadOnlyTable> getAllAssociatedTables() { - return CollectionTools.iterable(this.allAssociatedTables()); + return CollectionTools.collection(this.allAssociatedTables()); } public Iterator<ReadOnlyTable> allAssociatedTables() { @@ -1461,7 +1462,7 @@ public abstract class AbstractOrmEntity<X extends XmlEntity> if (tableName != null && tableName.equals(this.getPrimaryTableName())) { return true; } - return CollectionTools.contains(this.getAllAssociatedTableNames(), tableName); + return IterableTools.contains(this.getAllAssociatedTableNames(), tableName); } @@ -1769,7 +1770,7 @@ public abstract class AbstractOrmEntity<X extends XmlEntity> } protected void validateEntityName(List<IMessage> messages) { - if (StringTools.stringIsEmpty(this.getName())){ + if (StringTools.isBlank(this.getName())){ messages.add( DefaultJpaValidationMessages.buildMessage( IMessage.HIGH_SEVERITY, diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmGenerator.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmGenerator.java index 8a25fa6599..c56a77f1e2 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmGenerator.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmGenerator.java @@ -11,8 +11,8 @@ package org.eclipse.jpt.jpa.core.internal.context.orm; import java.util.List; import org.eclipse.jpt.common.core.utility.TextRange; +import org.eclipse.jpt.common.utility.internal.ObjectTools; import org.eclipse.jpt.common.utility.internal.StringTools; -import org.eclipse.jpt.common.utility.internal.Tools; import org.eclipse.jpt.jpa.core.context.Generator; import org.eclipse.jpt.jpa.core.context.JpaContextNode; import org.eclipse.jpt.jpa.core.context.JpaNamedContextNode; @@ -77,7 +77,7 @@ public abstract class AbstractOrmGenerator<X extends XmlGenerator> public void validate(List<IMessage> messages, IReporter reporter) { super.validate(messages, reporter); - if (StringTools.stringIsEmpty(this.name)){ + if (StringTools.isBlank(this.name)){ messages.add( DefaultJpaValidationMessages.buildMessage( IMessage.HIGH_SEVERITY, @@ -106,7 +106,7 @@ public abstract class AbstractOrmGenerator<X extends XmlGenerator> } protected boolean isEquivalentTo(Generator generator) { - return Tools.valuesAreEqual(this.name, generator.getName()); + return ObjectTools.equals(this.name, generator.getName()); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmIdMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmIdMapping.java index f09538eb35..08e1ad96bc 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmIdMapping.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmIdMapping.java @@ -12,7 +12,7 @@ package org.eclipse.jpt.jpa.core.internal.context.orm; import java.util.List; import org.eclipse.jpt.common.core.utility.TextRange; import org.eclipse.jpt.common.utility.internal.ArrayTools; -import org.eclipse.jpt.common.utility.internal.iterables.ArrayIterable; +import org.eclipse.jpt.common.utility.internal.iterable.ArrayIterable; import org.eclipse.jpt.jpa.core.MappingKeys; import org.eclipse.jpt.jpa.core.context.Converter; import org.eclipse.jpt.jpa.core.context.Generator; diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmJoinColumnRelationshipStrategy.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmJoinColumnRelationshipStrategy.java index e4e5d78dc3..02854915d7 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmJoinColumnRelationshipStrategy.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmJoinColumnRelationshipStrategy.java @@ -10,11 +10,12 @@ package org.eclipse.jpt.jpa.core.internal.context.orm; import java.util.List; -import org.eclipse.jpt.common.utility.internal.iterables.EmptyIterable; -import org.eclipse.jpt.common.utility.internal.iterables.EmptyListIterable; -import org.eclipse.jpt.common.utility.internal.iterables.ListIterable; -import org.eclipse.jpt.common.utility.internal.iterables.LiveCloneListIterable; -import org.eclipse.jpt.common.utility.internal.iterables.SingleElementListIterable; + +import org.eclipse.jpt.common.utility.internal.iterable.EmptyIterable; +import org.eclipse.jpt.common.utility.internal.iterable.EmptyListIterable; +import org.eclipse.jpt.common.utility.internal.iterable.LiveCloneListIterable; +import org.eclipse.jpt.common.utility.internal.iterable.SingleElementListIterable; +import org.eclipse.jpt.common.utility.iterable.ListIterable; import org.eclipse.jpt.jpa.core.context.JoinColumn; import org.eclipse.jpt.jpa.core.context.ReadOnlyJoinColumn; import org.eclipse.jpt.jpa.core.context.ReadOnlyJoinColumnRelationshipStrategy; diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmJoinTableRelationshipStrategy.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmJoinTableRelationshipStrategy.java index d457d0c5a8..84bca5974d 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmJoinTableRelationshipStrategy.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmJoinTableRelationshipStrategy.java @@ -10,7 +10,7 @@ package org.eclipse.jpt.jpa.core.internal.context.orm; import java.util.List; -import org.eclipse.jpt.common.utility.internal.Tools; +import org.eclipse.jpt.common.utility.internal.ObjectTools; import org.eclipse.jpt.jpa.core.context.ReadOnlyJoinTable; import org.eclipse.jpt.jpa.core.context.ReadOnlyJoinTableRelationshipStrategy; import org.eclipse.jpt.jpa.core.context.ReadOnlyTable; @@ -181,7 +181,7 @@ public abstract class AbstractOrmJoinTableRelationshipStrategy } public boolean tableNameIsInvalid(String tableName) { - return Tools.valuesAreDifferent(this.getTableName(), tableName); + return ObjectTools.notEquals(this.getTableName(), tableName); } public String getColumnTableNotValidDescription() { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmMappedSuperclass.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmMappedSuperclass.java index 6f547d0f4e..7b737a0dd8 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmMappedSuperclass.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmMappedSuperclass.java @@ -12,8 +12,8 @@ package org.eclipse.jpt.jpa.core.internal.context.orm; import java.util.List; import org.eclipse.jdt.core.IPackageFragment; import org.eclipse.jdt.core.IType; -import org.eclipse.jpt.common.utility.internal.iterables.CompositeIterable; -import org.eclipse.jpt.common.utility.internal.iterables.EmptyIterable; +import org.eclipse.jpt.common.utility.internal.iterable.CompositeIterable; +import org.eclipse.jpt.common.utility.internal.iterable.EmptyIterable; import org.eclipse.jpt.jpa.core.MappingKeys; import org.eclipse.jpt.jpa.core.context.Query; import org.eclipse.jpt.jpa.core.context.ReadOnlyTable; diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmMultiRelationshipMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmMultiRelationshipMapping.java index 3dcd7dc0b1..41793436a9 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmMultiRelationshipMapping.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmMultiRelationshipMapping.java @@ -17,15 +17,15 @@ 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.Tools; -import org.eclipse.jpt.common.utility.internal.iterables.ArrayIterable; -import org.eclipse.jpt.common.utility.internal.iterables.CompositeIterable; -import org.eclipse.jpt.common.utility.internal.iterables.EmptyIterable; -import org.eclipse.jpt.common.utility.internal.iterables.EmptyListIterable; -import org.eclipse.jpt.common.utility.internal.iterables.ListIterable; -import org.eclipse.jpt.common.utility.internal.iterables.LiveCloneListIterable; -import org.eclipse.jpt.common.utility.internal.iterables.SingleElementIterable; -import org.eclipse.jpt.common.utility.internal.iterables.SingleElementListIterable; +import org.eclipse.jpt.common.utility.internal.ObjectTools; +import org.eclipse.jpt.common.utility.internal.iterable.ArrayIterable; +import org.eclipse.jpt.common.utility.internal.iterable.CompositeIterable; +import org.eclipse.jpt.common.utility.internal.iterable.EmptyIterable; +import org.eclipse.jpt.common.utility.internal.iterable.EmptyListIterable; +import org.eclipse.jpt.common.utility.internal.iterable.LiveCloneListIterable; +import org.eclipse.jpt.common.utility.internal.iterable.SingleElementIterable; +import org.eclipse.jpt.common.utility.internal.iterable.SingleElementListIterable; +import org.eclipse.jpt.common.utility.iterable.ListIterable; import org.eclipse.jpt.jpa.core.context.AttributeMapping; import org.eclipse.jpt.jpa.core.context.AttributeOverrideContainer; import org.eclipse.jpt.jpa.core.context.Column; @@ -1027,7 +1027,7 @@ public abstract class AbstractOrmMultiRelationshipMapping<X extends AbstractXmlM } protected void validateMapKeyClass_(List<IMessage> messages) { - if (StringTools.stringIsEmpty(getMapKeyClass())) { + if (StringTools.isBlank(getMapKeyClass())) { messages.add( DefaultJpaValidationMessages.buildMessage( IMessage.HIGH_SEVERITY, @@ -1229,7 +1229,7 @@ public abstract class AbstractOrmMultiRelationshipMapping<X extends AbstractXmlM * the default table name. the table is always the collection table */ public boolean tableNameIsInvalid(String tableName) { - return Tools.valuesAreDifferent(this.getDefaultTableName(), tableName); + return ObjectTools.notEquals(this.getDefaultTableName(), tableName); } public JptValidator buildOverrideValidator(ReadOnlyOverride override, OverrideContainer container) { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmNamedColumn.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmNamedColumn.java index b5174cf5fa..99fb373417 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmNamedColumn.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmNamedColumn.java @@ -11,7 +11,7 @@ package org.eclipse.jpt.jpa.core.internal.context.orm; import java.util.List; import org.eclipse.jpt.common.core.utility.TextRange; -import org.eclipse.jpt.common.utility.internal.iterables.EmptyIterable; +import org.eclipse.jpt.common.utility.internal.iterable.EmptyIterable; import org.eclipse.jpt.jpa.core.context.JpaContextNode; import org.eclipse.jpt.jpa.core.context.ReadOnlyNamedColumn; import org.eclipse.jpt.jpa.core.context.orm.OrmNamedColumn; diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmQuery.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmQuery.java index b9d9354fa5..da6bea6d5a 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmQuery.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmQuery.java @@ -12,11 +12,11 @@ package org.eclipse.jpt.jpa.core.internal.context.orm; import java.util.ArrayList; import java.util.List; import org.eclipse.jpt.common.core.utility.TextRange; -import org.eclipse.jpt.common.utility.internal.CollectionTools; +import org.eclipse.jpt.common.utility.internal.ObjectTools; import org.eclipse.jpt.common.utility.internal.StringTools; -import org.eclipse.jpt.common.utility.internal.Tools; -import org.eclipse.jpt.common.utility.internal.iterables.ListIterable; -import org.eclipse.jpt.common.utility.internal.iterables.LiveCloneListIterable; +import org.eclipse.jpt.common.utility.internal.collection.ListTools; +import org.eclipse.jpt.common.utility.internal.iterable.LiveCloneListIterable; +import org.eclipse.jpt.common.utility.iterable.ListIterable; import org.eclipse.jpt.jpa.core.context.JpaContextNode; import org.eclipse.jpt.jpa.core.context.JpaNamedContextNode; import org.eclipse.jpt.jpa.core.context.Query; @@ -113,7 +113,7 @@ public abstract class AbstractOrmQuery<X extends XmlQuery> protected String getUnescapedQuery() { String queryString = this.xmlQuery.getQuery(); - if (StringTools.stringIsNotEmpty(queryString)) { + if (StringTools.isNotBlank(queryString)) { queryString = ExpressionTools.unescape(queryString, new int[1]); } return queryString; @@ -226,7 +226,7 @@ public abstract class AbstractOrmQuery<X extends XmlQuery> } protected void validateName(List<IMessage> messages) { - if (StringTools.stringIsEmpty(this.name)) { + if (StringTools.isBlank(this.name)) { messages.add( DefaultJpaValidationMessages.buildMessage( IMessage.HIGH_SEVERITY, @@ -240,7 +240,7 @@ public abstract class AbstractOrmQuery<X extends XmlQuery> } protected void validateQuery(JpaJpqlQueryHelper queryHelper, List<IMessage> messages, IReporter reporter) { - if (StringTools.stringIsEmpty(this.query)){ + if (StringTools.isBlank(this.query)){ messages.add( DefaultJpaValidationMessages.buildMessage( IMessage.HIGH_SEVERITY, @@ -277,15 +277,15 @@ public abstract class AbstractOrmQuery<X extends XmlQuery> } protected boolean isEquivalentTo(Query other) { - return Tools.valuesAreEqual(this.name, other.getName()) && - Tools.valuesAreEqual(this.query, other.getQuery()) && + return ObjectTools.equals(this.name, other.getName()) && + ObjectTools.equals(this.query, other.getQuery()) && this.hintsAreEquivalentTo(other); } protected boolean hintsAreEquivalentTo(Query other) { // get fixed lists of the hints - ArrayList<OrmQueryHint> hints1 = CollectionTools.list(this.getHints()); - ArrayList<? extends QueryHint> hints2 = CollectionTools.list(other.getHints()); + ArrayList<OrmQueryHint> hints1 = ListTools.list(this.getHints()); + ArrayList<? extends QueryHint> hints2 = ListTools.list(other.getHints()); if (hints1.size() != hints2.size()) { return false; } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmReadOnlyUniqueConstraint.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmReadOnlyUniqueConstraint.java index b82eb7e7dc..e06ea85dfc 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmReadOnlyUniqueConstraint.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmReadOnlyUniqueConstraint.java @@ -1,54 +1,53 @@ -/******************************************************************************* +/*******************************************************************************
* Copyright (c) 2008, 2012 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. - * - * Contributors: - * Oracle - initial API and implementation - ******************************************************************************/ -package org.eclipse.jpt.jpa.core.internal.context.orm; - -import java.util.Vector; - -import org.eclipse.jpt.common.utility.internal.iterables.LiveCloneListIterable; + * 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.
+ *
+ * Contributors:
+ * Oracle - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.jpt.jpa.core.internal.context.orm;
+
+import java.util.Vector;
+import org.eclipse.jpt.common.utility.internal.iterable.LiveCloneListIterable; import org.eclipse.jpt.jpa.core.context.JpaContextNode; import org.eclipse.jpt.jpa.core.context.ReadOnlyUniqueConstraint; - -public abstract class AbstractOrmReadOnlyUniqueConstraint - extends AbstractOrmXmlContextNode +
+public abstract class AbstractOrmReadOnlyUniqueConstraint
+ extends AbstractOrmXmlContextNode
implements ReadOnlyUniqueConstraint -{ - protected final Vector<String> columnNames = new Vector<String>(); - - +{
+ protected final Vector<String> columnNames = new Vector<String>();
+
+
public AbstractOrmReadOnlyUniqueConstraint(JpaContextNode parent) { - super(parent); - } - - - // ********** column names ********** - - public Iterable<String> getColumnNames() { - return new LiveCloneListIterable<String>(this.columnNames); - } - - public int getColumnNamesSize() { - return this.columnNames.size(); - } - - public String getColumnName(int index) { - return this.columnNames.get(index); - } - - protected void syncColumnNames() { - this.synchronizeList(this.getResourceColumnNames(), this.columnNames, COLUMN_NAMES_LIST); - } - - protected abstract Iterable<String> getResourceColumnNames(); - - @Override - public void toString(StringBuilder sb) { - sb.append(this.columnNames); - } -} + super(parent);
+ }
+
+
+ // ********** column names **********
+
+ public Iterable<String> getColumnNames() {
+ return new LiveCloneListIterable<String>(this.columnNames);
+ }
+
+ public int getColumnNamesSize() {
+ return this.columnNames.size();
+ }
+
+ public String getColumnName(int index) {
+ return this.columnNames.get(index);
+ }
+
+ protected void syncColumnNames() {
+ this.synchronizeList(this.getResourceColumnNames(), this.columnNames, COLUMN_NAMES_LIST);
+ }
+
+ protected abstract Iterable<String> getResourceColumnNames();
+
+ @Override
+ public void toString(StringBuilder sb) {
+ sb.append(this.columnNames);
+ }
+}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmRelationshipMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmRelationshipMapping.java index e2ecc723a0..aaf0128737 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmRelationshipMapping.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmRelationshipMapping.java @@ -15,10 +15,10 @@ 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.common.utility.internal.iterables.EmptyIterable; -import org.eclipse.jpt.common.utility.internal.iterables.SingleElementIterable; -import org.eclipse.jpt.common.utility.internal.iterables.TransformationIterable; +import org.eclipse.jpt.common.utility.internal.iterable.CompositeIterable; +import org.eclipse.jpt.common.utility.internal.iterable.EmptyIterable; +import org.eclipse.jpt.common.utility.internal.iterable.SingleElementIterable; +import org.eclipse.jpt.common.utility.internal.iterable.TransformationIterable; import org.eclipse.jpt.jpa.core.context.AttributeMapping; import org.eclipse.jpt.jpa.core.context.Entity; import org.eclipse.jpt.jpa.core.context.FetchType; @@ -391,7 +391,7 @@ public abstract class AbstractOrmRelationshipMapping<X extends AbstractXmlRelati } protected void validateTargetEntity(List<IMessage> messages) { - if (StringTools.stringIsEmpty(this.getTargetEntity())) { + if (StringTools.isBlank(this.getTargetEntity())) { messages.add( DefaultJpaValidationMessages.buildMessage( IMessage.HIGH_SEVERITY, diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmSequenceGenerator.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmSequenceGenerator.java index b4bd9c32b1..7fd53b0cba 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmSequenceGenerator.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmSequenceGenerator.java @@ -9,8 +9,8 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.internal.context.orm; -import org.eclipse.jpt.common.utility.internal.Tools; -import org.eclipse.jpt.common.utility.internal.iterables.EmptyIterable; +import org.eclipse.jpt.common.utility.internal.ObjectTools; +import org.eclipse.jpt.common.utility.internal.iterable.EmptyIterable; import org.eclipse.jpt.jpa.core.context.DbGenerator; import org.eclipse.jpt.jpa.core.context.JpaContextNode; import org.eclipse.jpt.jpa.core.context.SequenceGenerator; @@ -109,7 +109,7 @@ public abstract class AbstractOrmSequenceGenerator } protected boolean isEquivalentTo(SequenceGenerator generator) { - return Tools.valuesAreEqual(this.specifiedSequenceName, generator.getSpecifiedSequenceName()); + return ObjectTools.equals(this.specifiedSequenceName, generator.getSpecifiedSequenceName()); } // ********** metadata conversion ********** diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmTable.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmTable.java index 3333e40f8b..fa748780ac 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmTable.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmTable.java @@ -12,10 +12,10 @@ package org.eclipse.jpt.jpa.core.internal.context.orm; import java.util.List; import org.eclipse.jpt.common.core.utility.TextRange; import org.eclipse.jpt.common.utility.internal.NameTools; -import org.eclipse.jpt.common.utility.internal.iterables.EmptyIterable; -import org.eclipse.jpt.common.utility.internal.iterables.EmptyListIterable; -import org.eclipse.jpt.common.utility.internal.iterables.ListIterable; -import org.eclipse.jpt.common.utility.internal.iterables.LiveCloneListIterable; +import org.eclipse.jpt.common.utility.internal.iterable.EmptyIterable; +import org.eclipse.jpt.common.utility.internal.iterable.EmptyListIterable; +import org.eclipse.jpt.common.utility.internal.iterable.LiveCloneListIterable; +import org.eclipse.jpt.common.utility.iterable.ListIterable; import org.eclipse.jpt.jpa.core.context.JpaContextNode; import org.eclipse.jpt.jpa.core.context.ReadOnlyTable; import org.eclipse.jpt.jpa.core.context.ReadOnlyUniqueConstraint; @@ -564,7 +564,7 @@ public abstract class AbstractOrmTable<X extends AbstractXmlTable> } protected String buildQualifiedName() { - return NameTools.buildQualifiedDatabaseObjectName(this.getCatalog(), this.getSchema(), this.getName()); + return NameTools.buildQualifiedName(this.getCatalog(), this.getSchema(), this.getName()); } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmTypeMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmTypeMapping.java index c8111cad03..4c82cf096c 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmTypeMapping.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmTypeMapping.java @@ -14,13 +14,13 @@ import org.eclipse.jdt.core.IPackageFragment; import org.eclipse.jdt.core.IType; import org.eclipse.jpt.common.core.resource.java.JavaResourceType; import org.eclipse.jpt.common.core.utility.TextRange; +import org.eclipse.jpt.common.utility.internal.ObjectTools; import org.eclipse.jpt.common.utility.internal.StringTools; -import org.eclipse.jpt.common.utility.internal.Tools; -import org.eclipse.jpt.common.utility.internal.iterables.CompositeIterable; -import org.eclipse.jpt.common.utility.internal.iterables.EmptyIterable; -import org.eclipse.jpt.common.utility.internal.iterables.FilteringIterable; -import org.eclipse.jpt.common.utility.internal.iterables.SingleElementIterable; -import org.eclipse.jpt.common.utility.internal.iterables.TransformationIterable; +import org.eclipse.jpt.common.utility.internal.iterable.CompositeIterable; +import org.eclipse.jpt.common.utility.internal.iterable.EmptyIterable; +import org.eclipse.jpt.common.utility.internal.iterable.FilteringIterable; +import org.eclipse.jpt.common.utility.internal.iterable.SingleElementIterable; +import org.eclipse.jpt.common.utility.internal.iterable.TransformationIterable; import org.eclipse.jpt.jpa.core.JpaStructureNode; import org.eclipse.jpt.jpa.core.MappingKeys; import org.eclipse.jpt.jpa.core.context.AttributeMapping; @@ -369,7 +369,7 @@ public abstract class AbstractOrmTypeMapping<X extends XmlTypeMapping> return new FilteringIterable<AttributeMapping>(this.getAttributeMappings()) { @Override protected boolean accept(AttributeMapping o) { - return Tools.valuesAreEqual(o.getKey(), mappingKey); + return ObjectTools.equals(o.getKey(), mappingKey); } }; } @@ -378,7 +378,7 @@ public abstract class AbstractOrmTypeMapping<X extends XmlTypeMapping> return new FilteringIterable<AttributeMapping>(this.getAllAttributeMappings()) { @Override protected boolean accept(AttributeMapping o) { - return Tools.valuesAreEqual(o.getKey(), mappingKey); + return ObjectTools.equals(o.getKey(), mappingKey); } }; } @@ -568,7 +568,7 @@ public abstract class AbstractOrmTypeMapping<X extends XmlTypeMapping> } protected void validateClass(List<IMessage> messages, IReporter reporter) { - if (StringTools.stringIsEmpty(this.class_)) { + if (StringTools.isBlank(this.class_)) { messages.add( DefaultJpaValidationMessages.buildMessage( IMessage.HIGH_SEVERITY, diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmVersionMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmVersionMapping.java index 7baee3844d..ac69a027e4 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmVersionMapping.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmVersionMapping.java @@ -11,7 +11,7 @@ package org.eclipse.jpt.jpa.core.internal.context.orm; import java.util.List; import org.eclipse.jpt.common.utility.internal.ArrayTools; -import org.eclipse.jpt.common.utility.internal.iterables.ArrayIterable; +import org.eclipse.jpt.common.utility.internal.iterable.ArrayIterable; import org.eclipse.jpt.jpa.core.MappingKeys; import org.eclipse.jpt.jpa.core.context.Converter; import org.eclipse.jpt.jpa.core.context.ReadOnlyBaseColumn; diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmVirtualReferenceTable.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmVirtualReferenceTable.java index 30c0614eb6..1f34e3c699 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmVirtualReferenceTable.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmVirtualReferenceTable.java @@ -10,10 +10,11 @@ package org.eclipse.jpt.jpa.core.internal.context.orm; import java.util.List; -import org.eclipse.jpt.common.utility.internal.iterables.EmptyListIterable; -import org.eclipse.jpt.common.utility.internal.iterables.ListIterable; -import org.eclipse.jpt.common.utility.internal.iterables.SingleElementListIterable; -import org.eclipse.jpt.common.utility.internal.iterables.SuperListIterableWrapper; + +import org.eclipse.jpt.common.utility.internal.iterable.EmptyListIterable; +import org.eclipse.jpt.common.utility.internal.iterable.SingleElementListIterable; +import org.eclipse.jpt.common.utility.internal.iterable.SuperListIterableWrapper; +import org.eclipse.jpt.common.utility.iterable.ListIterable; import org.eclipse.jpt.jpa.core.context.JpaContextNode; import org.eclipse.jpt.jpa.core.context.ReadOnlyJoinColumn; import org.eclipse.jpt.jpa.core.context.ReadOnlyReferenceTable; diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmVirtualTable.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmVirtualTable.java index e4d37b097b..0013583b79 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmVirtualTable.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmVirtualTable.java @@ -12,8 +12,8 @@ package org.eclipse.jpt.jpa.core.internal.context.orm; import java.util.List; import org.eclipse.jpt.common.core.utility.TextRange; import org.eclipse.jpt.common.utility.internal.NameTools; -import org.eclipse.jpt.common.utility.internal.iterables.ListIterable; -import org.eclipse.jpt.common.utility.internal.iterables.SuperListIterableWrapper; +import org.eclipse.jpt.common.utility.internal.iterable.SuperListIterableWrapper; +import org.eclipse.jpt.common.utility.iterable.ListIterable; import org.eclipse.jpt.jpa.core.context.JpaContextNode; import org.eclipse.jpt.jpa.core.context.ReadOnlyTable; import org.eclipse.jpt.jpa.core.context.ReadOnlyUniqueConstraint; @@ -348,6 +348,6 @@ public abstract class AbstractOrmVirtualTable<T extends ReadOnlyTable> } protected String buildQualifiedName() { - return NameTools.buildQualifiedDatabaseObjectName(this.getCatalog(), this.getSchema(), this.getName()); + return NameTools.buildQualifiedName(this.getCatalog(), this.getSchema(), this.getName()); } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmXmlDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmXmlDefinition.java index 9ce4ecd589..4935c83529 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmXmlDefinition.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmXmlDefinition.java @@ -13,13 +13,14 @@ import java.util.ArrayList; import org.eclipse.core.runtime.content.IContentType; import org.eclipse.jpt.common.core.JptResourceType; import org.eclipse.jpt.common.core.internal.utility.PlatformTools; -import org.eclipse.jpt.common.utility.internal.CollectionTools; -import org.eclipse.jpt.common.utility.internal.Tools; +import org.eclipse.jpt.common.utility.internal.ObjectTools; +import org.eclipse.jpt.common.utility.internal.collection.CollectionTools; import org.eclipse.jpt.jpa.core.context.orm.OrmAttributeMappingDefinition; import org.eclipse.jpt.jpa.core.context.orm.OrmTypeMappingDefinition; import org.eclipse.jpt.jpa.core.context.orm.OrmXmlContextNodeFactory; import org.eclipse.jpt.jpa.core.context.orm.OrmXmlDefinition; import org.eclipse.jpt.jpa.core.context.orm.UnsupportedOrmAttributeMappingDefinition; +import org.eclipse.jpt.jpa.core.internal.GenericJpaPlatformProvider; /** * All the state in the definition should be "static" @@ -57,7 +58,7 @@ public abstract class AbstractOrmXmlDefinition public OrmTypeMappingDefinition getTypeMappingDefinition(String mappingKey) { for (OrmTypeMappingDefinition definition : this.getTypeMappingDefinitions()) { - if (Tools.valuesAreEqual(definition.getKey(), mappingKey)) { + if (ObjectTools.equals(definition.getKey(), mappingKey)) { return definition; } } @@ -101,7 +102,7 @@ public abstract class AbstractOrmXmlDefinition public OrmAttributeMappingDefinition getAttributeMappingDefinition(String mappingKey) { for (OrmAttributeMappingDefinition definition : this.getAttributeMappingDefinitions()) { - if (Tools.valuesAreEqual(definition.getKey(), mappingKey)) { + if (ObjectTools.equals(definition.getKey(), mappingKey)) { return definition; } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/GenericOrmIdClassReference.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/GenericOrmIdClassReference.java index 0854342906..3ddfa595a3 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/GenericOrmIdClassReference.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/GenericOrmIdClassReference.java @@ -17,8 +17,8 @@ import org.eclipse.jpt.common.core.resource.java.JavaResourceAnnotatedElement.Ki import org.eclipse.jpt.common.core.resource.java.JavaResourceType; import org.eclipse.jpt.common.core.utility.TextRange; import org.eclipse.jpt.common.utility.internal.StringTools; -import org.eclipse.jpt.common.utility.internal.iterables.EmptyIterable; -import org.eclipse.jpt.common.utility.internal.iterables.SingleElementIterable; +import org.eclipse.jpt.common.utility.internal.iterable.EmptyIterable; +import org.eclipse.jpt.common.utility.internal.iterable.SingleElementIterable; import org.eclipse.jpt.jpa.core.context.AccessType; import org.eclipse.jpt.jpa.core.context.java.JavaIdClassReference; import org.eclipse.jpt.jpa.core.context.java.JavaPersistentType; @@ -351,7 +351,7 @@ public class GenericOrmIdClassReference protected void validateIdClass(List<IMessage> messages, IReporter reporter) { if (this.isSpecified()) { - if (StringTools.stringIsEmpty(this.getIdClassName())) { + if (StringTools.isBlank(this.getIdClassName())) { messages.add( DefaultJpaValidationMessages.buildMessage( IMessage.HIGH_SEVERITY, diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/GenericOrmMappedByRelationshipStrategy.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/GenericOrmMappedByRelationshipStrategy.java index 39d7b4102e..8d0f46fee8 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/GenericOrmMappedByRelationshipStrategy.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/GenericOrmMappedByRelationshipStrategy.java @@ -12,7 +12,7 @@ package org.eclipse.jpt.jpa.core.internal.context.orm; import java.util.List; import org.eclipse.jpt.common.core.utility.TextRange; import org.eclipse.jpt.common.utility.internal.ArrayTools; -import org.eclipse.jpt.common.utility.internal.Tools; +import org.eclipse.jpt.common.utility.internal.ObjectTools; import org.eclipse.jpt.jpa.core.context.AttributeMapping; import org.eclipse.jpt.jpa.core.context.Entity; import org.eclipse.jpt.jpa.core.context.MappedByRelationshipStrategy; @@ -126,8 +126,8 @@ public class GenericOrmMappedByRelationshipStrategy String thisEntityName = this.getEntityName(); Entity otherEntity = otherMapping.getResolvedTargetEntity(); String otherEntityName = (otherEntity == null) ? null : otherEntity.getName(); - return Tools.valuesAreEqual(thisEntityName, otherEntityName) && - Tools.valuesAreEqual(this.mappedByAttribute, otherMapping.getName()); + return ObjectTools.equals(thisEntityName, otherEntityName) && + ObjectTools.equals(this.mappedByAttribute, otherMapping.getName()); } protected String getEntityName() { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/GenericOrmPrimaryKeyJoinColumnRelationshipStrategy.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/GenericOrmPrimaryKeyJoinColumnRelationshipStrategy.java index e79231aa95..08155560d4 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/GenericOrmPrimaryKeyJoinColumnRelationshipStrategy.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/GenericOrmPrimaryKeyJoinColumnRelationshipStrategy.java @@ -11,8 +11,8 @@ package org.eclipse.jpt.jpa.core.internal.context.orm; import java.util.List; import org.eclipse.jpt.common.core.utility.TextRange; -import org.eclipse.jpt.common.utility.internal.iterables.ListIterable; -import org.eclipse.jpt.common.utility.internal.iterables.LiveCloneListIterable; +import org.eclipse.jpt.common.utility.internal.iterable.LiveCloneListIterable; +import org.eclipse.jpt.common.utility.iterable.ListIterable; import org.eclipse.jpt.jpa.core.context.Entity; import org.eclipse.jpt.jpa.core.context.PersistentAttribute; import org.eclipse.jpt.jpa.core.context.PrimaryKeyJoinColumn; diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/GenericOrmVirtualJoinTable.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/GenericOrmVirtualJoinTable.java index 4ce22237d2..41fb358059 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/GenericOrmVirtualJoinTable.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/GenericOrmVirtualJoinTable.java @@ -11,12 +11,12 @@ package org.eclipse.jpt.jpa.core.internal.context.orm; import java.util.List; import org.eclipse.jpt.common.core.utility.TextRange; -import org.eclipse.jpt.common.utility.internal.Tools; -import org.eclipse.jpt.common.utility.internal.iterables.EmptyIterable; -import org.eclipse.jpt.common.utility.internal.iterables.EmptyListIterable; -import org.eclipse.jpt.common.utility.internal.iterables.ListIterable; -import org.eclipse.jpt.common.utility.internal.iterables.SingleElementListIterable; -import org.eclipse.jpt.common.utility.internal.iterables.SuperListIterableWrapper; +import org.eclipse.jpt.common.utility.internal.ObjectTools; +import org.eclipse.jpt.common.utility.internal.iterable.EmptyIterable; +import org.eclipse.jpt.common.utility.internal.iterable.EmptyListIterable; +import org.eclipse.jpt.common.utility.internal.iterable.SingleElementListIterable; +import org.eclipse.jpt.common.utility.internal.iterable.SuperListIterableWrapper; +import org.eclipse.jpt.common.utility.iterable.ListIterable; import org.eclipse.jpt.jpa.core.context.Entity; import org.eclipse.jpt.jpa.core.context.PersistentAttribute; import org.eclipse.jpt.jpa.core.context.ReadOnlyJoinColumn; @@ -253,7 +253,7 @@ public class GenericOrmVirtualJoinTable * the default table name. The table is always the join table. */ public boolean tableNameIsInvalid(String tableName) { - return Tools.valuesAreDifferent(this.getDefaultTableName(), tableName); + return ObjectTools.notEquals(this.getDefaultTableName(), tableName); } /** @@ -264,7 +264,7 @@ public class GenericOrmVirtualJoinTable } public org.eclipse.jpt.jpa.db.Table resolveDbTable(String tableName) { - return Tools.valuesAreEqual(GenericOrmVirtualJoinTable.this.getName(), tableName) ? + return ObjectTools.equals(GenericOrmVirtualJoinTable.this.getName(), tableName) ? GenericOrmVirtualJoinTable.this.getDbTable() : null; } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/GenericOrmVirtualOverrideJoinColumnRelationshipStrategy.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/GenericOrmVirtualOverrideJoinColumnRelationshipStrategy.java index 1bc7767e57..c5d627dda3 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/GenericOrmVirtualOverrideJoinColumnRelationshipStrategy.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/GenericOrmVirtualOverrideJoinColumnRelationshipStrategy.java @@ -11,11 +11,11 @@ package org.eclipse.jpt.jpa.core.internal.context.orm; import java.util.List; import org.eclipse.jpt.common.core.utility.TextRange; -import org.eclipse.jpt.common.utility.internal.iterables.EmptyIterable; -import org.eclipse.jpt.common.utility.internal.iterables.EmptyListIterable; -import org.eclipse.jpt.common.utility.internal.iterables.ListIterable; -import org.eclipse.jpt.common.utility.internal.iterables.SingleElementListIterable; -import org.eclipse.jpt.common.utility.internal.iterables.SuperListIterableWrapper; +import org.eclipse.jpt.common.utility.internal.iterable.EmptyIterable; +import org.eclipse.jpt.common.utility.internal.iterable.EmptyListIterable; +import org.eclipse.jpt.common.utility.internal.iterable.SingleElementListIterable; +import org.eclipse.jpt.common.utility.internal.iterable.SuperListIterableWrapper; +import org.eclipse.jpt.common.utility.iterable.ListIterable; import org.eclipse.jpt.jpa.core.context.Entity; import org.eclipse.jpt.jpa.core.context.ReadOnlyBaseColumn; import org.eclipse.jpt.jpa.core.context.ReadOnlyJoinColumn; diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/GenericOrmVirtualSecondaryTable.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/GenericOrmVirtualSecondaryTable.java index 326d102d35..b23892583e 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/GenericOrmVirtualSecondaryTable.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/GenericOrmVirtualSecondaryTable.java @@ -11,9 +11,9 @@ package org.eclipse.jpt.jpa.core.internal.context.orm; import java.util.List; import org.eclipse.jpt.common.core.utility.TextRange; -import org.eclipse.jpt.common.utility.internal.iterables.EmptyListIterable; -import org.eclipse.jpt.common.utility.internal.iterables.ListIterable; -import org.eclipse.jpt.common.utility.internal.iterables.SingleElementListIterable; +import org.eclipse.jpt.common.utility.internal.iterable.EmptyListIterable; +import org.eclipse.jpt.common.utility.internal.iterable.SingleElementListIterable; +import org.eclipse.jpt.common.utility.iterable.ListIterable; import org.eclipse.jpt.jpa.core.context.Entity; import org.eclipse.jpt.jpa.core.context.ReadOnlyBaseJoinColumn; import org.eclipse.jpt.jpa.core.context.ReadOnlyNamedColumn; diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/SpecifiedOrmPersistentAttribute.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/SpecifiedOrmPersistentAttribute.java index 749d57ea02..b2097ab298 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/SpecifiedOrmPersistentAttribute.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/SpecifiedOrmPersistentAttribute.java @@ -20,9 +20,9 @@ import org.eclipse.jpt.common.core.resource.java.JavaResourceMethod; import org.eclipse.jpt.common.core.resource.java.JavaResourceType; import org.eclipse.jpt.common.core.utility.TextRange; import org.eclipse.jpt.common.core.utility.jdt.TypeBinding; -import org.eclipse.jpt.common.utility.Filter; +import org.eclipse.jpt.common.utility.filter.Filter; import org.eclipse.jpt.common.utility.internal.StringTools; -import org.eclipse.jpt.common.utility.internal.iterables.FilteringIterable; +import org.eclipse.jpt.common.utility.internal.iterable.FilteringIterable; import org.eclipse.jpt.jpa.core.JpaFile; import org.eclipse.jpt.jpa.core.JpaStructureNode; import org.eclipse.jpt.jpa.core.context.AccessType; @@ -496,7 +496,7 @@ public abstract class SpecifiedOrmPersistentAttribute protected void validateUnresolvedAttribute(List<IMessage> messages) { String name = this.getName(); - if (StringTools.stringIsEmpty(name)) { + if (StringTools.isBlank(name)) { // if the name null, there will already be an XSD-driven error; // if the name is empty or whitespace, there will already be an attribute mapping error return; diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/SpecifiedOrmPersistentType.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/SpecifiedOrmPersistentType.java index 35e00747b4..f874e5df98 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/SpecifiedOrmPersistentType.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/SpecifiedOrmPersistentType.java @@ -27,22 +27,24 @@ import org.eclipse.jpt.common.core.resource.xml.EmfTools; import org.eclipse.jpt.common.core.utility.BodySourceWriter; import org.eclipse.jpt.common.core.utility.TextRange; import org.eclipse.jpt.common.core.utility.jdt.TypeBinding; -import org.eclipse.jpt.common.utility.Filter; -import org.eclipse.jpt.common.utility.internal.ClassName; -import org.eclipse.jpt.common.utility.internal.CollectionTools; +import org.eclipse.jpt.common.utility.filter.Filter; +import org.eclipse.jpt.common.utility.internal.ClassNameTools; +import org.eclipse.jpt.common.utility.internal.ObjectTools; import org.eclipse.jpt.common.utility.internal.StringTools; -import org.eclipse.jpt.common.utility.internal.Tools; -import org.eclipse.jpt.common.utility.internal.iterables.ChainIterable; -import org.eclipse.jpt.common.utility.internal.iterables.CompositeIterable; -import org.eclipse.jpt.common.utility.internal.iterables.CompositeListIterable; -import org.eclipse.jpt.common.utility.internal.iterables.EmptyIterable; -import org.eclipse.jpt.common.utility.internal.iterables.EmptyListIterable; -import org.eclipse.jpt.common.utility.internal.iterables.FilteringIterable; -import org.eclipse.jpt.common.utility.internal.iterables.ListIterable; -import org.eclipse.jpt.common.utility.internal.iterables.LiveCloneListIterable; -import org.eclipse.jpt.common.utility.internal.iterables.SingleElementIterable; -import org.eclipse.jpt.common.utility.internal.iterables.SuperListIterableWrapper; -import org.eclipse.jpt.common.utility.internal.iterables.TransformationIterable; +import org.eclipse.jpt.common.utility.internal.collection.CollectionTools; +import org.eclipse.jpt.common.utility.internal.collection.ListTools; +import org.eclipse.jpt.common.utility.internal.iterable.ChainIterable; +import org.eclipse.jpt.common.utility.internal.iterable.CompositeIterable; +import org.eclipse.jpt.common.utility.internal.iterable.CompositeListIterable; +import org.eclipse.jpt.common.utility.internal.iterable.EmptyIterable; +import org.eclipse.jpt.common.utility.internal.iterable.EmptyListIterable; +import org.eclipse.jpt.common.utility.internal.iterable.FilteringIterable; +import org.eclipse.jpt.common.utility.internal.iterable.IterableTools; +import org.eclipse.jpt.common.utility.internal.iterable.LiveCloneListIterable; +import org.eclipse.jpt.common.utility.internal.iterable.SingleElementIterable; +import org.eclipse.jpt.common.utility.internal.iterable.SuperListIterableWrapper; +import org.eclipse.jpt.common.utility.internal.iterable.TransformationIterable; +import org.eclipse.jpt.common.utility.iterable.ListIterable; import org.eclipse.jpt.jpa.core.JpaFile; import org.eclipse.jpt.jpa.core.JpaStructureNode; import org.eclipse.jpt.jpa.core.context.AccessType; @@ -216,7 +218,7 @@ public abstract class SpecifiedOrmPersistentType public String getSimpleName(){ String className = this.getName(); - return StringTools.stringIsEmpty(className) ? null : ClassName.getSimpleName(className); + return StringTools.isBlank(className) ? null : ClassNameTools.simpleName(className); } protected String getMappingClassName() { @@ -403,7 +405,7 @@ public abstract class SpecifiedOrmPersistentType return new FilteringIterable<OrmReadOnlyPersistentAttribute>(this.getAttributes()) { @Override protected boolean accept(OrmReadOnlyPersistentAttribute attribute) { - return Tools.valuesAreEqual(attributeName, attribute.getName()); + return ObjectTools.equals(attributeName, attribute.getName()); } }; } @@ -492,7 +494,7 @@ public abstract class SpecifiedOrmPersistentType } protected int getSpecifiedAttributeInsertionIndex(OrmPersistentAttribute attribute) { - return CollectionTools.insertionIndexOf(this.specifiedAttributes, attribute, this.getAttributeComparator()); + return ListTools.insertionIndexOf(this.specifiedAttributes, attribute, this.getAttributeComparator()); } protected Comparator<OrmPersistentAttribute> getAttributeComparator() { @@ -561,7 +563,7 @@ public abstract class SpecifiedOrmPersistentType * remaining specified attributes. */ protected boolean javaResourceFieldWillBeDefault(JavaResourceField javaResourceField, OrmPersistentAttribute specifiedAttributeToBeRemoved) { - return CollectionTools.contains(this.getJavaResourceFields(), javaResourceField) && + return IterableTools.contains(this.getJavaResourceFields(), javaResourceField) && (this.getSpecifiedAttributeFor(javaResourceField, specifiedAttributeToBeRemoved) == null); } @@ -573,8 +575,8 @@ public abstract class SpecifiedOrmPersistentType * remaining specified attributes. */ protected boolean javaResourcePropertyWillBeDefault(JavaResourceMethod javaResourceGetter, JavaResourceMethod javaResourceSetter, OrmPersistentAttribute specifiedAttributeToBeRemoved) { - return CollectionTools.contains(this.getJavaResourceMethods(), javaResourceGetter) && - CollectionTools.contains(this.getJavaResourceMethods(), javaResourceSetter) && + return IterableTools.contains(this.getJavaResourceMethods(), javaResourceGetter) && + IterableTools.contains(this.getJavaResourceMethods(), javaResourceSetter) && (this.getSpecifiedAttributeFor(javaResourceGetter, javaResourceSetter, specifiedAttributeToBeRemoved) == null); } @@ -1024,7 +1026,7 @@ public abstract class SpecifiedOrmPersistentType return null; } // check for circular inheritance - return CollectionTools.contains(spt.getInheritanceHierarchy(), this) ? null : spt; + return IterableTools.contains(spt.getInheritanceHierarchy(), this) ? null : spt; } protected PersistentType buildSuperPersistentType_() { @@ -1339,12 +1341,12 @@ public abstract class SpecifiedOrmPersistentType } public boolean isFor(String typeName) { - return Tools.valuesAreEqual(typeName, this.getName()); + return ObjectTools.equals(typeName, this.getName()); } public boolean isIn(IPackageFragment packageFragment) { String packageName = this.getPackageName(); - if (Tools.valuesAreEqual(packageName, packageFragment.getElementName())) { + if (ObjectTools.equals(packageName, packageFragment.getElementName())) { return true; } return false; diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/persistence/AbstractJarFileRef.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/persistence/AbstractJarFileRef.java index 1a2fcc6b7c..f98e032d44 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/persistence/AbstractJarFileRef.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/persistence/AbstractJarFileRef.java @@ -20,8 +20,8 @@ import org.eclipse.jpt.common.core.internal.utility.ProjectTools; import org.eclipse.jpt.common.core.resource.java.JavaResourcePackageFragmentRoot; import org.eclipse.jpt.common.core.utility.TextRange; import org.eclipse.jpt.common.utility.internal.StringTools; -import org.eclipse.jpt.common.utility.internal.iterables.EmptyIterable; -import org.eclipse.jpt.common.utility.internal.iterables.SingleElementIterable; +import org.eclipse.jpt.common.utility.internal.iterable.EmptyIterable; +import org.eclipse.jpt.common.utility.internal.iterable.SingleElementIterable; import org.eclipse.jpt.jpa.core.JpaFile; import org.eclipse.jpt.jpa.core.JpaStructureNode; import org.eclipse.jpt.jpa.core.context.PersistentType; @@ -199,7 +199,7 @@ public abstract class AbstractJarFileRef } protected JavaResourcePackageFragmentRoot resolveJavaResourcePackageFragmentRoot() { - return StringTools.stringIsEmpty(this.fileName) ? null : this.resolveJavaResourcePackageFragmentRoot_(); + return StringTools.isBlank(this.fileName) ? null : this.resolveJavaResourcePackageFragmentRoot_(); } /** @@ -343,7 +343,7 @@ public abstract class AbstractJarFileRef public void validate(List<IMessage> messages, IReporter reporter) { super.validate(messages, reporter); - if (StringTools.stringIsEmpty(this.xmlJarFileRef.getFileName())) { + if (StringTools.isBlank(this.xmlJarFileRef.getFileName())) { messages.add( DefaultJpaValidationMessages.buildMessage( IMessage.HIGH_SEVERITY, diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/persistence/AbstractMappingFileRef.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/persistence/AbstractMappingFileRef.java index 4485663841..60bf2f3fe1 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/persistence/AbstractMappingFileRef.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/persistence/AbstractMappingFileRef.java @@ -18,8 +18,8 @@ import org.eclipse.core.runtime.Path; import org.eclipse.jdt.core.IPackageFragment; import org.eclipse.jdt.core.IType; import org.eclipse.jpt.common.utility.internal.StringTools; -import org.eclipse.jpt.common.utility.internal.iterables.EmptyIterable; -import org.eclipse.jpt.common.utility.internal.iterables.SingleElementIterable; +import org.eclipse.jpt.common.utility.internal.iterable.EmptyIterable; +import org.eclipse.jpt.common.utility.internal.iterable.SingleElementIterable; import org.eclipse.jpt.jpa.core.JpaFile; import org.eclipse.jpt.jpa.core.JpaStructureNode; import org.eclipse.jpt.jpa.core.context.Generator; @@ -256,7 +256,7 @@ public abstract class AbstractMappingFileRef<MF extends MappingFile> public void validate(List<IMessage> messages, IReporter reporter) { super.validate(messages, reporter); - if (StringTools.stringIsEmpty(this.fileName)) { + if (StringTools.isBlank(this.fileName)) { messages.add( DefaultJpaValidationMessages.buildMessage( IMessage.HIGH_SEVERITY, diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/persistence/AbstractPersistenceUnit.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/persistence/AbstractPersistenceUnit.java index 87fd7f8068..f3e32083f1 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/persistence/AbstractPersistenceUnit.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/persistence/AbstractPersistenceUnit.java @@ -36,21 +36,21 @@ import org.eclipse.jpt.common.core.resource.java.JavaResourceAbstractType; import org.eclipse.jpt.common.core.resource.java.JavaResourceType; import org.eclipse.jpt.common.core.utility.BodySourceWriter; import org.eclipse.jpt.common.core.utility.TextRange; -import org.eclipse.jpt.common.utility.internal.CollectionTools; -import org.eclipse.jpt.common.utility.internal.NonEmptyStringFilter; -import org.eclipse.jpt.common.utility.internal.NotNullFilter; +import org.eclipse.jpt.common.utility.internal.ObjectTools; import org.eclipse.jpt.common.utility.internal.StringTools; -import org.eclipse.jpt.common.utility.internal.Tools; -import org.eclipse.jpt.common.utility.internal.iterables.CompositeIterable; -import org.eclipse.jpt.common.utility.internal.iterables.CompositeListIterable; -import org.eclipse.jpt.common.utility.internal.iterables.EmptyIterable; -import org.eclipse.jpt.common.utility.internal.iterables.EmptyListIterable; -import org.eclipse.jpt.common.utility.internal.iterables.FilteringIterable; -import org.eclipse.jpt.common.utility.internal.iterables.ListIterable; -import org.eclipse.jpt.common.utility.internal.iterables.LiveCloneIterable; -import org.eclipse.jpt.common.utility.internal.iterables.LiveCloneListIterable; -import org.eclipse.jpt.common.utility.internal.iterables.SubIterableWrapper; -import org.eclipse.jpt.common.utility.internal.iterables.TransformationIterable; +import org.eclipse.jpt.common.utility.internal.collection.CollectionTools; +import org.eclipse.jpt.common.utility.internal.collection.ListTools; +import org.eclipse.jpt.common.utility.internal.filter.NotNullFilter; +import org.eclipse.jpt.common.utility.internal.iterable.CompositeIterable; +import org.eclipse.jpt.common.utility.internal.iterable.CompositeListIterable; +import org.eclipse.jpt.common.utility.internal.iterable.EmptyIterable; +import org.eclipse.jpt.common.utility.internal.iterable.EmptyListIterable; +import org.eclipse.jpt.common.utility.internal.iterable.FilteringIterable; +import org.eclipse.jpt.common.utility.internal.iterable.LiveCloneIterable; +import org.eclipse.jpt.common.utility.internal.iterable.LiveCloneListIterable; +import org.eclipse.jpt.common.utility.internal.iterable.SubIterableWrapper; +import org.eclipse.jpt.common.utility.internal.iterable.TransformationIterable; +import org.eclipse.jpt.common.utility.iterable.ListIterable; import org.eclipse.jpt.jpa.core.JpaFile; import org.eclipse.jpt.jpa.core.JpaProject; import org.eclipse.jpt.jpa.core.JpaStructureNode; @@ -675,7 +675,7 @@ public abstract class AbstractPersistenceUnit protected boolean mappingFileIsSpecified(String impliedMappingFileName) { for (MappingFileRef specifiedMappingFileRef : this.getSpecifiedMappingFileRefs()) { - if (Tools.valuesAreEqual(specifiedMappingFileRef.getFileName(), impliedMappingFileName)) { + if (ObjectTools.equals(specifiedMappingFileRef.getFileName(), impliedMappingFileName)) { return true; } } @@ -788,6 +788,7 @@ public abstract class AbstractPersistenceUnit return this.getSpecifiedClassRefsSize() + this.getImpliedClassRefsSize(); } + // ********** specified class refs ********** public ListIterable<ClassRef> getSpecifiedClassRefs() { @@ -1050,7 +1051,7 @@ public abstract class AbstractPersistenceUnit return new FilteringIterable<Property>(this.getProperties()) { @Override protected boolean accept(Property property) { - return Tools.valuesAreEqual(property.getName(), propertyName); + return ObjectTools.equals(property.getName(), propertyName); } }; } @@ -1513,7 +1514,7 @@ public abstract class AbstractPersistenceUnit } protected Iterable<String> getNonEmptyGeneratorNames() { - return new FilteringIterable<String>(this.getGeneratorNames(), NonEmptyStringFilter.instance()); + return new FilteringIterable<String>(this.getGeneratorNames(), StringTools.NON_BLANK_FILTER); } protected Iterable<String> getGeneratorNames() { @@ -1529,7 +1530,7 @@ public abstract class AbstractPersistenceUnit * @see #buildQueries() */ protected Iterable<Generator> buildGenerators() { - ArrayList<Generator> result = CollectionTools.list(this.getMappingFileGenerators()); + ArrayList<Generator> result = ListTools.list(this.getMappingFileGenerators()); HashSet<String> mappingFileGeneratorNames = this.convertToNames(result); HashMap<String, ArrayList<JavaGenerator>> allJavaGenerators = this.mapByName(this.getAllJavaGenerators()); @@ -1630,7 +1631,7 @@ public abstract class AbstractPersistenceUnit * or multiple, non-overridden Java queries with the same name. */ protected Iterable<Query> buildQueries() { - ArrayList<Query> result = CollectionTools.list(this.getMappingFileQueries()); + ArrayList<Query> result = ListTools.list(this.getMappingFileQueries()); HashSet<String> mappingFileQueryNames = this.convertToNames(result); HashMap<String, ArrayList<JavaQuery>> allJavaQueries = this.mapByName(this.getAllJavaQueries()); @@ -1967,7 +1968,7 @@ public abstract class AbstractPersistenceUnit * type mappings (by full qualified class name). */ protected Iterable<TypeMapping> getActiveTypeMappings(){ - ArrayList<TypeMapping> result = CollectionTools.list(this.getMappingFileTypeMappings()); + ArrayList<TypeMapping> result = ListTools.list(this.getMappingFileTypeMappings()); HashSet<String> mappingFileClassNames = this.convertToClassNames(result); HashMap<String, ArrayList<TypeMapping>> javaTypeMappings = this.mapTypeMappingsByClassName(this.getJavaTypeMappings()); @@ -2153,7 +2154,7 @@ public abstract class AbstractPersistenceUnit } protected JavaTypeMappingDefinition getJavaTypeMappingDefinition(String key) { for (JavaTypeMappingDefinition definition : this.getJpaPlatform().getJavaTypeMappingDefinitions()) { - if (Tools.valuesAreEqual(definition.getKey(), key)) { + if (ObjectTools.equals(definition.getKey(), key)) { return definition; } } @@ -2218,11 +2219,11 @@ public abstract class AbstractPersistenceUnit protected <N extends JpaNamedContextNode> ArrayList<N> extractConvertibleJavaNodes(Iterable<N> allJavaNodes, Iterable<? extends JpaNamedContextNode> mappingFileNodes) { ArrayList<N> convertibleNodes = new ArrayList<N>(); - HashSet<String> mappingFileNodeNames = this.convertToNames(CollectionTools.list(mappingFileNodes)); + HashSet<String> mappingFileNodeNames = this.convertToNames(ListTools.list(mappingFileNodes)); HashMap<String, ArrayList<N>> allJavaNodesByName = this.mapByName(allJavaNodes); for (Map.Entry<String, ArrayList<N>> entry : allJavaNodesByName.entrySet()) { String javaNodeName = entry.getKey(); - if (StringTools.stringIsEmpty(javaNodeName)) { + if (StringTools.isBlank(javaNodeName)) { continue; // ignore any nodes with an empty name(?) } ArrayList<N> javaNodesWithSameName = entry.getValue(); @@ -2273,7 +2274,7 @@ public abstract class AbstractPersistenceUnit } protected void checkForMultiplePersistenceUnitMetadata(List<IMessage> messages) { - ArrayList<MappingFileRef> pumdMappingFileRefs = CollectionTools.list(this.getPersistenceUnitMetadataMappingFileRefs()); + ArrayList<MappingFileRef> pumdMappingFileRefs = ListTools.list(this.getPersistenceUnitMetadataMappingFileRefs()); if (pumdMappingFileRefs.size() > 1) { for (MappingFileRef mappingFileRef : pumdMappingFileRefs) { messages.add( @@ -2301,7 +2302,7 @@ public abstract class AbstractPersistenceUnit protected void checkForDuplicateMappingFileRefs(List<IMessage> messages) { for (Map.Entry<String, ArrayList<MappingFileRef>> entry : this.mapMappingFileRefsByFileName().entrySet()) { String fileName = entry.getKey(); - if (StringTools.stringIsNotEmpty(fileName)) { + if (StringTools.isNotBlank(fileName)) { ArrayList<MappingFileRef> dups = entry.getValue(); if (dups.size() > 1) { String[] parms = new String[] {fileName}; @@ -2342,7 +2343,7 @@ public abstract class AbstractPersistenceUnit protected void checkForDuplicateMappingFileClasses(List<IMessage> messages) { for (Map.Entry<String, ArrayList<PersistentType>> entry : this.mapMappingFilePersistentTypesByName().entrySet()) { String ptName = entry.getKey(); - if (StringTools.stringIsNotEmpty(ptName)) { + if (StringTools.isNotBlank(ptName)) { ArrayList<PersistentType> dups = entry.getValue(); if (dups.size() > 1) { String[] parms = new String[] {ptName}; @@ -2390,7 +2391,7 @@ public abstract class AbstractPersistenceUnit protected void checkForDuplicateClassRefs(List<IMessage> messages) { for (Map.Entry<String, ArrayList<ClassRef>> entry : this.mapClassRefsByName().entrySet()) { String className = entry.getKey(); - if (StringTools.stringIsNotEmpty(className)) { + if (StringTools.isNotBlank(className)) { ArrayList<ClassRef> dups = entry.getValue(); if (dups.size() > 1) { String[] parms = new String[] {className}; @@ -2438,7 +2439,7 @@ public abstract class AbstractPersistenceUnit protected void checkForDuplicateJarFileRefs(List<IMessage> messages) { for (Map.Entry<String, ArrayList<JarFileRef>> entry : this.mapJarFileRefsByName().entrySet()) { String fileName = entry.getKey(); - if (StringTools.stringIsNotEmpty(fileName)) { + if (StringTools.isNotBlank(fileName)) { ArrayList<JarFileRef> dups = entry.getValue(); if (dups.size() > 1) { String[] parms = new String[] {fileName}; @@ -2502,7 +2503,7 @@ public abstract class AbstractPersistenceUnit HashMap<String, ArrayList<Generator>> generatorsByName = this.mapByName(this.getGenerators()); for (Map.Entry<String, ArrayList<Generator>> entry : generatorsByName.entrySet()) { String generatorName = entry.getKey(); - if (StringTools.stringIsNotEmpty(generatorName)) { // ignore empty names + if (StringTools.isNotBlank(generatorName)) { // ignore empty names ArrayList<Generator> dups = entry.getValue(); if (dups.size() > 1) { this.validateGeneratorsWithSameName(generatorName, dups, messages); @@ -2570,7 +2571,7 @@ public abstract class AbstractPersistenceUnit HashMap<String, ArrayList<Query>> queriesByName = this.mapByName(this.getQueries()); for (Map.Entry<String, ArrayList<Query>> entry : queriesByName.entrySet()) { String queryName = entry.getKey(); - if (StringTools.stringIsNotEmpty(queryName)) { // ignore empty names + if (StringTools.isNotBlank(queryName)) { // ignore empty names ArrayList<Query> dups = entry.getValue(); if (dups.size() > 1) { this.validateQueriesWithSameName(queryName, dups, messages); @@ -2619,7 +2620,7 @@ public abstract class AbstractPersistenceUnit protected void validateEntityNames(List<IMessage> messages) { for (Map.Entry<String, ArrayList<Entity>> entry : this.mapTypeMappingsByName(this.getActiveEntities()).entrySet()) { String entityName = entry.getKey(); - if (StringTools.stringIsNotEmpty(entityName)) { + if (StringTools.isNotBlank(entityName)) { ArrayList<Entity> dups = entry.getValue(); if (dups.size() > 1) { this.validateEntitiesWithSameName(entityName, dups, messages); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/persistence/AbstractPersistenceUnitProperties.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/persistence/AbstractPersistenceUnitProperties.java index 43aa9ebe19..20f1431659 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/persistence/AbstractPersistenceUnitProperties.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/persistence/AbstractPersistenceUnitProperties.java @@ -13,15 +13,16 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; + import org.eclipse.jdt.core.IPackageFragment; import org.eclipse.jdt.core.IType; import org.eclipse.jpt.common.utility.internal.StringTools; -import org.eclipse.jpt.common.utility.internal.iterables.EmptyIterable; +import org.eclipse.jpt.common.utility.internal.iterable.EmptyIterable; import org.eclipse.jpt.common.utility.internal.model.AbstractModel; import org.eclipse.jpt.jpa.core.JpaProject; import org.eclipse.jpt.jpa.core.context.persistence.PersistenceUnit; -import org.eclipse.jpt.jpa.core.context.persistence.PersistenceXmlEnumValue; import org.eclipse.jpt.jpa.core.context.persistence.PersistenceUnitProperties; +import org.eclipse.jpt.jpa.core.context.persistence.PersistenceXmlEnumValue; import org.eclipse.text.edits.ReplaceEdit; /** @@ -260,7 +261,7 @@ public abstract class AbstractPersistenceUnitProperties extends AbstractModel } protected Integer getIntegerValueOf(String puStringValue) { - if (StringTools.stringIsEmpty(puStringValue)) { + if (StringTools.isBlank(puStringValue)) { return null; } try { @@ -322,7 +323,7 @@ public abstract class AbstractPersistenceUnitProperties extends AbstractModel } protected Boolean getBooleanValueOf(String puStringValue) { - if (StringTools.stringIsEmpty(puStringValue)) { + if (StringTools.isBlank(puStringValue)) { return null; } return Boolean.valueOf(puStringValue); @@ -498,16 +499,16 @@ public abstract class AbstractPersistenceUnitProperties extends AbstractModel } private String buildCompositeValue(String value, String valueToAppend) { - if((StringTools.stringIsEmpty(valueToAppend)) ) { + if((StringTools.isBlank(valueToAppend)) ) { return value; } - return (StringTools.stringIsEmpty(value)) ? + return (StringTools.isBlank(value)) ? valueToAppend : (value + PROPERTY_VALUE_DELIMITER + valueToAppend); } protected List<String> extractCompositeValue(String compositeValue) { - if(StringTools.stringIsEmpty(compositeValue)) { + if(StringTools.isBlank(compositeValue)) { return new ArrayList<String>(0); } String[] values = compositeValue.split(PROPERTY_VALUE_DELIMITER); @@ -519,7 +520,7 @@ public abstract class AbstractPersistenceUnitProperties extends AbstractModel } private String removeValueFrom(String compositeValue, String valueToRemove) { - if((StringTools.stringIsEmpty(valueToRemove))) { + if((StringTools.isBlank(valueToRemove))) { return compositeValue; } String[] values = compositeValue.split(PROPERTY_VALUE_DELIMITER); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/facet/JpaFacetActionDelegate.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/facet/JpaFacetActionDelegate.java index d7bd97da30..4816e6e256 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/facet/JpaFacetActionDelegate.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/facet/JpaFacetActionDelegate.java @@ -16,7 +16,7 @@ import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.SubMonitor; import org.eclipse.jpt.jpa.core.JpaPreferences; import org.eclipse.jpt.jpa.core.JpaWorkspace; -import org.eclipse.jpt.jpa.core.platform.JpaPlatformDescription; +import org.eclipse.jpt.jpa.core.platform.JpaPlatformConfig; import org.eclipse.jpt.jpa.core.platform.JpaPlatformManager; import org.eclipse.jst.common.project.facet.core.libprov.LibraryInstallDelegate; import org.eclipse.wst.common.frameworks.datamodel.IDataModel; @@ -45,8 +45,8 @@ public abstract class JpaFacetActionDelegate IDataModel dataModel = (IDataModel) config; // project settings - JpaPlatformDescription platformDescription = (JpaPlatformDescription) dataModel.getProperty(PLATFORM); - JpaPreferences.setJpaPlatformID(project, platformDescription.getId()); + JpaPlatformConfig platformConfig = (JpaPlatformConfig) dataModel.getProperty(PLATFORM); + JpaPreferences.setJpaPlatformID(project, platformConfig.getId()); subMonitor.worked(1); // do NOT use IDataModel.getStringProperty(String) - or the connection profile name can @@ -68,7 +68,7 @@ public abstract class JpaFacetActionDelegate subMonitor.worked(1); // defaults settings - this.getJpaPlatformManager().setDefaultJpaPlatformDescription(fv, platformDescription); + this.getJpaPlatformManager().setDefaultJpaPlatformConfig(fv, platformConfig); subMonitor.worked(1); //Delegate to LibraryInstallDelegate to configure the project classpath diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/facet/JpaFacetDataModelProvider.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/facet/JpaFacetDataModelProvider.java index 24b6725975..029efe6ce3 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/facet/JpaFacetDataModelProvider.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/facet/JpaFacetDataModelProvider.java @@ -18,15 +18,15 @@ import java.util.Set; import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.IStatus; import org.eclipse.jpt.common.utility.internal.ArrayTools; -import org.eclipse.jpt.common.utility.internal.CollectionTools; -import org.eclipse.jpt.common.utility.internal.iterables.EmptyIterable; -import org.eclipse.jpt.common.utility.internal.iterables.TransformationIterable; +import org.eclipse.jpt.common.utility.internal.collection.ListTools; +import org.eclipse.jpt.common.utility.internal.iterable.EmptyIterable; +import org.eclipse.jpt.common.utility.internal.iterable.TransformationIterable; import org.eclipse.jpt.jpa.core.JpaProject; import org.eclipse.jpt.jpa.core.JpaWorkspace; import org.eclipse.jpt.jpa.core.internal.JptCoreMessages; import org.eclipse.jpt.jpa.core.internal.plugin.JptJpaCorePlugin; import org.eclipse.jpt.jpa.core.libprov.JpaLibraryProviderInstallOperationConfig; -import org.eclipse.jpt.jpa.core.platform.JpaPlatformDescription; +import org.eclipse.jpt.jpa.core.platform.JpaPlatformConfig; import org.eclipse.jpt.jpa.core.platform.JpaPlatformManager; import org.eclipse.jpt.jpa.db.Catalog; import org.eclipse.jpt.jpa.db.ConnectionProfile; @@ -38,6 +38,7 @@ import org.eclipse.jst.common.project.facet.core.libprov.ILibraryProvider; import org.eclipse.jst.common.project.facet.core.libprov.IPropertyChangeListener; import org.eclipse.jst.common.project.facet.core.libprov.LibraryInstallDelegate; import org.eclipse.jst.common.project.facet.core.libprov.LibraryProviderOperationConfig; +import org.eclipse.persistence.jpa.jpql.util.CollectionTools; import org.eclipse.wst.common.componentcore.datamodel.FacetInstallDataModelProvider; import org.eclipse.wst.common.componentcore.internal.util.IModuleConstants; import org.eclipse.wst.common.frameworks.datamodel.DataModelPropertyDescriptor; @@ -102,8 +103,8 @@ public abstract class JpaFacetDataModelProvider return (IRuntime) this.getProperty(RUNTIME); } - protected JpaPlatformDescription getPlatform() { - return (JpaPlatformDescription) getProperty(PLATFORM); + protected JpaPlatformConfig getPlatformConfig() { + return (JpaPlatformConfig) getProperty(PLATFORM); } protected LibraryInstallDelegate getLibraryInstallDelegate() { @@ -167,7 +168,7 @@ public abstract class JpaFacetDataModelProvider return null; } if (propertyName.equals(PLATFORM)) { - return getDefaultPlatformDescription(); + return getDefaultPlatformConfig(); } if (propertyName.equals(LIBRARY_PROVIDER_DELEGATE)) { return getDefaultLibraryProvider(); @@ -200,7 +201,7 @@ public abstract class JpaFacetDataModelProvider return super.getDefaultProperty(propertyName); } - protected abstract JpaPlatformDescription getDefaultPlatformDescription(); + protected abstract JpaPlatformConfig getDefaultPlatformConfig(); protected LibraryInstallDelegate getDefaultLibraryProvider() { // delegate itself changes only when facet version changes @@ -226,12 +227,12 @@ public abstract class JpaFacetDataModelProvider } Map<String, Object> customEnablementVariables = new HashMap<String, Object>(); - JpaPlatformDescription jpaPlatform = getPlatform(); - String jpaPlatformId = (jpaPlatform == null) ? "" : jpaPlatform.getId(); + JpaPlatformConfig jpaPlatformConfig = getPlatformConfig(); + String jpaPlatformId = (jpaPlatformConfig == null) ? "" : jpaPlatformConfig.getId(); customEnablementVariables.put( JpaLibraryProviderInstallOperationConfig.JPA_PLATFORM_ENABLEMENT_EXP, jpaPlatformId); customEnablementVariables.put( - JpaLibraryProviderInstallOperationConfig.JPA_PLATFORM_DESCRIPTION_ENABLEMENT_EXP, jpaPlatform); + JpaLibraryProviderInstallOperationConfig.JPA_PLATFORM_DESCRIPTION_ENABLEMENT_EXP, jpaPlatformConfig); LibraryInstallDelegate lp = new LibraryInstallDelegate(fpjwc, pfv, customEnablementVariables); this.libraryProviderListener = buildLibraryProviderListener(); @@ -390,13 +391,13 @@ public abstract class JpaFacetDataModelProvider LibraryInstallDelegate lid = this.getLibraryInstallDelegate(); if (lid != null) { - JpaPlatformDescription jpaPlatform = getPlatform(); - String jpaPlatformId = (jpaPlatform == null) ? "" : jpaPlatform.getId(); + JpaPlatformConfig jpaPlatformConfig = getPlatformConfig(); + String jpaPlatformId = (jpaPlatformConfig == null) ? "" : jpaPlatformConfig.getId(); lid.setEnablementContextVariable( JpaLibraryProviderInstallOperationConfig.JPA_PLATFORM_ENABLEMENT_EXP, jpaPlatformId); lid.setEnablementContextVariable( - JpaLibraryProviderInstallOperationConfig.JPA_PLATFORM_DESCRIPTION_ENABLEMENT_EXP, jpaPlatform); + JpaLibraryProviderInstallOperationConfig.JPA_PLATFORM_DESCRIPTION_ENABLEMENT_EXP, jpaPlatformConfig); List<JpaLibraryProviderInstallOperationConfig> jpaConfigs = new ArrayList<JpaLibraryProviderInstallOperationConfig>(); @@ -415,7 +416,7 @@ public abstract class JpaFacetDataModelProvider } } for (JpaLibraryProviderInstallOperationConfig jpaConfig : jpaConfigs) { - jpaConfig.setJpaPlatform(getPlatform()); + jpaConfig.setJpaPlatformConfig(getPlatformConfig()); } } } @@ -442,19 +443,19 @@ public abstract class JpaFacetDataModelProvider } protected DataModelPropertyDescriptor[] buildValidPlatformDescriptors() { - Iterable<JpaPlatformDescription> validPlatformDescriptions = buildValidPlatformDescriptions(); + Iterable<JpaPlatformConfig> validPlatformConfigs = buildValidPlatformConfigs(); Iterable<DataModelPropertyDescriptor> validPlatformDescriptors = - new TransformationIterable<JpaPlatformDescription, DataModelPropertyDescriptor>(validPlatformDescriptions) { + new TransformationIterable<JpaPlatformConfig, DataModelPropertyDescriptor>(validPlatformConfigs) { @Override - protected DataModelPropertyDescriptor transform(JpaPlatformDescription desc) { - return buildPlatformDescriptor(desc); + protected DataModelPropertyDescriptor transform(JpaPlatformConfig config) { + return buildPlatformDescriptor(config); } }; return ArrayTools.sort(ArrayTools.array(validPlatformDescriptors, EMPTY_DMPD_ARRAY), DESCRIPTOR_COMPARATOR); } - protected Iterable<JpaPlatformDescription> buildValidPlatformDescriptions() { - return this.getJpaPlatformManager().getJpaPlatformDescriptions(this.getProjectFacetVersion()); + protected Iterable<JpaPlatformConfig> buildValidPlatformConfigs() { + return this.getJpaPlatformManager().getJpaPlatformConfigs(this.getProjectFacetVersion()); } protected static final Comparator<DataModelPropertyDescriptor> DESCRIPTOR_COMPARATOR = @@ -477,7 +478,7 @@ public abstract class JpaFacetDataModelProvider * put a null entry at the top of the list (for <none>) */ protected List<String> buildValidConnectionNames() { - List<String> connectionNames = CollectionTools.sort(CollectionTools.list(this.getConnectionProfileNames())); + List<String> connectionNames = ListTools.sort(ListTools.list(this.getConnectionProfileNames())); connectionNames.add(0, null); return connectionNames; } @@ -514,7 +515,7 @@ public abstract class JpaFacetDataModelProvider * put an entry for the default at the top of the list */ protected List<String> buildValidStrings(Iterable<String> strings, String defaultString) { - List<String> validStrings = CollectionTools.list(strings); + List<String> validStrings = ListTools.list(strings); if ((defaultString != null) && ! validStrings.contains(defaultString)) { validStrings.add(0, defaultString); } @@ -537,7 +538,7 @@ public abstract class JpaFacetDataModelProvider @Override public DataModelPropertyDescriptor getPropertyDescriptor(String propertyName) { if (propertyName.equals(PLATFORM)) { - return buildPlatformDescriptor(this.getPlatform()); + return buildPlatformDescriptor(this.getPlatformConfig()); } if (propertyName.equals(CONNECTION)) { return buildConnectionDescriptor(this.getConnectionName()); @@ -545,8 +546,8 @@ public abstract class JpaFacetDataModelProvider return super.getPropertyDescriptor(propertyName); } - protected DataModelPropertyDescriptor buildPlatformDescriptor(JpaPlatformDescription platform) { - return new DataModelPropertyDescriptor(platform, platform.getLabel()); + protected DataModelPropertyDescriptor buildPlatformDescriptor(JpaPlatformConfig platformConfig) { + return new DataModelPropertyDescriptor(platformConfig, platformConfig.getLabel()); } protected DataModelPropertyDescriptor buildConnectionDescriptor(String connectionName) { @@ -651,7 +652,7 @@ public abstract class JpaFacetDataModelProvider } protected IStatus validatePlatform() { - return (this.getPlatform() == null) ? + return (this.getPlatformConfig() == null) ? JptJpaCorePlugin.instance().buildErrorStatus(JptCoreMessages.VALIDATE_PLATFORM_NOT_SPECIFIED) : OK_STATUS; } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/facet/JpaFacetInstallDataModelProvider.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/facet/JpaFacetInstallDataModelProvider.java index eac5aa4fab..74f6db9a7b 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/facet/JpaFacetInstallDataModelProvider.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/facet/JpaFacetInstallDataModelProvider.java @@ -11,7 +11,7 @@ package org.eclipse.jpt.jpa.core.internal.facet; import java.util.Set; import org.eclipse.core.runtime.IStatus; -import org.eclipse.jpt.jpa.core.platform.JpaPlatformDescription; +import org.eclipse.jpt.jpa.core.platform.JpaPlatformConfig; import org.eclipse.jpt.jpa.db.ConnectionProfile; import org.eclipse.jpt.jpa.db.Database; import org.eclipse.jpt.jpa.db.SchemaContainer; @@ -83,8 +83,8 @@ public class JpaFacetInstallDataModelProvider } @Override - protected JpaPlatformDescription getDefaultPlatformDescription() { - return this.getJpaPlatformManager().getDefaultJpaPlatformDescription(this.getProjectFacetVersion()); + protected JpaPlatformConfig getDefaultPlatformConfig() { + return this.getJpaPlatformManager().getDefaultJpaPlatformConfig(this.getProjectFacetVersion()); } @Override diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/facet/JpaFacetVersionChangeDataModelProvider.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/facet/JpaFacetVersionChangeDataModelProvider.java index a2b4b0b5cc..ab4ac7095b 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/facet/JpaFacetVersionChangeDataModelProvider.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/facet/JpaFacetVersionChangeDataModelProvider.java @@ -12,12 +12,12 @@ package org.eclipse.jpt.jpa.core.internal.facet; import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.IStatus; -import org.eclipse.jpt.common.utility.internal.CollectionTools; -import org.eclipse.jpt.common.utility.internal.iterables.CompositeIterable; +import org.eclipse.jpt.common.utility.internal.iterable.CompositeIterable; +import org.eclipse.jpt.common.utility.internal.iterable.IterableTools; import org.eclipse.jpt.jpa.core.JpaProject; import org.eclipse.jpt.jpa.core.internal.JptCoreMessages; import org.eclipse.jpt.jpa.core.internal.plugin.JptJpaCorePlugin; -import org.eclipse.jpt.jpa.core.platform.JpaPlatformDescription; +import org.eclipse.jpt.jpa.core.platform.JpaPlatformConfig; public class JpaFacetVersionChangeDataModelProvider extends JpaFacetDataModelProvider @@ -55,8 +55,8 @@ public class JpaFacetVersionChangeDataModelProvider // **************** defaults ********************************************** @Override - protected JpaPlatformDescription getDefaultPlatformDescription() { - return getJpaProject().getJpaPlatform().getDescription(); + protected JpaPlatformConfig getDefaultPlatformConfig() { + return getJpaProject().getJpaPlatform().getConfig(); } @Override @@ -105,13 +105,13 @@ public class JpaFacetVersionChangeDataModelProvider // **************** valid property descriptors **************************** @Override - protected Iterable<JpaPlatformDescription> buildValidPlatformDescriptions() { + protected Iterable<JpaPlatformConfig> buildValidPlatformConfigs() { // add existing platform to list of choices - Iterable<JpaPlatformDescription> validPlatformDescs = super.buildValidPlatformDescriptions(); - if (! CollectionTools.contains(validPlatformDescs, getDefaultPlatformDescription())) { - validPlatformDescs = new CompositeIterable<JpaPlatformDescription>(getDefaultPlatformDescription(), validPlatformDescs); + Iterable<JpaPlatformConfig> validPlatformConfigs = super.buildValidPlatformConfigs(); + if (! IterableTools.contains(validPlatformConfigs, getDefaultPlatformConfig())) { + validPlatformConfigs = new CompositeIterable<JpaPlatformConfig>(getDefaultPlatformConfig(), validPlatformConfigs); } - return validPlatformDescs; + return validPlatformConfigs; } @@ -122,7 +122,7 @@ public class JpaFacetVersionChangeDataModelProvider IStatus status = super.validatePlatform(); if (status.isOK()) { - if (! getPlatform().supportsJpaFacetVersion(getProjectFacetVersion())) { + if (! getPlatformConfig().supportsJpaFacetVersion(getProjectFacetVersion())) { status = JptJpaCorePlugin.instance().buildErrorStatus(JptCoreMessages.VALIDATE_PLATFORM_DOES_NOT_SUPPORT_FACET_VERSION); } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/facet/RuntimeChangedListener.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/facet/RuntimeChangedListener.java index 2ac49588b1..f981be17b7 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/facet/RuntimeChangedListener.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/facet/RuntimeChangedListener.java @@ -17,7 +17,7 @@ import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.jpt.jpa.core.JpaProject; import org.eclipse.jpt.jpa.core.internal.plugin.JptJpaCorePlugin; import org.eclipse.jpt.jpa.core.libprov.JpaLibraryProviderInstallOperationConfig; -import org.eclipse.jpt.jpa.core.platform.JpaPlatformDescription; +import org.eclipse.jpt.jpa.core.platform.JpaPlatformConfig; import org.eclipse.jst.common.project.facet.core.libprov.LibraryInstallDelegate; import org.eclipse.wst.common.project.facet.core.IFacetedProjectBase; import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion; @@ -37,7 +37,7 @@ public class RuntimeChangedListener if (pfv != null) { Map<String, Object> enablementVariables = new HashMap<String, Object>(); enablementVariables.put(JpaLibraryProviderInstallOperationConfig.JPA_PLATFORM_ENABLEMENT_EXP, getJpaPlatformId(fpb.getProject())); - enablementVariables.put(JpaLibraryProviderInstallOperationConfig.JPA_PLATFORM_DESCRIPTION_ENABLEMENT_EXP, getJpaPlatformDescription(fpb.getProject())); + enablementVariables.put(JpaLibraryProviderInstallOperationConfig.JPA_PLATFORM_DESCRIPTION_ENABLEMENT_EXP, getJpaPlatformConfig(fpb.getProject())); LibraryInstallDelegate lp = new LibraryInstallDelegate(fpb, pfv, enablementVariables); try { lp.execute(new NullProgressMonitor()); @@ -56,9 +56,9 @@ public class RuntimeChangedListener return (jpaProject == null) ? null : jpaProject.getJpaPlatform().getId(); } - protected JpaPlatformDescription getJpaPlatformDescription(IProject project) { + protected JpaPlatformConfig getJpaPlatformConfig(IProject project) { JpaProject jpaProject = this.getJpaProject(project); - return (jpaProject == null) ? null : jpaProject.getJpaPlatform().getDescription(); + return (jpaProject == null) ? null : jpaProject.getJpaPlatform().getConfig(); } protected JpaProject getJpaProject(IProject project) { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/GenericJpaFile.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/GenericJpaFile.java index c260e0078b..9ed3eddc4a 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/GenericJpaFile.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/GenericJpaFile.java @@ -15,7 +15,7 @@ import java.util.Set; import org.eclipse.core.resources.IFile; import org.eclipse.core.runtime.content.IContentType; import org.eclipse.jpt.common.core.JptResourceModel; -import org.eclipse.jpt.common.utility.internal.iterables.LiveCloneIterable; +import org.eclipse.jpt.common.utility.internal.iterable.LiveCloneIterable; import org.eclipse.jpt.jpa.core.JpaFile; import org.eclipse.jpt.jpa.core.JpaProject; import org.eclipse.jpt.jpa.core.JpaStructureNode; @@ -168,5 +168,4 @@ public class GenericJpaFile sb.append(this.contentType.getName()); sb.append(']'); } - } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/AbstractNamedColumnValidator.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/AbstractNamedColumnValidator.java index cbf4eca9d2..38381aab25 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/AbstractNamedColumnValidator.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/AbstractNamedColumnValidator.java @@ -12,7 +12,7 @@ package org.eclipse.jpt.jpa.core.internal.jpa1.context; import java.util.List; import org.eclipse.jpt.common.core.utility.TextRange; -import org.eclipse.jpt.common.utility.internal.StringTools; +import org.eclipse.jpt.common.utility.internal.ObjectTools; import org.eclipse.jpt.jpa.core.context.ReadOnlyNamedColumn; import org.eclipse.jpt.jpa.core.context.ReadOnlyPersistentAttribute; import org.eclipse.jpt.jpa.core.context.ReadOnlyTableColumn; @@ -149,7 +149,7 @@ public abstract class AbstractNamedColumnValidator<C extends ReadOnlyNamedColumn } @Override public String toString() { - return StringTools.buildSingletonToString(this); + return ObjectTools.singletonToString(this); } } } @@ -174,7 +174,7 @@ public abstract class AbstractNamedColumnValidator<C extends ReadOnlyNamedColumn // its default table, don't do the table validation against it - bug 377110 String specifiedTable = this.getColumn().getSpecifiedTable(); String defaultTable = this.getColumn().getDefaultTable(); - if (specifiedTable == null || StringTools.stringsAreEqual(specifiedTable, defaultTable)) { + if (specifiedTable == null || ObjectTools.equals(specifiedTable, defaultTable)) { return true; } if (this.getColumn().tableNameIsInvalid()) { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/AbstractPrimaryKeyValidator.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/AbstractPrimaryKeyValidator.java index e4e34ea23f..3262aa7252 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/AbstractPrimaryKeyValidator.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/AbstractPrimaryKeyValidator.java @@ -14,15 +14,16 @@ import java.util.List; import org.eclipse.jpt.common.core.resource.java.JavaResourceField; import org.eclipse.jpt.common.core.resource.java.JavaResourceMethod; import org.eclipse.jpt.common.core.utility.TextRange; -import org.eclipse.jpt.common.utility.internal.ClassName; -import org.eclipse.jpt.common.utility.internal.CollectionTools; -import org.eclipse.jpt.common.utility.internal.HashBag; +import org.eclipse.jpt.common.utility.internal.ClassNameTools; +import org.eclipse.jpt.common.utility.internal.ObjectTools; import org.eclipse.jpt.common.utility.internal.StringTools; -import org.eclipse.jpt.common.utility.internal.iterables.ArrayIterable; -import org.eclipse.jpt.common.utility.internal.iterables.CompositeIterable; -import org.eclipse.jpt.common.utility.internal.iterables.FilteringIterable; -import org.eclipse.jpt.common.utility.internal.iterables.SubIterableWrapper; -import org.eclipse.jpt.common.utility.internal.iterables.TransformationIterable; +import org.eclipse.jpt.common.utility.internal.collection.HashBag; +import org.eclipse.jpt.common.utility.internal.iterable.ArrayIterable; +import org.eclipse.jpt.common.utility.internal.iterable.CompositeIterable; +import org.eclipse.jpt.common.utility.internal.iterable.FilteringIterable; +import org.eclipse.jpt.common.utility.internal.iterable.IterableTools; +import org.eclipse.jpt.common.utility.internal.iterable.SubIterableWrapper; +import org.eclipse.jpt.common.utility.internal.iterable.TransformationIterable; import org.eclipse.jpt.jpa.core.MappingKeys; import org.eclipse.jpt.jpa.core.context.AccessType; import org.eclipse.jpt.jpa.core.context.AttributeMapping; @@ -115,7 +116,7 @@ public abstract class AbstractPrimaryKeyValidator // only one composite primary key strategy may be used protected void validateOneOfIdClassOrEmbeddedIdIsUsed(List<IMessage> messages, IReporter reporter) { if (idClassReference().isSpecified() - && CollectionTools.size(typeMapping().getAllAttributeMappings(MappingKeys.EMBEDDED_ID_ATTRIBUTE_MAPPING_KEY)) > 0) { + && IterableTools.size(typeMapping().getAllAttributeMappings(MappingKeys.EMBEDDED_ID_ATTRIBUTE_MAPPING_KEY)) > 0) { messages.add( DefaultJpaValidationMessages.buildMessage( IMessage.HIGH_SEVERITY, @@ -141,7 +142,7 @@ public abstract class AbstractPrimaryKeyValidator // only one embedded id may be used protected void validateOneEmbeddedId(List<IMessage> messages, IReporter reporter) { - if (CollectionTools.size(getEmbeddedIdMappings(typeMapping())) > 1) { + if (IterableTools.size(getEmbeddedIdMappings(typeMapping())) > 1) { messages.add( DefaultJpaValidationMessages.buildMessage( IMessage.HIGH_SEVERITY, @@ -167,7 +168,7 @@ public abstract class AbstractPrimaryKeyValidator AttributeMapping resolvedAttributeMapping = mapsIdRelationshipMapping.getDerivedIdentity().getMapsIdDerivedIdentityStrategy().getDerivedIdAttributeMapping(); if (resolvedAttributeMapping != null - && ! ClassName.areAutoboxEquivalents( + && ! ClassNameTools.isAutoboxEquivalent( resolvedAttributeMapping.getPersistentAttribute().getTypeName(), getTargetEntityPrimaryKeyTypeName(mapsIdRelationshipMapping))) { messages.add(DefaultJpaValidationMessages.buildMessage( @@ -212,7 +213,7 @@ public abstract class AbstractPrimaryKeyValidator String attributeMappingTypeName = getTypeNameForIdClass(attributeMapping); if (attributeMappingTypeName != null // if it's null, there should be // another failing validation elsewhere - && ! ClassName.areAutoboxEquivalents(idClassAttributeTypeName, attributeMappingTypeName)) { + && ! ClassNameTools.isAutoboxEquivalent(idClassAttributeTypeName, attributeMappingTypeName)) { messages.add(DefaultJpaValidationMessages.buildMessage( IMessage.HIGH_SEVERITY, JpaValidationMessages.TYPE_MAPPING_ID_CLASS_ATTRIBUTE_TYPE_DOES_NOT_AGREE, @@ -242,7 +243,7 @@ public abstract class AbstractPrimaryKeyValidator } else if (type == AccessType.PROPERTY) { // EclipseLink does not care about the existence status of property methods, // but the matching field in the id class still needs to exist - if (!CollectionTools.contains(getIdClassFieldNames(idClass), attributeMapping.getName())) { + if (!IterableTools.contains(getIdClassFieldNames(idClass), attributeMapping.getName())) { messages.add(DefaultJpaValidationMessages.buildMessage( IMessage.HIGH_SEVERITY, JpaValidationMessages.TYPE_MAPPING_ID_CLASS_ATTRIBUTE_DOES_NOT_EXIST, @@ -266,7 +267,7 @@ public abstract class AbstractPrimaryKeyValidator protected void checkMissingAttribute(JavaPersistentType idClass, AttributeMapping attributeMapping, List<IMessage> messages, IReporter reporter) { - if (!CollectionTools.contains(getIdClassAttributeNames(idClass), attributeMapping.getName())) { + if (!IterableTools.contains(getIdClassAttributeNames(idClass), attributeMapping.getName())) { messages.add(DefaultJpaValidationMessages.buildMessage( IMessage.HIGH_SEVERITY, JpaValidationMessages.TYPE_MAPPING_ID_CLASS_ATTRIBUTE_DOES_NOT_EXIST, @@ -321,7 +322,7 @@ public abstract class AbstractPrimaryKeyValidator for (AttributeMapping each : errorMappings) { addNoIdClassAttributeMatchError(each, messages); } - if (CollectionTools.size(errorDerivedIdMappings) > 1) { + if (IterableTools.size(errorDerivedIdMappings) > 1) { for (AttributeMapping each : errorDerivedIdMappings) { addDuplicateIdClassAttributeMatchError(each, messages); } @@ -425,7 +426,7 @@ public abstract class AbstractPrimaryKeyValidator */ protected boolean definesPrimaryKey(TypeMapping typeMapping) { return getIdClass(typeMapping) != null - || ! CollectionTools.isEmpty(getPrimaryKeyMappings(typeMapping)); + || ! IterableTools.isEmpty(getPrimaryKeyMappings(typeMapping)); } /** @@ -466,10 +467,10 @@ public abstract class AbstractPrimaryKeyValidator */ protected boolean definesPrimaryKey(AttributeMapping attributeMapping) { String mappingKey = attributeMapping.getKey(); - if (CollectionTools.contains(this.getIdMappingKeys(), mappingKey)) { + if (IterableTools.contains(this.getIdMappingKeys(), mappingKey)) { return true; } - if (CollectionTools.contains(this.getSingleRelationshipMappingKeys(), mappingKey)) { + if (IterableTools.contains(this.getSingleRelationshipMappingKeys(), mappingKey)) { SingleRelationshipMapping2_0 relationshipMapping = (SingleRelationshipMapping2_0) attributeMapping; return (relationshipMapping.getDerivedIdentity().usesIdDerivedIdentityStrategy() || relationshipMapping.getDerivedIdentity().usesMapsIdDerivedIdentityStrategy()); @@ -551,7 +552,7 @@ public abstract class AbstractPrimaryKeyValidator return new FilteringIterable<AttributeMapping>(typeMapping.getAllAttributeMappings()) { @Override protected boolean accept(AttributeMapping o) { - return !StringTools.stringsAreEqual(o.getKey(), MappingKeys.TRANSIENT_ATTRIBUTE_MAPPING_KEY); + return !ObjectTools.equals(o.getKey(), MappingKeys.TRANSIENT_ATTRIBUTE_MAPPING_KEY); } }; } @@ -579,14 +580,14 @@ public abstract class AbstractPrimaryKeyValidator } protected boolean hasAnyPrimaryKeyMappings(TypeMapping typeMapping) { - return ! CollectionTools.isEmpty(getPrimaryKeyMappings(typeMapping)); + return ! IterableTools.isEmpty(getPrimaryKeyMappings(typeMapping)); } // **************** id mappings ******************************************* protected IdMapping getIdMapping(TypeMapping typeMapping) { Iterable<IdMapping> idMappings = getIdMappings(typeMapping); - if (CollectionTools.size(idMappings) == 1) { + if (IterableTools.size(idMappings) == 1) { return idMappings.iterator().next(); } return null; @@ -610,7 +611,7 @@ public abstract class AbstractPrimaryKeyValidator * or on an ancestor */ protected boolean definesEmbeddedIdMapping(TypeMapping typeMapping) { - return ! CollectionTools.isEmpty(getEmbeddedIdMappings(typeMapping)); + return ! IterableTools.isEmpty(getEmbeddedIdMappings(typeMapping)); } /** @@ -618,12 +619,12 @@ public abstract class AbstractPrimaryKeyValidator * or on an ancestor */ protected boolean definesIdMapping(TypeMapping typeMapping) { - return ! CollectionTools.isEmpty(getIdMappings(typeMapping)); + return ! IterableTools.isEmpty(getIdMappings(typeMapping)); } protected EmbeddedIdMapping getEmbeddedIdMapping(TypeMapping typeMapping) { Iterable<EmbeddedIdMapping> embeddedIdMappings = getEmbeddedIdMappings(typeMapping); - if (CollectionTools.size(embeddedIdMappings) == 1) { + if (IterableTools.size(embeddedIdMappings) == 1) { return embeddedIdMappings.iterator().next(); } return null; @@ -721,7 +722,7 @@ public abstract class AbstractPrimaryKeyValidator // A complex primary key mapping can be // - a derived id relationship mapping to an entity with a complex primary key int simplePrimaryKeyMappingCount = - CollectionTools.size(getIdMappings(typeMapping())); + IterableTools.size(getIdMappings(typeMapping())); if (simplePrimaryKeyMappingCount > 1) { return true; } @@ -760,10 +761,10 @@ public abstract class AbstractPrimaryKeyValidator protected String getTypeNameForIdClass(AttributeMapping attributeMapping) { String mappingKey = attributeMapping.getKey(); - if (CollectionTools.contains(this.getIdMappingKeys(), mappingKey)) { + if (IterableTools.contains(this.getIdMappingKeys(), mappingKey)) { return attributeMapping.getPersistentAttribute().getTypeName(typeMapping().getPersistentType()); } - if (CollectionTools.contains(this.getSingleRelationshipMappingKeys(), mappingKey)) { + if (IterableTools.contains(this.getSingleRelationshipMappingKeys(), mappingKey)) { SingleRelationshipMapping2_0 relationshipMapping = (SingleRelationshipMapping2_0) attributeMapping; Entity targetEntity = relationshipMapping.getResolvedTargetEntity(); if (targetEntity != null) { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/AbstractTemporalConverterValidator.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/AbstractTemporalConverterValidator.java index c6101149a0..b6ded731a8 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/AbstractTemporalConverterValidator.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/AbstractTemporalConverterValidator.java @@ -13,8 +13,8 @@ import java.util.List; import org.eclipse.jpt.common.utility.internal.ArrayTools; import org.eclipse.jpt.common.utility.internal.StringTools; import org.eclipse.jpt.jpa.core.context.AttributeMapping; -import org.eclipse.jpt.jpa.core.context.PersistentAttribute; import org.eclipse.jpt.jpa.core.context.BaseTemporalConverter; +import org.eclipse.jpt.jpa.core.context.PersistentAttribute; import org.eclipse.jpt.jpa.core.internal.context.JptValidator; import org.eclipse.jpt.jpa.core.internal.validation.DefaultJpaValidationMessages; import org.eclipse.wst.validation.internal.provisional.core.IMessage; diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/GenericRootContextNode.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/GenericRootContextNode.java index d071191ce7..4d8be66e97 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/GenericRootContextNode.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/GenericRootContextNode.java @@ -20,8 +20,8 @@ import org.eclipse.jpt.common.core.JptResourceType; import org.eclipse.jpt.common.core.resource.java.JavaResourceAbstractType; import org.eclipse.jpt.common.core.resource.xml.JptXmlResource; import org.eclipse.jpt.common.core.utility.TextRange; -import org.eclipse.jpt.common.utility.internal.CollectionTools; -import org.eclipse.jpt.common.utility.internal.HashBag; +import org.eclipse.jpt.common.utility.internal.collection.CollectionTools; +import org.eclipse.jpt.common.utility.internal.collection.HashBag; import org.eclipse.jpt.jpa.core.JpaProject; import org.eclipse.jpt.jpa.core.context.MappingFile; import org.eclipse.jpt.jpa.core.context.persistence.Persistence; diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/OverrideValidator.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/OverrideValidator.java index a169f4f32d..472f99590b 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/OverrideValidator.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/OverrideValidator.java @@ -10,7 +10,8 @@ package org.eclipse.jpt.jpa.core.internal.jpa1.context; import java.util.List; -import org.eclipse.jpt.common.utility.internal.CollectionTools; + +import org.eclipse.jpt.common.utility.internal.iterable.IterableTools; import org.eclipse.jpt.jpa.core.context.OverrideContainer; import org.eclipse.jpt.jpa.core.context.ReadOnlyPersistentAttribute; import org.eclipse.jpt.jpa.core.context.ReadOnlyOverride; @@ -88,7 +89,7 @@ public abstract class OverrideValidator } protected boolean validateName(List<IMessage> messages) { - if ( ! CollectionTools.contains(this.container.getAllOverridableNames(), this.override.getName())) { + if ( ! IterableTools.contains(this.container.getAllOverridableNames(), this.override.getName())) { messages.add(this.buildUnresolvedNameMessage()); return false; } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/AbstractJavaOverrideContainer.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/AbstractJavaOverrideContainer.java index 502ad2e192..08264747f0 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/AbstractJavaOverrideContainer.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/AbstractJavaOverrideContainer.java @@ -9,7 +9,6 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.internal.jpa1.context.java; -import java.util.Iterator; import java.util.List; import java.util.Vector; @@ -17,16 +16,15 @@ import org.eclipse.jpt.common.core.resource.java.Annotation; import org.eclipse.jpt.common.core.resource.java.JavaResourceMember; import org.eclipse.jpt.common.core.resource.java.NestableAnnotation; import org.eclipse.jpt.common.core.utility.TextRange; -import org.eclipse.jpt.common.utility.internal.CollectionTools; -import org.eclipse.jpt.common.utility.internal.NotNullFilter; -import org.eclipse.jpt.common.utility.internal.iterables.CompositeListIterable; -import org.eclipse.jpt.common.utility.internal.iterables.EmptyIterable; -import org.eclipse.jpt.common.utility.internal.iterables.FilteringIterable; -import org.eclipse.jpt.common.utility.internal.iterables.ListIterable; -import org.eclipse.jpt.common.utility.internal.iterables.LiveCloneListIterable; -import org.eclipse.jpt.common.utility.internal.iterables.SubIterableWrapper; -import org.eclipse.jpt.common.utility.internal.iterables.TransformationIterable; -import org.eclipse.jpt.common.utility.internal.iterators.FilteringIterator; +import org.eclipse.jpt.common.utility.internal.filter.NotNullFilter; +import org.eclipse.jpt.common.utility.internal.iterable.CompositeListIterable; +import org.eclipse.jpt.common.utility.internal.iterable.EmptyIterable; +import org.eclipse.jpt.common.utility.internal.iterable.FilteringIterable; +import org.eclipse.jpt.common.utility.internal.iterable.IterableTools; +import org.eclipse.jpt.common.utility.internal.iterable.LiveCloneListIterable; +import org.eclipse.jpt.common.utility.internal.iterable.SubIterableWrapper; +import org.eclipse.jpt.common.utility.internal.iterable.TransformationIterable; +import org.eclipse.jpt.common.utility.iterable.ListIterable; import org.eclipse.jpt.jpa.core.context.JpaContextNode; import org.eclipse.jpt.jpa.core.context.Override_; import org.eclipse.jpt.jpa.core.context.ReadOnlyBaseColumn; @@ -176,7 +174,7 @@ public abstract class AbstractJavaOverrideContainer< * remaining specified overrides. */ protected boolean overrideWillBeVirtual(String overrideName, S specifiedOverrideToBeRemoved) { - return CollectionTools.contains(this.getAllOverridableNames(), overrideName) && + return IterableTools.contains(this.getAllOverridableNames(), overrideName) && (this.getSpecifiedOverrideNamed(overrideName, specifiedOverrideToBeRemoved) == null); } @@ -258,7 +256,7 @@ public abstract class AbstractJavaOverrideContainer< // if we are adding to the end of the specified list, // put the annotation after all the existing annotations if (index == this.specifiedOverrides.size()) { - return CollectionTools.size(this.getOverrideAnnotations()); + return IterableTools.size(this.getOverrideAnnotations()); } // if we are adding to the front of the specified list, @@ -277,7 +275,7 @@ public abstract class AbstractJavaOverrideContainer< * pre-condition: override exists at the specified index */ protected int translateToAnnotationIndex(int index) { - return CollectionTools.indexOf(this.getOverrideAnnotations(), this.specifiedOverrides.get(index).getOverrideAnnotation()); + return IterableTools.indexOf(this.getOverrideAnnotations(), this.specifiedOverrides.get(index).getOverrideAnnotation()); } protected abstract String getOverrideAnnotationName(); @@ -413,11 +411,7 @@ public abstract class AbstractJavaOverrideContainer< * specified overrides. */ protected Iterable<String> getVirtualOverrideNames() { - return CollectionTools.iterable(this.virtualOverrideNames()); - } - - protected Iterator<String> virtualOverrideNames() { - return new FilteringIterator<String>(this.getAllOverridableNames()) { + return new FilteringIterable<String>(this.getAllOverridableNames()) { @Override protected boolean accept(String name) { return AbstractJavaOverrideContainer.this.overrideIsVirtual(name); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJarFile.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJarFile.java index 08ba7ae42d..574666ad21 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJarFile.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJarFile.java @@ -20,8 +20,8 @@ import org.eclipse.jpt.common.core.resource.java.JavaResourceAnnotatedElement.Ki import org.eclipse.jpt.common.core.resource.java.JavaResourcePackageFragmentRoot; import org.eclipse.jpt.common.core.resource.java.JavaResourceType; import org.eclipse.jpt.common.core.utility.TextRange; -import org.eclipse.jpt.common.utility.internal.iterables.FilteringIterable; -import org.eclipse.jpt.common.utility.internal.iterables.SubIterableWrapper; +import org.eclipse.jpt.common.utility.internal.iterable.FilteringIterable; +import org.eclipse.jpt.common.utility.internal.iterable.SubIterableWrapper; import org.eclipse.jpt.jpa.core.JpaFile; import org.eclipse.jpt.jpa.core.JpaStructureNode; import org.eclipse.jpt.jpa.core.context.AccessType; diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaGeneratedValue.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaGeneratedValue.java index 89aa1bad88..498304df91 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaGeneratedValue.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaGeneratedValue.java @@ -12,6 +12,8 @@ package org.eclipse.jpt.jpa.core.internal.jpa1.context.java; import java.util.List; import org.eclipse.jpt.common.core.utility.TextRange; import org.eclipse.jpt.common.utility.internal.StringTools; +import org.eclipse.jpt.common.utility.internal.iterable.FilteringIterable; +import org.eclipse.jpt.common.utility.internal.iterable.TransformationIterable; import org.eclipse.jpt.jpa.core.context.GenerationType; import org.eclipse.jpt.jpa.core.context.Generator; import org.eclipse.jpt.jpa.core.context.java.JavaGeneratedValue; @@ -175,7 +177,8 @@ public class GenericJavaGeneratedValue } protected Iterable<String> getJavaCandidateGeneratorNames() { - return StringTools.convertToJavaStringLiteralContents(this.getCandidateGeneratorNames()); + return new TransformationIterable<String, String>(this.getCandidateGeneratorNames(), + StringTools.JAVA_STRING_LITERAL_CONTENT_TRANSFORMER); } protected Iterable<String> getCandidateGeneratorNames() { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaGeneratorContainer.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaGeneratorContainer.java index cfe105e634..1ff7a90812 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaGeneratorContainer.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaGeneratorContainer.java @@ -11,9 +11,9 @@ package org.eclipse.jpt.jpa.core.internal.jpa1.context.java; import java.util.List; import org.eclipse.jpt.common.core.utility.TextRange; -import org.eclipse.jpt.common.utility.internal.NotNullFilter; -import org.eclipse.jpt.common.utility.internal.iterables.ArrayIterable; -import org.eclipse.jpt.common.utility.internal.iterables.FilteringIterable; +import org.eclipse.jpt.common.utility.internal.filter.NotNullFilter; +import org.eclipse.jpt.common.utility.internal.iterable.ArrayIterable; +import org.eclipse.jpt.common.utility.internal.iterable.FilteringIterable; import org.eclipse.jpt.jpa.core.context.Generator; import org.eclipse.jpt.jpa.core.context.java.JavaGeneratorContainer; import org.eclipse.jpt.jpa.core.context.java.JavaSequenceGenerator; diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaJoinColumn.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaJoinColumn.java index 31256f4f82..3cd8f9bee9 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaJoinColumn.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaJoinColumn.java @@ -11,7 +11,9 @@ package org.eclipse.jpt.jpa.core.internal.jpa1.context.java; import org.eclipse.jpt.common.core.utility.TextRange; import org.eclipse.jpt.common.utility.internal.StringTools; -import org.eclipse.jpt.common.utility.internal.iterables.EmptyIterable; +import org.eclipse.jpt.common.utility.internal.iterable.EmptyIterable; +import org.eclipse.jpt.common.utility.internal.iterable.FilteringIterable; +import org.eclipse.jpt.common.utility.internal.iterable.TransformationIterable; import org.eclipse.jpt.jpa.core.context.JpaContextNode; import org.eclipse.jpt.jpa.core.context.ReadOnlyJoinColumn; import org.eclipse.jpt.jpa.core.context.java.JavaJoinColumn; @@ -169,7 +171,8 @@ public class GenericJavaJoinColumn } protected Iterable<String> getJavaCandidateReferencedColumnNames() { - return StringTools.convertToJavaStringLiteralContents(this.getCandidateReferencedColumnNames()); + return new TransformationIterable<String, String>(this.getCandidateReferencedColumnNames(), + StringTools.JAVA_STRING_LITERAL_CONTENT_TRANSFORMER); } protected Iterable<String> getCandidateReferencedColumnNames() { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaJoinTable.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaJoinTable.java index fe6dd88d33..aefad74df6 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaJoinTable.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaJoinTable.java @@ -11,11 +11,11 @@ package org.eclipse.jpt.jpa.core.internal.jpa1.context.java; import java.util.List; import org.eclipse.jpt.common.core.utility.TextRange; -import org.eclipse.jpt.common.utility.internal.Tools; -import org.eclipse.jpt.common.utility.internal.iterables.EmptyIterable; -import org.eclipse.jpt.common.utility.internal.iterables.EmptyListIterable; -import org.eclipse.jpt.common.utility.internal.iterables.ListIterable; -import org.eclipse.jpt.common.utility.internal.iterables.SingleElementListIterable; +import org.eclipse.jpt.common.utility.internal.ObjectTools; +import org.eclipse.jpt.common.utility.internal.iterable.EmptyIterable; +import org.eclipse.jpt.common.utility.internal.iterable.EmptyListIterable; +import org.eclipse.jpt.common.utility.internal.iterable.SingleElementListIterable; +import org.eclipse.jpt.common.utility.iterable.ListIterable; import org.eclipse.jpt.jpa.core.context.Entity; import org.eclipse.jpt.jpa.core.context.JoinColumn; import org.eclipse.jpt.jpa.core.context.PersistentAttribute; @@ -336,7 +336,7 @@ public class GenericJavaJoinTable * the default table name. The table is always the join table. */ public boolean tableNameIsInvalid(String tableName) { - return Tools.valuesAreDifferent(this.getDefaultTableName(), tableName); + return ObjectTools.notEquals(this.getDefaultTableName(), tableName); } /** @@ -347,7 +347,7 @@ public class GenericJavaJoinTable } public org.eclipse.jpt.jpa.db.Table resolveDbTable(String tableName) { - return Tools.valuesAreEqual(GenericJavaJoinTable.this.getName(), tableName) ? + return ObjectTools.equals(GenericJavaJoinTable.this.getName(), tableName) ? GenericJavaJoinTable.this.getDbTable() : null; } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaNamedNativeQuery.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaNamedNativeQuery.java index e3b64c23e6..5629f3e231 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaNamedNativeQuery.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaNamedNativeQuery.java @@ -10,7 +10,7 @@ package org.eclipse.jpt.jpa.core.internal.jpa1.context.java; import java.util.List; -import org.eclipse.jpt.common.utility.internal.Tools; +import org.eclipse.jpt.common.utility.internal.ObjectTools; import org.eclipse.jpt.jpa.core.context.NamedNativeQuery; import org.eclipse.jpt.jpa.core.context.Query; import org.eclipse.jpt.jpa.core.context.java.JavaNamedNativeQuery; @@ -134,8 +134,8 @@ public class GenericJavaNamedNativeQuery } protected boolean isEquivalentTo(NamedNativeQuery other) { - return Tools.valuesAreEqual(this.resultClass, other.getResultClass()) && - Tools.valuesAreEqual(this.resultSetMapping, other.getResultSetMapping()); + return ObjectTools.equals(this.resultClass, other.getResultClass()) && + ObjectTools.equals(this.resultSetMapping, other.getResultSetMapping()); } // ********** misc ********** diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaPrimaryKeyJoinColumn.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaPrimaryKeyJoinColumn.java index bb0e182d5a..097e9c31d5 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaPrimaryKeyJoinColumn.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaPrimaryKeyJoinColumn.java @@ -11,7 +11,9 @@ package org.eclipse.jpt.jpa.core.internal.jpa1.context.java; import org.eclipse.jpt.common.core.utility.TextRange; import org.eclipse.jpt.common.utility.internal.StringTools; -import org.eclipse.jpt.common.utility.internal.iterables.EmptyIterable; +import org.eclipse.jpt.common.utility.internal.iterable.EmptyIterable; +import org.eclipse.jpt.common.utility.internal.iterable.FilteringIterable; +import org.eclipse.jpt.common.utility.internal.iterable.TransformationIterable; import org.eclipse.jpt.jpa.core.context.JpaContextNode; import org.eclipse.jpt.jpa.core.context.ReadOnlyBaseJoinColumn; import org.eclipse.jpt.jpa.core.context.java.JavaPrimaryKeyJoinColumn; @@ -165,7 +167,8 @@ public class GenericJavaPrimaryKeyJoinColumn } protected Iterable<String> getJavaCandidateReferencedColumnNames() { - return StringTools.convertToJavaStringLiteralContents(this.getCandidateReferencedColumnNames()); + return new TransformationIterable<String, String>(this.getCandidateReferencedColumnNames(), + StringTools.JAVA_STRING_LITERAL_CONTENT_TRANSFORMER); } protected Iterable<String> getCandidateReferencedColumnNames() { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaQueryContainer.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaQueryContainer.java index cfc9e33af6..b71c2bc693 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaQueryContainer.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaQueryContainer.java @@ -10,12 +10,11 @@ package org.eclipse.jpt.jpa.core.internal.jpa1.context.java; import java.util.List; - import org.eclipse.jpt.common.core.resource.java.NestableAnnotation; import org.eclipse.jpt.common.core.utility.TextRange; -import org.eclipse.jpt.common.utility.internal.iterables.CompositeIterable; -import org.eclipse.jpt.common.utility.internal.iterables.ListIterable; -import org.eclipse.jpt.common.utility.internal.iterables.SubListIterableWrapper; +import org.eclipse.jpt.common.utility.internal.iterable.CompositeIterable; +import org.eclipse.jpt.common.utility.internal.iterable.SubListIterableWrapper; +import org.eclipse.jpt.common.utility.iterable.ListIterable; import org.eclipse.jpt.jpa.core.context.JpaContextNode; import org.eclipse.jpt.jpa.core.context.NamedNativeQuery; import org.eclipse.jpt.jpa.core.context.NamedQuery; diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaQueryHint.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaQueryHint.java index 639cf4d929..a492b3354c 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaQueryHint.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaQueryHint.java @@ -10,7 +10,7 @@ package org.eclipse.jpt.jpa.core.internal.jpa1.context.java; import org.eclipse.jpt.common.core.utility.TextRange; -import org.eclipse.jpt.common.utility.internal.Tools; +import org.eclipse.jpt.common.utility.internal.ObjectTools; import org.eclipse.jpt.jpa.core.context.QueryHint; import org.eclipse.jpt.jpa.core.context.java.JavaQuery; import org.eclipse.jpt.jpa.core.context.java.JavaQueryHint; @@ -92,8 +92,8 @@ public class GenericJavaQueryHint } public boolean isEquivalentTo(QueryHint hint) { - return Tools.valuesAreEqual(this.name, hint.getName()) && - Tools.valuesAreEqual(this.value, hint.getValue()) ; + return ObjectTools.equals(this.name, hint.getName()) && + ObjectTools.equals(this.value, hint.getValue()) ; } // ********** misc ********** diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaReferenceTable.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaReferenceTable.java index 7535b7f44f..9a663fb53a 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaReferenceTable.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaReferenceTable.java @@ -10,9 +10,9 @@ package org.eclipse.jpt.jpa.core.internal.jpa1.context.java; import java.util.List; -import org.eclipse.jpt.common.utility.internal.iterables.EmptyListIterable; -import org.eclipse.jpt.common.utility.internal.iterables.ListIterable; -import org.eclipse.jpt.common.utility.internal.iterables.SingleElementListIterable; +import org.eclipse.jpt.common.utility.internal.iterable.EmptyListIterable; +import org.eclipse.jpt.common.utility.internal.iterable.SingleElementListIterable; +import org.eclipse.jpt.common.utility.iterable.ListIterable; import org.eclipse.jpt.jpa.core.context.JoinColumn; import org.eclipse.jpt.jpa.core.context.JpaContextNode; import org.eclipse.jpt.jpa.core.context.ReadOnlyJoinColumn; diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaSecondaryTable.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaSecondaryTable.java index 75780e9a3e..75e2e96aba 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaSecondaryTable.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaSecondaryTable.java @@ -11,9 +11,9 @@ package org.eclipse.jpt.jpa.core.internal.jpa1.context.java; import java.util.List; import org.eclipse.jpt.common.core.utility.TextRange; -import org.eclipse.jpt.common.utility.internal.iterables.EmptyListIterable; -import org.eclipse.jpt.common.utility.internal.iterables.ListIterable; -import org.eclipse.jpt.common.utility.internal.iterables.SingleElementListIterable; +import org.eclipse.jpt.common.utility.internal.iterable.EmptyListIterable; +import org.eclipse.jpt.common.utility.internal.iterable.SingleElementListIterable; +import org.eclipse.jpt.common.utility.iterable.ListIterable; import org.eclipse.jpt.jpa.core.context.PrimaryKeyJoinColumn; import org.eclipse.jpt.jpa.core.context.ReadOnlyBaseJoinColumn; import org.eclipse.jpt.jpa.core.context.ReadOnlyNamedColumn; diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaSequenceGenerator.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaSequenceGenerator.java index 5b45320174..d828ccd42a 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaSequenceGenerator.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaSequenceGenerator.java @@ -9,7 +9,7 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.internal.jpa1.context.java; -import org.eclipse.jpt.common.utility.internal.Tools; +import org.eclipse.jpt.common.utility.internal.ObjectTools; import org.eclipse.jpt.jpa.core.context.SequenceGenerator; import org.eclipse.jpt.jpa.core.context.java.JavaGeneratorContainer; import org.eclipse.jpt.jpa.core.internal.context.java.AbstractJavaSequenceGenerator; @@ -49,7 +49,7 @@ public class GenericJavaSequenceGenerator @Override protected boolean isEquivalentTo(SequenceGenerator generator) { return super.isEquivalentTo(generator) && - Tools.valuesAreEqual(this.getDbSchema(), generator.getDbSchema()) && - Tools.valuesAreEqual(this.getDbCatalog(), generator.getDbCatalog()); + ObjectTools.equals(this.getDbSchema(), generator.getDbSchema()) && + ObjectTools.equals(this.getDbCatalog(), generator.getDbCatalog()); } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaTableGenerator.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaTableGenerator.java index 38f8077179..1d52707460 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaTableGenerator.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaTableGenerator.java @@ -10,14 +10,14 @@ package org.eclipse.jpt.jpa.core.internal.jpa1.context.java; import java.util.ArrayList; - -import org.eclipse.jpt.common.utility.Filter; -import org.eclipse.jpt.common.utility.internal.CollectionTools; +import org.eclipse.jpt.common.utility.filter.Filter; +import org.eclipse.jpt.common.utility.internal.ObjectTools; import org.eclipse.jpt.common.utility.internal.StringTools; -import org.eclipse.jpt.common.utility.internal.Tools; -import org.eclipse.jpt.common.utility.internal.iterables.EmptyIterable; -import org.eclipse.jpt.common.utility.internal.iterables.FilteringIterable; -import org.eclipse.jpt.common.utility.internal.iterables.ListIterable; +import org.eclipse.jpt.common.utility.internal.collection.ListTools; +import org.eclipse.jpt.common.utility.internal.iterable.EmptyIterable; +import org.eclipse.jpt.common.utility.internal.iterable.FilteringIterable; +import org.eclipse.jpt.common.utility.internal.iterable.TransformationIterable; +import org.eclipse.jpt.common.utility.iterable.ListIterable; import org.eclipse.jpt.jpa.core.context.DbGenerator; import org.eclipse.jpt.jpa.core.context.TableGenerator; import org.eclipse.jpt.jpa.core.context.UniqueConstraint; @@ -473,7 +473,8 @@ public class GenericJavaTableGenerator } protected Iterable<String> getJavaCandidateTables() { - return StringTools.convertToJavaStringLiteralContents(this.getCandidateTables()); + return new TransformationIterable<String, String>(this.getCandidateTables(), + StringTools.JAVA_STRING_LITERAL_CONTENT_TRANSFORMER); } protected Iterable<String> getCandidateTables() { @@ -488,7 +489,8 @@ public class GenericJavaTableGenerator } protected Iterable<String> getJavaCandidateSchemata() { - return StringTools.convertToJavaStringLiteralContents(this.getCandidateSchemata()); + return new TransformationIterable<String, String>(this.getCandidateSchemata(), + StringTools.JAVA_STRING_LITERAL_CONTENT_TRANSFORMER); } protected Iterable<String> getCandidateSchemata() { @@ -503,7 +505,8 @@ public class GenericJavaTableGenerator } protected Iterable<String> getJavaCandidateCatalogs(Filter<String> filter) { - return StringTools.convertToJavaStringLiteralContents(this.getCandidateCatalogs(filter)); + return new TransformationIterable<String, String>(this.getCandidateCatalogs(filter), + StringTools.JAVA_STRING_LITERAL_CONTENT_TRANSFORMER); } protected Iterable<String> getCandidateCatalogs(Filter<String> filter) { @@ -522,7 +525,8 @@ public class GenericJavaTableGenerator } protected Iterable<String> getJavaCandidateColumnNames() { - return StringTools.convertToJavaStringLiteralContents(this.getCandidateColumnNames()); + return new TransformationIterable<String, String>(this.getCandidateColumnNames(), + StringTools.JAVA_STRING_LITERAL_CONTENT_TRANSFORMER); } protected Iterable<String> getCandidateColumnNames() { @@ -561,19 +565,19 @@ public class GenericJavaTableGenerator } protected boolean isEquivalentTo(TableGenerator generator) { - return Tools.valuesAreEqual(this.specifiedTable, generator.getSpecifiedTable()) && - Tools.valuesAreEqual(this.specifiedSchema, generator.getSpecifiedSchema()) && - Tools.valuesAreEqual(this.specifiedCatalog, generator.getSpecifiedCatalog()) && - Tools.valuesAreEqual(this.specifiedPkColumnName, generator.getSpecifiedPkColumnName()) && - Tools.valuesAreEqual(this.specifiedPkColumnValue, generator.getSpecifiedPkColumnValue()) && - Tools.valuesAreEqual(this.specifiedValueColumnName, generator.getSpecifiedValueColumnName()) && + return ObjectTools.equals(this.specifiedTable, generator.getSpecifiedTable()) && + ObjectTools.equals(this.specifiedSchema, generator.getSpecifiedSchema()) && + ObjectTools.equals(this.specifiedCatalog, generator.getSpecifiedCatalog()) && + ObjectTools.equals(this.specifiedPkColumnName, generator.getSpecifiedPkColumnName()) && + ObjectTools.equals(this.specifiedPkColumnValue, generator.getSpecifiedPkColumnValue()) && + ObjectTools.equals(this.specifiedValueColumnName, generator.getSpecifiedValueColumnName()) && this.uniqueConstrainsAreEquivalentTo(generator); } protected boolean uniqueConstrainsAreEquivalentTo(TableGenerator generator) { // get fixed lists of the unique constraints - ArrayList<JavaUniqueConstraint> uniqueConstraints1 = CollectionTools.list(this.getUniqueConstraints()); - ArrayList<UniqueConstraint> uniqueConstraints2 = CollectionTools.list(generator.getUniqueConstraints()); + ArrayList<JavaUniqueConstraint> uniqueConstraints1 = ListTools.list(this.getUniqueConstraints()); + ArrayList<UniqueConstraint> uniqueConstraints2 = ListTools.list(generator.getUniqueConstraints()); if (uniqueConstraints1.size() != uniqueConstraints2.size()) { return false; } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaUniqueConstraint.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaUniqueConstraint.java index e2d8fc30d0..f74b7c9503 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaUniqueConstraint.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaUniqueConstraint.java @@ -10,8 +10,9 @@ package org.eclipse.jpt.jpa.core.internal.jpa1.context.java; import org.eclipse.jpt.common.core.utility.TextRange; +import org.eclipse.jpt.common.utility.internal.ObjectTools; import org.eclipse.jpt.common.utility.internal.StringTools; -import org.eclipse.jpt.common.utility.internal.Tools; +import org.eclipse.jpt.common.utility.internal.iterable.TransformationIterable; import org.eclipse.jpt.jpa.core.context.JpaContextNode; import org.eclipse.jpt.jpa.core.context.ReadOnlyUniqueConstraint; import org.eclipse.jpt.jpa.core.context.UniqueConstraint; @@ -99,7 +100,8 @@ public class GenericJavaUniqueConstraint } protected Iterable<String> getJavaCandidateColumnNames() { - return StringTools.convertToJavaStringLiteralContents(this.getCandidateColumnNames()); + return new TransformationIterable<String, String>(this.getCandidateColumnNames(), + StringTools.JAVA_STRING_LITERAL_CONTENT_TRANSFORMER); } protected Iterable<String> getCandidateColumnNames() { @@ -124,7 +126,7 @@ public class GenericJavaUniqueConstraint } for (int i=0; i<this.getColumnNamesSize(); i++) { - if (! Tools.valuesAreEqual(this.columnNames.get(i), uniqueConstraint.getColumnName(i))) { + if (ObjectTools.notEquals(this.columnNames.get(i), uniqueConstraint.getColumnName(i))) { return false; } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaVirtualOverrideJoinColumnRelationshipStrategy.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaVirtualOverrideJoinColumnRelationshipStrategy.java index be58026ddb..56c166b0f3 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaVirtualOverrideJoinColumnRelationshipStrategy.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/GenericJavaVirtualOverrideJoinColumnRelationshipStrategy.java @@ -11,11 +11,11 @@ package org.eclipse.jpt.jpa.core.internal.jpa1.context.java; import java.util.List; import org.eclipse.jpt.common.core.utility.TextRange; -import org.eclipse.jpt.common.utility.internal.iterables.EmptyIterable; -import org.eclipse.jpt.common.utility.internal.iterables.EmptyListIterable; -import org.eclipse.jpt.common.utility.internal.iterables.ListIterable; -import org.eclipse.jpt.common.utility.internal.iterables.SingleElementListIterable; -import org.eclipse.jpt.common.utility.internal.iterables.SuperListIterableWrapper; +import org.eclipse.jpt.common.utility.internal.iterable.EmptyIterable; +import org.eclipse.jpt.common.utility.internal.iterable.EmptyListIterable; +import org.eclipse.jpt.common.utility.internal.iterable.SingleElementListIterable; +import org.eclipse.jpt.common.utility.internal.iterable.SuperListIterableWrapper; +import org.eclipse.jpt.common.utility.iterable.ListIterable; import org.eclipse.jpt.jpa.core.context.Entity; import org.eclipse.jpt.jpa.core.context.ReadOnlyBaseColumn; import org.eclipse.jpt.jpa.core.context.ReadOnlyJoinColumn; diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/NullJavaJoinColumnRelationshipStrategy.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/NullJavaJoinColumnRelationshipStrategy.java index cebf635860..4a305c48fb 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/NullJavaJoinColumnRelationshipStrategy.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/java/NullJavaJoinColumnRelationshipStrategy.java @@ -10,8 +10,8 @@ package org.eclipse.jpt.jpa.core.internal.jpa1.context.java; import org.eclipse.jpt.common.core.utility.TextRange; -import org.eclipse.jpt.common.utility.internal.iterables.EmptyListIterable; -import org.eclipse.jpt.common.utility.internal.iterables.ListIterable; +import org.eclipse.jpt.common.utility.internal.iterable.EmptyListIterable; +import org.eclipse.jpt.common.utility.iterable.ListIterable; import org.eclipse.jpt.jpa.core.context.JoinColumn; import org.eclipse.jpt.jpa.core.context.ReadOnlyJoinColumnRelationshipStrategy; import org.eclipse.jpt.jpa.core.context.ReadOnlyRelationshipStrategy; diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/AbstractOrmEmbeddedIdMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/AbstractOrmEmbeddedIdMapping.java index e022e8d385..813feafa7f 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/AbstractOrmEmbeddedIdMapping.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/AbstractOrmEmbeddedIdMapping.java @@ -14,8 +14,8 @@ import java.util.List; import org.eclipse.jdt.core.IJavaProject; import org.eclipse.jpt.common.core.internal.utility.JDTTools; import org.eclipse.jpt.common.core.resource.java.JavaResourceType; -import org.eclipse.jpt.common.utility.internal.iterables.EmptyIterable; -import org.eclipse.jpt.common.utility.internal.iterables.FilteringIterable; +import org.eclipse.jpt.common.utility.internal.iterable.EmptyIterable; +import org.eclipse.jpt.common.utility.internal.iterable.FilteringIterable; import org.eclipse.jpt.jpa.core.MappingKeys; import org.eclipse.jpt.jpa.core.context.TypeMapping; import org.eclipse.jpt.jpa.core.context.orm.OrmAttributeMapping; diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/AbstractOrmEmbeddedMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/AbstractOrmEmbeddedMapping.java index cc5de86264..1c05eede45 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/AbstractOrmEmbeddedMapping.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/AbstractOrmEmbeddedMapping.java @@ -12,10 +12,10 @@ package org.eclipse.jpt.jpa.core.internal.jpa1.context.orm; import java.util.List; import org.eclipse.emf.common.util.EList; import org.eclipse.jpt.common.core.utility.TextRange; -import org.eclipse.jpt.common.utility.internal.iterables.CompositeIterable; -import org.eclipse.jpt.common.utility.internal.iterables.EmptyIterable; -import org.eclipse.jpt.common.utility.internal.iterables.FilteringIterable; -import org.eclipse.jpt.common.utility.internal.iterables.SubIterableWrapper; +import org.eclipse.jpt.common.utility.internal.iterable.CompositeIterable; +import org.eclipse.jpt.common.utility.internal.iterable.EmptyIterable; +import org.eclipse.jpt.common.utility.internal.iterable.FilteringIterable; +import org.eclipse.jpt.common.utility.internal.iterable.SubIterableWrapper; import org.eclipse.jpt.jpa.core.MappingKeys; import org.eclipse.jpt.jpa.core.context.AssociationOverride; import org.eclipse.jpt.jpa.core.context.AssociationOverrideContainer; diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/AbstractOrmOverrideContainer.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/AbstractOrmOverrideContainer.java index c2d7d577d0..b6faa04648 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/AbstractOrmOverrideContainer.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/AbstractOrmOverrideContainer.java @@ -12,12 +12,12 @@ package org.eclipse.jpt.jpa.core.internal.jpa1.context.orm; import java.util.List; import java.util.Vector; import org.eclipse.jpt.common.core.utility.TextRange; -import org.eclipse.jpt.common.utility.internal.CollectionTools; -import org.eclipse.jpt.common.utility.internal.iterables.CompositeListIterable; -import org.eclipse.jpt.common.utility.internal.iterables.EmptyIterable; -import org.eclipse.jpt.common.utility.internal.iterables.FilteringIterable; -import org.eclipse.jpt.common.utility.internal.iterables.ListIterable; -import org.eclipse.jpt.common.utility.internal.iterables.LiveCloneListIterable; +import org.eclipse.jpt.common.utility.internal.iterable.CompositeListIterable; +import org.eclipse.jpt.common.utility.internal.iterable.EmptyIterable; +import org.eclipse.jpt.common.utility.internal.iterable.FilteringIterable; +import org.eclipse.jpt.common.utility.internal.iterable.IterableTools; +import org.eclipse.jpt.common.utility.internal.iterable.LiveCloneListIterable; +import org.eclipse.jpt.common.utility.iterable.ListIterable; import org.eclipse.jpt.jpa.core.context.JpaContextNode; import org.eclipse.jpt.jpa.core.context.Override_; import org.eclipse.jpt.jpa.core.context.ReadOnlyBaseColumn; @@ -136,7 +136,7 @@ public abstract class AbstractOrmOverrideContainer< * remaining specified overrides. */ protected boolean overrideWillBeVirtual(String overrideName, S specifiedOverrideToBeRemoved) { - return CollectionTools.contains(this.getPossibleVirtualOverrideNames(), overrideName) && + return IterableTools.contains(this.getPossibleVirtualOverrideNames(), overrideName) && (this.getSpecifiedOverrideNamed(overrideName, specifiedOverrideToBeRemoved) == null); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/AbstractOrmPersistenceUnitDefaults.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/AbstractOrmPersistenceUnitDefaults.java index 2f128f4036..78486a6e1a 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/AbstractOrmPersistenceUnitDefaults.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/AbstractOrmPersistenceUnitDefaults.java @@ -10,7 +10,7 @@ package org.eclipse.jpt.jpa.core.internal.jpa1.context.orm; import org.eclipse.jpt.common.core.utility.TextRange; -import org.eclipse.jpt.common.utility.internal.iterables.EmptyIterable; +import org.eclipse.jpt.common.utility.internal.iterable.EmptyIterable; import org.eclipse.jpt.jpa.core.context.AccessType; import org.eclipse.jpt.jpa.core.context.orm.OrmPersistenceUnitMetadata; import org.eclipse.jpt.jpa.core.internal.context.orm.AbstractOrmXmlContextNode; diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmAssociationOverrideContainer.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmAssociationOverrideContainer.java index e3f21c9e4a..47296cd3c5 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmAssociationOverrideContainer.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmAssociationOverrideContainer.java @@ -9,7 +9,7 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.internal.jpa1.context.orm; -import org.eclipse.jpt.common.utility.internal.iterables.LiveCloneIterable; +import org.eclipse.jpt.common.utility.internal.iterable.LiveCloneIterable; import org.eclipse.jpt.jpa.core.context.JpaContextNode; import org.eclipse.jpt.jpa.core.context.ReadOnlyAssociationOverride; import org.eclipse.jpt.jpa.core.context.ReadOnlyJoinColumn; diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmAttributeOverrideContainer.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmAttributeOverrideContainer.java index fdb170e5c2..0ce8ddb021 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmAttributeOverrideContainer.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmAttributeOverrideContainer.java @@ -9,7 +9,7 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.internal.jpa1.context.orm; -import org.eclipse.jpt.common.utility.internal.iterables.LiveCloneIterable; +import org.eclipse.jpt.common.utility.internal.iterable.LiveCloneIterable; import org.eclipse.jpt.jpa.core.context.JpaContextNode; import org.eclipse.jpt.jpa.core.context.ReadOnlyAttributeOverride; import org.eclipse.jpt.jpa.core.context.ReadOnlyColumn; diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmGeneratorContainer.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmGeneratorContainer.java index 99f9ccb2ca..a89fae1420 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmGeneratorContainer.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmGeneratorContainer.java @@ -11,9 +11,9 @@ package org.eclipse.jpt.jpa.core.internal.jpa1.context.orm; import java.util.List; import org.eclipse.jpt.common.core.utility.TextRange; -import org.eclipse.jpt.common.utility.internal.NotNullFilter; -import org.eclipse.jpt.common.utility.internal.iterables.ArrayIterable; -import org.eclipse.jpt.common.utility.internal.iterables.FilteringIterable; +import org.eclipse.jpt.common.utility.internal.filter.NotNullFilter; +import org.eclipse.jpt.common.utility.internal.iterable.ArrayIterable; +import org.eclipse.jpt.common.utility.internal.iterable.FilteringIterable; import org.eclipse.jpt.jpa.core.context.Generator; import org.eclipse.jpt.jpa.core.context.JpaContextNode; import org.eclipse.jpt.jpa.core.context.orm.OrmGeneratorContainer; diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmJoinColumn.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmJoinColumn.java index 96769c7e1e..cb25dbc1b3 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmJoinColumn.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmJoinColumn.java @@ -10,7 +10,7 @@ package org.eclipse.jpt.jpa.core.internal.jpa1.context.orm; import org.eclipse.jpt.common.core.utility.TextRange; -import org.eclipse.jpt.common.utility.internal.iterables.EmptyIterable; +import org.eclipse.jpt.common.utility.internal.iterable.EmptyIterable; import org.eclipse.jpt.jpa.core.context.JpaContextNode; import org.eclipse.jpt.jpa.core.context.ReadOnlyJoinColumn; import org.eclipse.jpt.jpa.core.context.orm.OrmJoinColumn; diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmJoinTable.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmJoinTable.java index d68e7aba25..c9820f3dca 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmJoinTable.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmJoinTable.java @@ -11,12 +11,12 @@ package org.eclipse.jpt.jpa.core.internal.jpa1.context.orm; import java.util.List; import org.eclipse.jpt.common.core.utility.TextRange; -import org.eclipse.jpt.common.utility.internal.Tools; -import org.eclipse.jpt.common.utility.internal.iterables.EmptyIterable; -import org.eclipse.jpt.common.utility.internal.iterables.EmptyListIterable; -import org.eclipse.jpt.common.utility.internal.iterables.ListIterable; -import org.eclipse.jpt.common.utility.internal.iterables.LiveCloneListIterable; -import org.eclipse.jpt.common.utility.internal.iterables.SingleElementListIterable; +import org.eclipse.jpt.common.utility.internal.ObjectTools; +import org.eclipse.jpt.common.utility.internal.iterable.EmptyIterable; +import org.eclipse.jpt.common.utility.internal.iterable.EmptyListIterable; +import org.eclipse.jpt.common.utility.internal.iterable.LiveCloneListIterable; +import org.eclipse.jpt.common.utility.internal.iterable.SingleElementListIterable; +import org.eclipse.jpt.common.utility.iterable.ListIterable; import org.eclipse.jpt.jpa.core.context.Entity; import org.eclipse.jpt.jpa.core.context.JoinColumn; import org.eclipse.jpt.jpa.core.context.PersistentAttribute; @@ -342,7 +342,7 @@ public class GenericOrmJoinTable * the default table name. The table is always the join table. */ public boolean tableNameIsInvalid(String tableName) { - return Tools.valuesAreDifferent(this.getDefaultTableName(), tableName); + return ObjectTools.notEquals(this.getDefaultTableName(), tableName); } /** @@ -353,7 +353,7 @@ public class GenericOrmJoinTable } public org.eclipse.jpt.jpa.db.Table resolveDbTable(String tableName) { - return Tools.valuesAreEqual(GenericOrmJoinTable.this.getName(), tableName) ? + return ObjectTools.equals(GenericOrmJoinTable.this.getName(), tableName) ? GenericOrmJoinTable.this.getDbTable() : null; } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmNamedNativeQuery.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmNamedNativeQuery.java index 4013af07a6..4e3d0ef47c 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmNamedNativeQuery.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmNamedNativeQuery.java @@ -10,7 +10,7 @@ package org.eclipse.jpt.jpa.core.internal.jpa1.context.orm; import java.util.List; -import org.eclipse.jpt.common.utility.internal.Tools; +import org.eclipse.jpt.common.utility.internal.ObjectTools; import org.eclipse.jpt.jpa.core.context.JpaContextNode; import org.eclipse.jpt.jpa.core.context.NamedNativeQuery; import org.eclipse.jpt.jpa.core.context.Query; @@ -132,8 +132,8 @@ public class GenericOrmNamedNativeQuery } protected boolean isEquivalentTo(NamedNativeQuery other) { - return Tools.valuesAreEqual(this.resultClass, other.getResultClass()) && - Tools.valuesAreEqual(this.resultSetMapping, other.getResultSetMapping()); + return ObjectTools.equals(this.resultClass, other.getResultClass()) && + ObjectTools.equals(this.resultSetMapping, other.getResultSetMapping()); } // ********** misc ********** diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmPrimaryKeyJoinColumn.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmPrimaryKeyJoinColumn.java index 0bd5f6affb..8231721d7d 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmPrimaryKeyJoinColumn.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmPrimaryKeyJoinColumn.java @@ -10,7 +10,7 @@ package org.eclipse.jpt.jpa.core.internal.jpa1.context.orm; import org.eclipse.jpt.common.core.utility.TextRange; -import org.eclipse.jpt.common.utility.internal.iterables.EmptyIterable; +import org.eclipse.jpt.common.utility.internal.iterable.EmptyIterable; import org.eclipse.jpt.jpa.core.context.JpaContextNode; import org.eclipse.jpt.jpa.core.context.ReadOnlyBaseJoinColumn; import org.eclipse.jpt.jpa.core.context.ReadOnlyPrimaryKeyJoinColumn; diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmQueryContainer.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmQueryContainer.java index d886007772..48352725ac 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmQueryContainer.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmQueryContainer.java @@ -10,11 +10,10 @@ package org.eclipse.jpt.jpa.core.internal.jpa1.context.orm; import java.util.List; - import org.eclipse.jpt.common.core.utility.TextRange; -import org.eclipse.jpt.common.utility.internal.iterables.CompositeIterable; -import org.eclipse.jpt.common.utility.internal.iterables.ListIterable; -import org.eclipse.jpt.common.utility.internal.iterables.LiveCloneListIterable; +import org.eclipse.jpt.common.utility.internal.iterable.CompositeIterable; +import org.eclipse.jpt.common.utility.internal.iterable.LiveCloneListIterable; +import org.eclipse.jpt.common.utility.iterable.ListIterable; import org.eclipse.jpt.jpa.core.context.JpaContextNode; import org.eclipse.jpt.jpa.core.context.NamedNativeQuery; import org.eclipse.jpt.jpa.core.context.NamedQuery; diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmQueryHint.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmQueryHint.java index ba5a96c483..ae2afdc1eb 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmQueryHint.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmQueryHint.java @@ -10,7 +10,7 @@ package org.eclipse.jpt.jpa.core.internal.jpa1.context.orm; import org.eclipse.jpt.common.core.utility.TextRange; -import org.eclipse.jpt.common.utility.internal.Tools; +import org.eclipse.jpt.common.utility.internal.ObjectTools; import org.eclipse.jpt.jpa.core.context.QueryHint; import org.eclipse.jpt.jpa.core.context.java.JavaQueryHint; import org.eclipse.jpt.jpa.core.context.orm.OrmQuery; @@ -99,8 +99,8 @@ public class GenericOrmQueryHint } public boolean isEquivalentTo(QueryHint hint) { - return Tools.valuesAreEqual(this.name, hint.getName()) && - Tools.valuesAreEqual(this.value, hint.getValue()) ; + return ObjectTools.equals(this.name, hint.getName()) && + ObjectTools.equals(this.value, hint.getValue()) ; } // ********** misc ********** diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmReferenceTable.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmReferenceTable.java index 4512c768d9..d5d49c2a47 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmReferenceTable.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmReferenceTable.java @@ -10,10 +10,11 @@ package org.eclipse.jpt.jpa.core.internal.jpa1.context.orm; import java.util.List; -import org.eclipse.jpt.common.utility.internal.iterables.EmptyListIterable; -import org.eclipse.jpt.common.utility.internal.iterables.ListIterable; -import org.eclipse.jpt.common.utility.internal.iterables.LiveCloneListIterable; -import org.eclipse.jpt.common.utility.internal.iterables.SingleElementListIterable; + +import org.eclipse.jpt.common.utility.internal.iterable.EmptyListIterable; +import org.eclipse.jpt.common.utility.internal.iterable.LiveCloneListIterable; +import org.eclipse.jpt.common.utility.internal.iterable.SingleElementListIterable; +import org.eclipse.jpt.common.utility.iterable.ListIterable; import org.eclipse.jpt.jpa.core.context.JoinColumn; import org.eclipse.jpt.jpa.core.context.JpaContextNode; import org.eclipse.jpt.jpa.core.context.ReadOnlyJoinColumn; diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmSecondaryTable.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmSecondaryTable.java index 6cafdd7d08..5ebc8b684b 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmSecondaryTable.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmSecondaryTable.java @@ -11,10 +11,10 @@ package org.eclipse.jpt.jpa.core.internal.jpa1.context.orm; import java.util.List; import org.eclipse.jpt.common.core.utility.TextRange; -import org.eclipse.jpt.common.utility.internal.iterables.EmptyListIterable; -import org.eclipse.jpt.common.utility.internal.iterables.ListIterable; -import org.eclipse.jpt.common.utility.internal.iterables.LiveCloneListIterable; -import org.eclipse.jpt.common.utility.internal.iterables.SingleElementListIterable; +import org.eclipse.jpt.common.utility.internal.iterable.EmptyListIterable; +import org.eclipse.jpt.common.utility.internal.iterable.LiveCloneListIterable; +import org.eclipse.jpt.common.utility.internal.iterable.SingleElementListIterable; +import org.eclipse.jpt.common.utility.iterable.ListIterable; import org.eclipse.jpt.jpa.core.context.Entity; import org.eclipse.jpt.jpa.core.context.PrimaryKeyJoinColumn; import org.eclipse.jpt.jpa.core.context.ReadOnlyBaseJoinColumn; diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmSequenceGenerator.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmSequenceGenerator.java index d0627e368b..e1f2887cd0 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmSequenceGenerator.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmSequenceGenerator.java @@ -9,7 +9,7 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.internal.jpa1.context.orm; -import org.eclipse.jpt.common.utility.internal.Tools; +import org.eclipse.jpt.common.utility.internal.ObjectTools; import org.eclipse.jpt.jpa.core.context.JpaContextNode; import org.eclipse.jpt.jpa.core.context.SequenceGenerator; import org.eclipse.jpt.jpa.core.internal.context.orm.AbstractOrmSequenceGenerator; @@ -48,8 +48,8 @@ public class GenericOrmSequenceGenerator @Override protected boolean isEquivalentTo(SequenceGenerator generator) { return super.isEquivalentTo(generator) && - Tools.valuesAreEqual(this.getDbSchema(), generator.getDbSchema()) && - Tools.valuesAreEqual(this.getDbCatalog(), generator.getDbCatalog()); + ObjectTools.equals(this.getDbSchema(), generator.getDbSchema()) && + ObjectTools.equals(this.getDbCatalog(), generator.getDbCatalog()); } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmTableGenerator.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmTableGenerator.java index 22eb088f19..1da7aef29e 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmTableGenerator.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmTableGenerator.java @@ -10,11 +10,11 @@ package org.eclipse.jpt.jpa.core.internal.jpa1.context.orm; import java.util.ArrayList; -import org.eclipse.jpt.common.utility.internal.CollectionTools; -import org.eclipse.jpt.common.utility.internal.Tools; -import org.eclipse.jpt.common.utility.internal.iterables.EmptyIterable; -import org.eclipse.jpt.common.utility.internal.iterables.ListIterable; -import org.eclipse.jpt.common.utility.internal.iterables.LiveCloneListIterable; +import org.eclipse.jpt.common.utility.internal.ObjectTools; +import org.eclipse.jpt.common.utility.internal.collection.ListTools; +import org.eclipse.jpt.common.utility.internal.iterable.EmptyIterable; +import org.eclipse.jpt.common.utility.internal.iterable.LiveCloneListIterable; +import org.eclipse.jpt.common.utility.iterable.ListIterable; import org.eclipse.jpt.jpa.core.context.DbGenerator; import org.eclipse.jpt.jpa.core.context.JpaContextNode; import org.eclipse.jpt.jpa.core.context.TableGenerator; @@ -439,19 +439,19 @@ public class GenericOrmTableGenerator } protected boolean isEquivalentTo(TableGenerator generator) { - return Tools.valuesAreEqual(this.specifiedTable, generator.getSpecifiedTable()) && - Tools.valuesAreEqual(this.specifiedSchema, generator.getSpecifiedSchema()) && - Tools.valuesAreEqual(this.specifiedCatalog, generator.getSpecifiedCatalog()) && - Tools.valuesAreEqual(this.specifiedPkColumnName, generator.getSpecifiedPkColumnName()) && - Tools.valuesAreEqual(this.specifiedValueColumnName, generator.getSpecifiedValueColumnName()) && - Tools.valuesAreEqual(this.specifiedPkColumnValue, generator.getSpecifiedPkColumnValue()) && + return ObjectTools.equals(this.specifiedTable, generator.getSpecifiedTable()) && + ObjectTools.equals(this.specifiedSchema, generator.getSpecifiedSchema()) && + ObjectTools.equals(this.specifiedCatalog, generator.getSpecifiedCatalog()) && + ObjectTools.equals(this.specifiedPkColumnName, generator.getSpecifiedPkColumnName()) && + ObjectTools.equals(this.specifiedValueColumnName, generator.getSpecifiedValueColumnName()) && + ObjectTools.equals(this.specifiedPkColumnValue, generator.getSpecifiedPkColumnValue()) && this.uniqueConstrainsAreEquivalentTo(generator); } protected boolean uniqueConstrainsAreEquivalentTo(TableGenerator generator) { // get fixed lists of the unique constraints - ArrayList<OrmUniqueConstraint> uniqueConstraints1 = CollectionTools.list(this.getUniqueConstraints()); - ArrayList<UniqueConstraint> uniqueConstraints2 = CollectionTools.list(generator.getUniqueConstraints()); + ArrayList<OrmUniqueConstraint> uniqueConstraints1 = ListTools.list(this.getUniqueConstraints()); + ArrayList<UniqueConstraint> uniqueConstraints2 = ListTools.list(generator.getUniqueConstraints()); if (uniqueConstraints1.size() != uniqueConstraints2.size()) { return false; } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmUniqueConstraint.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmUniqueConstraint.java index 0ead5f4e6e..d884b04468 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmUniqueConstraint.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmUniqueConstraint.java @@ -10,7 +10,7 @@ package org.eclipse.jpt.jpa.core.internal.jpa1.context.orm; import org.eclipse.jpt.common.core.utility.TextRange; -import org.eclipse.jpt.common.utility.internal.Tools; +import org.eclipse.jpt.common.utility.internal.ObjectTools; import org.eclipse.jpt.jpa.core.context.JpaContextNode; import org.eclipse.jpt.jpa.core.context.ReadOnlyUniqueConstraint; import org.eclipse.jpt.jpa.core.context.UniqueConstraint; @@ -98,7 +98,7 @@ public class GenericOrmUniqueConstraint } for (int i=0; i<this.getColumnNamesSize(); i++) { - if (! Tools.valuesAreEqual(this.columnNames.get(i), uniqueConstraint.getColumnName(i))) { + if (! ObjectTools.equals(this.columnNames.get(i), uniqueConstraint.getColumnName(i))) { return false; } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmXml.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmXml.java index 6ef3685e23..ffb173e364 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmXml.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmXml.java @@ -19,8 +19,8 @@ import org.eclipse.jdt.core.IType; import org.eclipse.jpt.common.core.JptResourceType; import org.eclipse.jpt.common.core.resource.xml.JptXmlResource; import org.eclipse.jpt.common.core.utility.TextRange; -import org.eclipse.jpt.common.utility.internal.Tools; -import org.eclipse.jpt.common.utility.internal.iterables.EmptyIterable; +import org.eclipse.jpt.common.utility.internal.ObjectTools; +import org.eclipse.jpt.common.utility.internal.iterable.EmptyIterable; import org.eclipse.jpt.jpa.core.JpaFile; import org.eclipse.jpt.jpa.core.JpaStructureNode; import org.eclipse.jpt.jpa.core.context.Generator; @@ -253,7 +253,7 @@ public class GenericOrmXml public boolean isIn(IFolder folder) { IResource member = folder.findMember(this.xmlResource.getFile().getName()); IFile file = this.xmlResource.getFile(); - return Tools.valuesAreEqual(member, file); + return ObjectTools.equals(member, file); } public boolean isGenericMappingFile() { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmXmlDefinition.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmXmlDefinition.java index ce7af75ea8..fa52a98ae2 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmXmlDefinition.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/GenericOrmXmlDefinition.java @@ -10,9 +10,10 @@ package org.eclipse.jpt.jpa.core.internal.jpa1.context.orm; import java.util.ArrayList; + import org.eclipse.emf.ecore.EFactory; import org.eclipse.jpt.common.core.JptResourceType; -import org.eclipse.jpt.common.utility.internal.CollectionTools; +import org.eclipse.jpt.common.utility.internal.collection.CollectionTools; import org.eclipse.jpt.jpa.core.context.orm.NullOrmAttributeMappingDefinition; import org.eclipse.jpt.jpa.core.context.orm.OrmAttributeMappingDefinition; import org.eclipse.jpt.jpa.core.context.orm.OrmXmlContextNodeFactory; diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/NullOrmJoinColumnRelationshipStrategy.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/NullOrmJoinColumnRelationshipStrategy.java index 550d4078ac..626e7d2b44 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/NullOrmJoinColumnRelationshipStrategy.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/orm/NullOrmJoinColumnRelationshipStrategy.java @@ -10,8 +10,8 @@ package org.eclipse.jpt.jpa.core.internal.jpa1.context.orm; import org.eclipse.jpt.common.core.utility.TextRange; -import org.eclipse.jpt.common.utility.internal.iterables.EmptyListIterable; -import org.eclipse.jpt.common.utility.internal.iterables.ListIterable; +import org.eclipse.jpt.common.utility.internal.iterable.EmptyListIterable; +import org.eclipse.jpt.common.utility.iterable.ListIterable; import org.eclipse.jpt.jpa.core.context.JoinColumn; import org.eclipse.jpt.jpa.core.context.ReadOnlyJoinColumnRelationshipStrategy; import org.eclipse.jpt.jpa.core.context.ReadOnlyRelationshipStrategy; diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/persistence/GenericClassRef.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/persistence/GenericClassRef.java index 3a4c82c3a9..64d246a2c6 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/persistence/GenericClassRef.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/persistence/GenericClassRef.java @@ -17,9 +17,9 @@ import org.eclipse.jpt.common.core.resource.java.JavaResourceAnnotatedElement.Ki import org.eclipse.jpt.common.core.resource.java.JavaResourceType; import org.eclipse.jpt.common.core.utility.TextRange; import org.eclipse.jpt.common.utility.internal.StringTools; -import org.eclipse.jpt.common.utility.internal.Tools; -import org.eclipse.jpt.common.utility.internal.iterables.EmptyIterable; -import org.eclipse.jpt.common.utility.internal.iterables.SingleElementIterable; +import org.eclipse.jpt.common.utility.internal.ObjectTools; +import org.eclipse.jpt.common.utility.internal.iterable.EmptyIterable; +import org.eclipse.jpt.common.utility.internal.iterable.SingleElementIterable; import org.eclipse.jpt.jpa.core.JpaFile; import org.eclipse.jpt.jpa.core.JpaStructureNode; import org.eclipse.jpt.jpa.core.context.AccessType; @@ -145,7 +145,7 @@ public class GenericClassRef * with a '.'. Like <code>className</code>, this can be <code>null</code>. */ protected String getJavaClassName() { - return StringTools.stringIsEmpty(this.className) ? null : this.className.replace('$', '.'); + return StringTools.isBlank(this.className) ? null : this.className.replace('$', '.'); } @@ -208,11 +208,11 @@ public class GenericClassRef } public boolean isFor(String typeName) { - return Tools.valuesAreEqual(typeName, this.getJavaClassName()); + return ObjectTools.equals(typeName, this.getJavaClassName()); } protected boolean isInPackage(IPackageFragment packageFragment) { - return Tools.valuesAreEqual(this.getPackageName(), packageFragment.getElementName()); + return ObjectTools.equals(this.getPackageName(), packageFragment.getElementName()); } protected String getPackageName() { @@ -332,7 +332,7 @@ public class GenericClassRef public void validate(List<IMessage> messages, IReporter reporter) { super.validate(messages, reporter); - if (StringTools.stringIsEmpty(this.className)) { + if (StringTools.isBlank(this.className)) { messages.add( DefaultJpaValidationMessages.buildMessage( IMessage.HIGH_SEVERITY, diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/persistence/GenericOrmXmlRef.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/persistence/GenericOrmXmlRef.java index eed6fb2169..63b6571a42 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/persistence/GenericOrmXmlRef.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/persistence/GenericOrmXmlRef.java @@ -15,8 +15,8 @@ import org.eclipse.core.resources.IProject; import org.eclipse.core.runtime.IPath; import org.eclipse.jpt.common.core.resource.ProjectResourceLocator; import org.eclipse.jpt.common.core.utility.TextRange; -import org.eclipse.jpt.common.utility.internal.iterables.EmptyIterable; -import org.eclipse.jpt.common.utility.internal.iterables.SingleElementIterable; +import org.eclipse.jpt.common.utility.internal.iterable.EmptyIterable; +import org.eclipse.jpt.common.utility.internal.iterable.SingleElementIterable; import org.eclipse.jpt.jpa.core.context.persistence.PersistenceUnit; import org.eclipse.jpt.jpa.core.internal.context.persistence.AbstractOrmXmlRef; import org.eclipse.jpt.jpa.core.resource.persistence.XmlMappingFileRef; diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/persistence/GenericPersistence.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/persistence/GenericPersistence.java index 59599331e1..d0108c732b 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/persistence/GenericPersistence.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/persistence/GenericPersistence.java @@ -15,9 +15,9 @@ import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; import org.eclipse.jpt.common.core.utility.TextRange; -import org.eclipse.jpt.common.utility.internal.iterables.EmptyListIterable; -import org.eclipse.jpt.common.utility.internal.iterables.ListIterable; -import org.eclipse.jpt.common.utility.internal.iterables.SingleElementListIterable; +import org.eclipse.jpt.common.utility.internal.iterable.EmptyListIterable; +import org.eclipse.jpt.common.utility.internal.iterable.SingleElementListIterable; +import org.eclipse.jpt.common.utility.iterable.ListIterable; import org.eclipse.jpt.jpa.core.JpaFile; import org.eclipse.jpt.jpa.core.JpaStructureNode; import org.eclipse.jpt.jpa.core.context.persistence.Persistence; diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/persistence/GenericPersistenceUnitProperty.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/persistence/GenericPersistenceUnitProperty.java index 66e1110763..7b1cedbb4e 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/persistence/GenericPersistenceUnitProperty.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa1/context/persistence/GenericPersistenceUnitProperty.java @@ -12,9 +12,9 @@ package org.eclipse.jpt.jpa.core.internal.jpa1.context.persistence; import org.eclipse.jdt.core.IPackageFragment; import org.eclipse.jdt.core.IType; import org.eclipse.jpt.common.core.utility.TextRange; -import org.eclipse.jpt.common.utility.internal.Tools; -import org.eclipse.jpt.common.utility.internal.iterables.EmptyIterable; -import org.eclipse.jpt.common.utility.internal.iterables.SingleElementIterable; +import org.eclipse.jpt.common.utility.internal.ObjectTools; +import org.eclipse.jpt.common.utility.internal.iterable.EmptyIterable; +import org.eclipse.jpt.common.utility.internal.iterable.SingleElementIterable; import org.eclipse.jpt.jpa.core.context.persistence.PersistenceUnit; import org.eclipse.jpt.jpa.core.internal.context.persistence.AbstractPersistenceXmlContextNode; import org.eclipse.jpt.jpa.core.resource.persistence.XmlProperty; @@ -123,7 +123,7 @@ public class GenericPersistenceUnitProperty // ********** refactoring ********** public Iterable<ReplaceEdit> createRenameTypeEdits(IType originalType, String newName) { - return Tools.valuesAreEqual(this.value, originalType.getFullyQualifiedName('.')) ? + return ObjectTools.equals(this.value, originalType.getFullyQualifiedName('.')) ? new SingleElementIterable<ReplaceEdit>(this.createRenameTypeEdit(originalType, newName)) : EmptyIterable.<ReplaceEdit>instance(); } @@ -133,13 +133,13 @@ public class GenericPersistenceUnitProperty } public Iterable<ReplaceEdit> createMoveTypeEdits(IType originalType, IPackageFragment newPackage) { - return Tools.valuesAreEqual(this.value, originalType.getFullyQualifiedName('.')) ? + return ObjectTools.equals(this.value, originalType.getFullyQualifiedName('.')) ? new SingleElementIterable<ReplaceEdit>(this.createRenamePackageEdit(newPackage.getElementName())) : EmptyIterable.<ReplaceEdit>instance(); } public Iterable<ReplaceEdit> createRenamePackageEdits(IPackageFragment originalPackage, String newName) { - return Tools.valuesAreEqual(this.getValuePackageName(), originalPackage.getElementName()) ? + return ObjectTools.equals(this.getValuePackageName(), originalPackage.getElementName()) ? new SingleElementIterable<ReplaceEdit>(this.createRenamePackageEdit(newName)) : EmptyIterable.<ReplaceEdit>instance(); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/Generic2_0JpaAnnotationDefinitionProvider.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/Generic2_0JpaAnnotationDefinitionProvider.java index 948eff2c22..4548e581a8 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/Generic2_0JpaAnnotationDefinitionProvider.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/Generic2_0JpaAnnotationDefinitionProvider.java @@ -12,7 +12,7 @@ package org.eclipse.jpt.jpa.core.internal.jpa2; import java.util.ArrayList; import org.eclipse.jpt.common.core.resource.java.AnnotationDefinition; import org.eclipse.jpt.common.core.resource.java.NestableAnnotationDefinition; -import org.eclipse.jpt.common.utility.internal.CollectionTools; +import org.eclipse.jpt.common.utility.internal.collection.CollectionTools; import org.eclipse.jpt.jpa.core.JpaAnnotationDefinitionProvider; import org.eclipse.jpt.jpa.core.internal.AbstractJpaAnnotationDefinitionProvider; import org.eclipse.jpt.jpa.core.internal.jpa2.resource.java.Access2_0AnnotationDefinition; diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/Generic2_0JpaPlatformProvider.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/Generic2_0JpaPlatformProvider.java index 03f0a8684f..b6481b0e70 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/Generic2_0JpaPlatformProvider.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/Generic2_0JpaPlatformProvider.java @@ -11,7 +11,7 @@ package org.eclipse.jpt.jpa.core.internal.jpa2; import java.util.ArrayList; import org.eclipse.jpt.common.core.JptResourceType; -import org.eclipse.jpt.common.utility.internal.CollectionTools; +import org.eclipse.jpt.common.utility.internal.collection.CollectionTools; import org.eclipse.jpt.jpa.core.JpaPlatformProvider; import org.eclipse.jpt.jpa.core.JpaResourceModelProvider; import org.eclipse.jpt.jpa.core.ResourceDefinition; diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/GenericJpaDatabaseIdentifierAdapter.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/GenericJpaDatabaseIdentifierAdapter.java index 4576e42d05..f80801d6fc 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/GenericJpaDatabaseIdentifierAdapter.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/GenericJpaDatabaseIdentifierAdapter.java @@ -11,7 +11,7 @@ package org.eclipse.jpt.jpa.core.internal.jpa2; import java.util.Iterator; -import org.eclipse.jpt.common.utility.internal.StringTools; +import org.eclipse.jpt.common.utility.internal.ObjectTools; import org.eclipse.jpt.jpa.core.JpaDataSource; import org.eclipse.jpt.jpa.core.context.JpaRootContextNode; import org.eclipse.jpt.jpa.core.context.persistence.Persistence; @@ -73,6 +73,6 @@ public class GenericJpaDatabaseIdentifierAdapter @Override public String toString() { - return StringTools.buildToStringFor(this, Boolean.valueOf(this.treatIdentifiersAsDelimited())); + return ObjectTools.toString(this, Boolean.valueOf(this.treatIdentifiersAsDelimited())); } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/GenericMetamodelSynchronizer.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/GenericMetamodelSynchronizer.java index 20a160fbd4..d5f95c85ba 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/GenericMetamodelSynchronizer.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/GenericMetamodelSynchronizer.java @@ -23,9 +23,9 @@ import org.eclipse.jdt.core.IPackageFragmentRoot; import org.eclipse.jdt.core.JavaModelException; import org.eclipse.jpt.common.core.resource.java.JavaResourceAbstractType; import org.eclipse.jpt.common.core.utility.BodySourceWriter; -import org.eclipse.jpt.common.utility.internal.ClassName; -import org.eclipse.jpt.common.utility.internal.SimpleStack; -import org.eclipse.jpt.common.utility.internal.StringTools; +import org.eclipse.jpt.common.utility.internal.ClassNameTools; +import org.eclipse.jpt.common.utility.internal.ObjectTools; +import org.eclipse.jpt.common.utility.internal.collection.LinkedStack; import org.eclipse.jpt.jpa.core.context.AttributeMapping; import org.eclipse.jpt.jpa.core.context.PersistentType; import org.eclipse.jpt.jpa.core.context.ReadOnlyPersistentAttribute; @@ -152,7 +152,7 @@ public class GenericMetamodelSynchronizer } protected String buildPackageName(String topLevelSourceTypeName) { - return this.buildPackageName_(ClassName.getPackageName(topLevelSourceTypeName)); + return this.buildPackageName_(ClassNameTools.packageName(topLevelSourceTypeName)); } // TODO @@ -162,7 +162,7 @@ public class GenericMetamodelSynchronizer } protected String getFileName() { - return ClassName.getSimpleName(this.getClassName()) + ".java"; + return ClassNameTools.simpleName(this.getClassName()) + ".java"; } protected String getClassName() { @@ -175,10 +175,10 @@ public class GenericMetamodelSynchronizer protected String buildClassName(String sourceTypeName, Map<String, Collection<MetamodelSourceType>> memberTypeTree) { String current = sourceTypeName; - SimpleStack<String> stack = new SimpleStack<String>(); + LinkedStack<String> stack = new LinkedStack<String>(); while (true) { - stack.push(ClassName.getSimpleName(current)); + stack.push(ClassNameTools.simpleName(current)); String declaringTypeName = this.getDeclaringTypeName(current, memberTypeTree); if (declaringTypeName == null) { break; @@ -196,11 +196,11 @@ public class GenericMetamodelSynchronizer } protected String buildClassName(String topLevelSourceTypeName) { - return this.buildPackageName(topLevelSourceTypeName) + '.' + this.buildSimpleClassName(ClassName.getSimpleName(topLevelSourceTypeName)); + return this.buildPackageName(topLevelSourceTypeName) + '.' + this.buildSimpleClassName(ClassNameTools.simpleName(topLevelSourceTypeName)); } protected String getSimpleClassName() { - return this.buildSimpleClassName(ClassName.getSimpleName(this.sourceType.getName())); + return this.buildSimpleClassName(ClassNameTools.simpleName(this.sourceType.getName())); } // TODO @@ -428,7 +428,7 @@ public class GenericMetamodelSynchronizer @Override public String toString() { - return StringTools.buildToStringFor(this, this.sourceType.getName()); + return ObjectTools.toString(this, this.sourceType.getName()); } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/SimpleMetamodelField.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/SimpleMetamodelField.java index 7720bfbd30..5d4a4fdabf 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/SimpleMetamodelField.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/SimpleMetamodelField.java @@ -9,7 +9,7 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.internal.jpa2.context; -import org.eclipse.jpt.common.utility.internal.CollectionTools; +import org.eclipse.jpt.common.utility.internal.iterable.IterableTools; import org.eclipse.jpt.jpa.core.jpa2.context.MetamodelField; /** @@ -66,9 +66,9 @@ public class SimpleMetamodelField @Override public int hashCode() { - return CollectionTools.hashCode(this.modifiers) ^ + return IterableTools.hashCode(this.modifiers) ^ this.typeName.hashCode() ^ - CollectionTools.hashCode(this.typeArgumentNames) ^ + IterableTools.hashCode(this.typeArgumentNames) ^ this.name.hashCode(); } @@ -78,9 +78,9 @@ public class SimpleMetamodelField return false; } MetamodelField other = (MetamodelField) o; - return CollectionTools.elementsAreEqual(this.getModifiers(), other.getModifiers()) && + return IterableTools.elementsAreEqual(this.getModifiers(), other.getModifiers()) && this.getTypeName().equals(other.getTypeName()) && - CollectionTools.elementsAreEqual(this.getTypeArgumentNames(), other.getTypeArgumentNames()) && + IterableTools.elementsAreEqual(this.getTypeArgumentNames(), other.getTypeArgumentNames()) && this.getName().equals(other.getName()); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/AbstractJavaElementCollectionMapping2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/AbstractJavaElementCollectionMapping2_0.java index 7c120f37e0..5feaa4aadf 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/AbstractJavaElementCollectionMapping2_0.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/AbstractJavaElementCollectionMapping2_0.java @@ -16,20 +16,21 @@ import org.eclipse.jpt.common.core.resource.java.JavaResourceAttribute; import org.eclipse.jpt.common.core.resource.java.JavaResourceMember; import org.eclipse.jpt.common.core.resource.java.NestableAnnotation; import org.eclipse.jpt.common.core.utility.TextRange; -import org.eclipse.jpt.common.utility.internal.Association; -import org.eclipse.jpt.common.utility.internal.CollectionTools; +import org.eclipse.jpt.common.utility.Association; +import org.eclipse.jpt.common.utility.internal.ObjectTools; import org.eclipse.jpt.common.utility.internal.SimpleAssociation; import org.eclipse.jpt.common.utility.internal.StringTools; -import org.eclipse.jpt.common.utility.internal.Tools; -import org.eclipse.jpt.common.utility.internal.Transformer; -import org.eclipse.jpt.common.utility.internal.iterables.ArrayIterable; -import org.eclipse.jpt.common.utility.internal.iterables.CompositeIterable; -import org.eclipse.jpt.common.utility.internal.iterables.EmptyIterable; -import org.eclipse.jpt.common.utility.internal.iterables.EmptyListIterable; -import org.eclipse.jpt.common.utility.internal.iterables.ListIterable; -import org.eclipse.jpt.common.utility.internal.iterables.SingleElementListIterable; -import org.eclipse.jpt.common.utility.internal.iterables.SubListIterableWrapper; -import org.eclipse.jpt.common.utility.internal.iterables.TransformationIterable; +import org.eclipse.jpt.common.utility.internal.iterable.ArrayIterable; +import org.eclipse.jpt.common.utility.internal.iterable.CompositeIterable; +import org.eclipse.jpt.common.utility.internal.iterable.EmptyIterable; +import org.eclipse.jpt.common.utility.internal.iterable.EmptyListIterable; +import org.eclipse.jpt.common.utility.internal.iterable.FilteringIterable; +import org.eclipse.jpt.common.utility.internal.iterable.IterableTools; +import org.eclipse.jpt.common.utility.internal.iterable.SingleElementListIterable; +import org.eclipse.jpt.common.utility.internal.iterable.SubListIterableWrapper; +import org.eclipse.jpt.common.utility.internal.iterable.TransformationIterable; +import org.eclipse.jpt.common.utility.iterable.ListIterable; +import org.eclipse.jpt.common.utility.transformer.Transformer; import org.eclipse.jpt.jpa.core.JpaFactory; import org.eclipse.jpt.jpa.core.MappingKeys; import org.eclipse.jpt.jpa.core.context.AssociationOverride; @@ -1409,7 +1410,8 @@ public abstract class AbstractJavaElementCollectionMapping2_0 } protected Iterable<String> getJavaCandidateMapKeyNames() { - return StringTools.convertToJavaStringLiteralContents(this.getCandidateMapKeyNames()); + return new TransformationIterable<String, String>(this.getCandidateMapKeyNames(), + StringTools.JAVA_STRING_LITERAL_CONTENT_TRANSFORMER); } @@ -1480,7 +1482,7 @@ public abstract class AbstractJavaElementCollectionMapping2_0 if (embeddable != null && embeddable != parentEmbeddable) { embeddableContainsElementCollection(messages, embeddable); embeddableContainsProhibitedRelationshipMapping(messages, embeddable); - if (!CollectionTools.contains(visited, embeddable)) { + if (!visited.contains(embeddable)) { visited.add(embeddable); embeddableHierarchyContainsProhibitedMapping(messages, embeddable, visited); } @@ -1492,7 +1494,7 @@ public abstract class AbstractJavaElementCollectionMapping2_0 if (embeddable != null && embeddable != parentEmbeddable) { embeddableContainsElementCollection(messages, embeddable); embeddableContainsProhibitedRelationshipMapping(messages, embeddable); - if (!CollectionTools.contains(visited, embeddable)) { + if (!visited.contains(embeddable)) { visited.add(embeddable); embeddableHierarchyContainsProhibitedMapping(messages, embeddable, visited); } @@ -1807,7 +1809,7 @@ public abstract class AbstractJavaElementCollectionMapping2_0 public org.eclipse.jpt.jpa.db.Table resolveDbTable(String tableName) { JavaCollectionTable2_0 table = this.getCollectionTable(); - return Tools.valuesAreEqual(table.getName(), tableName) ? table.getDbTable() : null; + return ObjectTools.equals(table.getName(), tableName) ? table.getDbTable() : null; } public Iterable<String> getCandidateTableNames() { @@ -1819,7 +1821,7 @@ public abstract class AbstractJavaElementCollectionMapping2_0 * the default table name. the table is always the collection table */ public boolean tableNameIsInvalid(String tableName) { - return Tools.valuesAreDifferent(this.getDefaultTableName(), tableName); + return ObjectTools.notEquals(this.getDefaultTableName(), tableName); } public TextRange getValidationTextRange() { @@ -2014,7 +2016,7 @@ public abstract class AbstractJavaElementCollectionMapping2_0 * the default table name. The table is always the collection table. */ public boolean tableNameIsInvalid(String tableName) { - return Tools.valuesAreDifferent(this.getDefaultTableName(), tableName); + return ObjectTools.notEquals(this.getDefaultTableName(), tableName); } public Iterable<String> getCandidateTableNames() { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/GenericJavaCollectionTable2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/GenericJavaCollectionTable2_0.java index 3f9022e1bb..b05bb37bd8 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/GenericJavaCollectionTable2_0.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/GenericJavaCollectionTable2_0.java @@ -10,9 +10,8 @@ package org.eclipse.jpt.jpa.core.internal.jpa2.context.java; import org.eclipse.jpt.common.core.utility.TextRange; -import org.eclipse.jpt.common.utility.internal.StringTools; -import org.eclipse.jpt.common.utility.internal.Tools; -import org.eclipse.jpt.common.utility.internal.iterables.EmptyIterable; +import org.eclipse.jpt.common.utility.internal.ObjectTools; +import org.eclipse.jpt.common.utility.internal.iterable.EmptyIterable; import org.eclipse.jpt.jpa.core.context.Entity; import org.eclipse.jpt.jpa.core.context.PersistentAttribute; import org.eclipse.jpt.jpa.core.context.ReadOnlyJoinColumn; @@ -103,7 +102,7 @@ public class GenericJavaCollectionTable2_0 } public org.eclipse.jpt.jpa.db.Table resolveDbTable(String tableName) { - return Tools.valuesAreEqual(GenericJavaCollectionTable2_0.this.getName(), tableName) ? + return ObjectTools.equals(GenericJavaCollectionTable2_0.this.getName(), tableName) ? GenericJavaCollectionTable2_0.this.getDbTable() : null; } @@ -133,7 +132,7 @@ public class GenericJavaCollectionTable2_0 * the default table name. The table is always the collection table. */ public boolean tableNameIsInvalid(String tableName) { - return ! StringTools.stringsAreEqual(this.getDefaultTableName(), tableName); + return ! ObjectTools.equals(this.getDefaultTableName(), tableName); } /** diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/GenericJavaMapsIdDerivedIdentityStrategy2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/GenericJavaMapsIdDerivedIdentityStrategy2_0.java index 34bc4abf30..c5ad9ac248 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/GenericJavaMapsIdDerivedIdentityStrategy2_0.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/GenericJavaMapsIdDerivedIdentityStrategy2_0.java @@ -14,14 +14,14 @@ import java.util.List; import org.eclipse.jpt.common.core.resource.java.JavaResourceAttribute; import org.eclipse.jpt.common.core.utility.TextRange; import org.eclipse.jpt.common.utility.internal.ArrayTools; -import org.eclipse.jpt.common.utility.internal.CollectionTools; +import org.eclipse.jpt.common.utility.internal.ObjectTools; import org.eclipse.jpt.common.utility.internal.StringTools; -import org.eclipse.jpt.common.utility.internal.Tools; -import org.eclipse.jpt.common.utility.internal.iterables.ArrayIterable; -import org.eclipse.jpt.common.utility.internal.iterables.CompositeIterable; -import org.eclipse.jpt.common.utility.internal.iterables.FilteringIterable; -import org.eclipse.jpt.common.utility.internal.iterables.SingleElementIterable; -import org.eclipse.jpt.common.utility.internal.iterables.TransformationIterable; +import org.eclipse.jpt.common.utility.internal.iterable.ArrayIterable; +import org.eclipse.jpt.common.utility.internal.iterable.CompositeIterable; +import org.eclipse.jpt.common.utility.internal.iterable.FilteringIterable; +import org.eclipse.jpt.common.utility.internal.iterable.IterableTools; +import org.eclipse.jpt.common.utility.internal.iterable.SingleElementIterable; +import org.eclipse.jpt.common.utility.internal.iterable.TransformationIterable; import org.eclipse.jpt.jpa.core.MappingKeys; import org.eclipse.jpt.jpa.core.context.AttributeMapping; import org.eclipse.jpt.jpa.core.context.Embeddable; @@ -178,7 +178,7 @@ public class GenericJavaMapsIdDerivedIdentityStrategy2_0 } public Iterable<String> getSortedCandidateIdAttributeNames() { - return CollectionTools.sort(this.getAllAttributeMappingChoiceNames()); + return IterableTools.sort(this.getAllAttributeMappingChoiceNames()); } protected Iterable<String> getAllAttributeMappingChoiceNames() { @@ -205,7 +205,7 @@ public class GenericJavaMapsIdDerivedIdentityStrategy2_0 return new TransformationIterable<AttributeMapping, Iterable<AttributeMapping>>(availableMappings) { @Override protected Iterable<AttributeMapping> transform(AttributeMapping mapping) { - if (Tools.valuesAreEqual(mapping.getKey(), MappingKeys.EMBEDDED_ID_ATTRIBUTE_MAPPING_KEY)) { + if (ObjectTools.equals(mapping.getKey(), MappingKeys.EMBEDDED_ID_ATTRIBUTE_MAPPING_KEY)) { return GenericJavaMapsIdDerivedIdentityStrategy2_0.this.getEmbeddedIdMappingChoiceIterable((EmbeddedIdMapping) mapping); } return new SingleElementIterable<AttributeMapping>(mapping); @@ -274,7 +274,8 @@ public class GenericJavaMapsIdDerivedIdentityStrategy2_0 } protected Iterable<String> getSortedJavaValueChoices() { - return StringTools.convertToJavaStringLiteralContents(this.getSortedCandidateIdAttributeNames()); + return new TransformationIterable<String, String>(this.getSortedCandidateIdAttributeNames(), + StringTools.JAVA_STRING_LITERAL_CONTENT_TRANSFORMER); } @@ -290,7 +291,7 @@ public class GenericJavaMapsIdDerivedIdentityStrategy2_0 } protected boolean mappingIsIdMapping(AttributeMapping mapping) { - return CollectionTools.contains(this.getIdMappingKeys(), mapping.getKey()); + return IterableTools.contains(this.getIdMappingKeys(), mapping.getKey()); } protected Iterable<String> getIdMappingKeys() { @@ -331,7 +332,7 @@ public class GenericJavaMapsIdDerivedIdentityStrategy2_0 } } else { // test whether attribute mapping is allowable - if ( ! CollectionTools.contains(this.getValidAttributeMappingChoices(), attributeMapping)) { + if ( ! IterableTools.contains(this.getValidAttributeMappingChoices(), attributeMapping)) { messages.add(this.buildMessage(JpaValidationMessages.MAPS_ID_VALUE_INVALID, new String[] {this.getIdAttributeName()})); } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/GenericJavaSequenceGenerator2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/GenericJavaSequenceGenerator2_0.java index cf9575247d..62c60fa807 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/GenericJavaSequenceGenerator2_0.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/GenericJavaSequenceGenerator2_0.java @@ -9,7 +9,7 @@ *******************************************************************************/ package org.eclipse.jpt.jpa.core.internal.jpa2.context.java; -import org.eclipse.jpt.common.utility.internal.Tools; +import org.eclipse.jpt.common.utility.internal.ObjectTools; import org.eclipse.jpt.jpa.core.context.SequenceGenerator; import org.eclipse.jpt.jpa.core.context.java.JavaGeneratorContainer; import org.eclipse.jpt.jpa.core.internal.context.java.AbstractJavaSequenceGenerator; @@ -134,7 +134,7 @@ public class GenericJavaSequenceGenerator2_0 @Override protected boolean isEquivalentTo(SequenceGenerator generator) { return super.isEquivalentTo(generator) && - Tools.valuesAreEqual(this.specifiedSchema, ((SequenceGenerator2_0) generator).getSpecifiedSchema()) && - Tools.valuesAreEqual(this.specifiedCatalog, ((SequenceGenerator2_0) generator).getSpecifiedCatalog()); + ObjectTools.equals(this.specifiedSchema, ((SequenceGenerator2_0) generator).getSpecifiedSchema()) && + ObjectTools.equals(this.specifiedCatalog, ((SequenceGenerator2_0) generator).getSpecifiedCatalog()); } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/JavaBasicMappingDefinition2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/JavaBasicMappingDefinition2_0.java index a28fcecd2a..5c7ad23c0c 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/JavaBasicMappingDefinition2_0.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/JavaBasicMappingDefinition2_0.java @@ -9,8 +9,8 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.internal.jpa2.context.java; -import org.eclipse.jpt.common.utility.internal.iterables.ArrayIterable; -import org.eclipse.jpt.common.utility.internal.iterables.CompositeIterable; +import org.eclipse.jpt.common.utility.internal.iterable.ArrayIterable; +import org.eclipse.jpt.common.utility.internal.iterable.CompositeIterable; import org.eclipse.jpt.jpa.core.context.java.DefaultJavaAttributeMappingDefinition; import org.eclipse.jpt.jpa.core.internal.context.java.DefaultJavaAttributeMappingDefinitionWrapper; import org.eclipse.jpt.jpa.core.internal.context.java.JavaBasicMappingDefinition; diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/JavaElementCollectionMappingDefinition2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/JavaElementCollectionMappingDefinition2_0.java index 6ce75a03cb..8466d904aa 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/JavaElementCollectionMappingDefinition2_0.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/JavaElementCollectionMappingDefinition2_0.java @@ -9,7 +9,7 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.internal.jpa2.context.java; -import org.eclipse.jpt.common.utility.internal.iterables.ArrayIterable; +import org.eclipse.jpt.common.utility.internal.iterable.ArrayIterable; import org.eclipse.jpt.jpa.core.JpaFactory; import org.eclipse.jpt.jpa.core.context.java.JavaAttributeMapping; import org.eclipse.jpt.jpa.core.context.java.JavaAttributeMappingDefinition; diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/JavaEmbeddableDefinition2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/JavaEmbeddableDefinition2_0.java index 4b0f18df5c..cffc8ff828 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/JavaEmbeddableDefinition2_0.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/JavaEmbeddableDefinition2_0.java @@ -9,8 +9,8 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.internal.jpa2.context.java; -import org.eclipse.jpt.common.utility.internal.iterables.ArrayIterable; -import org.eclipse.jpt.common.utility.internal.iterables.CompositeIterable; +import org.eclipse.jpt.common.utility.internal.iterable.ArrayIterable; +import org.eclipse.jpt.common.utility.internal.iterable.CompositeIterable; import org.eclipse.jpt.jpa.core.context.java.JavaTypeMappingDefinition; import org.eclipse.jpt.jpa.core.internal.context.java.JavaEmbeddableDefinition; import org.eclipse.jpt.jpa.core.internal.context.java.JavaTypeMappingDefinitionWrapper; diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/JavaEmbeddedIdMappingDefinition2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/JavaEmbeddedIdMappingDefinition2_0.java index 214ca6a5e7..8a9600a5ed 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/JavaEmbeddedIdMappingDefinition2_0.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/JavaEmbeddedIdMappingDefinition2_0.java @@ -9,8 +9,8 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.internal.jpa2.context.java; -import org.eclipse.jpt.common.utility.internal.iterables.ArrayIterable; -import org.eclipse.jpt.common.utility.internal.iterables.CompositeIterable; +import org.eclipse.jpt.common.utility.internal.iterable.ArrayIterable; +import org.eclipse.jpt.common.utility.internal.iterable.CompositeIterable; import org.eclipse.jpt.jpa.core.context.java.JavaAttributeMappingDefinition; import org.eclipse.jpt.jpa.core.internal.context.java.JavaAttributeMappingDefinitionWrapper; import org.eclipse.jpt.jpa.core.internal.context.java.JavaEmbeddedIdMappingDefinition; diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/JavaEmbeddedMappingDefinition2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/JavaEmbeddedMappingDefinition2_0.java index 13b275d511..a9c88bc881 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/JavaEmbeddedMappingDefinition2_0.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/JavaEmbeddedMappingDefinition2_0.java @@ -9,8 +9,8 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.internal.jpa2.context.java; -import org.eclipse.jpt.common.utility.internal.iterables.ArrayIterable; -import org.eclipse.jpt.common.utility.internal.iterables.CompositeIterable; +import org.eclipse.jpt.common.utility.internal.iterable.ArrayIterable; +import org.eclipse.jpt.common.utility.internal.iterable.CompositeIterable; import org.eclipse.jpt.jpa.core.context.java.DefaultJavaAttributeMappingDefinition; import org.eclipse.jpt.jpa.core.internal.context.java.DefaultJavaAttributeMappingDefinitionWrapper; import org.eclipse.jpt.jpa.core.internal.context.java.JavaEmbeddedMappingDefinition; diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/JavaEntityDefinition2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/JavaEntityDefinition2_0.java index 826c03abd1..17b9aef41f 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/JavaEntityDefinition2_0.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/JavaEntityDefinition2_0.java @@ -9,8 +9,8 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.internal.jpa2.context.java; -import org.eclipse.jpt.common.utility.internal.iterables.ArrayIterable; -import org.eclipse.jpt.common.utility.internal.iterables.CompositeIterable; +import org.eclipse.jpt.common.utility.internal.iterable.ArrayIterable; +import org.eclipse.jpt.common.utility.internal.iterable.CompositeIterable; import org.eclipse.jpt.jpa.core.context.java.JavaTypeMappingDefinition; import org.eclipse.jpt.jpa.core.internal.context.java.JavaEntityDefinition; import org.eclipse.jpt.jpa.core.internal.context.java.JavaTypeMappingDefinitionWrapper; diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/JavaIdMappingDefinition2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/JavaIdMappingDefinition2_0.java index 9ec4396688..f60b84f137 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/JavaIdMappingDefinition2_0.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/JavaIdMappingDefinition2_0.java @@ -9,8 +9,8 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.internal.jpa2.context.java; -import org.eclipse.jpt.common.utility.internal.iterables.ArrayIterable; -import org.eclipse.jpt.common.utility.internal.iterables.CompositeIterable; +import org.eclipse.jpt.common.utility.internal.iterable.ArrayIterable; +import org.eclipse.jpt.common.utility.internal.iterable.CompositeIterable; import org.eclipse.jpt.jpa.core.context.java.JavaAttributeMappingDefinition; import org.eclipse.jpt.jpa.core.context.java.JavaPersistentAttribute; import org.eclipse.jpt.jpa.core.internal.context.java.JavaAttributeMappingDefinitionWrapper; diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/JavaManyToManyMappingDefinition2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/JavaManyToManyMappingDefinition2_0.java index 6349cfa244..651a0207b0 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/JavaManyToManyMappingDefinition2_0.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/JavaManyToManyMappingDefinition2_0.java @@ -9,8 +9,8 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.internal.jpa2.context.java; -import org.eclipse.jpt.common.utility.internal.iterables.ArrayIterable; -import org.eclipse.jpt.common.utility.internal.iterables.CompositeIterable; +import org.eclipse.jpt.common.utility.internal.iterable.ArrayIterable; +import org.eclipse.jpt.common.utility.internal.iterable.CompositeIterable; import org.eclipse.jpt.jpa.core.context.java.JavaAttributeMappingDefinition; import org.eclipse.jpt.jpa.core.internal.context.java.JavaAttributeMappingDefinitionWrapper; import org.eclipse.jpt.jpa.core.internal.context.java.JavaManyToManyMappingDefinition; diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/JavaManyToOneMappingDefinition2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/JavaManyToOneMappingDefinition2_0.java index 18541ac7c8..cd9abea79a 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/JavaManyToOneMappingDefinition2_0.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/JavaManyToOneMappingDefinition2_0.java @@ -9,8 +9,8 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.internal.jpa2.context.java; -import org.eclipse.jpt.common.utility.internal.iterables.ArrayIterable; -import org.eclipse.jpt.common.utility.internal.iterables.CompositeIterable; +import org.eclipse.jpt.common.utility.internal.iterable.ArrayIterable; +import org.eclipse.jpt.common.utility.internal.iterable.CompositeIterable; import org.eclipse.jpt.jpa.core.context.java.JavaAttributeMappingDefinition; import org.eclipse.jpt.jpa.core.internal.context.java.JavaAttributeMappingDefinitionWrapper; import org.eclipse.jpt.jpa.core.internal.context.java.JavaManyToOneMappingDefinition; diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/JavaMappedSuperclassDefinition2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/JavaMappedSuperclassDefinition2_0.java index 550c76293e..8f33bfc013 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/JavaMappedSuperclassDefinition2_0.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/JavaMappedSuperclassDefinition2_0.java @@ -1,62 +1,62 @@ -/******************************************************************************* - * Copyright (c) 2011 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. - * - * Contributors: - * Oracle - initial API and implementation - ******************************************************************************/ -package org.eclipse.jpt.jpa.core.internal.jpa2.context.java; - -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.java.JavaTypeMappingDefinition; -import org.eclipse.jpt.jpa.core.internal.context.java.JavaMappedSuperclassDefinition; -import org.eclipse.jpt.jpa.core.internal.context.java.JavaTypeMappingDefinitionWrapper; -import org.eclipse.jpt.jpa.core.jpa2.resource.java.Access2_0Annotation; - -public class JavaMappedSuperclassDefinition2_0 - extends JavaTypeMappingDefinitionWrapper -{ - private static final JavaTypeMappingDefinition DELEGATE = JavaMappedSuperclassDefinition.instance(); - - // singleton - private static final JavaTypeMappingDefinition INSTANCE = new JavaMappedSuperclassDefinition2_0(); - - /** - * Return the singleton. - */ - public static JavaTypeMappingDefinition instance() { - return INSTANCE; - } - - - /** - * Enforce singleton usage - */ - private JavaMappedSuperclassDefinition2_0() { - super(); - } - - @Override - protected JavaTypeMappingDefinition getDelegate() { - return DELEGATE; - } - - @Override - public Iterable<String> getSupportingAnnotationNames() { - return COMBINED_SUPPORTING_ANNOTATION_NAMES; - } - - public static final String[] SUPPORTING_ANNOTATION_NAMES_ARRAY_2_0 = new String[] { - Access2_0Annotation.ANNOTATION_NAME - }; - private static final Iterable<String> SUPPORTING_ANNOTATION_NAMES_2_0 = new ArrayIterable<String>(SUPPORTING_ANNOTATION_NAMES_ARRAY_2_0); - - @SuppressWarnings("unchecked") - private static final Iterable<String> COMBINED_SUPPORTING_ANNOTATION_NAMES = new CompositeIterable<String>( - DELEGATE.getSupportingAnnotationNames(), - SUPPORTING_ANNOTATION_NAMES_2_0 - ); -} +/*******************************************************************************
+ * Copyright (c) 2011 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.
+ *
+ * Contributors:
+ * Oracle - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.jpt.jpa.core.internal.jpa2.context.java;
+
+import org.eclipse.jpt.common.utility.internal.iterable.ArrayIterable;
+import org.eclipse.jpt.common.utility.internal.iterable.CompositeIterable;
+import org.eclipse.jpt.jpa.core.context.java.JavaTypeMappingDefinition;
+import org.eclipse.jpt.jpa.core.internal.context.java.JavaMappedSuperclassDefinition;
+import org.eclipse.jpt.jpa.core.internal.context.java.JavaTypeMappingDefinitionWrapper;
+import org.eclipse.jpt.jpa.core.jpa2.resource.java.Access2_0Annotation;
+
+public class JavaMappedSuperclassDefinition2_0
+ extends JavaTypeMappingDefinitionWrapper
+{
+ private static final JavaTypeMappingDefinition DELEGATE = JavaMappedSuperclassDefinition.instance();
+
+ // singleton
+ private static final JavaTypeMappingDefinition INSTANCE = new JavaMappedSuperclassDefinition2_0();
+
+ /**
+ * Return the singleton.
+ */
+ public static JavaTypeMappingDefinition instance() {
+ return INSTANCE;
+ }
+
+
+ /**
+ * Enforce singleton usage
+ */
+ private JavaMappedSuperclassDefinition2_0() {
+ super();
+ }
+
+ @Override
+ protected JavaTypeMappingDefinition getDelegate() {
+ return DELEGATE;
+ }
+
+ @Override
+ public Iterable<String> getSupportingAnnotationNames() {
+ return COMBINED_SUPPORTING_ANNOTATION_NAMES;
+ }
+
+ public static final String[] SUPPORTING_ANNOTATION_NAMES_ARRAY_2_0 = new String[] {
+ Access2_0Annotation.ANNOTATION_NAME
+ };
+ private static final Iterable<String> SUPPORTING_ANNOTATION_NAMES_2_0 = new ArrayIterable<String>(SUPPORTING_ANNOTATION_NAMES_ARRAY_2_0);
+
+ @SuppressWarnings("unchecked")
+ private static final Iterable<String> COMBINED_SUPPORTING_ANNOTATION_NAMES = new CompositeIterable<String>(
+ DELEGATE.getSupportingAnnotationNames(),
+ SUPPORTING_ANNOTATION_NAMES_2_0
+ );
+}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/JavaOneToManyMappingDefinition2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/JavaOneToManyMappingDefinition2_0.java index b7e729f7b7..933f43f9de 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/JavaOneToManyMappingDefinition2_0.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/JavaOneToManyMappingDefinition2_0.java @@ -1,80 +1,80 @@ -/******************************************************************************* - * Copyright (c) 2010, 2011 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. - * - * Contributors: - * Oracle - initial API and implementation - ******************************************************************************/ -package org.eclipse.jpt.jpa.core.internal.jpa2.context.java; - -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.java.JavaAttributeMappingDefinition; -import org.eclipse.jpt.jpa.core.internal.context.java.JavaAttributeMappingDefinitionWrapper; -import org.eclipse.jpt.jpa.core.internal.context.java.JavaOneToManyMappingDefinition; -import org.eclipse.jpt.jpa.core.jpa2.resource.java.Access2_0Annotation; -import org.eclipse.jpt.jpa.core.jpa2.resource.java.JPA2_0; -import org.eclipse.jpt.jpa.core.jpa2.resource.java.MapKeyClass2_0Annotation; -import org.eclipse.jpt.jpa.core.jpa2.resource.java.MapKeyColumn2_0Annotation; -import org.eclipse.jpt.jpa.core.jpa2.resource.java.MapKeyEnumerated2_0Annotation; -import org.eclipse.jpt.jpa.core.jpa2.resource.java.MapKeyJoinColumn2_0Annotation; -import org.eclipse.jpt.jpa.core.jpa2.resource.java.MapKeyTemporal2_0Annotation; -import org.eclipse.jpt.jpa.core.jpa2.resource.java.OrderColumn2_0Annotation; -import org.eclipse.jpt.jpa.core.resource.java.AttributeOverrideAnnotation; -import org.eclipse.jpt.jpa.core.resource.java.JPA; - -public class JavaOneToManyMappingDefinition2_0 - extends JavaAttributeMappingDefinitionWrapper -{ - private static final JavaAttributeMappingDefinition DELEGATE = JavaOneToManyMappingDefinition.instance(); - - // singleton - private static final JavaAttributeMappingDefinition INSTANCE = new JavaOneToManyMappingDefinition2_0(); - - /** - * Return the singleton. - */ - public static JavaAttributeMappingDefinition instance() { - return INSTANCE; - } - - - /** - * Enforce singleton usage - */ - private JavaOneToManyMappingDefinition2_0() { - super(); - } - - @Override - protected JavaAttributeMappingDefinition getDelegate() { - return DELEGATE; - } - - @Override - public Iterable<String> getSupportingAnnotationNames() { - return COMBINED_SUPPORTING_ANNOTATION_NAMES; - } - - private static final String[] SUPPORTING_ANNOTATION_NAMES_ARRAY_2_0 = new String[] { - Access2_0Annotation.ANNOTATION_NAME, - AttributeOverrideAnnotation.ANNOTATION_NAME, - JPA.ATTRIBUTE_OVERRIDES, - MapKeyClass2_0Annotation.ANNOTATION_NAME, - MapKeyColumn2_0Annotation.ANNOTATION_NAME, - MapKeyEnumerated2_0Annotation.ANNOTATION_NAME, - MapKeyJoinColumn2_0Annotation.ANNOTATION_NAME, - JPA2_0.MAP_KEY_JOIN_COLUMNS, - MapKeyTemporal2_0Annotation.ANNOTATION_NAME, - OrderColumn2_0Annotation.ANNOTATION_NAME - }; - private static final Iterable<String> SUPPORTING_ANNOTATION_NAMES_2_0 = new ArrayIterable<String>(SUPPORTING_ANNOTATION_NAMES_ARRAY_2_0); - - @SuppressWarnings("unchecked") - private static final Iterable<String> COMBINED_SUPPORTING_ANNOTATION_NAMES = new CompositeIterable<String>( - DELEGATE.getSupportingAnnotationNames(), - SUPPORTING_ANNOTATION_NAMES_2_0 - ); -} +/*******************************************************************************
+ * Copyright (c) 2010, 2011 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.
+ *
+ * Contributors:
+ * Oracle - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.jpt.jpa.core.internal.jpa2.context.java;
+
+import org.eclipse.jpt.common.utility.internal.iterable.ArrayIterable;
+import org.eclipse.jpt.common.utility.internal.iterable.CompositeIterable;
+import org.eclipse.jpt.jpa.core.context.java.JavaAttributeMappingDefinition;
+import org.eclipse.jpt.jpa.core.internal.context.java.JavaAttributeMappingDefinitionWrapper;
+import org.eclipse.jpt.jpa.core.internal.context.java.JavaOneToManyMappingDefinition;
+import org.eclipse.jpt.jpa.core.jpa2.resource.java.Access2_0Annotation;
+import org.eclipse.jpt.jpa.core.jpa2.resource.java.JPA2_0;
+import org.eclipse.jpt.jpa.core.jpa2.resource.java.MapKeyClass2_0Annotation;
+import org.eclipse.jpt.jpa.core.jpa2.resource.java.MapKeyColumn2_0Annotation;
+import org.eclipse.jpt.jpa.core.jpa2.resource.java.MapKeyEnumerated2_0Annotation;
+import org.eclipse.jpt.jpa.core.jpa2.resource.java.MapKeyJoinColumn2_0Annotation;
+import org.eclipse.jpt.jpa.core.jpa2.resource.java.MapKeyTemporal2_0Annotation;
+import org.eclipse.jpt.jpa.core.jpa2.resource.java.OrderColumn2_0Annotation;
+import org.eclipse.jpt.jpa.core.resource.java.AttributeOverrideAnnotation;
+import org.eclipse.jpt.jpa.core.resource.java.JPA;
+
+public class JavaOneToManyMappingDefinition2_0
+ extends JavaAttributeMappingDefinitionWrapper
+{
+ private static final JavaAttributeMappingDefinition DELEGATE = JavaOneToManyMappingDefinition.instance();
+
+ // singleton
+ private static final JavaAttributeMappingDefinition INSTANCE = new JavaOneToManyMappingDefinition2_0();
+
+ /**
+ * Return the singleton.
+ */
+ public static JavaAttributeMappingDefinition instance() {
+ return INSTANCE;
+ }
+
+
+ /**
+ * Enforce singleton usage
+ */
+ private JavaOneToManyMappingDefinition2_0() {
+ super();
+ }
+
+ @Override
+ protected JavaAttributeMappingDefinition getDelegate() {
+ return DELEGATE;
+ }
+
+ @Override
+ public Iterable<String> getSupportingAnnotationNames() {
+ return COMBINED_SUPPORTING_ANNOTATION_NAMES;
+ }
+
+ private static final String[] SUPPORTING_ANNOTATION_NAMES_ARRAY_2_0 = new String[] {
+ Access2_0Annotation.ANNOTATION_NAME,
+ AttributeOverrideAnnotation.ANNOTATION_NAME,
+ JPA.ATTRIBUTE_OVERRIDES,
+ MapKeyClass2_0Annotation.ANNOTATION_NAME,
+ MapKeyColumn2_0Annotation.ANNOTATION_NAME,
+ MapKeyEnumerated2_0Annotation.ANNOTATION_NAME,
+ MapKeyJoinColumn2_0Annotation.ANNOTATION_NAME,
+ JPA2_0.MAP_KEY_JOIN_COLUMNS,
+ MapKeyTemporal2_0Annotation.ANNOTATION_NAME,
+ OrderColumn2_0Annotation.ANNOTATION_NAME
+ };
+ private static final Iterable<String> SUPPORTING_ANNOTATION_NAMES_2_0 = new ArrayIterable<String>(SUPPORTING_ANNOTATION_NAMES_ARRAY_2_0);
+
+ @SuppressWarnings("unchecked")
+ private static final Iterable<String> COMBINED_SUPPORTING_ANNOTATION_NAMES = new CompositeIterable<String>(
+ DELEGATE.getSupportingAnnotationNames(),
+ SUPPORTING_ANNOTATION_NAMES_2_0
+ );
+}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/JavaOneToOneMappingDefinition2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/JavaOneToOneMappingDefinition2_0.java index 6db96e73bb..9b4a9f7571 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/JavaOneToOneMappingDefinition2_0.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/JavaOneToOneMappingDefinition2_0.java @@ -1,66 +1,66 @@ -/******************************************************************************* - * Copyright (c) 2010, 2011 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. - * - * Contributors: - * Oracle - initial API and implementation - ******************************************************************************/ -package org.eclipse.jpt.jpa.core.internal.jpa2.context.java; - -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.java.JavaAttributeMappingDefinition; -import org.eclipse.jpt.jpa.core.internal.context.java.JavaAttributeMappingDefinitionWrapper; -import org.eclipse.jpt.jpa.core.internal.context.java.JavaOneToOneMappingDefinition; -import org.eclipse.jpt.jpa.core.jpa2.resource.java.Access2_0Annotation; -import org.eclipse.jpt.jpa.core.jpa2.resource.java.MapsId2_0Annotation; -import org.eclipse.jpt.jpa.core.resource.java.IdAnnotation; - -public class JavaOneToOneMappingDefinition2_0 - extends JavaAttributeMappingDefinitionWrapper -{ - private static final JavaAttributeMappingDefinition DELEGATE = JavaOneToOneMappingDefinition.instance(); - - // singleton - private static final JavaAttributeMappingDefinition INSTANCE = new JavaOneToOneMappingDefinition2_0(); - - /** - * Return the singleton. - */ - public static JavaAttributeMappingDefinition instance() { - return INSTANCE; - } - - - /** - * Enforce singleton usage - */ - private JavaOneToOneMappingDefinition2_0() { - super(); - } - - @Override - protected JavaAttributeMappingDefinition getDelegate() { - return DELEGATE; - } - - @Override - public Iterable<String> getSupportingAnnotationNames() { - return COMBINED_SUPPORTING_ANNOTATION_NAMES; - } - - public static final String[] SUPPORTING_ANNOTATION_NAMES_ARRAY_2_0 = new String[] { - Access2_0Annotation.ANNOTATION_NAME, - IdAnnotation.ANNOTATION_NAME, - MapsId2_0Annotation.ANNOTATION_NAME - }; - private static final Iterable<String> SUPPORTING_ANNOTATION_NAMES_2_0 = new ArrayIterable<String>(SUPPORTING_ANNOTATION_NAMES_ARRAY_2_0); - - @SuppressWarnings("unchecked") - private static final Iterable<String> COMBINED_SUPPORTING_ANNOTATION_NAMES = new CompositeIterable<String>( - DELEGATE.getSupportingAnnotationNames(), - SUPPORTING_ANNOTATION_NAMES_2_0 - ); -} +/*******************************************************************************
+ * Copyright (c) 2010, 2011 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.
+ *
+ * Contributors:
+ * Oracle - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.jpt.jpa.core.internal.jpa2.context.java;
+
+import org.eclipse.jpt.common.utility.internal.iterable.ArrayIterable;
+import org.eclipse.jpt.common.utility.internal.iterable.CompositeIterable;
+import org.eclipse.jpt.jpa.core.context.java.JavaAttributeMappingDefinition;
+import org.eclipse.jpt.jpa.core.internal.context.java.JavaAttributeMappingDefinitionWrapper;
+import org.eclipse.jpt.jpa.core.internal.context.java.JavaOneToOneMappingDefinition;
+import org.eclipse.jpt.jpa.core.jpa2.resource.java.Access2_0Annotation;
+import org.eclipse.jpt.jpa.core.jpa2.resource.java.MapsId2_0Annotation;
+import org.eclipse.jpt.jpa.core.resource.java.IdAnnotation;
+
+public class JavaOneToOneMappingDefinition2_0
+ extends JavaAttributeMappingDefinitionWrapper
+{
+ private static final JavaAttributeMappingDefinition DELEGATE = JavaOneToOneMappingDefinition.instance();
+
+ // singleton
+ private static final JavaAttributeMappingDefinition INSTANCE = new JavaOneToOneMappingDefinition2_0();
+
+ /**
+ * Return the singleton.
+ */
+ public static JavaAttributeMappingDefinition instance() {
+ return INSTANCE;
+ }
+
+
+ /**
+ * Enforce singleton usage
+ */
+ private JavaOneToOneMappingDefinition2_0() {
+ super();
+ }
+
+ @Override
+ protected JavaAttributeMappingDefinition getDelegate() {
+ return DELEGATE;
+ }
+
+ @Override
+ public Iterable<String> getSupportingAnnotationNames() {
+ return COMBINED_SUPPORTING_ANNOTATION_NAMES;
+ }
+
+ public static final String[] SUPPORTING_ANNOTATION_NAMES_ARRAY_2_0 = new String[] {
+ Access2_0Annotation.ANNOTATION_NAME,
+ IdAnnotation.ANNOTATION_NAME,
+ MapsId2_0Annotation.ANNOTATION_NAME
+ };
+ private static final Iterable<String> SUPPORTING_ANNOTATION_NAMES_2_0 = new ArrayIterable<String>(SUPPORTING_ANNOTATION_NAMES_ARRAY_2_0);
+
+ @SuppressWarnings("unchecked")
+ private static final Iterable<String> COMBINED_SUPPORTING_ANNOTATION_NAMES = new CompositeIterable<String>(
+ DELEGATE.getSupportingAnnotationNames(),
+ SUPPORTING_ANNOTATION_NAMES_2_0
+ );
+}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/JavaVersionMappingDefinition2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/JavaVersionMappingDefinition2_0.java index 6a87ebd825..d6320f5db0 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/JavaVersionMappingDefinition2_0.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/JavaVersionMappingDefinition2_0.java @@ -1,62 +1,62 @@ -/******************************************************************************* - * Copyright (c) 2011 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. - * - * Contributors: - * Oracle - initial API and implementation - ******************************************************************************/ -package org.eclipse.jpt.jpa.core.internal.jpa2.context.java; - -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.java.JavaAttributeMappingDefinition; -import org.eclipse.jpt.jpa.core.internal.context.java.JavaAttributeMappingDefinitionWrapper; -import org.eclipse.jpt.jpa.core.internal.context.java.JavaVersionMappingDefinition; -import org.eclipse.jpt.jpa.core.jpa2.resource.java.Access2_0Annotation; - -public class JavaVersionMappingDefinition2_0 - extends JavaAttributeMappingDefinitionWrapper -{ - private static final JavaAttributeMappingDefinition DELEGATE = JavaVersionMappingDefinition.instance(); - - // singleton - private static final JavaAttributeMappingDefinition INSTANCE = new JavaVersionMappingDefinition2_0(); - - /** - * Return the singleton. - */ - public static JavaAttributeMappingDefinition instance() { - return INSTANCE; - } - - - /** - * Enforce singleton usage - */ - private JavaVersionMappingDefinition2_0() { - super(); - } - - @Override - protected JavaAttributeMappingDefinition getDelegate() { - return DELEGATE; - } - - @Override - public Iterable<String> getSupportingAnnotationNames() { - return COMBINED_SUPPORTING_ANNOTATION_NAMES; - } - - public static final String[] SUPPORTING_ANNOTATION_NAMES_ARRAY_2_0 = new String[] { - Access2_0Annotation.ANNOTATION_NAME - }; - private static final Iterable<String> SUPPORTING_ANNOTATION_NAMES_2_0 = new ArrayIterable<String>(SUPPORTING_ANNOTATION_NAMES_ARRAY_2_0); - - @SuppressWarnings("unchecked") - private static final Iterable<String> COMBINED_SUPPORTING_ANNOTATION_NAMES = new CompositeIterable<String>( - DELEGATE.getSupportingAnnotationNames(), - SUPPORTING_ANNOTATION_NAMES_2_0 - ); -} +/*******************************************************************************
+ * Copyright (c) 2011 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.
+ *
+ * Contributors:
+ * Oracle - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.jpt.jpa.core.internal.jpa2.context.java;
+
+import org.eclipse.jpt.common.utility.internal.iterable.ArrayIterable;
+import org.eclipse.jpt.common.utility.internal.iterable.CompositeIterable;
+import org.eclipse.jpt.jpa.core.context.java.JavaAttributeMappingDefinition;
+import org.eclipse.jpt.jpa.core.internal.context.java.JavaAttributeMappingDefinitionWrapper;
+import org.eclipse.jpt.jpa.core.internal.context.java.JavaVersionMappingDefinition;
+import org.eclipse.jpt.jpa.core.jpa2.resource.java.Access2_0Annotation;
+
+public class JavaVersionMappingDefinition2_0
+ extends JavaAttributeMappingDefinitionWrapper
+{
+ private static final JavaAttributeMappingDefinition DELEGATE = JavaVersionMappingDefinition.instance();
+
+ // singleton
+ private static final JavaAttributeMappingDefinition INSTANCE = new JavaVersionMappingDefinition2_0();
+
+ /**
+ * Return the singleton.
+ */
+ public static JavaAttributeMappingDefinition instance() {
+ return INSTANCE;
+ }
+
+
+ /**
+ * Enforce singleton usage
+ */
+ private JavaVersionMappingDefinition2_0() {
+ super();
+ }
+
+ @Override
+ protected JavaAttributeMappingDefinition getDelegate() {
+ return DELEGATE;
+ }
+
+ @Override
+ public Iterable<String> getSupportingAnnotationNames() {
+ return COMBINED_SUPPORTING_ANNOTATION_NAMES;
+ }
+
+ public static final String[] SUPPORTING_ANNOTATION_NAMES_ARRAY_2_0 = new String[] {
+ Access2_0Annotation.ANNOTATION_NAME
+ };
+ private static final Iterable<String> SUPPORTING_ANNOTATION_NAMES_2_0 = new ArrayIterable<String>(SUPPORTING_ANNOTATION_NAMES_ARRAY_2_0);
+
+ @SuppressWarnings("unchecked")
+ private static final Iterable<String> COMBINED_SUPPORTING_ANNOTATION_NAMES = new CompositeIterable<String>(
+ DELEGATE.getSupportingAnnotationNames(),
+ SUPPORTING_ANNOTATION_NAMES_2_0
+ );
+}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/NullJavaMapKeyColumn2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/NullJavaMapKeyColumn2_0.java index 3ce00d43f5..db36dd80f8 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/NullJavaMapKeyColumn2_0.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/java/NullJavaMapKeyColumn2_0.java @@ -10,7 +10,7 @@ package org.eclipse.jpt.jpa.core.internal.jpa2.context.java; import org.eclipse.jpt.common.core.utility.TextRange; -import org.eclipse.jpt.common.utility.internal.iterables.EmptyIterable; +import org.eclipse.jpt.common.utility.internal.iterable.EmptyIterable; import org.eclipse.jpt.jpa.core.context.ReadOnlyColumn; import org.eclipse.jpt.jpa.core.context.java.JavaColumn; import org.eclipse.jpt.jpa.core.context.java.JavaRelationshipMapping; diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/orm/AbstractOrmElementCollectionMapping2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/orm/AbstractOrmElementCollectionMapping2_0.java index 96fd4f8a35..2400522fa2 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/orm/AbstractOrmElementCollectionMapping2_0.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/orm/AbstractOrmElementCollectionMapping2_0.java @@ -16,19 +16,18 @@ import org.eclipse.jdt.core.IPackageFragment; 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.CollectionTools; +import org.eclipse.jpt.common.utility.internal.ObjectTools; import org.eclipse.jpt.common.utility.internal.StringTools; -import org.eclipse.jpt.common.utility.internal.Tools; -import org.eclipse.jpt.common.utility.internal.Transformer; -import org.eclipse.jpt.common.utility.internal.iterables.ArrayIterable; -import org.eclipse.jpt.common.utility.internal.iterables.CompositeIterable; -import org.eclipse.jpt.common.utility.internal.iterables.EmptyIterable; -import org.eclipse.jpt.common.utility.internal.iterables.EmptyListIterable; -import org.eclipse.jpt.common.utility.internal.iterables.ListIterable; -import org.eclipse.jpt.common.utility.internal.iterables.LiveCloneListIterable; -import org.eclipse.jpt.common.utility.internal.iterables.SingleElementIterable; -import org.eclipse.jpt.common.utility.internal.iterables.SingleElementListIterable; -import org.eclipse.jpt.common.utility.internal.iterables.TransformationIterable; +import org.eclipse.jpt.common.utility.internal.iterable.ArrayIterable; +import org.eclipse.jpt.common.utility.internal.iterable.CompositeIterable; +import org.eclipse.jpt.common.utility.internal.iterable.EmptyIterable; +import org.eclipse.jpt.common.utility.internal.iterable.EmptyListIterable; +import org.eclipse.jpt.common.utility.internal.iterable.LiveCloneListIterable; +import org.eclipse.jpt.common.utility.internal.iterable.SingleElementIterable; +import org.eclipse.jpt.common.utility.internal.iterable.SingleElementListIterable; +import org.eclipse.jpt.common.utility.internal.iterable.TransformationIterable; +import org.eclipse.jpt.common.utility.iterable.ListIterable; +import org.eclipse.jpt.common.utility.transformer.Transformer; import org.eclipse.jpt.jpa.core.MappingKeys; import org.eclipse.jpt.jpa.core.context.AssociationOverride; import org.eclipse.jpt.jpa.core.context.AssociationOverrideContainer; @@ -1508,7 +1507,7 @@ public abstract class AbstractOrmElementCollectionMapping2_0<X extends XmlElemen if (embeddable != null && embeddable != parentEmbeddable) { embeddableContainsElementCollection(messages, embeddable); embeddableContainsProhibitedRelationshipMapping(messages, embeddable); - if (!CollectionTools.contains(visited, embeddable)) { + if (!visited.contains(embeddable)) { visited.add(embeddable); embeddableHierarchyContainsProhibitedMapping(messages, embeddable, visited); } @@ -1520,7 +1519,7 @@ public abstract class AbstractOrmElementCollectionMapping2_0<X extends XmlElemen if (embeddable != null && embeddable != parentEmbeddable) { embeddableContainsElementCollection(messages, embeddable); embeddableContainsProhibitedRelationshipMapping(messages, embeddable); - if (!CollectionTools.contains(visited, embeddable)) { + if (!visited.contains(embeddable)) { visited.add(embeddable); embeddableHierarchyContainsProhibitedMapping(messages, embeddable, visited); } @@ -1586,7 +1585,7 @@ public abstract class AbstractOrmElementCollectionMapping2_0<X extends XmlElemen } protected void validateTargetClass(List<IMessage> messages) { - if (StringTools.stringIsEmpty(this.getTargetClass())) { + if (StringTools.isBlank(this.getTargetClass())) { messages.add( DefaultJpaValidationMessages.buildMessage( IMessage.HIGH_SEVERITY, @@ -1642,7 +1641,7 @@ public abstract class AbstractOrmElementCollectionMapping2_0<X extends XmlElemen } protected void validateMapKeyClass_(List<IMessage> messages) { - if (StringTools.stringIsEmpty(this.getMapKeyClass())) { + if (StringTools.isBlank(this.getMapKeyClass())) { messages.add( DefaultJpaValidationMessages.buildMessage( IMessage.HIGH_SEVERITY, @@ -1837,7 +1836,7 @@ public abstract class AbstractOrmElementCollectionMapping2_0<X extends XmlElemen public org.eclipse.jpt.jpa.db.Table resolveDbTable(String tableName) { OrmCollectionTable2_0 table = this.getCollectionTable(); - return Tools.valuesAreEqual(table.getName(), tableName) ? table.getDbTable() : null; + return ObjectTools.equals(table.getName(), tableName) ? table.getDbTable() : null; } public Iterable<String> getCandidateTableNames() { @@ -1849,7 +1848,7 @@ public abstract class AbstractOrmElementCollectionMapping2_0<X extends XmlElemen * the default table name. the table is always the collection table */ public boolean tableNameIsInvalid(String tableName) { - return Tools.valuesAreDifferent(this.getDefaultTableName(), tableName); + return ObjectTools.notEquals(this.getDefaultTableName(), tableName); } public TextRange getValidationTextRange() { @@ -2082,7 +2081,7 @@ public abstract class AbstractOrmElementCollectionMapping2_0<X extends XmlElemen * the default table name. The table is always the collection table. */ public boolean tableNameIsInvalid(String tableName) { - return Tools.valuesAreDifferent(this.getDefaultTableName(), tableName); + return ObjectTools.notEquals(this.getDefaultTableName(), tableName); } public Iterable<String> getCandidateTableNames() { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/orm/GenericOrmCollectionTable2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/orm/GenericOrmCollectionTable2_0.java index fa916e2d85..bf124d50d8 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/orm/GenericOrmCollectionTable2_0.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/orm/GenericOrmCollectionTable2_0.java @@ -10,8 +10,8 @@ package org.eclipse.jpt.jpa.core.internal.jpa2.context.orm; import org.eclipse.jpt.common.core.utility.TextRange; -import org.eclipse.jpt.common.utility.internal.Tools; -import org.eclipse.jpt.common.utility.internal.iterables.EmptyIterable; +import org.eclipse.jpt.common.utility.internal.ObjectTools; +import org.eclipse.jpt.common.utility.internal.iterable.EmptyIterable; import org.eclipse.jpt.jpa.core.context.Entity; import org.eclipse.jpt.jpa.core.context.PersistentAttribute; import org.eclipse.jpt.jpa.core.context.ReadOnlyJoinColumn; @@ -120,7 +120,7 @@ public class GenericOrmCollectionTable2_0 } public org.eclipse.jpt.jpa.db.Table resolveDbTable(String tableName) { - return Tools.valuesAreEqual(GenericOrmCollectionTable2_0.this.getName(), tableName) ? + return ObjectTools.equals(GenericOrmCollectionTable2_0.this.getName(), tableName) ? GenericOrmCollectionTable2_0.this.getDbTable() : null; } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/orm/GenericOrmEmbeddable2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/orm/GenericOrmEmbeddable2_0.java index 7d5525de4d..c86361f8c0 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/orm/GenericOrmEmbeddable2_0.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/orm/GenericOrmEmbeddable2_0.java @@ -1,33 +1,33 @@ -/******************************************************************************* - * Copyright (c) 2009, 2010 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. - * - * Contributors: - * Oracle - initial API and implementation - ******************************************************************************/ -package org.eclipse.jpt.jpa.core.internal.jpa2.context.orm; - -import org.eclipse.jpt.common.utility.internal.ArrayTools; -import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentType; -import org.eclipse.jpt.jpa.core.internal.context.orm.AbstractOrmEmbeddable; -import org.eclipse.jpt.jpa.core.internal.jpa2.context.java.GenericJavaEmbeddable2_0; -import org.eclipse.jpt.jpa.core.resource.orm.XmlEmbeddable; - -/** - * JPA 2.0 - * <code>orm.xml</code> embeddable type mapping - */ -public class GenericOrmEmbeddable2_0 - extends AbstractOrmEmbeddable<XmlEmbeddable> -{ - public GenericOrmEmbeddable2_0(OrmPersistentType parent, XmlEmbeddable resourceMapping) { - super(parent, resourceMapping); - } - - @Override - public boolean attributeMappingKeyAllowed(String attributeMappingKey) { - return ArrayTools.contains(GenericJavaEmbeddable2_0.ALLOWED_ATTRIBUTE_MAPPING_KEYS, attributeMappingKey); - } -} +/*******************************************************************************
+ * Copyright (c) 2009, 2010 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.
+ *
+ * Contributors:
+ * Oracle - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.jpt.jpa.core.internal.jpa2.context.orm;
+
+import org.eclipse.jpt.common.utility.internal.ArrayTools;
+import org.eclipse.jpt.jpa.core.context.orm.OrmPersistentType;
+import org.eclipse.jpt.jpa.core.internal.context.orm.AbstractOrmEmbeddable;
+import org.eclipse.jpt.jpa.core.internal.jpa2.context.java.GenericJavaEmbeddable2_0;
+import org.eclipse.jpt.jpa.core.resource.orm.XmlEmbeddable;
+
+/**
+ * JPA 2.0
+ * <code>orm.xml</code> embeddable type mapping
+ */
+public class GenericOrmEmbeddable2_0
+ extends AbstractOrmEmbeddable<XmlEmbeddable>
+{
+ public GenericOrmEmbeddable2_0(OrmPersistentType parent, XmlEmbeddable resourceMapping) {
+ super(parent, resourceMapping);
+ }
+
+ @Override
+ public boolean attributeMappingKeyAllowed(String attributeMappingKey) {
+ return ArrayTools.contains(GenericJavaEmbeddable2_0.ALLOWED_ATTRIBUTE_MAPPING_KEYS, attributeMappingKey);
+ }
+}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/orm/GenericOrmMapsIdDerivedIdentityStrategy2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/orm/GenericOrmMapsIdDerivedIdentityStrategy2_0.java index bced510416..7e5bb58ebb 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/orm/GenericOrmMapsIdDerivedIdentityStrategy2_0.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/orm/GenericOrmMapsIdDerivedIdentityStrategy2_0.java @@ -12,14 +12,14 @@ package org.eclipse.jpt.jpa.core.internal.jpa2.context.orm; import java.util.List; import org.eclipse.jpt.common.core.utility.TextRange; import org.eclipse.jpt.common.utility.internal.ArrayTools; -import org.eclipse.jpt.common.utility.internal.CollectionTools; -import org.eclipse.jpt.common.utility.internal.NotNullFilter; -import org.eclipse.jpt.common.utility.internal.Tools; -import org.eclipse.jpt.common.utility.internal.iterables.ArrayIterable; -import org.eclipse.jpt.common.utility.internal.iterables.CompositeIterable; -import org.eclipse.jpt.common.utility.internal.iterables.FilteringIterable; -import org.eclipse.jpt.common.utility.internal.iterables.SingleElementIterable; -import org.eclipse.jpt.common.utility.internal.iterables.TransformationIterable; +import org.eclipse.jpt.common.utility.internal.ObjectTools; +import org.eclipse.jpt.common.utility.internal.filter.NotNullFilter; +import org.eclipse.jpt.common.utility.internal.iterable.ArrayIterable; +import org.eclipse.jpt.common.utility.internal.iterable.CompositeIterable; +import org.eclipse.jpt.common.utility.internal.iterable.FilteringIterable; +import org.eclipse.jpt.common.utility.internal.iterable.IterableTools; +import org.eclipse.jpt.common.utility.internal.iterable.SingleElementIterable; +import org.eclipse.jpt.common.utility.internal.iterable.TransformationIterable; import org.eclipse.jpt.jpa.core.MappingKeys; import org.eclipse.jpt.jpa.core.context.AttributeMapping; import org.eclipse.jpt.jpa.core.context.Embeddable; @@ -120,7 +120,7 @@ public class GenericOrmMapsIdDerivedIdentityStrategy2_0 } public Iterable<String> getSortedCandidateIdAttributeNames() { - return CollectionTools.sort(this.getNonNullCandidateIdAttributeNames()); + return IterableTools.sort(this.getNonNullCandidateIdAttributeNames()); } protected Iterable<String> getNonNullCandidateIdAttributeNames() { @@ -148,7 +148,7 @@ public class GenericOrmMapsIdDerivedIdentityStrategy2_0 return new TransformationIterable<AttributeMapping, Iterable<AttributeMapping>>(attributeMappings) { @Override protected Iterable<AttributeMapping> transform(AttributeMapping attributeMapping) { - return Tools.valuesAreEqual(attributeMapping.getKey(), MappingKeys.EMBEDDED_ID_ATTRIBUTE_MAPPING_KEY) ? + return ObjectTools.equals(attributeMapping.getKey(), MappingKeys.EMBEDDED_ID_ATTRIBUTE_MAPPING_KEY) ? this.getEmbeddedIdMappingChoiceIterable((EmbeddedIdMapping) attributeMapping) : new SingleElementIterable<AttributeMapping>(attributeMapping); } @@ -216,7 +216,7 @@ public class GenericOrmMapsIdDerivedIdentityStrategy2_0 } protected boolean mappingIsIdMapping(AttributeMapping mapping) { - return CollectionTools.contains(this.getIdMappingKeys(), mapping.getKey()); + return IterableTools.contains(this.getIdMappingKeys(), mapping.getKey()); } protected Iterable<String> getIdMappingKeys() { @@ -253,7 +253,7 @@ public class GenericOrmMapsIdDerivedIdentityStrategy2_0 messages.add(this.buildMessage(JpaValidationMessages.MAPS_ID_VALUE_NOT_RESOLVED, new String[] {this.getIdAttributeName()})); } else { // test whether attribute mapping is allowable - if ( ! CollectionTools.contains(this.getValidAttributeMappingChoices(), attributeMapping)) { + if ( ! IterableTools.contains(this.getValidAttributeMappingChoices(), attributeMapping)) { messages.add(this.buildMessage(JpaValidationMessages.MAPS_ID_VALUE_INVALID, new String[] {this.getIdAttributeName()})); } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/orm/GenericOrmSequenceGenerator2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/orm/GenericOrmSequenceGenerator2_0.java index 8a3b2d607a..5a736df21f 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/orm/GenericOrmSequenceGenerator2_0.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/orm/GenericOrmSequenceGenerator2_0.java @@ -9,7 +9,7 @@ *******************************************************************************/ package org.eclipse.jpt.jpa.core.internal.jpa2.context.orm; -import org.eclipse.jpt.common.utility.internal.Tools; +import org.eclipse.jpt.common.utility.internal.ObjectTools; import org.eclipse.jpt.jpa.core.context.JpaContextNode; import org.eclipse.jpt.jpa.core.context.SequenceGenerator; import org.eclipse.jpt.jpa.core.context.java.JavaSequenceGenerator; @@ -136,8 +136,8 @@ public class GenericOrmSequenceGenerator2_0 @Override protected boolean isEquivalentTo(SequenceGenerator generator) { return super.isEquivalentTo(generator) && - Tools.valuesAreEqual(this.specifiedSchema, ((SequenceGenerator2_0) generator).getSpecifiedSchema()) && - Tools.valuesAreEqual(this.specifiedCatalog, ((SequenceGenerator2_0) generator).getSpecifiedCatalog()); + ObjectTools.equals(this.specifiedSchema, ((SequenceGenerator2_0) generator).getSpecifiedSchema()) && + ObjectTools.equals(this.specifiedCatalog, ((SequenceGenerator2_0) generator).getSpecifiedCatalog()); } // ********** metadata conversion ********** diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/orm/GenericOrmXml2_0Definition.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/orm/GenericOrmXml2_0Definition.java index eda279e0fa..a5d72b86d6 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/orm/GenericOrmXml2_0Definition.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/orm/GenericOrmXml2_0Definition.java @@ -1,93 +1,94 @@ -/******************************************************************************* - * Copyright (c) 2009, 2012 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. - * - * Contributors: - * Oracle - initial API and implementation - ******************************************************************************/ -package org.eclipse.jpt.jpa.core.internal.jpa2.context.orm; - -import java.util.ArrayList; -import org.eclipse.emf.ecore.EFactory; -import org.eclipse.jpt.common.core.JptResourceType; -import org.eclipse.jpt.common.utility.internal.CollectionTools; -import org.eclipse.jpt.jpa.core.context.orm.NullOrmAttributeMappingDefinition; -import org.eclipse.jpt.jpa.core.context.orm.OrmAttributeMappingDefinition; -import org.eclipse.jpt.jpa.core.context.orm.OrmXmlContextNodeFactory; -import org.eclipse.jpt.jpa.core.context.orm.OrmXmlDefinition; -import org.eclipse.jpt.jpa.core.internal.context.orm.AbstractOrmXmlDefinition; -import org.eclipse.jpt.jpa.core.internal.context.orm.OrmBasicMappingDefinition; -import org.eclipse.jpt.jpa.core.internal.context.orm.OrmEmbeddedIdMappingDefinition; -import org.eclipse.jpt.jpa.core.internal.context.orm.OrmEmbeddedMappingDefinition; -import org.eclipse.jpt.jpa.core.internal.context.orm.OrmIdMappingDefinition; -import org.eclipse.jpt.jpa.core.internal.context.orm.OrmManyToManyMappingDefinition; -import org.eclipse.jpt.jpa.core.internal.context.orm.OrmManyToOneMappingDefinition; -import org.eclipse.jpt.jpa.core.internal.context.orm.OrmOneToManyMappingDefinition; -import org.eclipse.jpt.jpa.core.internal.context.orm.OrmOneToOneMappingDefinition; -import org.eclipse.jpt.jpa.core.internal.context.orm.OrmTransientMappingDefinition; -import org.eclipse.jpt.jpa.core.internal.context.orm.OrmVersionMappingDefinition; -import org.eclipse.jpt.jpa.core.internal.jpa2.Generic2_0JpaPlatformProvider; -import org.eclipse.jpt.jpa.core.resource.orm.OrmFactory; -import org.eclipse.jpt.jpa.core.resource.orm.XmlEntityMappings; -import org.eclipse.jpt.jpa.core.resource.orm.v2_0.JPA2_0; - -public class GenericOrmXml2_0Definition - extends AbstractOrmXmlDefinition -{ - // singleton - private static final OrmXmlDefinition INSTANCE = new GenericOrmXml2_0Definition(); - - /** - * Return the singleton - */ - public static OrmXmlDefinition instance() { - return INSTANCE; - } - - - /** - * Enforce singleton usage - */ - private GenericOrmXml2_0Definition() { - super(); - } - - public JptResourceType getResourceType() { - return this.getResourceType(XmlEntityMappings.CONTENT_TYPE, JPA2_0.SCHEMA_VERSION); - } - - public EFactory getResourceNodeFactory() { - return OrmFactory.eINSTANCE; - } - - @Override - protected OrmXmlContextNodeFactory buildContextNodeFactory() { - return new GenericOrmXml2_0ContextNodeFactory(); - } - - @Override - protected void addAttributeMappingDefinitionsTo(ArrayList<OrmAttributeMappingDefinition> definitions) { - CollectionTools.addAll(definitions, ATTRIBUTE_MAPPING_DEFINITIONS); - } - - /** - * Order should not matter here; but we'll use the same order as for Java. - * @see Generic2_0JpaPlatformProvider - */ - protected static final OrmAttributeMappingDefinition[] ATTRIBUTE_MAPPING_DEFINITIONS = new OrmAttributeMappingDefinition[] { - OrmTransientMappingDefinition.instance(), - OrmElementCollectionMapping2_0Definition.instance(), - OrmIdMappingDefinition.instance(), - OrmVersionMappingDefinition.instance(), - OrmBasicMappingDefinition.instance(), - OrmEmbeddedMappingDefinition.instance(), - OrmEmbeddedIdMappingDefinition.instance(), - OrmManyToManyMappingDefinition.instance(), - OrmManyToOneMappingDefinition.instance(), - OrmOneToManyMappingDefinition.instance(), - OrmOneToOneMappingDefinition.instance(), - NullOrmAttributeMappingDefinition.instance() - }; -} +/*******************************************************************************
+ * Copyright (c) 2009, 2012 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.
+ *
+ * Contributors:
+ * Oracle - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.jpt.jpa.core.internal.jpa2.context.orm;
+
+import java.util.ArrayList;
+
+import org.eclipse.emf.ecore.EFactory;
+import org.eclipse.jpt.common.core.JptResourceType;
+import org.eclipse.jpt.common.utility.internal.collection.CollectionTools;
+import org.eclipse.jpt.jpa.core.context.orm.NullOrmAttributeMappingDefinition;
+import org.eclipse.jpt.jpa.core.context.orm.OrmAttributeMappingDefinition;
+import org.eclipse.jpt.jpa.core.context.orm.OrmXmlContextNodeFactory;
+import org.eclipse.jpt.jpa.core.context.orm.OrmXmlDefinition;
+import org.eclipse.jpt.jpa.core.internal.context.orm.AbstractOrmXmlDefinition;
+import org.eclipse.jpt.jpa.core.internal.context.orm.OrmBasicMappingDefinition;
+import org.eclipse.jpt.jpa.core.internal.context.orm.OrmEmbeddedIdMappingDefinition;
+import org.eclipse.jpt.jpa.core.internal.context.orm.OrmEmbeddedMappingDefinition;
+import org.eclipse.jpt.jpa.core.internal.context.orm.OrmIdMappingDefinition;
+import org.eclipse.jpt.jpa.core.internal.context.orm.OrmManyToManyMappingDefinition;
+import org.eclipse.jpt.jpa.core.internal.context.orm.OrmManyToOneMappingDefinition;
+import org.eclipse.jpt.jpa.core.internal.context.orm.OrmOneToManyMappingDefinition;
+import org.eclipse.jpt.jpa.core.internal.context.orm.OrmOneToOneMappingDefinition;
+import org.eclipse.jpt.jpa.core.internal.context.orm.OrmTransientMappingDefinition;
+import org.eclipse.jpt.jpa.core.internal.context.orm.OrmVersionMappingDefinition;
+import org.eclipse.jpt.jpa.core.internal.jpa2.Generic2_0JpaPlatformProvider;
+import org.eclipse.jpt.jpa.core.resource.orm.OrmFactory;
+import org.eclipse.jpt.jpa.core.resource.orm.XmlEntityMappings;
+import org.eclipse.jpt.jpa.core.resource.orm.v2_0.JPA2_0;
+
+public class GenericOrmXml2_0Definition
+ extends AbstractOrmXmlDefinition
+{
+ // singleton
+ private static final OrmXmlDefinition INSTANCE = new GenericOrmXml2_0Definition();
+
+ /**
+ * Return the singleton
+ */
+ public static OrmXmlDefinition instance() {
+ return INSTANCE;
+ }
+
+
+ /**
+ * Enforce singleton usage
+ */
+ private GenericOrmXml2_0Definition() {
+ super();
+ }
+
+ public JptResourceType getResourceType() {
+ return this.getResourceType(XmlEntityMappings.CONTENT_TYPE, JPA2_0.SCHEMA_VERSION);
+ }
+
+ public EFactory getResourceNodeFactory() {
+ return OrmFactory.eINSTANCE;
+ }
+
+ @Override
+ protected OrmXmlContextNodeFactory buildContextNodeFactory() {
+ return new GenericOrmXml2_0ContextNodeFactory();
+ }
+
+ @Override
+ protected void addAttributeMappingDefinitionsTo(ArrayList<OrmAttributeMappingDefinition> definitions) {
+ CollectionTools.addAll(definitions, ATTRIBUTE_MAPPING_DEFINITIONS);
+ }
+
+ /**
+ * Order should not matter here; but we'll use the same order as for Java.
+ * @see Generic2_0JpaPlatformProvider
+ */
+ protected static final OrmAttributeMappingDefinition[] ATTRIBUTE_MAPPING_DEFINITIONS = new OrmAttributeMappingDefinition[] {
+ OrmTransientMappingDefinition.instance(),
+ OrmElementCollectionMapping2_0Definition.instance(),
+ OrmIdMappingDefinition.instance(),
+ OrmVersionMappingDefinition.instance(),
+ OrmBasicMappingDefinition.instance(),
+ OrmEmbeddedMappingDefinition.instance(),
+ OrmEmbeddedIdMappingDefinition.instance(),
+ OrmManyToManyMappingDefinition.instance(),
+ OrmManyToOneMappingDefinition.instance(),
+ OrmOneToManyMappingDefinition.instance(),
+ OrmOneToOneMappingDefinition.instance(),
+ NullOrmAttributeMappingDefinition.instance()
+ };
+}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/persistence/options/GenericOptions2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/persistence/options/GenericOptions2_0.java index 48cf290337..a47bfbb6bf 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/persistence/options/GenericOptions2_0.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/persistence/options/GenericOptions2_0.java @@ -11,8 +11,9 @@ package org.eclipse.jpt.jpa.core.internal.jpa2.context.persistence.options; import java.util.List; import java.util.Map; -import org.eclipse.jpt.common.utility.internal.iterables.ListIterable; -import org.eclipse.jpt.common.utility.internal.iterables.LiveCloneListIterable; + +import org.eclipse.jpt.common.utility.internal.iterable.LiveCloneListIterable; +import org.eclipse.jpt.common.utility.iterable.ListIterable; import org.eclipse.jpt.jpa.core.context.persistence.PersistenceUnit; import org.eclipse.jpt.jpa.core.internal.context.persistence.AbstractPersistenceUnitProperties; import org.eclipse.jpt.jpa.core.jpa2.context.persistence.PersistenceUnit2_0; diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/persistence/options/NullOptions2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/persistence/options/NullOptions2_0.java index 4ef13a055e..3e13dbb634 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/persistence/options/NullOptions2_0.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/context/persistence/options/NullOptions2_0.java @@ -10,8 +10,9 @@ package org.eclipse.jpt.jpa.core.internal.jpa2.context.persistence.options; import java.util.Map; -import org.eclipse.jpt.common.utility.internal.iterables.EmptyListIterable; -import org.eclipse.jpt.common.utility.internal.iterables.ListIterable; + +import org.eclipse.jpt.common.utility.internal.iterable.EmptyListIterable; +import org.eclipse.jpt.common.utility.iterable.ListIterable; import org.eclipse.jpt.jpa.core.context.persistence.PersistenceUnit; import org.eclipse.jpt.jpa.core.internal.context.persistence.AbstractPersistenceUnitProperties; import org.eclipse.jpt.jpa.core.jpa2.context.persistence.options.JpaOptions2_0; diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/resource/java/NullCollectionTable2_0Annotation.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/resource/java/NullCollectionTable2_0Annotation.java index 8d92f4a687..149a9db058 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/resource/java/NullCollectionTable2_0Annotation.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/resource/java/NullCollectionTable2_0Annotation.java @@ -1,59 +1,59 @@ -/******************************************************************************* - * Copyright (c) 2009, 2011 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. - * - * Contributors: - * Oracle - initial API and implementation - ******************************************************************************/ -package org.eclipse.jpt.jpa.core.internal.jpa2.resource.java; - -import org.eclipse.jpt.common.core.resource.java.JavaResourceNode; -import org.eclipse.jpt.common.utility.internal.iterables.EmptyListIterable; -import org.eclipse.jpt.common.utility.internal.iterables.ListIterable; -import org.eclipse.jpt.jpa.core.internal.resource.java.NullBaseTableAnnotation; -import org.eclipse.jpt.jpa.core.jpa2.resource.java.CollectionTable2_0Annotation; -import org.eclipse.jpt.jpa.core.resource.java.JoinColumnAnnotation; - -/** - * <code>javax.persistence.CollectionTable</code> - */ -public final class NullCollectionTable2_0Annotation - extends NullBaseTableAnnotation<CollectionTable2_0Annotation> - implements CollectionTable2_0Annotation -{ - public NullCollectionTable2_0Annotation(JavaResourceNode parent) { - super(parent); - } - - public String getAnnotationName() { - return ANNOTATION_NAME; - } - - // ***** join columns - public ListIterable<JoinColumnAnnotation> getJoinColumns() { - return EmptyListIterable.instance(); - } - - public int getJoinColumnsSize() { - return 0; - } - - public JoinColumnAnnotation joinColumnAt(int index) { - return null; - } - - public JoinColumnAnnotation addJoinColumn(int index) { - // the CollectionTable annotation is missing, add both it and a join column at the same time - return this.addAnnotation().addJoinColumn(index); - } - - public void moveJoinColumn(int targetIndex, int sourceIndex) { - throw new UnsupportedOperationException(); - } - - public void removeJoinColumn(int index) { - throw new UnsupportedOperationException(); - } -} +/*******************************************************************************
+ * Copyright (c) 2009, 2011 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.
+ *
+ * Contributors:
+ * Oracle - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.jpt.jpa.core.internal.jpa2.resource.java;
+
+import org.eclipse.jpt.common.core.resource.java.JavaResourceNode;
+import org.eclipse.jpt.common.utility.internal.iterable.EmptyListIterable;
+import org.eclipse.jpt.common.utility.iterable.ListIterable;
+import org.eclipse.jpt.jpa.core.internal.resource.java.NullBaseTableAnnotation;
+import org.eclipse.jpt.jpa.core.jpa2.resource.java.CollectionTable2_0Annotation;
+import org.eclipse.jpt.jpa.core.resource.java.JoinColumnAnnotation;
+
+/**
+ * <code>javax.persistence.CollectionTable</code>
+ */
+public final class NullCollectionTable2_0Annotation
+ extends NullBaseTableAnnotation<CollectionTable2_0Annotation>
+ implements CollectionTable2_0Annotation
+{
+ public NullCollectionTable2_0Annotation(JavaResourceNode parent) {
+ super(parent);
+ }
+
+ public String getAnnotationName() {
+ return ANNOTATION_NAME;
+ }
+
+ // ***** join columns
+ public ListIterable<JoinColumnAnnotation> getJoinColumns() {
+ return EmptyListIterable.instance();
+ }
+
+ public int getJoinColumnsSize() {
+ return 0;
+ }
+
+ public JoinColumnAnnotation joinColumnAt(int index) {
+ return null;
+ }
+
+ public JoinColumnAnnotation addJoinColumn(int index) {
+ // the CollectionTable annotation is missing, add both it and a join column at the same time
+ return this.addAnnotation().addJoinColumn(index);
+ }
+
+ public void moveJoinColumn(int targetIndex, int sourceIndex) {
+ throw new UnsupportedOperationException();
+ }
+
+ public void removeJoinColumn(int index) {
+ throw new UnsupportedOperationException();
+ }
+}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/resource/java/binary/BinaryCollectionTable2_0Annotation.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/resource/java/binary/BinaryCollectionTable2_0Annotation.java index 00024b61cb..1b749168bb 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/resource/java/binary/BinaryCollectionTable2_0Annotation.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/resource/java/binary/BinaryCollectionTable2_0Annotation.java @@ -12,8 +12,8 @@ package org.eclipse.jpt.jpa.core.internal.jpa2.resource.java.binary; import java.util.Vector; import org.eclipse.jdt.core.IAnnotation; import org.eclipse.jpt.common.core.resource.java.JavaResourceAnnotatedElement; -import org.eclipse.jpt.common.utility.internal.iterables.ListIterable; -import org.eclipse.jpt.common.utility.internal.iterables.LiveCloneListIterable; +import org.eclipse.jpt.common.utility.internal.iterable.LiveCloneListIterable; +import org.eclipse.jpt.common.utility.iterable.ListIterable; import org.eclipse.jpt.jpa.core.internal.resource.java.binary.BinaryBaseTableAnnotation; import org.eclipse.jpt.jpa.core.internal.resource.java.binary.BinaryJoinColumnAnnotation; import org.eclipse.jpt.jpa.core.jpa2.resource.java.CollectionTable2_0Annotation; diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/resource/java/binary/BinaryGeneratedAnnotation.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/resource/java/binary/BinaryGeneratedAnnotation.java index a8427a3af8..6c54460346 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/resource/java/binary/BinaryGeneratedAnnotation.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/resource/java/binary/BinaryGeneratedAnnotation.java @@ -13,8 +13,8 @@ import java.util.Vector; import org.eclipse.jdt.core.IAnnotation; import org.eclipse.jpt.common.core.internal.resource.java.binary.BinaryAnnotation; import org.eclipse.jpt.common.core.resource.java.JavaResourceAnnotatedElement; -import org.eclipse.jpt.common.utility.internal.iterables.ListIterable; -import org.eclipse.jpt.common.utility.internal.iterables.LiveCloneListIterable; +import org.eclipse.jpt.common.utility.internal.iterable.LiveCloneListIterable; +import org.eclipse.jpt.common.utility.iterable.ListIterable; import org.eclipse.jpt.jpa.core.jpa2.resource.java.GeneratedAnnotation; /** diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/resource/java/source/SourceCollectionTable2_0Annotation.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/resource/java/source/SourceCollectionTable2_0Annotation.java index 3de457bf38..e7cc08810c 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/resource/java/source/SourceCollectionTable2_0Annotation.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/resource/java/source/SourceCollectionTable2_0Annotation.java @@ -18,7 +18,7 @@ import org.eclipse.jpt.common.core.utility.jdt.AnnotatedElement; import org.eclipse.jpt.common.core.utility.jdt.DeclarationAnnotationAdapter; import org.eclipse.jpt.common.core.utility.jdt.DeclarationAnnotationElementAdapter; import org.eclipse.jpt.common.core.utility.jdt.IndexedDeclarationAnnotationAdapter; -import org.eclipse.jpt.common.utility.internal.iterables.ListIterable; +import org.eclipse.jpt.common.utility.iterable.ListIterable; import org.eclipse.jpt.jpa.core.internal.resource.java.source.SourceBaseTableAnnotation; import org.eclipse.jpt.jpa.core.internal.resource.java.source.SourceJoinColumnAnnotation; import org.eclipse.jpt.jpa.core.jpa2.resource.java.CollectionTable2_0Annotation; diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/resource/java/source/SourceGeneratedAnnotation.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/resource/java/source/SourceGeneratedAnnotation.java index 493ad40347..2aabdcd922 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/resource/java/source/SourceGeneratedAnnotation.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/jpa2/resource/java/source/SourceGeneratedAnnotation.java @@ -23,9 +23,9 @@ import org.eclipse.jpt.common.core.utility.jdt.AnnotationElementAdapter; import org.eclipse.jpt.common.core.utility.jdt.DeclarationAnnotationAdapter; import org.eclipse.jpt.common.core.utility.jdt.DeclarationAnnotationElementAdapter; import org.eclipse.jpt.common.core.utility.jdt.ExpressionConverter; -import org.eclipse.jpt.common.utility.internal.CollectionTools; -import org.eclipse.jpt.common.utility.internal.iterables.ListIterable; -import org.eclipse.jpt.common.utility.internal.iterables.LiveCloneListIterable; +import org.eclipse.jpt.common.utility.internal.collection.ListTools; +import org.eclipse.jpt.common.utility.internal.iterable.LiveCloneListIterable; +import org.eclipse.jpt.common.utility.iterable.ListIterable; import org.eclipse.jpt.jpa.core.jpa2.resource.java.GeneratedAnnotation; /** @@ -124,7 +124,7 @@ public final class SourceGeneratedAnnotation } public void moveValue(int targetIndex, int sourceIndex) { - CollectionTools.move(this.values, targetIndex, sourceIndex); + ListTools.move(this.values, targetIndex, sourceIndex); this.writeValues(); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/libprov/JpaLibraryProviderInstallOperationConfigAdapterFactory.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/libprov/JpaLibraryProviderInstallOperationConfigAdapterFactory.java index f7b86100a8..6dc8e8906a 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/libprov/JpaLibraryProviderInstallOperationConfigAdapterFactory.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/libprov/JpaLibraryProviderInstallOperationConfigAdapterFactory.java @@ -11,11 +11,11 @@ package org.eclipse.jpt.jpa.core.internal.libprov; import org.eclipse.core.runtime.IAdapterFactory; import org.eclipse.jpt.jpa.core.libprov.JpaLibraryProviderInstallOperationConfig; -import org.eclipse.jpt.jpa.core.platform.JpaPlatformDescription; +import org.eclipse.jpt.jpa.core.platform.JpaPlatformConfig; /** * Factory to build Dali adapters for an {@link JpaLibraryProviderInstallOperationConfig}:<ul> - * <li>{@link JpaPlatformDescription} + * <li>{@link JpaPlatformConfig} * </ul> * See <code>org.eclipse.jpt.jpa.core/plugin.xml:org.eclipse.core.runtime.adapters</code>. */ @@ -23,7 +23,7 @@ public class JpaLibraryProviderInstallOperationConfigAdapterFactory implements IAdapterFactory { private static final Class<?>[] ADAPTER_LIST = new Class[] { - JpaPlatformDescription.class + JpaPlatformConfig.class }; public Class<?>[] getAdapterList() { @@ -38,8 +38,8 @@ public class JpaLibraryProviderInstallOperationConfigAdapterFactory } private Object getAdapter(JpaLibraryProviderInstallOperationConfig config, Class<?> adapterType) { - if (adapterType == JpaPlatformDescription.class) { - return config.getJpaPlatform(); + if (adapterType == JpaPlatformConfig.class) { + return config.getJpaPlatformConfig(); } return null; } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/libprov/JpaOsgiBundlesLibraryProviderInstallOperationConfig.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/libprov/JpaOsgiBundlesLibraryProviderInstallOperationConfig.java index 1414a3b681..50dc571b74 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/libprov/JpaOsgiBundlesLibraryProviderInstallOperationConfig.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/libprov/JpaOsgiBundlesLibraryProviderInstallOperationConfig.java @@ -11,26 +11,26 @@ package org.eclipse.jpt.jpa.core.internal.libprov; import org.eclipse.jpt.common.core.internal.libprov.JptOsgiBundlesLibraryProviderInstallOperationConfig; import org.eclipse.jpt.jpa.core.libprov.JpaLibraryProviderInstallOperationConfig; -import org.eclipse.jpt.jpa.core.platform.JpaPlatformDescription; +import org.eclipse.jpt.jpa.core.platform.JpaPlatformConfig; public class JpaOsgiBundlesLibraryProviderInstallOperationConfig extends JptOsgiBundlesLibraryProviderInstallOperationConfig implements JpaLibraryProviderInstallOperationConfig { - private JpaPlatformDescription jpaPlatform; + private JpaPlatformConfig jpaPlatformConfig; public JpaOsgiBundlesLibraryProviderInstallOperationConfig() { super(); } - public JpaPlatformDescription getJpaPlatform() { - return this.jpaPlatform; + public JpaPlatformConfig getJpaPlatformConfig() { + return this.jpaPlatformConfig; } - public void setJpaPlatform(JpaPlatformDescription jpaPlatform) { - JpaPlatformDescription old = this.jpaPlatform; - this.jpaPlatform = jpaPlatform; - notifyListeners(PROP_JPA_PLATFORM, old, jpaPlatform); + public void setJpaPlatformConfig(JpaPlatformConfig jpaPlatformConfig) { + JpaPlatformConfig old = this.jpaPlatformConfig; + this.jpaPlatformConfig = jpaPlatformConfig; + notifyListeners(PROP_JPA_PLATFORM, old, jpaPlatformConfig); } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/libprov/JpaUserLibraryProviderInstallOperationConfig.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/libprov/JpaUserLibraryProviderInstallOperationConfig.java index 9f28287e06..d1430cbd76 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/libprov/JpaUserLibraryProviderInstallOperationConfig.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/libprov/JpaUserLibraryProviderInstallOperationConfig.java @@ -11,13 +11,13 @@ package org.eclipse.jpt.jpa.core.internal.libprov; import org.eclipse.jpt.common.core.internal.libprov.JptUserLibraryProviderInstallOperationConfig; import org.eclipse.jpt.jpa.core.libprov.JpaLibraryProviderInstallOperationConfig; -import org.eclipse.jpt.jpa.core.platform.JpaPlatformDescription; +import org.eclipse.jpt.jpa.core.platform.JpaPlatformConfig; public class JpaUserLibraryProviderInstallOperationConfig extends JptUserLibraryProviderInstallOperationConfig implements JpaLibraryProviderInstallOperationConfig { - private JpaPlatformDescription jpaPlatform; + private JpaPlatformConfig jpaPlatformConfig; public JpaUserLibraryProviderInstallOperationConfig() { @@ -25,13 +25,13 @@ public class JpaUserLibraryProviderInstallOperationConfig } - public JpaPlatformDescription getJpaPlatform() { - return this.jpaPlatform; + public JpaPlatformConfig getJpaPlatformConfig() { + return this.jpaPlatformConfig; } - public void setJpaPlatform(JpaPlatformDescription jpaPlatform) { - JpaPlatformDescription old = this.jpaPlatform; - this.jpaPlatform = jpaPlatform; - notifyListeners(PROP_JPA_PLATFORM, old, jpaPlatform); + public void setJpaPlatformConfig(JpaPlatformConfig jpaPlatformConfig) { + JpaPlatformConfig old = this.jpaPlatformConfig; + this.jpaPlatformConfig = jpaPlatformConfig; + notifyListeners(PROP_JPA_PLATFORM, old, jpaPlatformConfig); } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/libval/GenericJpaUserLibraryValidator.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/libval/GenericJpaUserLibraryValidator.java index 49f394a710..f4d780a616 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/libval/GenericJpaUserLibraryValidator.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/libval/GenericJpaUserLibraryValidator.java @@ -9,38 +9,26 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.internal.libval; -import java.util.HashSet; -import java.util.Set; -import org.eclipse.core.runtime.IPath; +import java.util.ArrayList; import org.eclipse.core.runtime.IStatus; -import org.eclipse.jdt.core.IClasspathEntry; -import org.eclipse.jpt.common.core.internal.libval.LibValUtil; +import org.eclipse.jpt.common.core.internal.libval.LibraryValidatorTools; import org.eclipse.jpt.common.core.libprov.JptLibraryProviderInstallOperationConfig; import org.eclipse.jpt.common.core.libval.LibraryValidator; -import org.eclipse.jpt.common.utility.internal.iterables.TransformationIterable; import org.eclipse.jpt.jpa.core.internal.libprov.JpaUserLibraryProviderInstallOperationConfig; import org.eclipse.jpt.jpa.core.jpa2.JpaProject2_0; +import org.eclipse.jpt.jpa.core.jpa2.resource.java.ElementCollection2_0Annotation; +import org.eclipse.jpt.jpa.core.resource.java.EntityAnnotation; public class GenericJpaUserLibraryValidator - implements LibraryValidator { - + implements LibraryValidator +{ public IStatus validate(JptLibraryProviderInstallOperationConfig config) { - JpaUserLibraryProviderInstallOperationConfig jpaConfig - = (JpaUserLibraryProviderInstallOperationConfig) config; - Set<String> classNames = new HashSet<String>(); - classNames.add("javax.persistence.Entity"); //$NON-NLS-1$ + JpaUserLibraryProviderInstallOperationConfig jpaConfig = (JpaUserLibraryProviderInstallOperationConfig) config; + ArrayList<String> classNames = new ArrayList<String>(2); + classNames.add(EntityAnnotation.ANNOTATION_NAME); if (config.getProjectFacetVersion().compareTo(JpaProject2_0.FACET_VERSION) >= 0) { - classNames.add("javax.persistence.ElementCollection"); //$NON-NLS-1$ + classNames.add(ElementCollection2_0Annotation.ANNOTATION_NAME); } - - Iterable<IPath> libraryPaths = - new TransformationIterable<IClasspathEntry, IPath>(jpaConfig.resolve()) { - @Override - protected IPath transform(IClasspathEntry o) { - return o.getPath(); - } - }; - - return LibValUtil.validate(libraryPaths, classNames); + return LibraryValidatorTools.validateClasspathEntries(jpaConfig.resolve(), classNames); } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/operations/OrmFileCreationDataModelProvider.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/operations/OrmFileCreationDataModelProvider.java index 7832df09de..90a1e8dd40 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/operations/OrmFileCreationDataModelProvider.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/operations/OrmFileCreationDataModelProvider.java @@ -15,9 +15,9 @@ import org.eclipse.core.runtime.Status; import org.eclipse.core.runtime.content.IContentType; import org.eclipse.jpt.common.utility.internal.ArrayTools; import org.eclipse.jpt.common.utility.internal.StringTools; -import org.eclipse.jpt.common.utility.internal.iterables.CompositeIterable; -import org.eclipse.jpt.common.utility.internal.iterables.EmptyIterable; -import org.eclipse.jpt.common.utility.internal.iterables.TransformationIterable; +import org.eclipse.jpt.common.utility.internal.iterable.CompositeIterable; +import org.eclipse.jpt.common.utility.internal.iterable.EmptyIterable; +import org.eclipse.jpt.common.utility.internal.iterable.TransformationIterable; import org.eclipse.jpt.jpa.core.JpaPlatform; import org.eclipse.jpt.jpa.core.JpaProject; import org.eclipse.jpt.jpa.core.context.persistence.Persistence; @@ -167,7 +167,7 @@ public class OrmFileCreationDataModelProvider } DataModelPropertyDescriptor persistenceUnitPropertyDescriptor(String persistenceUnitName) { - if (StringTools.stringIsEmpty(persistenceUnitName)) { + if (StringTools.isBlank(persistenceUnitName)) { return new DataModelPropertyDescriptor(null, JptCoreMessages.NONE); } return new DataModelPropertyDescriptor(persistenceUnitName); @@ -214,7 +214,7 @@ public class OrmFileCreationDataModelProvider String projectName = getProject().getName(); String pUnitName = getStringProperty(PERSISTENCE_UNIT); if (addToPUnit) { - if (StringTools.stringIsEmpty(pUnitName)) { + if (StringTools.isBlank(pUnitName)) { return JptJpaCorePlugin.instance().buildErrorStatus(JptCoreMessages.VALIDATE_PERSISTENCE_UNIT_DOES_NOT_SPECIFIED, pUnitName); } if (getPersistenceUnit() == null) { @@ -230,7 +230,7 @@ public class OrmFileCreationDataModelProvider protected PersistenceUnit getPersistenceUnit() { String pUnitName = getStringProperty(PERSISTENCE_UNIT); JpaProject jpaProject = - (StringTools.stringIsEmpty(pUnitName)) ? null : getJpaProject(); + (StringTools.isBlank(pUnitName)) ? null : getJpaProject(); PersistenceXml persistenceXml = (jpaProject == null) ? null : jpaProject.getRootContextNode().getPersistenceXml(); Persistence persistence = diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/platform/InternalJpaPlatformDescription.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/platform/InternalJpaPlatformConfig.java index 48f2b85509..30e6f82b3d 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/platform/InternalJpaPlatformDescription.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/platform/InternalJpaPlatformConfig.java @@ -9,18 +9,18 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.internal.platform; -import org.eclipse.jpt.common.core.internal.utility.XPointTools; -import org.eclipse.jpt.common.utility.internal.StringTools; +import org.eclipse.jpt.common.core.internal.utility.PlatformTools; +import org.eclipse.jpt.common.utility.internal.ObjectTools; import org.eclipse.jpt.jpa.core.JpaPlatform; import org.eclipse.jpt.jpa.core.JpaPlatformFactory; import org.eclipse.jpt.jpa.core.JpaProject; -import org.eclipse.jpt.jpa.core.platform.JpaPlatformDescription; +import org.eclipse.jpt.jpa.core.platform.JpaPlatformConfig; +import org.eclipse.jpt.jpa.core.platform.JpaPlatformGroupConfig; import org.eclipse.jpt.jpa.core.platform.JpaPlatformManager; -import org.eclipse.jpt.jpa.core.platform.JpaPlatformGroupDescription; import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion; -class InternalJpaPlatformDescription - implements JpaPlatformDescription +class InternalJpaPlatformConfig + implements JpaPlatformConfig { private final InternalJpaPlatformManager jpaPlatformManager; private final String id; @@ -28,12 +28,14 @@ class InternalJpaPlatformDescription private final String factoryClassName; private /* final */ IProjectFacetVersion jpaFacetVersion; private /* final */ boolean default_ = false; - private /* final */ InternalJpaPlatformGroupDescription group; + private /* final */ InternalJpaPlatformGroupConfig group; private /* final */ String pluginId; + + // lazily initialized private JpaPlatform jpaPlatform; - InternalJpaPlatformDescription(InternalJpaPlatformManager jpaPlatformManager, String id, String label, String factoryClassName) { + InternalJpaPlatformConfig(InternalJpaPlatformManager jpaPlatformManager, String id, String label, String factoryClassName) { super(); this.jpaPlatformManager = jpaPlatformManager; this.id = id; @@ -76,11 +78,11 @@ class InternalJpaPlatformDescription this.default_ = default_; } - public JpaPlatformGroupDescription getGroupDescription() { + public JpaPlatformGroupConfig getGroupConfig() { return this.group; } - void setGroup(InternalJpaPlatformGroupDescription group) { + void setGroup(InternalJpaPlatformGroupConfig group) { this.group = group; } @@ -105,11 +107,11 @@ class InternalJpaPlatformDescription } private JpaPlatformFactory buildJpaPlatformFactory() { - return XPointTools.instantiate(this.pluginId, this.jpaPlatformManager.getExtensionPointName(), this.factoryClassName, JpaPlatformFactory.class); + return PlatformTools.instantiate(this.pluginId, this.jpaPlatformManager.getExtensionPointName(), this.factoryClassName, JpaPlatformFactory.class); } @Override public String toString() { - return StringTools.buildToStringFor(this, this.label); + return ObjectTools.toString(this, this.label); } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/platform/InternalJpaPlatformGroupDescription.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/platform/InternalJpaPlatformGroupConfig.java index ca48adebd6..096b9c6203 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/platform/InternalJpaPlatformGroupDescription.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/platform/InternalJpaPlatformGroupConfig.java @@ -10,25 +10,25 @@ package org.eclipse.jpt.jpa.core.internal.platform; import java.util.ArrayList; -import org.eclipse.jpt.common.utility.internal.StringTools; -import org.eclipse.jpt.common.utility.internal.iterables.SuperIterableWrapper; -import org.eclipse.jpt.jpa.core.platform.JpaPlatformDescription; +import org.eclipse.jpt.common.utility.internal.ObjectTools; +import org.eclipse.jpt.common.utility.internal.iterable.SuperIterableWrapper; +import org.eclipse.jpt.jpa.core.platform.JpaPlatformConfig; +import org.eclipse.jpt.jpa.core.platform.JpaPlatformGroupConfig; import org.eclipse.jpt.jpa.core.platform.JpaPlatformManager; -import org.eclipse.jpt.jpa.core.platform.JpaPlatformGroupDescription; -class InternalJpaPlatformGroupDescription - implements JpaPlatformGroupDescription +class InternalJpaPlatformGroupConfig + implements JpaPlatformGroupConfig { private final InternalJpaPlatformManager jpaPlatformManager; private final String id; private final String label; - private String pluginId; + private /* final */ String pluginId; // not sure why we hold these... - private ArrayList<InternalJpaPlatformDescription> platformDescriptions = new ArrayList<InternalJpaPlatformDescription>(); + private ArrayList<InternalJpaPlatformConfig> platformConfigs = new ArrayList<InternalJpaPlatformConfig>(); - InternalJpaPlatformGroupDescription(InternalJpaPlatformManager jpaPlatformManager, String id, String label) { + InternalJpaPlatformGroupConfig(InternalJpaPlatformManager jpaPlatformManager, String id, String label) { super(); this.jpaPlatformManager = jpaPlatformManager; this.id = id; @@ -55,16 +55,16 @@ class InternalJpaPlatformGroupDescription return this.pluginId; } - void addPlatform(InternalJpaPlatformDescription platform) { - this.platformDescriptions.add(platform); + void addPlatform(InternalJpaPlatformConfig platform) { + this.platformConfigs.add(platform); } - public Iterable<JpaPlatformDescription> getJpaPlatformDescriptions() { - return new SuperIterableWrapper<JpaPlatformDescription>(this.platformDescriptions); + public Iterable<JpaPlatformConfig> getJpaPlatformConfigs() { + return new SuperIterableWrapper<JpaPlatformConfig>(this.platformConfigs); } @Override public String toString() { - return StringTools.buildToStringFor(this, this.label); + return ObjectTools.toString(this, this.label); } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/platform/InternalJpaPlatformManager.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/platform/InternalJpaPlatformManager.java index c47a64e174..06af263ad3 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/platform/InternalJpaPlatformManager.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/platform/InternalJpaPlatformManager.java @@ -19,20 +19,19 @@ import org.eclipse.core.runtime.IExtensionPoint; import org.eclipse.core.runtime.IExtensionRegistry; import org.eclipse.core.runtime.RegistryFactory; import org.eclipse.jpt.common.core.internal.JptCommonCoreMessages; -import org.eclipse.jpt.common.core.internal.utility.XPointTools; -import org.eclipse.jpt.common.utility.Filter; -import org.eclipse.jpt.common.utility.internal.FilterAdapter; -import org.eclipse.jpt.common.utility.internal.StringTools; -import org.eclipse.jpt.common.utility.internal.iterables.FilteringIterable; -import org.eclipse.jpt.common.utility.internal.iterables.SuperIterableWrapper; +import org.eclipse.jpt.common.core.internal.utility.ConfigurationElementTools; +import org.eclipse.jpt.common.utility.filter.Filter; +import org.eclipse.jpt.common.utility.internal.ObjectTools; +import org.eclipse.jpt.common.utility.internal.iterable.FilteringIterable; +import org.eclipse.jpt.common.utility.internal.iterable.SuperIterableWrapper; import org.eclipse.jpt.jpa.core.JpaPlatform; import org.eclipse.jpt.jpa.core.JpaProject; import org.eclipse.jpt.jpa.core.JpaWorkspace; import org.eclipse.jpt.jpa.core.internal.InternalJpaWorkspace; import org.eclipse.jpt.jpa.core.internal.JptCoreMessages; import org.eclipse.jpt.jpa.core.internal.plugin.JptJpaCorePlugin; -import org.eclipse.jpt.jpa.core.platform.JpaPlatformDescription; -import org.eclipse.jpt.jpa.core.platform.JpaPlatformGroupDescription; +import org.eclipse.jpt.jpa.core.platform.JpaPlatformConfig; +import org.eclipse.jpt.jpa.core.platform.JpaPlatformGroupConfig; import org.eclipse.jpt.jpa.core.platform.JpaPlatformManager; import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion; @@ -43,21 +42,21 @@ public class InternalJpaPlatformManager implements JpaPlatformManager { /** - * The JPA platform description manager's JPA workspace. + * The JPA platform manager's JPA workspace. */ private final InternalJpaWorkspace jpaWorkspace; /** - * The JPA platform group descriptions, keyed by ID. + * The JPA platform group configs, keyed by ID. * Initialized during construction. */ - private final HashMap<String, InternalJpaPlatformGroupDescription> jpaPlatformGroupDescriptions = new HashMap<String, InternalJpaPlatformGroupDescription>(); + private final HashMap<String, InternalJpaPlatformGroupConfig> jpaPlatformGroupConfigs = new HashMap<String, InternalJpaPlatformGroupConfig>(); /** - * The JPA platform descriptions, keyed by ID. + * The JPA platform configs, keyed by ID. * Initialized during construction. */ - private final HashMap<String, InternalJpaPlatformDescription> jpaPlatformDescriptions = new HashMap<String, InternalJpaPlatformDescription>(); + private final HashMap<String, InternalJpaPlatformConfig> jpaPlatformConfigs = new HashMap<String, InternalJpaPlatformConfig>(); // ********** extension point element and attribute names ********** @@ -89,7 +88,7 @@ public class InternalJpaPlatformManager private void initialize() { IExtensionPoint extensionPoint = this.getExtensionPoint(); if (extensionPoint == null) { - throw new IllegalStateException(); + throw new IllegalStateException("missing extension point: " + this.getExtensionPointName()); //$NON-NLS-1$ } ArrayList<IConfigurationElement> jpaPlatformGroupElements = new ArrayList<IConfigurationElement>(); @@ -109,25 +108,25 @@ public class InternalJpaPlatformManager // build the groups first so the platforms can be added as they are built for (IConfigurationElement element : jpaPlatformGroupElements) { - InternalJpaPlatformGroupDescription desc = this.buildPlatformGroupDescription(element); - if (desc != null) { - this.jpaPlatformGroupDescriptions.put(desc.getId(), desc); + InternalJpaPlatformGroupConfig config = this.buildPlatformGroupConfig(element); + if (config != null) { + this.jpaPlatformGroupConfigs.put(config.getId(), config); } } for (IConfigurationElement element : jpaPlatformElements) { - InternalJpaPlatformDescription desc = this.buildPlatformDescription(element); - if (desc != null) { - this.jpaPlatformDescriptions.put(desc.getId(), desc); + InternalJpaPlatformConfig config = this.buildPlatformConfig(element); + if (config != null) { + this.jpaPlatformConfigs.put(config.getId(), config); } } } /** * Return <code>null</code> if there is any sort of problem building a - * group description from the specified configuration element. + * group config from the specified configuration element. */ - private InternalJpaPlatformGroupDescription buildPlatformGroupDescription(IConfigurationElement element) { + private InternalJpaPlatformGroupConfig buildPlatformGroupConfig(IConfigurationElement element) { String contributor = element.getContributor().getName(); // id String id = element.getAttribute(ID_ATTRIBUTE); @@ -135,7 +134,7 @@ public class InternalJpaPlatformManager this.logMissingAttribute(element, ID_ATTRIBUTE); return null; } - if (this.jpaPlatformGroupDescriptions.containsKey(id)) { + if (this.jpaPlatformGroupConfigs.containsKey(id)) { this.logError(JptCommonCoreMessages.REGISTRY_DUPLICATE, this.getExtensionPointName(), contributor, ID_ATTRIBUTE, id); return null; // drop any duplicate platform groups } @@ -147,16 +146,16 @@ public class InternalJpaPlatformManager return null; } - InternalJpaPlatformGroupDescription desc = new InternalJpaPlatformGroupDescription(this, id, label); - desc.setPluginId(contributor); - return desc; + InternalJpaPlatformGroupConfig config = new InternalJpaPlatformGroupConfig(this, id, label); + config.setPluginId(contributor); + return config; } /** * Return <code>null</code> if there is any sort of problem building a - * platform description from the specified configuration element. + * platform config from the specified configuration element. */ - private InternalJpaPlatformDescription buildPlatformDescription(IConfigurationElement element) { + private InternalJpaPlatformConfig buildPlatformConfig(IConfigurationElement element) { String contributor = element.getContributor().getName(); // id String id = element.getAttribute(ID_ATTRIBUTE); @@ -164,7 +163,7 @@ public class InternalJpaPlatformManager this.logMissingAttribute(element, ID_ATTRIBUTE); return null; } - if (this.jpaPlatformDescriptions.containsKey(id)) { + if (this.jpaPlatformConfigs.containsKey(id)) { this.logError(JptCommonCoreMessages.REGISTRY_DUPLICATE, this.getExtensionPointName(), contributor, ID_ATTRIBUTE, id); return null; // drop any duplicate platforms } @@ -183,7 +182,7 @@ public class InternalJpaPlatformManager return null; } - InternalJpaPlatformDescription desc = new InternalJpaPlatformDescription(this, id, label, factoryClassName); + InternalJpaPlatformConfig config = new InternalJpaPlatformConfig(this, id, label, factoryClassName); // JPA facet version String jpaFacetVersionString = element.getAttribute(JPA_FACET_VERSION_ATTRIBUTE); @@ -193,7 +192,7 @@ public class InternalJpaPlatformManager this.logInvalidValue(element, JPA_FACET_VERSION_ATTRIBUTE, jpaFacetVersionString); return null; } - desc.setJpaFacetVersion(jpaFacetVersion); + config.setJpaFacetVersion(jpaFacetVersion); } // default @@ -204,23 +203,23 @@ public class InternalJpaPlatformManager this.logInvalidValue(element, DEFAULT_ATTRIBUTE, defaultString); return null; } - desc.setDefault(default_.booleanValue()); + config.setDefault(default_.booleanValue()); } // group String groupID = element.getAttribute(GROUP_ATTRIBUTE); if (groupID != null) { - InternalJpaPlatformGroupDescription group = this.jpaPlatformGroupDescriptions.get(groupID); - if (group == null) { + InternalJpaPlatformGroupConfig groupConfig = this.jpaPlatformGroupConfigs.get(groupID); + if (groupConfig == null) { this.logInvalidValue(element, GROUP_ATTRIBUTE, groupID); return null; // drop any platform with an invalid group(?) } - desc.setGroup(group); - group.addPlatform(desc); + config.setGroup(groupConfig); + groupConfig.addPlatform(config); } - desc.setPluginId(contributor); - return desc; + config.setPluginId(contributor); + return config; } @@ -242,27 +241,27 @@ public class InternalJpaPlatformManager } private void initializeDefaultPreference(IProjectFacetVersion jpaFacetVersion) { - JpaPlatformDescription description = this.buildDefaultJpaPlatformDescription(jpaFacetVersion); - if (description != null) { - this.getPlugin().setDefaultPreference(this.buildDefaultJpaPlatformPreferenceKey(jpaFacetVersion), description.getId()); + JpaPlatformConfig config = this.buildDefaultJpaPlatformConfig(jpaFacetVersion); + if (config != null) { + this.getPlugin().setDefaultPreference(this.buildDefaultJpaPlatformPreferenceKey(jpaFacetVersion), config.getId()); } } /** - * Return the first JPA platform description registered as a default for the + * Return the first JPA platform config registered as a default for the * specified JPA facet version. Return an <em>internal</em> platform - * description if none are registered. Log an error and return + * config if none are registered. Log an error and return * <code>null</code> if the specified JPA facet version is invalid. */ - private JpaPlatformDescription buildDefaultJpaPlatformDescription(IProjectFacetVersion jpaFacetVersion) { - JpaPlatformDescription description = this.selectJpaPlatformDescription(this.getDefaultJpaPlatformDescriptions(), jpaFacetVersion); - if (description != null) { - return description; + private JpaPlatformConfig buildDefaultJpaPlatformConfig(IProjectFacetVersion jpaFacetVersion) { + JpaPlatformConfig config = this.selectJpaPlatformConfig(this.getDefaultJpaPlatformConfigs(), jpaFacetVersion); + if (config != null) { + return config; } - description = this.selectJpaPlatformDescription(this.getInternalJpaPlatformDescriptions(), jpaFacetVersion); - if (description != null) { - return description; + config = this.selectJpaPlatformConfig(this.getInternalJpaPlatformConfigs(), jpaFacetVersion); + if (config != null) { + return config; } this.logError(JptCoreMessages.INVALID_FACET, jpaFacetVersion); @@ -278,7 +277,7 @@ public class InternalJpaPlatformManager * workspace preferences. The keys can calculated by appending the * {@link IProjectFacetVersion#getVersionString() JPA facet version} * to this base. - * @see #getDefaultJpaPlatformDescription(IProjectFacetVersion) + * @see #getDefaultJpaPlatformConfig(IProjectFacetVersion) * @see org.eclipse.jpt.common.core.internal.utility.JptPlugin#getPreference(String) */ private static final String DEFAULT_JPA_PLATFORM_PREF_KEY_BASE = "defaultJpaPlatform_"; //$NON-NLS-1$ @@ -287,126 +286,115 @@ public class InternalJpaPlatformManager // ********** JPA platforms ********** public JpaPlatform getJpaPlatform(String jpaPlatformID) { - InternalJpaPlatformDescription desc = this.jpaPlatformDescriptions.get(jpaPlatformID); - return (desc == null) ? null : desc.getJpaPlatform(); + InternalJpaPlatformConfig config = this.jpaPlatformConfigs.get(jpaPlatformID); + return (config == null) ? null : config.getJpaPlatform(); } - // ********** JPA platform group descriptions ********** + // ********** JPA platform group configs ********** - public Iterable<JpaPlatformGroupDescription> getJpaPlatformGroupDescriptions() { - return new SuperIterableWrapper<JpaPlatformGroupDescription>(this.jpaPlatformGroupDescriptions.values()); + public Iterable<JpaPlatformGroupConfig> getJpaPlatformGroupConfigs() { + return new SuperIterableWrapper<JpaPlatformGroupConfig>(this.jpaPlatformGroupConfigs.values()); } - public JpaPlatformGroupDescription getJpaPlatformGroupDescription(String groupID) { - return this.jpaPlatformGroupDescriptions.get(groupID); + public JpaPlatformGroupConfig getJpaPlatformGroupConfig(String groupID) { + return this.jpaPlatformGroupConfigs.get(groupID); } - // ********** JPA platform descriptions ********** + // ********** JPA platform configs ********** - public Iterable<JpaPlatformDescription> getJpaPlatformDescriptions() { - return new SuperIterableWrapper<JpaPlatformDescription>(this.jpaPlatformDescriptions.values()); + public Iterable<JpaPlatformConfig> getJpaPlatformConfigs() { + return new SuperIterableWrapper<JpaPlatformConfig>(this.jpaPlatformConfigs.values()); } - public JpaPlatformDescription getJpaPlatformDescription(String jpaPlatformID) { - return this.jpaPlatformDescriptions.get(jpaPlatformID); + public JpaPlatformConfig getJpaPlatformConfig(String jpaPlatformID) { + return this.jpaPlatformConfigs.get(jpaPlatformID); } - public Iterable<JpaPlatformDescription> getJpaPlatformDescriptions(IProjectFacetVersion jpaFacetVersion) { - return this.selectJpaPlatformDescriptions(this.getJpaPlatformDescriptions(), jpaFacetVersion); + public Iterable<JpaPlatformConfig> getJpaPlatformConfigs(IProjectFacetVersion jpaFacetVersion) { + return this.selectJpaPlatformConfigs(this.getJpaPlatformConfigs(), jpaFacetVersion); } /** - * Return the first description among those specified that supports the + * Return the first config among those specified that supports the * specified JPA facet version. */ - private JpaPlatformDescription selectJpaPlatformDescription(Iterable<JpaPlatformDescription> descriptions, IProjectFacetVersion jpaFacetVersion) { - Iterator<JpaPlatformDescription> stream = this.selectJpaPlatformDescriptions(descriptions, jpaFacetVersion).iterator(); + private JpaPlatformConfig selectJpaPlatformConfig(Iterable<JpaPlatformConfig> configs, IProjectFacetVersion jpaFacetVersion) { + Iterator<JpaPlatformConfig> stream = this.selectJpaPlatformConfigs(configs, jpaFacetVersion).iterator(); return stream.hasNext() ? stream.next() : null; } /** - * Return the JPA platform descriptions among those specified that support + * Return the JPA platform configs among those specified that support * the specified facet version. */ - private Iterable<JpaPlatformDescription> selectJpaPlatformDescriptions(Iterable<JpaPlatformDescription> descriptions, IProjectFacetVersion jpaFacetVersion) { - return new FilteringIterable<JpaPlatformDescription>(descriptions, this.buildJpaPlatformDescriptionFilter(jpaFacetVersion)); + private Iterable<JpaPlatformConfig> selectJpaPlatformConfigs(Iterable<JpaPlatformConfig> configs, IProjectFacetVersion jpaFacetVersion) { + return new FilteringIterable<JpaPlatformConfig>(configs, this.buildJpaPlatformConfigFilter(jpaFacetVersion)); } - private Filter<JpaPlatformDescription> buildJpaPlatformDescriptionFilter(IProjectFacetVersion jpaFacetVersion) { - return new FacetVersionJpaPlatformDescriptionFilter(jpaFacetVersion); + private Filter<JpaPlatformConfig> buildJpaPlatformConfigFilter(IProjectFacetVersion jpaFacetVersion) { + return new FacetVersionJpaPlatformConfigFilter(jpaFacetVersion); } - /* CU private */ static class FacetVersionJpaPlatformDescriptionFilter - extends FilterAdapter<JpaPlatformDescription> + /* CU private */ static class FacetVersionJpaPlatformConfigFilter + extends Filter.Adapter<JpaPlatformConfig> { private final IProjectFacetVersion jpaFacetVersion; - FacetVersionJpaPlatformDescriptionFilter(IProjectFacetVersion jpaFacetVersion) { + FacetVersionJpaPlatformConfigFilter(IProjectFacetVersion jpaFacetVersion) { super(); this.jpaFacetVersion = jpaFacetVersion; } @Override - public boolean accept(JpaPlatformDescription description) { - return description.supportsJpaFacetVersion(this.jpaFacetVersion); + public boolean accept(JpaPlatformConfig config) { + return config.supportsJpaFacetVersion(this.jpaFacetVersion); } } /** * "Default" platforms (i.e. third-party platforms flagged as "default"). */ - private Iterable<JpaPlatformDescription> getDefaultJpaPlatformDescriptions() { - return new FilteringIterable<JpaPlatformDescription>(this.getJpaPlatformDescriptions(), DEFAULT_JPA_PLATFORM_DESCRIPTION_FILTER); - } - - private static final Filter<JpaPlatformDescription> DEFAULT_JPA_PLATFORM_DESCRIPTION_FILTER = new DefaultJpaPlatformDescriptionFilter(); - - /* CU private */ static class DefaultJpaPlatformDescriptionFilter - extends FilterAdapter<JpaPlatformDescription> - { - @Override - public boolean accept(JpaPlatformDescription desc) { - return desc.isDefault(); - } + private Iterable<JpaPlatformConfig> getDefaultJpaPlatformConfigs() { + return new FilteringIterable<JpaPlatformConfig>(this.getJpaPlatformConfigs(), JpaPlatformConfig.DEFAULT_FILTER); } /** * "Internal" (i.e. Dali-defined generic) platforms. */ - private Iterable<JpaPlatformDescription> getInternalJpaPlatformDescriptions() { - return new FilteringIterable<JpaPlatformDescription>(this.getJpaPlatformDescriptions(), this.buildInternalJpaPlatformDescriptionFilter()); + private Iterable<JpaPlatformConfig> getInternalJpaPlatformConfigs() { + return new FilteringIterable<JpaPlatformConfig>(this.getJpaPlatformConfigs(), this.buildInternalJpaPlatformConfigFilter()); } - private Filter<JpaPlatformDescription> buildInternalJpaPlatformDescriptionFilter() { - return new InternalJpaPlatformDescriptionFilter(this.getPluginID()); + private Filter<JpaPlatformConfig> buildInternalJpaPlatformConfigFilter() { + return new InternalJpaPlatformConfigFilter(this.getPluginID()); } - /* CU private */ static class InternalJpaPlatformDescriptionFilter - extends FilterAdapter<JpaPlatformDescription> + /* CU private */ static class InternalJpaPlatformConfigFilter + extends Filter.Adapter<JpaPlatformConfig> { private final String prefix; - InternalJpaPlatformDescriptionFilter(String prefix) { + InternalJpaPlatformConfigFilter(String prefix) { super(); this.prefix = prefix; } @Override - public boolean accept(JpaPlatformDescription desc) { - return desc.getFactoryClassName().startsWith(this.prefix); + public boolean accept(JpaPlatformConfig config) { + return config.getFactoryClassName().startsWith(this.prefix); } } - // ********** default JPA platform description ********** + // ********** default JPA platform config ********** - public JpaPlatformDescription getDefaultJpaPlatformDescription(IProjectFacetVersion jpaFacetVersion) { + public JpaPlatformConfig getDefaultJpaPlatformConfig(IProjectFacetVersion jpaFacetVersion) { String key = this.buildDefaultJpaPlatformPreferenceKey(jpaFacetVersion); - String platformID = this.getPlugin().getPreference(key); - return (platformID == null) ? null : this.getJpaPlatformDescription(platformID); + String id = this.getPlugin().getPreference(key); + return (id == null) ? null : this.getJpaPlatformConfig(id); } - public void setDefaultJpaPlatformDescription(IProjectFacetVersion jpaFacetVersion, JpaPlatformDescription description) { + public void setDefaultJpaPlatformConfig(IProjectFacetVersion jpaFacetVersion, JpaPlatformConfig config) { String key = this.buildDefaultJpaPlatformPreferenceKey(jpaFacetVersion); - this.getPlugin().setPreference(key, description.getId()); + this.getPlugin().setPreference(key, config.getId()); } @@ -417,11 +405,11 @@ public class InternalJpaPlatformManager } private void logMissingAttribute(IConfigurationElement element, String attributeName) { - this.getPlugin().logError(XPointTools.buildMissingAttributeMessage(element, attributeName)); + this.getPlugin().logError(ConfigurationElementTools.buildMissingAttributeMessage(element, attributeName)); } private void logInvalidValue(IConfigurationElement element, String nodeName, String invalidValue) { - this.getPlugin().logError(XPointTools.buildInvalidValueMessage(element, nodeName, invalidValue)); + this.getPlugin().logError(ConfigurationElementTools.buildInvalidValueMessage(element, nodeName, invalidValue)); } @@ -453,6 +441,6 @@ public class InternalJpaPlatformManager @Override public String toString() { - return StringTools.buildToStringFor(this); + return ObjectTools.toString(this); } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/platform/JavaElementAdapterFactory.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/platform/JavaElementAdapterFactory.java index 49baf5fe73..e6e16caa9c 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/platform/JavaElementAdapterFactory.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/platform/JavaElementAdapterFactory.java @@ -11,11 +11,11 @@ package org.eclipse.jpt.jpa.core.internal.platform; import org.eclipse.core.runtime.IAdapterFactory; import org.eclipse.jdt.core.IJavaElement; -import org.eclipse.jpt.jpa.core.platform.JpaPlatformDescription; +import org.eclipse.jpt.jpa.core.platform.JpaPlatformConfig; /** * Factory to build Dali adapters for an {@link IJavaElement}:<ul> - * <li>{@link JpaPlatformDescription} + * <li>{@link JpaPlatformConfig} * </ul> * See <code>org.eclipse.jpt.jpa.core/plugin.xml:org.eclipse.core.runtime.adapters</code>. */ @@ -23,7 +23,7 @@ public class JavaElementAdapterFactory implements IAdapterFactory { private static final Class<?>[] ADAPTER_LIST = new Class[] { - JpaPlatformDescription.class + JpaPlatformConfig.class }; public Class<?>[] getAdapterList() { @@ -38,8 +38,8 @@ public class JavaElementAdapterFactory } private Object getAdapter(IJavaElement javaElement, Class<?> adapterType) { - if (adapterType == JpaPlatformDescription.class) { - return javaElement.getResource().getAdapter(JpaPlatformDescription.class); + if (adapterType == JpaPlatformConfig.class) { + return javaElement.getResource().getAdapter(JpaPlatformConfig.class); } return null; } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/platform/JpaPlatformDescriptionPropertyTester.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/platform/JpaPlatformConfigPropertyTester.java index 660926dd92..7adde3e5ba 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/platform/JpaPlatformDescriptionPropertyTester.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/platform/JpaPlatformConfigPropertyTester.java @@ -10,47 +10,47 @@ package org.eclipse.jpt.jpa.core.internal.platform; import org.eclipse.core.expressions.PropertyTester; import org.eclipse.core.resources.ResourcesPlugin; -import org.eclipse.jpt.common.utility.internal.Tools; +import org.eclipse.jpt.common.utility.internal.ObjectTools; import org.eclipse.jpt.jpa.core.JpaWorkspace; -import org.eclipse.jpt.jpa.core.platform.JpaPlatformDescription; -import org.eclipse.jpt.jpa.core.platform.JpaPlatformGroupDescription; +import org.eclipse.jpt.jpa.core.platform.JpaPlatformConfig; +import org.eclipse.jpt.jpa.core.platform.JpaPlatformGroupConfig; import org.eclipse.jpt.jpa.core.platform.JpaPlatformManager; /** - * Property tester for {@link JpaPlatformDescription}. + * Property tester for {@link JpaPlatformConfig}. * See <code>org.eclipse.jpt.jpa.core/plugin.xml:org.eclipse.core.expressions.propertyTesters</code> */ -public class JpaPlatformDescriptionPropertyTester +public class JpaPlatformConfigPropertyTester extends PropertyTester { public static final String JPA_PLATFORM = "jpaPlatform"; //$NON-NLS-1$ public static final String JPA_PLATFORM_GROUP = "jpaPlatformGroup"; //$NON-NLS-1$ public boolean test(Object receiver, String property, Object[] args, Object expectedValue) { - if (receiver instanceof JpaPlatformDescription) { - return this.test((JpaPlatformDescription) receiver, property, expectedValue); + if (receiver instanceof JpaPlatformConfig) { + return this.test((JpaPlatformConfig) receiver, property, expectedValue); } return false; } - private boolean test(JpaPlatformDescription platformDescription, String property, Object expectedValue) { + private boolean test(JpaPlatformConfig platformConfig, String property, Object expectedValue) { if (property.equals(JPA_PLATFORM)) { - JpaPlatformDescription expected = this.getJpaPlatformDescription((String) expectedValue); - return Tools.valuesAreEqual(platformDescription, expected); + JpaPlatformConfig expected = this.getJpaPlatformConfig((String) expectedValue); + return ObjectTools.equals(platformConfig, expected); } if (property.equals(JPA_PLATFORM_GROUP)) { - JpaPlatformGroupDescription expected = this.getJpaPlatformGroupDescription((String) expectedValue); - return Tools.valuesAreEqual(platformDescription.getGroupDescription(), expected); + JpaPlatformGroupConfig expected = this.getJpaPlatformGroupConfig((String) expectedValue); + return ObjectTools.equals(platformConfig.getGroupConfig(), expected); } return false; } - private JpaPlatformDescription getJpaPlatformDescription(String id) { - return this.getJpaPlatformManager().getJpaPlatformDescription(id); + private JpaPlatformConfig getJpaPlatformConfig(String id) { + return this.getJpaPlatformManager().getJpaPlatformConfig(id); } - private JpaPlatformGroupDescription getJpaPlatformGroupDescription(String id) { - return this.getJpaPlatformManager().getJpaPlatformGroupDescription(id); + private JpaPlatformGroupConfig getJpaPlatformGroupConfig(String id) { + return this.getJpaPlatformManager().getJpaPlatformGroupConfig(id); } private JpaPlatformManager getJpaPlatformManager() { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/platform/ResourceAdapterFactory.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/platform/ResourceAdapterFactory.java index 1ac6678fa6..df6bbd8a3c 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/platform/ResourceAdapterFactory.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/platform/ResourceAdapterFactory.java @@ -14,12 +14,12 @@ import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.IAdapterFactory; import org.eclipse.jpt.jpa.core.JpaPreferences; import org.eclipse.jpt.jpa.core.JpaWorkspace; -import org.eclipse.jpt.jpa.core.platform.JpaPlatformDescription; +import org.eclipse.jpt.jpa.core.platform.JpaPlatformConfig; import org.eclipse.jpt.jpa.core.platform.JpaPlatformManager; /** * Factory to build Dali adapters for an {@link IResource}:<ul> - * <li>{@link JpaPlatformDescription} + * <li>{@link JpaPlatformConfig} * </ul> * See <code>org.eclipse.jpt.jpa.core/plugin.xml:org.eclipse.core.runtime.adapters</code>. */ @@ -27,7 +27,7 @@ public class ResourceAdapterFactory implements IAdapterFactory { private static final Class<?>[] ADAPTER_LIST = new Class[] { - JpaPlatformDescription.class + JpaPlatformConfig.class }; public Class<?>[] getAdapterList() { @@ -42,14 +42,14 @@ public class ResourceAdapterFactory } private Object getAdapter(IResource resource, Class<?> adapterType) { - if (adapterType == JpaPlatformDescription.class) { - return this.getJpaPlatformDescription(resource); + if (adapterType == JpaPlatformConfig.class) { + return this.getJpaPlatformConfig(resource); } return null; } - private JpaPlatformDescription getJpaPlatformDescription(IResource resource) { - return this.getJpaPlatformManager().getJpaPlatformDescription(JpaPreferences.getJpaPlatformID(resource.getProject())); + private JpaPlatformConfig getJpaPlatformConfig(IResource resource) { + return this.getJpaPlatformManager().getJpaPlatformConfig(JpaPreferences.getJpaPlatformID(resource.getProject())); } private JpaPlatformManager getJpaPlatformManager() { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/plugin/JptJpaCorePlugin.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/plugin/JptJpaCorePlugin.java index dbec6c49f8..871da7e474 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/plugin/JptJpaCorePlugin.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/plugin/JptJpaCorePlugin.java @@ -15,6 +15,9 @@ import org.eclipse.jpt.common.core.internal.utility.JptPlugin; import org.eclipse.jpt.common.utility.internal.StringTools; import org.eclipse.jpt.jpa.core.internal.InternalJpaWorkspace; +/** + * Dali JPA core plug-in. + */ public class JptJpaCorePlugin extends JptPlugin { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/refactoring/AbstractJpaDeleteTypeParticipant.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/refactoring/AbstractJpaDeleteTypeParticipant.java index d4dba75423..95f8ffefef 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/refactoring/AbstractJpaDeleteTypeParticipant.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/refactoring/AbstractJpaDeleteTypeParticipant.java @@ -23,10 +23,10 @@ import org.eclipse.core.runtime.SubMonitor; import org.eclipse.jdt.core.IJavaProject; import org.eclipse.jdt.core.IType; import org.eclipse.jdt.core.JavaModelException; -import org.eclipse.jpt.common.utility.internal.CollectionTools; -import org.eclipse.jpt.common.utility.internal.iterables.CompositeIterable; -import org.eclipse.jpt.common.utility.internal.iterables.FilteringIterable; -import org.eclipse.jpt.common.utility.internal.iterables.TransformationIterable; +import org.eclipse.jpt.common.utility.internal.iterable.CompositeIterable; +import org.eclipse.jpt.common.utility.internal.iterable.FilteringIterable; +import org.eclipse.jpt.common.utility.internal.iterable.IterableTools; +import org.eclipse.jpt.common.utility.internal.iterable.TransformationIterable; import org.eclipse.jpt.jpa.core.JpaProject; import org.eclipse.jpt.jpa.core.JpaProjectManager; import org.eclipse.jpt.jpa.core.context.persistence.MappingFileRef; @@ -112,7 +112,7 @@ public abstract class AbstractJpaDeleteTypeParticipant //we can at least set the subtask and report no progress. Only happens first time getJpaProjectManager() is called. monitor.subTask(JpaCoreRefactoringMessages.JPA_REFACORING_PARTICIPANT_LOADING_JPA_PROJECTS_SUB_TASK_NAME); Iterable<JpaProject> jpaProjects = this.getJpaProjects(); - int size = CollectionTools.size(jpaProjects); + int size = IterableTools.size(jpaProjects); if (size == 0) { return null; } @@ -196,7 +196,7 @@ public abstract class AbstractJpaDeleteTypeParticipant } SubMonitor sm = SubMonitor.convert(monitor, 1 + persistenceUnit.getMappingFileRefsSize()); Iterable<DeleteEdit> edits = this.createPersistenceXmlDeleteEdits(persistenceUnit); - if (!CollectionTools.isEmpty(edits)) { + if (! IterableTools.isEmpty(edits)) { this.persistenceXmlDeleteEdits.put(jpaProject.getPersistenceXmlResource().getFile(), edits); } sm.worked(1); @@ -205,7 +205,7 @@ public abstract class AbstractJpaDeleteTypeParticipant throw new OperationCanceledException(); } Iterable<DeleteEdit> mappingFileDeleteEdits = this.createMappingFileDeleteTypeEdits(mappingFileRef); - if (!CollectionTools.isEmpty(mappingFileDeleteEdits)) { + if (! IterableTools.isEmpty(mappingFileDeleteEdits)) { this.mappingFilePersistentTypeDeleteEdits.put((IFile) mappingFileRef.getMappingFile().getResource(), mappingFileDeleteEdits); } sm.worked(1); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/refactoring/AbstractJpaMoveJavaElementParticipant.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/refactoring/AbstractJpaMoveJavaElementParticipant.java index 9218176a47..13a94f1231 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/refactoring/AbstractJpaMoveJavaElementParticipant.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/refactoring/AbstractJpaMoveJavaElementParticipant.java @@ -20,10 +20,10 @@ import org.eclipse.core.runtime.OperationCanceledException; import org.eclipse.core.runtime.SubMonitor; import org.eclipse.jdt.core.IJavaElement; import org.eclipse.jdt.core.IJavaProject; -import org.eclipse.jpt.common.utility.internal.CollectionTools; -import org.eclipse.jpt.common.utility.internal.iterables.CompositeIterable; -import org.eclipse.jpt.common.utility.internal.iterables.FilteringIterable; -import org.eclipse.jpt.common.utility.internal.iterables.TransformationIterable; +import org.eclipse.jpt.common.utility.internal.iterable.CompositeIterable; +import org.eclipse.jpt.common.utility.internal.iterable.FilteringIterable; +import org.eclipse.jpt.common.utility.internal.iterable.IterableTools; +import org.eclipse.jpt.common.utility.internal.iterable.TransformationIterable; import org.eclipse.jpt.jpa.core.JpaProject; import org.eclipse.jpt.jpa.core.JpaProjectManager; import org.eclipse.jpt.jpa.core.context.persistence.MappingFileRef; @@ -109,7 +109,7 @@ public abstract class AbstractJpaMoveJavaElementParticipant public RefactoringStatus checkConditions(IProgressMonitor monitor, CheckConditionsContext context) throws OperationCanceledException { monitor.subTask(JpaCoreRefactoringMessages.JPA_REFACORING_PARTICIPANT_LOADING_JPA_PROJECTS_SUB_TASK_NAME); Iterable<JpaProject> jpaProjects = this.getJpaProjects(); - int size = CollectionTools.size(jpaProjects); + int size = IterableTools.size(jpaProjects); if (size == 0) { return null; } @@ -192,7 +192,7 @@ public abstract class AbstractJpaMoveJavaElementParticipant SubMonitor sm = SubMonitor.convert(monitor, 1 + persistenceUnit.getMappingFileRefsSize()); Iterable<ReplaceEdit> classRefDeleteEdits = this.createPersistenceUnitReplaceEditsCheckClasspath(persistenceUnit); sm.worked(1); - if (!CollectionTools.isEmpty(classRefDeleteEdits)) { + if (!IterableTools.isEmpty(classRefDeleteEdits)) { this.persistenceXmlReplaceEdits.put(jpaProject.getPersistenceXmlResource().getFile(), classRefDeleteEdits); } for (MappingFileRef mappingFileRef : persistenceUnit.getMappingFileRefs()) { @@ -200,7 +200,7 @@ public abstract class AbstractJpaMoveJavaElementParticipant throw new OperationCanceledException(); } Iterable<ReplaceEdit> edits = this.createMappingFileReplaceEditsCheckClasspath(mappingFileRef); - if (!CollectionTools.isEmpty(edits)) { + if (!IterableTools.isEmpty(edits)) { IFile file = (IFile) mappingFileRef.getMappingFile().getResource(); this.mappingFileReplaceEdits.put(file, edits); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/refactoring/AbstractJpaRenameJavaElementParticipant.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/refactoring/AbstractJpaRenameJavaElementParticipant.java index c0c359d164..9967bd0f4e 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/refactoring/AbstractJpaRenameJavaElementParticipant.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/refactoring/AbstractJpaRenameJavaElementParticipant.java @@ -19,8 +19,8 @@ import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.OperationCanceledException; import org.eclipse.core.runtime.SubMonitor; import org.eclipse.jdt.core.IJavaElement; -import org.eclipse.jpt.common.utility.internal.CollectionTools; -import org.eclipse.jpt.common.utility.internal.iterables.EmptyIterable; +import org.eclipse.jpt.common.utility.internal.iterable.EmptyIterable; +import org.eclipse.jpt.common.utility.internal.iterable.IterableTools; import org.eclipse.jpt.jpa.core.JpaProject; import org.eclipse.jpt.jpa.core.JpaProjectManager; import org.eclipse.jpt.jpa.core.context.persistence.MappingFileRef; @@ -89,7 +89,7 @@ public abstract class AbstractJpaRenameJavaElementParticipant public RefactoringStatus checkConditions(IProgressMonitor monitor, CheckConditionsContext context) throws OperationCanceledException { monitor.subTask(JpaCoreRefactoringMessages.JPA_REFACORING_PARTICIPANT_LOADING_JPA_PROJECTS_SUB_TASK_NAME); Iterable<JpaProject> jpaProjects = this.getJpaProjects(); - int size = CollectionTools.size(jpaProjects); + int size = IterableTools.size(jpaProjects); if (size == 0) { return null; } @@ -172,7 +172,7 @@ public abstract class AbstractJpaRenameJavaElementParticipant SubMonitor sm = SubMonitor.convert(monitor, 1 + persistenceUnit.getMappingFileRefsSize()); Iterable<ReplaceEdit> classRefDeleteEdits = this.createPersistenceXmlReplaceEditsCheckClasspath(persistenceUnit); sm.worked(1); - if (!CollectionTools.isEmpty(classRefDeleteEdits)) { + if (!IterableTools.isEmpty(classRefDeleteEdits)) { this.persistenceXmlReplaceEdits.put(jpaProject.getPersistenceXmlResource().getFile(), classRefDeleteEdits); } for (MappingFileRef mappingFileRef : persistenceUnit.getMappingFileRefs()) { @@ -180,7 +180,7 @@ public abstract class AbstractJpaRenameJavaElementParticipant throw new OperationCanceledException(); } Iterable<ReplaceEdit> edits = this.createMappingFileReplaceEditsCheckClasspath(mappingFileRef); - if (!CollectionTools.isEmpty(edits)) { + if (!IterableTools.isEmpty(edits)) { IFile file = (IFile) mappingFileRef.getMappingFile().getResource(); this.mappingFileReplaceEdits.put(file, edits); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/refactoring/JpaDeleteMappingFileParticipant.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/refactoring/JpaDeleteMappingFileParticipant.java index e74c0a9f66..2a282e721b 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/refactoring/JpaDeleteMappingFileParticipant.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/refactoring/JpaDeleteMappingFileParticipant.java @@ -18,9 +18,9 @@ import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.OperationCanceledException; import org.eclipse.core.runtime.SubMonitor; -import org.eclipse.jpt.common.utility.internal.CollectionTools; -import org.eclipse.jpt.common.utility.internal.iterables.CompositeIterable; -import org.eclipse.jpt.common.utility.internal.iterables.TransformationIterable; +import org.eclipse.jpt.common.utility.internal.iterable.CompositeIterable; +import org.eclipse.jpt.common.utility.internal.iterable.IterableTools; +import org.eclipse.jpt.common.utility.internal.iterable.TransformationIterable; import org.eclipse.jpt.jpa.core.JpaProject; import org.eclipse.jpt.jpa.core.JpaProjectManager; import org.eclipse.jpt.jpa.core.context.persistence.Persistence; @@ -108,7 +108,7 @@ public class JpaDeleteMappingFileParticipant //we can at least set the subtask and report no progress. Only happens first time getJpaProjectManager() is called. monitor.subTask(JpaCoreRefactoringMessages.JPA_REFACORING_PARTICIPANT_LOADING_JPA_PROJECTS_SUB_TASK_NAME); Iterable<JpaProject> jpaProjects = this.getJpaProjects(); - int size = CollectionTools.size(jpaProjects); + int size = IterableTools.size(jpaProjects); if (size == 0) { return null; } @@ -150,7 +150,7 @@ public class JpaDeleteMappingFileParticipant return; } Iterable<DeleteEdit> classRefDeleteEdits = this.createSpecifiedMappingFileRefDeleteEdits(persistenceUnit); - if (!CollectionTools.isEmpty(classRefDeleteEdits)) { + if (!IterableTools.isEmpty(classRefDeleteEdits)) { this.persistenceXmlMappingFileDeleteEdits.put(jpaProject.getPersistenceXmlResource().getFile(), classRefDeleteEdits); } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/refactoring/JpaDeletePackageOrFolderParticipant.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/refactoring/JpaDeletePackageOrFolderParticipant.java index afacdc127e..42822f6663 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/refactoring/JpaDeletePackageOrFolderParticipant.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/refactoring/JpaDeletePackageOrFolderParticipant.java @@ -28,10 +28,10 @@ import org.eclipse.jdt.core.IType; import org.eclipse.jdt.core.JavaCore; import org.eclipse.jdt.core.JavaModelException; import org.eclipse.jpt.common.core.internal.utility.JDTTools; -import org.eclipse.jpt.common.utility.internal.Tools; -import org.eclipse.jpt.common.utility.internal.iterables.CompositeIterable; -import org.eclipse.jpt.common.utility.internal.iterables.FilteringIterable; -import org.eclipse.jpt.common.utility.internal.iterables.TransformationIterable; +import org.eclipse.jpt.common.utility.internal.ObjectTools; +import org.eclipse.jpt.common.utility.internal.iterable.CompositeIterable; +import org.eclipse.jpt.common.utility.internal.iterable.FilteringIterable; +import org.eclipse.jpt.common.utility.internal.iterable.TransformationIterable; import org.eclipse.jpt.jpa.core.JpaProject; import org.eclipse.jpt.jpa.core.context.persistence.PersistenceUnit; import org.eclipse.jpt.jpa.core.internal.GenericJpaPlatform; @@ -225,7 +225,7 @@ public class JpaDeletePackageOrFolderParticipant } catch (JavaModelException e) { JptJpaCorePlugin.instance().logError(e); - return Tools.EMPTY_OBJECT_ARRAY; + return ObjectTools.EMPTY_OBJECT_ARRAY; } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/refactoring/JpaMoveFolderParticipant.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/refactoring/JpaMoveFolderParticipant.java index b12bafd9dc..50f4b83aec 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/refactoring/JpaMoveFolderParticipant.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/refactoring/JpaMoveFolderParticipant.java @@ -24,10 +24,10 @@ import org.eclipse.core.runtime.OperationCanceledException; import org.eclipse.core.runtime.SubMonitor; import org.eclipse.jdt.core.IJavaProject; import org.eclipse.jpt.common.core.resource.ProjectResourceLocator; -import org.eclipse.jpt.common.utility.internal.CollectionTools; -import org.eclipse.jpt.common.utility.internal.iterables.CompositeIterable; -import org.eclipse.jpt.common.utility.internal.iterables.FilteringIterable; -import org.eclipse.jpt.common.utility.internal.iterables.TransformationIterable; +import org.eclipse.jpt.common.utility.internal.iterable.CompositeIterable; +import org.eclipse.jpt.common.utility.internal.iterable.FilteringIterable; +import org.eclipse.jpt.common.utility.internal.iterable.IterableTools; +import org.eclipse.jpt.common.utility.internal.iterable.TransformationIterable; import org.eclipse.jpt.jpa.core.JpaProject; import org.eclipse.jpt.jpa.core.JpaProjectManager; import org.eclipse.jpt.jpa.core.context.persistence.Persistence; @@ -118,7 +118,7 @@ public class JpaMoveFolderParticipant //we can at least set the subtask and report no progress. Only happens first time getJpaProjectManager() is called. monitor.subTask(JpaCoreRefactoringMessages.JPA_REFACORING_PARTICIPANT_LOADING_JPA_PROJECTS_SUB_TASK_NAME); Iterable<JpaProject> jpaProjects = this.getJpaProjects(); - int size = CollectionTools.size(jpaProjects); + int size = IterableTools.size(jpaProjects); if (size == 0) { return null; } @@ -160,7 +160,7 @@ public class JpaMoveFolderParticipant return; } Iterable<ReplaceEdit> replaceEdits = this.createPersistenceUnitReplaceEditsCheckClasspath(persistenceUnit); - if (!CollectionTools.isEmpty(replaceEdits)) { + if (!IterableTools.isEmpty(replaceEdits)) { this.persistenceXmlReplaceEdits.put(jpaProject.getPersistenceXmlResource().getFile(), replaceEdits); } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/refactoring/JpaMoveMappingFileParticipant.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/refactoring/JpaMoveMappingFileParticipant.java index 1ec0fba4b9..a5c569a75e 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/refactoring/JpaMoveMappingFileParticipant.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/refactoring/JpaMoveMappingFileParticipant.java @@ -23,10 +23,10 @@ import org.eclipse.core.runtime.OperationCanceledException; import org.eclipse.core.runtime.SubMonitor; import org.eclipse.jdt.core.IJavaProject; import org.eclipse.jpt.common.core.resource.ProjectResourceLocator; -import org.eclipse.jpt.common.utility.internal.CollectionTools; -import org.eclipse.jpt.common.utility.internal.iterables.CompositeIterable; -import org.eclipse.jpt.common.utility.internal.iterables.FilteringIterable; -import org.eclipse.jpt.common.utility.internal.iterables.TransformationIterable; +import org.eclipse.jpt.common.utility.internal.iterable.CompositeIterable; +import org.eclipse.jpt.common.utility.internal.iterable.FilteringIterable; +import org.eclipse.jpt.common.utility.internal.iterable.IterableTools; +import org.eclipse.jpt.common.utility.internal.iterable.TransformationIterable; import org.eclipse.jpt.jpa.core.JpaProject; import org.eclipse.jpt.jpa.core.JpaProjectManager; import org.eclipse.jpt.jpa.core.context.persistence.Persistence; @@ -122,7 +122,7 @@ public class JpaMoveMappingFileParticipant //we can at least set the subtask and report no progress. Only happens first time getJpaProjectManager() is called. monitor.subTask(JpaCoreRefactoringMessages.JPA_REFACORING_PARTICIPANT_LOADING_JPA_PROJECTS_SUB_TASK_NAME); Iterable<JpaProject> jpaProjects = this.getJpaProjects(); - int size = CollectionTools.size(jpaProjects); + int size = IterableTools.size(jpaProjects); if (size == 0) { return null; } @@ -164,7 +164,7 @@ public class JpaMoveMappingFileParticipant return; } Iterable<ReplaceEdit> replaceEdits = this.createPersistenceUnitReplaceEditsCheckClasspath(persistenceUnit); - if (!CollectionTools.isEmpty(replaceEdits)) { + if (!IterableTools.isEmpty(replaceEdits)) { this.persistenceXmlMappingFileReplaceEdits.put(jpaProject.getPersistenceXmlResource().getFile(), replaceEdits); } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/refactoring/JpaRenameFolderParticipant.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/refactoring/JpaRenameFolderParticipant.java index e918e390fc..6324479fb3 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/refactoring/JpaRenameFolderParticipant.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/refactoring/JpaRenameFolderParticipant.java @@ -19,8 +19,8 @@ import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.OperationCanceledException; import org.eclipse.core.runtime.SubMonitor; -import org.eclipse.jpt.common.utility.internal.CollectionTools; -import org.eclipse.jpt.common.utility.internal.iterables.EmptyIterable; +import org.eclipse.jpt.common.utility.internal.iterable.EmptyIterable; +import org.eclipse.jpt.common.utility.internal.iterable.IterableTools; import org.eclipse.jpt.jpa.core.JpaProject; import org.eclipse.jpt.jpa.core.JpaProjectManager; import org.eclipse.jpt.jpa.core.context.persistence.Persistence; @@ -94,7 +94,7 @@ public class JpaRenameFolderParticipant //we can at least set the subtask and report no progress. Only happens first time getJpaProjectManager() is called. monitor.subTask(JpaCoreRefactoringMessages.JPA_REFACORING_PARTICIPANT_LOADING_JPA_PROJECTS_SUB_TASK_NAME); Iterable<JpaProject> jpaProjects = this.getJpaProjects(); - int size = CollectionTools.size(jpaProjects); + int size = IterableTools.size(jpaProjects); if (size == 0) { return null; } @@ -136,7 +136,7 @@ public class JpaRenameFolderParticipant return; } Iterable<ReplaceEdit> replaceEdits = this.createPersistenceUnitReplaceEdits(persistenceUnit); - if (!CollectionTools.isEmpty(replaceEdits)) { + if (!IterableTools.isEmpty(replaceEdits)) { this.persistenceXmlReplaceEdits.put(jpaProject.getPersistenceXmlResource().getFile(), replaceEdits); } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/refactoring/JpaRenameMappingFileParticipant.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/refactoring/JpaRenameMappingFileParticipant.java index 2a113f54b7..5d2e0832d5 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/refactoring/JpaRenameMappingFileParticipant.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/refactoring/JpaRenameMappingFileParticipant.java @@ -18,7 +18,7 @@ import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.OperationCanceledException; import org.eclipse.core.runtime.SubMonitor; -import org.eclipse.jpt.common.utility.internal.CollectionTools; +import org.eclipse.jpt.common.utility.internal.iterable.IterableTools; import org.eclipse.jpt.jpa.core.JpaProject; import org.eclipse.jpt.jpa.core.JpaProjectManager; import org.eclipse.jpt.jpa.core.context.persistence.Persistence; @@ -95,7 +95,7 @@ public class JpaRenameMappingFileParticipant //we can at least set the subtask and report no progress. Only happens first time getJpaProjectManager() is called. monitor.subTask(JpaCoreRefactoringMessages.JPA_REFACORING_PARTICIPANT_LOADING_JPA_PROJECTS_SUB_TASK_NAME); Iterable<JpaProject> jpaProjects = this.getJpaProjects(); - int size = CollectionTools.size(jpaProjects); + int size = IterableTools.size(jpaProjects); if (size == 0) { return null; } @@ -137,7 +137,7 @@ public class JpaRenameMappingFileParticipant return; } Iterable<ReplaceEdit> replaceEdits = this.createMappingFileRefReplaceEdits(persistenceUnit); - if (!CollectionTools.isEmpty(replaceEdits)) { + if (!IterableTools.isEmpty(replaceEdits)) { this.persistenceXmlMappingFileReplaceEdits.put(jpaProject.getPersistenceXmlResource().getFile(), replaceEdits); } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/refactoring/JpaRenameTypeParticipant.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/refactoring/JpaRenameTypeParticipant.java index 390823f456..eb287b77d2 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/refactoring/JpaRenameTypeParticipant.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/refactoring/JpaRenameTypeParticipant.java @@ -13,8 +13,8 @@ import java.util.ArrayList; import java.util.Collection; import org.eclipse.jdt.core.IType; import org.eclipse.jdt.core.JavaModelException; -import org.eclipse.jpt.common.utility.internal.iterables.CompositeIterable; -import org.eclipse.jpt.common.utility.internal.iterables.TransformationIterable; +import org.eclipse.jpt.common.utility.internal.iterable.CompositeIterable; +import org.eclipse.jpt.common.utility.internal.iterable.TransformationIterable; import org.eclipse.jpt.jpa.core.context.persistence.MappingFileRef; import org.eclipse.jpt.jpa.core.context.persistence.PersistenceUnit; import org.eclipse.jpt.jpa.core.internal.plugin.JptJpaCorePlugin; diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/resource/java/NullBaseTableAnnotation.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/resource/java/NullBaseTableAnnotation.java index bb058f59cb..bf160a56ec 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/resource/java/NullBaseTableAnnotation.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/resource/java/NullBaseTableAnnotation.java @@ -12,8 +12,8 @@ package org.eclipse.jpt.jpa.core.internal.resource.java; import org.eclipse.jpt.common.core.internal.resource.java.NullAnnotation; import org.eclipse.jpt.common.core.resource.java.JavaResourceNode; import org.eclipse.jpt.common.core.utility.TextRange; -import org.eclipse.jpt.common.utility.internal.iterables.EmptyListIterable; -import org.eclipse.jpt.common.utility.internal.iterables.ListIterable; +import org.eclipse.jpt.common.utility.internal.iterable.EmptyListIterable; +import org.eclipse.jpt.common.utility.iterable.ListIterable; import org.eclipse.jpt.jpa.core.resource.java.BaseTableAnnotation; import org.eclipse.jpt.jpa.core.resource.java.UniqueConstraintAnnotation; diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/resource/java/NullJoinTableAnnotation.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/resource/java/NullJoinTableAnnotation.java index e1f72c0d31..fc7d9918af 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/resource/java/NullJoinTableAnnotation.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/resource/java/NullJoinTableAnnotation.java @@ -10,8 +10,8 @@ package org.eclipse.jpt.jpa.core.internal.resource.java; import org.eclipse.jpt.common.core.resource.java.JavaResourceNode; -import org.eclipse.jpt.common.utility.internal.iterables.EmptyListIterable; -import org.eclipse.jpt.common.utility.internal.iterables.ListIterable; +import org.eclipse.jpt.common.utility.internal.iterable.EmptyListIterable; +import org.eclipse.jpt.common.utility.iterable.ListIterable; import org.eclipse.jpt.jpa.core.resource.java.JoinColumnAnnotation; import org.eclipse.jpt.jpa.core.resource.java.JoinTableAnnotation; diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/resource/java/binary/BinaryAssociationOverrideAnnotation.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/resource/java/binary/BinaryAssociationOverrideAnnotation.java index e148d63290..9e6f6833ab 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/resource/java/binary/BinaryAssociationOverrideAnnotation.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/resource/java/binary/BinaryAssociationOverrideAnnotation.java @@ -12,8 +12,8 @@ package org.eclipse.jpt.jpa.core.internal.resource.java.binary; import java.util.Vector; import org.eclipse.jdt.core.IAnnotation; import org.eclipse.jpt.common.core.resource.java.JavaResourceNode; -import org.eclipse.jpt.common.utility.internal.iterables.ListIterable; -import org.eclipse.jpt.common.utility.internal.iterables.LiveCloneListIterable; +import org.eclipse.jpt.common.utility.internal.iterable.LiveCloneListIterable; +import org.eclipse.jpt.common.utility.iterable.ListIterable; import org.eclipse.jpt.jpa.core.resource.java.AssociationOverrideAnnotation; import org.eclipse.jpt.jpa.core.resource.java.JPA; import org.eclipse.jpt.jpa.core.resource.java.JoinColumnAnnotation; diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/resource/java/binary/BinaryBaseTableAnnotation.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/resource/java/binary/BinaryBaseTableAnnotation.java index e6a2509ced..6818c0bb0b 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/resource/java/binary/BinaryBaseTableAnnotation.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/resource/java/binary/BinaryBaseTableAnnotation.java @@ -14,8 +14,8 @@ import org.eclipse.jdt.core.IAnnotation; import org.eclipse.jpt.common.core.internal.resource.java.binary.BinaryAnnotation; import org.eclipse.jpt.common.core.resource.java.JavaResourceNode; import org.eclipse.jpt.common.core.utility.TextRange; -import org.eclipse.jpt.common.utility.internal.iterables.ListIterable; -import org.eclipse.jpt.common.utility.internal.iterables.LiveCloneListIterable; +import org.eclipse.jpt.common.utility.internal.iterable.LiveCloneListIterable; +import org.eclipse.jpt.common.utility.iterable.ListIterable; import org.eclipse.jpt.jpa.core.resource.java.BaseTableAnnotation; import org.eclipse.jpt.jpa.core.resource.java.UniqueConstraintAnnotation; diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/resource/java/binary/BinaryJoinTableAnnotation.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/resource/java/binary/BinaryJoinTableAnnotation.java index 1ce1051898..4df37025a4 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/resource/java/binary/BinaryJoinTableAnnotation.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/resource/java/binary/BinaryJoinTableAnnotation.java @@ -12,8 +12,8 @@ package org.eclipse.jpt.jpa.core.internal.resource.java.binary; import java.util.Vector; import org.eclipse.jdt.core.IAnnotation; import org.eclipse.jpt.common.core.resource.java.JavaResourceNode; -import org.eclipse.jpt.common.utility.internal.iterables.ListIterable; -import org.eclipse.jpt.common.utility.internal.iterables.LiveCloneListIterable; +import org.eclipse.jpt.common.utility.internal.iterable.LiveCloneListIterable; +import org.eclipse.jpt.common.utility.iterable.ListIterable; import org.eclipse.jpt.jpa.core.resource.java.JPA; import org.eclipse.jpt.jpa.core.resource.java.JoinColumnAnnotation; import org.eclipse.jpt.jpa.core.resource.java.JoinTableAnnotation; diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/resource/java/binary/BinaryQueryAnnotation.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/resource/java/binary/BinaryQueryAnnotation.java index 54efe0ce0d..c90d7c5fc2 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/resource/java/binary/BinaryQueryAnnotation.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/resource/java/binary/BinaryQueryAnnotation.java @@ -14,8 +14,8 @@ import org.eclipse.jdt.core.IAnnotation; import org.eclipse.jpt.common.core.internal.resource.java.binary.BinaryAnnotation; import org.eclipse.jpt.common.core.resource.java.JavaResourceNode; import org.eclipse.jpt.common.core.utility.TextRange; -import org.eclipse.jpt.common.utility.internal.iterables.ListIterable; -import org.eclipse.jpt.common.utility.internal.iterables.LiveCloneListIterable; +import org.eclipse.jpt.common.utility.internal.iterable.LiveCloneListIterable; +import org.eclipse.jpt.common.utility.iterable.ListIterable; import org.eclipse.jpt.jpa.core.resource.java.QueryAnnotation; import org.eclipse.jpt.jpa.core.resource.java.QueryHintAnnotation; diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/resource/java/binary/BinarySecondaryTableAnnotation.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/resource/java/binary/BinarySecondaryTableAnnotation.java index fce7c76e93..bfc4336bd4 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/resource/java/binary/BinarySecondaryTableAnnotation.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/resource/java/binary/BinarySecondaryTableAnnotation.java @@ -12,8 +12,8 @@ package org.eclipse.jpt.jpa.core.internal.resource.java.binary; import java.util.Vector; import org.eclipse.jdt.core.IAnnotation; import org.eclipse.jpt.common.core.resource.java.JavaResourceNode; -import org.eclipse.jpt.common.utility.internal.iterables.ListIterable; -import org.eclipse.jpt.common.utility.internal.iterables.LiveCloneListIterable; +import org.eclipse.jpt.common.utility.internal.iterable.LiveCloneListIterable; +import org.eclipse.jpt.common.utility.iterable.ListIterable; import org.eclipse.jpt.jpa.core.resource.java.JPA; import org.eclipse.jpt.jpa.core.resource.java.PrimaryKeyJoinColumnAnnotation; import org.eclipse.jpt.jpa.core.resource.java.SecondaryTableAnnotation; diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/resource/java/binary/BinaryTableGeneratorAnnotation.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/resource/java/binary/BinaryTableGeneratorAnnotation.java index 6298c9bec8..f6f6d33489 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/resource/java/binary/BinaryTableGeneratorAnnotation.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/resource/java/binary/BinaryTableGeneratorAnnotation.java @@ -13,8 +13,8 @@ import java.util.Vector; import org.eclipse.jdt.core.IAnnotation; import org.eclipse.jpt.common.core.resource.java.JavaResourceNode; import org.eclipse.jpt.common.core.utility.TextRange; -import org.eclipse.jpt.common.utility.internal.iterables.ListIterable; -import org.eclipse.jpt.common.utility.internal.iterables.LiveCloneListIterable; +import org.eclipse.jpt.common.utility.internal.iterable.LiveCloneListIterable; +import org.eclipse.jpt.common.utility.iterable.ListIterable; import org.eclipse.jpt.jpa.core.resource.java.JPA; import org.eclipse.jpt.jpa.core.resource.java.TableGeneratorAnnotation; import org.eclipse.jpt.jpa.core.resource.java.UniqueConstraintAnnotation; diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/resource/java/binary/BinaryUniqueConstraintAnnotation.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/resource/java/binary/BinaryUniqueConstraintAnnotation.java index 1c3f9ae101..4a3288407c 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/resource/java/binary/BinaryUniqueConstraintAnnotation.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/resource/java/binary/BinaryUniqueConstraintAnnotation.java @@ -13,8 +13,8 @@ import java.util.Vector; import org.eclipse.jdt.core.IAnnotation; import org.eclipse.jpt.common.core.internal.resource.java.binary.BinaryAnnotation; import org.eclipse.jpt.common.core.resource.java.JavaResourceNode; -import org.eclipse.jpt.common.utility.internal.iterables.ListIterable; -import org.eclipse.jpt.common.utility.internal.iterables.LiveCloneListIterable; +import org.eclipse.jpt.common.utility.internal.iterable.LiveCloneListIterable; +import org.eclipse.jpt.common.utility.iterable.ListIterable; import org.eclipse.jpt.jpa.core.resource.java.JPA; import org.eclipse.jpt.jpa.core.resource.java.UniqueConstraintAnnotation; diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/resource/java/source/SourceAssociationOverrideAnnotation.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/resource/java/source/SourceAssociationOverrideAnnotation.java index ef55c77b52..9db898f1e2 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/resource/java/source/SourceAssociationOverrideAnnotation.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/resource/java/source/SourceAssociationOverrideAnnotation.java @@ -20,7 +20,7 @@ import org.eclipse.jpt.common.core.utility.jdt.AnnotationAdapter; import org.eclipse.jpt.common.core.utility.jdt.DeclarationAnnotationAdapter; import org.eclipse.jpt.common.core.utility.jdt.IndexedAnnotationAdapter; import org.eclipse.jpt.common.core.utility.jdt.IndexedDeclarationAnnotationAdapter; -import org.eclipse.jpt.common.utility.internal.iterables.ListIterable; +import org.eclipse.jpt.common.utility.iterable.ListIterable; import org.eclipse.jpt.jpa.core.resource.java.AssociationOverrideAnnotation; import org.eclipse.jpt.jpa.core.resource.java.JPA; import org.eclipse.jpt.jpa.core.resource.java.JoinColumnAnnotation; diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/resource/java/source/SourceBaseTableAnnotation.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/resource/java/source/SourceBaseTableAnnotation.java index 22b265ad7b..9e709201ca 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/resource/java/source/SourceBaseTableAnnotation.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/resource/java/source/SourceBaseTableAnnotation.java @@ -22,7 +22,7 @@ import org.eclipse.jpt.common.core.utility.jdt.AnnotationElementAdapter; import org.eclipse.jpt.common.core.utility.jdt.DeclarationAnnotationAdapter; import org.eclipse.jpt.common.core.utility.jdt.DeclarationAnnotationElementAdapter; import org.eclipse.jpt.common.core.utility.jdt.IndexedDeclarationAnnotationAdapter; -import org.eclipse.jpt.common.utility.internal.iterables.ListIterable; +import org.eclipse.jpt.common.utility.iterable.ListIterable; import org.eclipse.jpt.jpa.core.resource.java.BaseTableAnnotation; import org.eclipse.jpt.jpa.core.resource.java.JPA; import org.eclipse.jpt.jpa.core.resource.java.UniqueConstraintAnnotation; diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/resource/java/source/SourceJoinTableAnnotation.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/resource/java/source/SourceJoinTableAnnotation.java index e6dbfd6854..761ac358ad 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/resource/java/source/SourceJoinTableAnnotation.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/resource/java/source/SourceJoinTableAnnotation.java @@ -18,7 +18,7 @@ import org.eclipse.jpt.common.core.utility.jdt.AnnotatedElement; import org.eclipse.jpt.common.core.utility.jdt.DeclarationAnnotationAdapter; import org.eclipse.jpt.common.core.utility.jdt.DeclarationAnnotationElementAdapter; import org.eclipse.jpt.common.core.utility.jdt.IndexedDeclarationAnnotationAdapter; -import org.eclipse.jpt.common.utility.internal.iterables.ListIterable; +import org.eclipse.jpt.common.utility.iterable.ListIterable; import org.eclipse.jpt.jpa.core.resource.java.JPA; import org.eclipse.jpt.jpa.core.resource.java.JoinColumnAnnotation; import org.eclipse.jpt.jpa.core.resource.java.JoinTableAnnotation; diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/resource/java/source/SourceQueryAnnotation.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/resource/java/source/SourceQueryAnnotation.java index 70d44f1c6e..8dbb8e0bfd 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/resource/java/source/SourceQueryAnnotation.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/resource/java/source/SourceQueryAnnotation.java @@ -19,7 +19,7 @@ import org.eclipse.jpt.common.core.utility.jdt.AnnotationAdapter; import org.eclipse.jpt.common.core.utility.jdt.AnnotationElementAdapter; import org.eclipse.jpt.common.core.utility.jdt.DeclarationAnnotationAdapter; import org.eclipse.jpt.common.core.utility.jdt.DeclarationAnnotationElementAdapter; -import org.eclipse.jpt.common.utility.internal.iterables.ListIterable; +import org.eclipse.jpt.common.utility.iterable.ListIterable; import org.eclipse.jpt.jpa.core.resource.java.QueryAnnotation; import org.eclipse.jpt.jpa.core.resource.java.QueryHintAnnotation; diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/resource/java/source/SourceSecondaryTableAnnotation.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/resource/java/source/SourceSecondaryTableAnnotation.java index cfdf1d4a02..171da53021 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/resource/java/source/SourceSecondaryTableAnnotation.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/resource/java/source/SourceSecondaryTableAnnotation.java @@ -21,7 +21,7 @@ import org.eclipse.jpt.common.core.utility.jdt.DeclarationAnnotationAdapter; import org.eclipse.jpt.common.core.utility.jdt.DeclarationAnnotationElementAdapter; import org.eclipse.jpt.common.core.utility.jdt.IndexedAnnotationAdapter; import org.eclipse.jpt.common.core.utility.jdt.IndexedDeclarationAnnotationAdapter; -import org.eclipse.jpt.common.utility.internal.iterables.ListIterable; +import org.eclipse.jpt.common.utility.iterable.ListIterable; import org.eclipse.jpt.jpa.core.resource.java.JPA; import org.eclipse.jpt.jpa.core.resource.java.PrimaryKeyJoinColumnAnnotation; import org.eclipse.jpt.jpa.core.resource.java.SecondaryTableAnnotation; diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/resource/java/source/SourceTableGeneratorAnnotation.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/resource/java/source/SourceTableGeneratorAnnotation.java index cf236b3801..fee363a92c 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/resource/java/source/SourceTableGeneratorAnnotation.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/resource/java/source/SourceTableGeneratorAnnotation.java @@ -19,7 +19,7 @@ import org.eclipse.jpt.common.core.utility.jdt.AnnotationElementAdapter; import org.eclipse.jpt.common.core.utility.jdt.DeclarationAnnotationAdapter; import org.eclipse.jpt.common.core.utility.jdt.DeclarationAnnotationElementAdapter; import org.eclipse.jpt.common.core.utility.jdt.IndexedDeclarationAnnotationAdapter; -import org.eclipse.jpt.common.utility.internal.iterables.ListIterable; +import org.eclipse.jpt.common.utility.iterable.ListIterable; import org.eclipse.jpt.jpa.core.resource.java.JPA; import org.eclipse.jpt.jpa.core.resource.java.TableGeneratorAnnotation; import org.eclipse.jpt.jpa.core.resource.java.UniqueConstraintAnnotation; diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/resource/java/source/SourceUniqueConstraintAnnotation.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/resource/java/source/SourceUniqueConstraintAnnotation.java index 143cfb6ec8..f783cd626d 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/resource/java/source/SourceUniqueConstraintAnnotation.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/resource/java/source/SourceUniqueConstraintAnnotation.java @@ -25,9 +25,9 @@ import org.eclipse.jpt.common.core.utility.jdt.DeclarationAnnotationAdapter; import org.eclipse.jpt.common.core.utility.jdt.DeclarationAnnotationElementAdapter; import org.eclipse.jpt.common.core.utility.jdt.ExpressionConverter; import org.eclipse.jpt.common.core.utility.jdt.IndexedDeclarationAnnotationAdapter; -import org.eclipse.jpt.common.utility.internal.CollectionTools; -import org.eclipse.jpt.common.utility.internal.iterables.ListIterable; -import org.eclipse.jpt.common.utility.internal.iterables.LiveCloneListIterable; +import org.eclipse.jpt.common.utility.internal.collection.ListTools; +import org.eclipse.jpt.common.utility.internal.iterable.LiveCloneListIterable; +import org.eclipse.jpt.common.utility.iterable.ListIterable; import org.eclipse.jpt.jpa.core.resource.java.JPA; import org.eclipse.jpt.jpa.core.resource.java.UniqueConstraintAnnotation; @@ -94,7 +94,7 @@ public final class SourceUniqueConstraintAnnotation } public void moveColumnName(int targetIndex, int sourceIndex) { - CollectionTools.move(this.columnNames, targetIndex, sourceIndex); + ListTools.move(this.columnNames, targetIndex, sourceIndex); this.writeColumnNames(); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/validation/DefaultJpaValidationMessages.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/validation/DefaultJpaValidationMessages.java index a024860d82..21f715263e 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/validation/DefaultJpaValidationMessages.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/validation/DefaultJpaValidationMessages.java @@ -12,7 +12,7 @@ package org.eclipse.jpt.jpa.core.internal.validation; import org.eclipse.core.resources.IMarker; import org.eclipse.core.resources.IResource; import org.eclipse.jpt.common.core.utility.TextRange; -import org.eclipse.jpt.common.utility.internal.StringTools; +import org.eclipse.jpt.common.utility.internal.ObjectTools; import org.eclipse.jpt.jpa.core.JpaNode; import org.eclipse.jpt.jpa.core.JpaPreferences; import org.eclipse.jpt.jpa.core.internal.plugin.JptJpaCorePlugin; @@ -122,7 +122,7 @@ public class DefaultJpaValidationMessages { @Override public String toString() { - return StringTools.buildToStringFor(this); + return ObjectTools.toString(this); } } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/validation/JpaValidator.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/validation/JpaValidator.java index 9990a753a8..04c4d88316 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/validation/JpaValidator.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/validation/JpaValidator.java @@ -14,7 +14,7 @@ import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IResource; import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.jpt.common.utility.internal.Tools; +import org.eclipse.jpt.common.utility.internal.ObjectTools; import org.eclipse.jpt.jpa.core.JpaPreferences; import org.eclipse.jpt.jpa.core.JpaProject; import org.eclipse.jpt.jpa.core.internal.plugin.JptJpaCorePlugin; @@ -105,7 +105,7 @@ public class JpaValidator for (IMessage message : messages) { // check preferences for IGNORE - if (Tools.valuesAreDifferent(JpaPreferences.getProblemSeverity(project, message.getId()), JpaPreferences.PROBLEM_IGNORE)) { + if (ObjectTools.notEquals(JpaPreferences.getProblemSeverity(project, message.getId()), JpaPreferences.PROBLEM_IGNORE)) { reporter.addMessage(this, message); } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/MetamodelSynchronizer.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/MetamodelSynchronizer.java index d3e6cf1f98..df67b7425f 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/MetamodelSynchronizer.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/MetamodelSynchronizer.java @@ -15,6 +15,7 @@ import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; import org.eclipse.jdt.core.IPackageFragmentRoot; import org.eclipse.jpt.common.core.resource.java.JavaResourceAbstractType; +import org.eclipse.jpt.common.utility.internal.ObjectTools; import org.eclipse.jpt.common.utility.internal.StringTools; import org.eclipse.jpt.jpa.core.jpa2.resource.java.GeneratedAnnotation; import org.eclipse.jpt.jpa.core.jpa2.resource.java.StaticMetamodelAnnotation; @@ -105,7 +106,7 @@ public interface MetamodelSynchronizer { @Override public String toString() { - return StringTools.buildSingletonToString(this); + return ObjectTools.singletonToString(this); } private static final long serialVersionUID = 1L; @@ -169,7 +170,7 @@ public interface MetamodelSynchronizer { if ( ! generatedAnnotation.getValue(0).equals(METAMODEL_GENERATED_ANNOTATION_VALUE)) { return false; } - if (StringTools.stringIsEmpty(generatedAnnotation.getDate())) { + if (StringTools.isBlank(generatedAnnotation.getDate())) { return false; } return true; diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/AttributeMapping2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/AttributeMapping2_0.java index 6c97944a00..8eac73273c 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/AttributeMapping2_0.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/AttributeMapping2_0.java @@ -9,7 +9,7 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.jpa2.context; -import org.eclipse.jpt.common.utility.internal.iterables.ArrayIterable; +import org.eclipse.jpt.common.utility.internal.iterable.ArrayIterable; import org.eclipse.jpt.jpa.core.context.AttributeMapping; /** diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/CollectionMapping2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/CollectionMapping2_0.java index 59cebce3f4..5f98146ff4 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/CollectionMapping2_0.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/CollectionMapping2_0.java @@ -10,7 +10,7 @@ package org.eclipse.jpt.jpa.core.jpa2.context; import org.eclipse.jdt.core.IType; -import org.eclipse.jpt.common.utility.internal.iterables.ListIterable; +import org.eclipse.jpt.common.utility.iterable.ListIterable; import org.eclipse.jpt.jpa.core.context.AttributeOverrideContainer; import org.eclipse.jpt.jpa.core.context.CollectionMapping; import org.eclipse.jpt.jpa.core.context.Column; diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/MetamodelSourceType.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/MetamodelSourceType.java index 7cb565bc25..61cb404391 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/MetamodelSourceType.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/MetamodelSourceType.java @@ -14,7 +14,7 @@ import java.util.Comparator; import java.util.Map; import org.eclipse.core.resources.IFile; import org.eclipse.jpt.common.core.utility.BodySourceWriter; -import org.eclipse.jpt.common.utility.internal.iterables.ListIterable; +import org.eclipse.jpt.common.utility.iterable.ListIterable; import org.eclipse.jpt.jpa.core.JpaProject; import org.eclipse.jpt.jpa.core.context.PersistentType; import org.eclipse.jpt.jpa.core.context.ReadOnlyPersistentAttribute; diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/java/JavaCollectionMapping2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/java/JavaCollectionMapping2_0.java index 79ad5fadef..35d7ee3180 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/java/JavaCollectionMapping2_0.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/java/JavaCollectionMapping2_0.java @@ -9,7 +9,7 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.jpa2.context.java; -import org.eclipse.jpt.common.utility.internal.iterables.ListIterable; +import org.eclipse.jpt.common.utility.iterable.ListIterable; import org.eclipse.jpt.jpa.core.context.java.JavaAttributeOverrideContainer; import org.eclipse.jpt.jpa.core.context.java.JavaJoinColumn; import org.eclipse.jpt.jpa.core.jpa2.context.CollectionMapping2_0; diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/orm/OrmCollectionMapping2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/orm/OrmCollectionMapping2_0.java index 6849f9b727..db608bc070 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/orm/OrmCollectionMapping2_0.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/orm/OrmCollectionMapping2_0.java @@ -9,7 +9,7 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.jpa2.context.orm; -import org.eclipse.jpt.common.utility.internal.iterables.ListIterable; +import org.eclipse.jpt.common.utility.iterable.ListIterable; import org.eclipse.jpt.jpa.core.context.orm.OrmAttributeOverrideContainer; import org.eclipse.jpt.jpa.core.context.orm.OrmJoinColumn; import org.eclipse.jpt.jpa.core.jpa2.context.CollectionMapping2_0; diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/persistence/options/JpaOptions2_0.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/persistence/options/JpaOptions2_0.java index bde433ca8c..0fc8b2566a 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/persistence/options/JpaOptions2_0.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/context/persistence/options/JpaOptions2_0.java @@ -9,7 +9,7 @@ *******************************************************************************/ package org.eclipse.jpt.jpa.core.jpa2.context.persistence.options; -import org.eclipse.jpt.common.utility.internal.iterables.ListIterable; +import org.eclipse.jpt.common.utility.iterable.ListIterable; import org.eclipse.jpt.jpa.core.context.persistence.PersistenceUnitProperties; /** diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/resource/java/GeneratedAnnotation.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/resource/java/GeneratedAnnotation.java index 897d9aad5d..7297611724 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/resource/java/GeneratedAnnotation.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpa2/resource/java/GeneratedAnnotation.java @@ -10,7 +10,7 @@ package org.eclipse.jpt.jpa.core.jpa2.resource.java; import org.eclipse.jpt.common.core.resource.java.Annotation; -import org.eclipse.jpt.common.utility.internal.iterables.ListIterable; +import org.eclipse.jpt.common.utility.iterable.ListIterable; /** * Corresponds to the Java 6 annotation diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpql/JpaJpqlQueryHelper.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpql/JpaJpqlQueryHelper.java index 5fdff81ffd..f07a9fbc63 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpql/JpaJpqlQueryHelper.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpql/JpaJpqlQueryHelper.java @@ -16,7 +16,7 @@ package org.eclipse.jpt.jpa.core.jpql; import java.util.List; import org.eclipse.jpt.common.core.internal.utility.SimpleTextRange; import org.eclipse.jpt.common.core.utility.TextRange; -import org.eclipse.jpt.common.utility.internal.StringTools; +import org.eclipse.jpt.common.utility.internal.ObjectTools; import org.eclipse.jpt.jpa.core.JpaPreferences; import org.eclipse.jpt.jpa.core.JpaProject; import org.eclipse.jpt.jpa.core.context.AttributeMapping; @@ -223,7 +223,7 @@ public abstract class JpaJpqlQueryHelper extends AbstractJPQLQueryHelper { } protected boolean shouldValidate(NamedQuery namedQuery) { - return ! StringTools.stringsAreEqual( + return ObjectTools.notEquals( getValidationPreference(namedQuery), JpaPreferences.PROBLEM_IGNORE); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpql/spi/JavaType.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpql/spi/JavaType.java index d7a167b22a..f2224e48df 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpql/spi/JavaType.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpql/spi/JavaType.java @@ -17,7 +17,7 @@ import java.lang.annotation.Annotation; import java.lang.reflect.Constructor; import java.util.ArrayList; import java.util.Collection; -import org.eclipse.jpt.common.utility.internal.iterables.SnapshotCloneIterable; +import org.eclipse.jpt.common.utility.internal.iterable.SnapshotCloneIterable; import org.eclipse.persistence.jpa.jpql.ExpressionTools; import org.eclipse.persistence.jpa.jpql.TypeHelper; import org.eclipse.persistence.jpa.jpql.spi.IConstructor; diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpql/spi/JavaTypeDeclaration.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpql/spi/JavaTypeDeclaration.java index 419a657094..006c1b0c7c 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpql/spi/JavaTypeDeclaration.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpql/spi/JavaTypeDeclaration.java @@ -93,7 +93,7 @@ public class JavaTypeDeclaration implements ITypeDeclaration { StringBuilder sb = new StringBuilder(); int index = arrayTypeName.indexOf('['); - int dimensionality = (arrayTypeName.length() - index) / 2; + int dimensionality = (arrayTypeName.length() - index) >> 1; String typeName = arrayTypeName.substring(0, index); while (--dimensionality >= 0) { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpql/spi/JpaEntity.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpql/spi/JpaEntity.java index 94b5b25340..4c29b2ac23 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpql/spi/JpaEntity.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpql/spi/JpaEntity.java @@ -15,12 +15,14 @@ package org.eclipse.jpt.jpa.core.jpql.spi; import java.util.HashMap; import java.util.Map; -import org.eclipse.jpt.common.utility.internal.iterables.ListIterable; + +import org.eclipse.jpt.common.utility.iterable.ListIterable; import org.eclipse.jpt.jpa.core.context.AttributeMapping; import org.eclipse.jpt.jpa.core.context.Entity; import org.eclipse.jpt.jpa.core.context.NamedQuery; import org.eclipse.persistence.jpa.jpql.spi.IEntity; import org.eclipse.persistence.jpa.jpql.spi.IManagedTypeVisitor; +import org.eclipse.persistence.jpa.jpql.spi.IMapping; import org.eclipse.persistence.jpa.jpql.spi.IMappingBuilder; import org.eclipse.persistence.jpa.jpql.spi.IQuery; diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpql/spi/JpaManagedType.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpql/spi/JpaManagedType.java index ee3edb9eaf..bf5d611f66 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpql/spi/JpaManagedType.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpql/spi/JpaManagedType.java @@ -15,7 +15,7 @@ package org.eclipse.jpt.jpa.core.jpql.spi; import java.util.HashMap; import java.util.Map; -import org.eclipse.jpt.common.utility.internal.iterables.SnapshotCloneIterable; +import org.eclipse.jpt.common.utility.internal.iterable.SnapshotCloneIterable; import org.eclipse.jpt.jpa.core.context.AttributeMapping; import org.eclipse.jpt.jpa.core.context.TypeMapping; import org.eclipse.persistence.jpa.jpql.spi.IManagedType; diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpql/spi/JpaManagedTypeProvider.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpql/spi/JpaManagedTypeProvider.java index e65adf4a61..87ac48d828 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpql/spi/JpaManagedTypeProvider.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpql/spi/JpaManagedTypeProvider.java @@ -17,7 +17,7 @@ import java.util.Collection; import java.util.HashMap; import java.util.LinkedList; import java.util.Map; -import org.eclipse.jpt.common.utility.internal.iterables.SnapshotCloneIterable; +import org.eclipse.jpt.common.utility.internal.iterable.SnapshotCloneIterable; import org.eclipse.jpt.jpa.core.JpaProject; import org.eclipse.jpt.jpa.core.context.AttributeMapping; import org.eclipse.jpt.jpa.core.context.Embeddable; @@ -31,6 +31,7 @@ import org.eclipse.persistence.jpa.jpql.spi.IEntity; import org.eclipse.persistence.jpa.jpql.spi.IManagedType; import org.eclipse.persistence.jpa.jpql.spi.IManagedTypeProvider; import org.eclipse.persistence.jpa.jpql.spi.IMappedSuperclass; +import org.eclipse.persistence.jpa.jpql.spi.IMapping; import org.eclipse.persistence.jpa.jpql.spi.IMappingBuilder; import org.eclipse.persistence.jpa.jpql.spi.IType; diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpql/spi/JpaMapping.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpql/spi/JpaMapping.java index fa7d4a4cb2..8803eff4be 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpql/spi/JpaMapping.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpql/spi/JpaMapping.java @@ -16,10 +16,11 @@ package org.eclipse.jpt.jpa.core.jpql.spi; import java.lang.annotation.Annotation; import java.util.List; import org.eclipse.jpt.common.core.resource.java.JavaResourceAttribute; -import org.eclipse.jpt.common.utility.internal.CollectionTools; +import org.eclipse.jpt.common.utility.internal.StringBuilderTools; import org.eclipse.jpt.common.utility.internal.StringTools; -import org.eclipse.jpt.common.utility.internal.iterables.EmptyIterable; -import org.eclipse.jpt.common.utility.internal.iterables.TransformationIterable; +import org.eclipse.jpt.common.utility.internal.collection.ListTools; +import org.eclipse.jpt.common.utility.internal.iterable.EmptyIterable; +import org.eclipse.jpt.common.utility.internal.iterable.TransformationIterable; import org.eclipse.jpt.jpa.core.MappingKeys; import org.eclipse.jpt.jpa.core.context.AttributeMapping; import org.eclipse.jpt.jpa.core.context.PersistentAttribute; @@ -93,7 +94,7 @@ public abstract class JpaMapping implements IMapping { protected ITypeDeclaration[] buildGenericTypeDeclarations() { JavaPersistentAttribute javaPersistentAttribute = mapping.getPersistentAttribute().getJavaPersistentAttribute(); JavaResourceAttribute resource = javaPersistentAttribute == null ? null : javaPersistentAttribute.getResourceAttribute(); - List<ITypeDeclaration> declarations = CollectionTools.list(buildGenericTypeDeclarations(resource)); + List<ITypeDeclaration> declarations = ListTools.list(buildGenericTypeDeclarations(resource)); return declarations.toArray(new ITypeDeclaration[declarations.size()]); } @@ -126,14 +127,14 @@ public abstract class JpaMapping implements IMapping { if (mappingType == ELEMENT_COLLECTION) { String targetClass = ((ElementCollectionMapping2_0) mapping).getTargetClass(); - if (StringTools.stringIsNotEmpty(targetClass)) { + if (StringTools.isNotBlank(targetClass)) { return getTypeRepository().getType(targetClass); } } else { String entityName = ((RelationshipMapping) mapping).getTargetEntity(); - if (StringTools.stringIsNotEmpty(entityName)) { + if (StringTools.isNotBlank(entityName)) { IEntity entity = getParent().getProvider().getEntityNamed(entityName); if (entity != null) { return entity.getType(); @@ -361,11 +362,11 @@ public abstract class JpaMapping implements IMapping { @Override public String toString() { StringBuilder sb = new StringBuilder(); - StringTools.appendSimpleToString(sb, this); - sb.append(", name="); + StringBuilderTools.appendHashCodeToString(sb, this); + sb.append(" name="); sb.append(getName()); sb.append(", mappingType="); sb.append(getMappingType()); return sb.toString(); } -} +}
\ No newline at end of file diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpql/spi/JpaNullManagedType.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpql/spi/JpaNullManagedType.java index 0cd54c98a8..f10ad956c4 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpql/spi/JpaNullManagedType.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpql/spi/JpaNullManagedType.java @@ -13,7 +13,7 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.jpql.spi; -import org.eclipse.jpt.common.utility.internal.iterables.EmptyIterable; +import org.eclipse.jpt.common.utility.internal.iterable.EmptyIterable; import org.eclipse.jpt.jpa.core.context.TypeMapping; import org.eclipse.persistence.jpa.jpql.spi.IManagedType; import org.eclipse.persistence.jpa.jpql.spi.IManagedTypeProvider; diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpql/spi/JpaType.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpql/spi/JpaType.java index 92488be98b..607bd6dd57 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpql/spi/JpaType.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpql/spi/JpaType.java @@ -38,8 +38,8 @@ import org.eclipse.jdt.core.dom.IMethodBinding; import org.eclipse.jdt.core.dom.ITypeBinding; import org.eclipse.jdt.core.dom.NodeFinder; import org.eclipse.jpt.common.core.internal.utility.jdt.ASTTools; -import org.eclipse.jpt.common.utility.internal.StringTools; -import org.eclipse.jpt.common.utility.internal.iterables.SnapshotCloneIterable; +import org.eclipse.jpt.common.utility.internal.ObjectTools; +import org.eclipse.jpt.common.utility.internal.iterable.SnapshotCloneIterable; import org.eclipse.jpt.jpa.core.internal.plugin.JptJpaCorePlugin; import org.eclipse.persistence.jpa.jpql.ExpressionTools; import org.eclipse.persistence.jpa.jpql.spi.IConstructor; @@ -431,6 +431,6 @@ public class JpaType implements IJpaType { */ @Override public String toString() { - return StringTools.buildToStringFor(this, typeName); + return ObjectTools.toString(this, typeName); } }
\ No newline at end of file diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpql/spi/JpaTypeRepository.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpql/spi/JpaTypeRepository.java index a6090672c9..d8132cc17b 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpql/spi/JpaTypeRepository.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpql/spi/JpaTypeRepository.java @@ -121,7 +121,7 @@ public class JpaTypeRepository implements ITypeRepository { protected String convertToJavaArrayType(String typeName) { int index = typeName.indexOf("[]"); - int dimensionality = (typeName.length() - index) / 2; + int dimensionality = (typeName.length() - index) >> 1; StringBuilder sb = new StringBuilder(); while (dimensionality-- > 0) { @@ -194,7 +194,7 @@ public class JpaTypeRepository implements ITypeRepository { public IJpaType getEnumType(String enumTypeName) { // Make sure the enum type name is not empty before doing operations over it - if (StringTools.stringIsEmpty(enumTypeName)) { + if (StringTools.isBlank(enumTypeName)) { return null; } @@ -262,7 +262,7 @@ public class JpaTypeRepository implements ITypeRepository { */ public IJpaType getType(String typeName) { - if (StringTools.stringIsEmpty(typeName) || + if (StringTools.isBlank(typeName) || IJpaType.UNRESOLVABLE_TYPE == typeName) { return unresolvableType(); @@ -303,7 +303,7 @@ public class JpaTypeRepository implements ITypeRepository { catch (Exception e) { int index = typeName.indexOf("[]"); - int dimensionality = (typeName.length() - index) / 2; + int dimensionality = (typeName.length() - index) >> 1; type = getType(typeName.substring(0, index)); @@ -358,7 +358,7 @@ public class JpaTypeRepository implements ITypeRepository { catch (Exception e) { int index = typeName.lastIndexOf("["); - int dimensionality = index / 2; + int dimensionality = index >> 1; type = getType(typeName.substring(index, typeName.endsWith(";") ? typeName.length() - 1 : typeName.length())); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpql/spi/SimpleType.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpql/spi/SimpleType.java index afe59f8d1c..827c31d1af 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpql/spi/SimpleType.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/jpql/spi/SimpleType.java @@ -15,7 +15,7 @@ package org.eclipse.jpt.jpa.core.jpql.spi; import java.lang.annotation.Annotation; import org.eclipse.jpt.common.utility.internal.StringTools; -import org.eclipse.jpt.common.utility.internal.iterables.EmptyIterable; +import org.eclipse.jpt.common.utility.internal.iterable.EmptyIterable; import org.eclipse.persistence.jpa.jpql.spi.IConstructor; import org.eclipse.persistence.jpa.jpql.spi.IType; import org.eclipse.persistence.jpa.jpql.spi.ITypeDeclaration; @@ -145,4 +145,4 @@ public class SimpleType implements IJpaType { public String toString() { return typeName; } -}
\ No newline at end of file +} diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/libprov/JpaLibraryProviderInstallOperationConfig.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/libprov/JpaLibraryProviderInstallOperationConfig.java index 9ec2b342ae..639bd55a62 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/libprov/JpaLibraryProviderInstallOperationConfig.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/libprov/JpaLibraryProviderInstallOperationConfig.java @@ -1,21 +1,21 @@ /******************************************************************************* - * Copyright (c) 2010, 2011 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 - * - * Contributors: - * Oracle - initial API and implementation - *******************************************************************************/ + * Copyright (c) 2010, 2012 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. + * + * Contributors: + * Oracle - initial API and implementation + ******************************************************************************/ package org.eclipse.jpt.jpa.core.libprov; import org.eclipse.jpt.common.core.libprov.JptLibraryProviderInstallOperationConfig; -import org.eclipse.jpt.jpa.core.platform.JpaPlatformDescription; +import org.eclipse.jpt.jpa.core.platform.JpaPlatformConfig; public interface JpaLibraryProviderInstallOperationConfig - extends JptLibraryProviderInstallOperationConfig { - + extends JptLibraryProviderInstallOperationConfig +{ /** enablement expression for jpa platform id (String) */ public static final String JPA_PLATFORM_ENABLEMENT_EXP = "jpaPlatform"; //$NON-NLS-1$ @@ -25,7 +25,7 @@ public interface JpaLibraryProviderInstallOperationConfig /** property of all jpa library provider install operation configs */ public static final String PROP_JPA_PLATFORM = "JPA_PLATFORM"; //$NON-NLS-1$ - JpaPlatformDescription getJpaPlatform(); + JpaPlatformConfig getJpaPlatformConfig(); - void setJpaPlatform(JpaPlatformDescription jpaPlatform); + void setJpaPlatformConfig(JpaPlatformConfig jpaPlatformConfig); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/platform/JpaPlatformDescription.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/platform/JpaPlatformConfig.java index ef6a5f186d..24ab60ca6e 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/platform/JpaPlatformDescription.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/platform/JpaPlatformConfig.java @@ -9,6 +9,7 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.platform; +import org.eclipse.jpt.common.utility.filter.Filter; import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion; /** @@ -29,35 +30,35 @@ import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion; * @version 3.0 * @since 3.0 */ -public interface JpaPlatformDescription { +public interface JpaPlatformConfig { /** - * Return the description's manager. + * Return the config's manager. */ JpaPlatformManager getJpaPlatformManager(); /** - * Return the description's extension-supplied ID. - * This is unique among all the JPA platform descriptions. + * Return the config's extension-supplied ID. + * This is unique among all the JPA platform configs. */ String getId(); /** - * Return the description's extension-supplied label. + * Return the config's extension-supplied label. */ String getLabel(); /** - * Return the description's extension-supplied factory class name. + * Return the config's extension-supplied factory class name. * The class must be instantiable and implement the * {@link org.eclipse.jpt.jpa.core.JpaPlatformFactory} interface. */ String getFactoryClassName(); /** - * Return whether the description's JPA platform supports the specified + * Return whether the config's JPA platform supports the specified * JPA facet version. If the extension specifies a JPA facet version, it * must be the same as the specified JPA facet version. If the extension - * does <em>not</em> specify a JPA facet verion, the description's JPA + * does <em>not</em> specify a JPA facet verion, the config's JPA * platform supports all JPA facet versions. * @exception IllegalArgumentException if the specified facet version is * not for a JPA facet @@ -65,20 +66,30 @@ public interface JpaPlatformDescription { boolean supportsJpaFacetVersion(IProjectFacetVersion jpaFacetVersion); /** - * Return whether the description's JPA platform can be used as the default + * Return whether the config's JPA platform can be used as the default * JPA platform for its {@link #supportsJpaFacetVersion(IProjectFacetVersion) * supported JPA facet versions}. */ boolean isDefault(); /** - * Return description's group description. + * Return config's group config. */ - JpaPlatformGroupDescription getGroupDescription(); + JpaPlatformGroupConfig getGroupConfig(); /** * Return the ID of the plug-in that contributed the JPA platform - * description. + * config. */ String getPluginId(); + + Filter<JpaPlatformConfig> DEFAULT_FILTER = new DefaultFilter(); + /* CU private */ static class DefaultFilter + extends Filter.Adapter<JpaPlatformConfig> + { + @Override + public boolean accept(JpaPlatformConfig config) { + return config.isDefault(); + } + } } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/platform/JpaPlatformGroupDescription.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/platform/JpaPlatformGroupConfig.java index 765437ac9b..c8b59edb3a 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/platform/JpaPlatformGroupDescription.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/platform/JpaPlatformGroupConfig.java @@ -27,31 +27,31 @@ package org.eclipse.jpt.jpa.core.platform; * @version 3.0 * @since 3.0 */ -public interface JpaPlatformGroupDescription { +public interface JpaPlatformGroupConfig { /** - * Return the description's manager. + * Return the config's manager. */ JpaPlatformManager getJpaPlatformManager(); /** - * Return the JPA platform group description's extension-supplied ID. - * This is unique among all the JPA platform group descriptions. + * Return the JPA platform group config's extension-supplied ID. + * This is unique among all the JPA platform group configs. */ String getId(); /** - * Return the JPA platform group description's extension-supplied label. + * Return the JPA platform group config's extension-supplied label. */ String getLabel(); /** - * Return the JPA platform descriptions that belong to the group. + * Return the JPA platform configs that belong to the group. */ - Iterable<JpaPlatformDescription> getJpaPlatformDescriptions(); + Iterable<JpaPlatformConfig> getJpaPlatformConfigs(); /** * Return the ID of the plug-in that contributed the JPA platform group - * description. + * config. */ String getPluginId(); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/platform/JpaPlatformManager.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/platform/JpaPlatformManager.java index 5173113de6..2846110938 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/platform/JpaPlatformManager.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/platform/JpaPlatformManager.java @@ -28,7 +28,7 @@ import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion; * will almost certainly be broken (repeatedly) as the API evolves. * * @see JpaPlatform - * @see JpaPlatformDescription + * @see JpaPlatformConfig * @version 3.0 * @since 3.0 */ @@ -47,50 +47,50 @@ public interface JpaPlatformManager { JpaPlatform getJpaPlatform(String jpaPlatformID); - // ********** JPA platform group descriptions ********** + // ********** JPA platform group configs ********** /** - * Return all the JPA platform group descriptions. + * Return all the JPA platform group configs. */ - Iterable<JpaPlatformGroupDescription> getJpaPlatformGroupDescriptions(); + Iterable<JpaPlatformGroupConfig> getJpaPlatformGroupConfigs(); /** - * Return the JPA platform group description for the specified ID. + * Return the JPA platform group config for the specified ID. */ - JpaPlatformGroupDescription getJpaPlatformGroupDescription(String groupID); + JpaPlatformGroupConfig getJpaPlatformGroupConfig(String groupID); - // ********** JPA platform descriptions ********** + // ********** JPA platform configs ********** /** - * Return all the JPA platform descriptions. + * Return all the JPA platform configs. */ - Iterable<JpaPlatformDescription> getJpaPlatformDescriptions(); + Iterable<JpaPlatformConfig> getJpaPlatformConfigs(); /** - * Return the JPA platform description for the specified ID. + * Return the JPA platform config for the specified ID. */ - JpaPlatformDescription getJpaPlatformDescription(String jpaPlatformID); + JpaPlatformConfig getJpaPlatformConfig(String jpaPlatformID); /** - * Return the JPA platform descriptions that support the specified + * Return the JPA platform configs that support the specified * JPA facet version. */ - Iterable<JpaPlatformDescription> getJpaPlatformDescriptions(IProjectFacetVersion jpaFacetVersion); + Iterable<JpaPlatformConfig> getJpaPlatformConfigs(IProjectFacetVersion jpaFacetVersion); - // ********** default JPA platform description ********** + // ********** default JPA platform config ********** /** - * Return the JPA platform description that is the workspace's default for + * Return the JPA platform config that is the workspace's default for * the specified JPA facet version. */ - JpaPlatformDescription getDefaultJpaPlatformDescription(IProjectFacetVersion jpaFacetVersion); + JpaPlatformConfig getDefaultJpaPlatformConfig(IProjectFacetVersion jpaFacetVersion); /** - * Set the workspace's default JPA platform description for the specified + * Set the workspace's default JPA platform config for the specified * JPA facet version. - * @see #getDefaultJpaPlatformDescription(IProjectFacetVersion) + * @see #getDefaultJpaPlatformConfig(IProjectFacetVersion) */ - void setDefaultJpaPlatformDescription(IProjectFacetVersion jpaFacetVersion, JpaPlatformDescription description); + void setDefaultJpaPlatformConfig(IProjectFacetVersion jpaFacetVersion, JpaPlatformConfig config); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/java/AssociationOverrideAnnotation.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/java/AssociationOverrideAnnotation.java index 7e5eedc0c8..733bce63fb 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/java/AssociationOverrideAnnotation.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/java/AssociationOverrideAnnotation.java @@ -9,7 +9,7 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.resource.java; -import org.eclipse.jpt.common.utility.internal.iterables.ListIterable; +import org.eclipse.jpt.common.utility.iterable.ListIterable; /** * Corresponds to the JPA annotation diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/java/BaseTableAnnotation.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/java/BaseTableAnnotation.java index 98cd21ba48..e39b32b3f1 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/java/BaseTableAnnotation.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/java/BaseTableAnnotation.java @@ -11,7 +11,7 @@ package org.eclipse.jpt.jpa.core.resource.java; import org.eclipse.jpt.common.core.resource.java.Annotation; import org.eclipse.jpt.common.core.utility.TextRange; -import org.eclipse.jpt.common.utility.internal.iterables.ListIterable; +import org.eclipse.jpt.common.utility.iterable.ListIterable; /** * Corresponds to the JPA annotations:<code><ul> diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/java/JoinTableAnnotation.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/java/JoinTableAnnotation.java index de6583e7e8..8798f07683 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/java/JoinTableAnnotation.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/java/JoinTableAnnotation.java @@ -9,7 +9,7 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.resource.java; -import org.eclipse.jpt.common.utility.internal.iterables.ListIterable; +import org.eclipse.jpt.common.utility.iterable.ListIterable; /** * Corresponds to the JPA annotation diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/java/QueryAnnotation.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/java/QueryAnnotation.java index dd656c5dee..99b72673d9 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/java/QueryAnnotation.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/java/QueryAnnotation.java @@ -11,7 +11,7 @@ package org.eclipse.jpt.jpa.core.resource.java; import org.eclipse.jpt.common.core.resource.java.NestableAnnotation; import org.eclipse.jpt.common.core.utility.TextRange; -import org.eclipse.jpt.common.utility.internal.iterables.ListIterable; +import org.eclipse.jpt.common.utility.iterable.ListIterable; /** * Common protocol among:<code><ul> diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/java/ReferenceTableAnnotation.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/java/ReferenceTableAnnotation.java index 6b05ea4f72..238079ce2c 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/java/ReferenceTableAnnotation.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/java/ReferenceTableAnnotation.java @@ -9,7 +9,7 @@ ******************************************************************************/ package org.eclipse.jpt.jpa.core.resource.java; -import org.eclipse.jpt.common.utility.internal.iterables.ListIterable; +import org.eclipse.jpt.common.utility.iterable.ListIterable; /** * Corresponds to the JPA annotations:<code><ul> diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/java/SecondaryTableAnnotation.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/java/SecondaryTableAnnotation.java index 5266fff5e2..204fc70dc9 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/java/SecondaryTableAnnotation.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/java/SecondaryTableAnnotation.java @@ -10,7 +10,7 @@ package org.eclipse.jpt.jpa.core.resource.java; import org.eclipse.jpt.common.core.resource.java.NestableAnnotation; -import org.eclipse.jpt.common.utility.internal.iterables.ListIterable; +import org.eclipse.jpt.common.utility.iterable.ListIterable; /** * Corresponds to the JPA annotation diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/java/TableGeneratorAnnotation.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/java/TableGeneratorAnnotation.java index 1668c3b88f..6b5ea8355f 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/java/TableGeneratorAnnotation.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/java/TableGeneratorAnnotation.java @@ -10,7 +10,7 @@ package org.eclipse.jpt.jpa.core.resource.java; import org.eclipse.jpt.common.core.utility.TextRange; -import org.eclipse.jpt.common.utility.internal.iterables.ListIterable; +import org.eclipse.jpt.common.utility.iterable.ListIterable; /** * Corresponds to the JPA annotation diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/java/UniqueConstraintAnnotation.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/java/UniqueConstraintAnnotation.java index c513864085..54e1677928 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/java/UniqueConstraintAnnotation.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/java/UniqueConstraintAnnotation.java @@ -10,7 +10,7 @@ package org.eclipse.jpt.jpa.core.resource.java; import org.eclipse.jpt.common.core.resource.java.NestableAnnotation; -import org.eclipse.jpt.common.utility.internal.iterables.ListIterable; +import org.eclipse.jpt.common.utility.iterable.ListIterable; /** * Corresponds to the JPA annotation diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/Attributes.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/Attributes.java index b05b20bf7e..dff6d699c3 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/Attributes.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/Attributes.java @@ -23,7 +23,7 @@ import org.eclipse.emf.ecore.util.EObjectContainmentEList; import org.eclipse.emf.ecore.util.InternalEList; import org.eclipse.jpt.common.core.internal.utility.translators.SimpleTranslator; import org.eclipse.jpt.common.core.resource.xml.EBaseObjectImpl; -import org.eclipse.jpt.common.utility.internal.CollectionTools; +import org.eclipse.jpt.common.utility.internal.collection.CollectionTools; import org.eclipse.jpt.jpa.core.resource.orm.v2_0.JPA2_0; import org.eclipse.jpt.jpa.core.resource.orm.v2_0.OrmV2_0Package; import org.eclipse.jpt.jpa.core.resource.orm.v2_0.XmlAttributes_2_0; diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/XmlEntityMappings.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/XmlEntityMappings.java index 3ebcb0e982..9f699d30b1 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/XmlEntityMappings.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/orm/XmlEntityMappings.java @@ -27,7 +27,7 @@ import org.eclipse.emf.ecore.util.InternalEList; import org.eclipse.jpt.common.core.internal.utility.translators.SimpleRootTranslator; import org.eclipse.jpt.common.core.resource.xml.ERootObjectImpl; import org.eclipse.jpt.common.core.utility.TextRange; -import org.eclipse.jpt.common.utility.internal.CollectionTools; +import org.eclipse.jpt.common.utility.internal.collection.CollectionTools; import org.eclipse.jpt.jpa.core.internal.plugin.JptJpaCorePlugin; import org.eclipse.jpt.jpa.core.resource.orm.v2_0.JPA2_0; import org.eclipse.text.edits.ReplaceEdit; diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/persistence/XmlJarFileRef.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/persistence/XmlJarFileRef.java index f19862b449..2b0c1de6ff 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/persistence/XmlJarFileRef.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/persistence/XmlJarFileRef.java @@ -205,7 +205,7 @@ public class XmlJarFileRef extends EBaseObjectImpl implements EBaseObject @Override public TextRange getValidationTextRange() { - return (! StringTools.stringIsEmpty(this.fileName)) ? + return (! StringTools.isBlank(this.fileName)) ? getTextTextRange() : super.getValidationTextRange(); } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/persistence/XmlPersistenceUnit.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/persistence/XmlPersistenceUnit.java index 839632947b..413a214e44 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/persistence/XmlPersistenceUnit.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/resource/persistence/XmlPersistenceUnit.java @@ -23,7 +23,7 @@ import org.eclipse.emf.ecore.util.InternalEList; import org.eclipse.jpt.common.core.internal.utility.translators.BooleanTranslator; import org.eclipse.jpt.common.core.internal.utility.translators.SimpleTranslator; import org.eclipse.jpt.common.core.resource.xml.EBaseObjectImpl; -import org.eclipse.jpt.common.utility.internal.CollectionTools; +import org.eclipse.jpt.common.utility.internal.iterable.IterableTools; import org.eclipse.jpt.jpa.core.resource.persistence.v2_0.JPA2_0; import org.eclipse.jpt.jpa.core.resource.persistence.v2_0.PersistenceV2_0Package; import org.eclipse.jpt.jpa.core.resource.persistence.v2_0.XmlPersistenceUnitCachingType_2_0; @@ -1080,7 +1080,7 @@ public class XmlPersistenceUnit extends EBaseObjectImpl implements XmlPersistenc public int getLocationToInsertMappingFileRef() { if (getMappingFiles().size() > 0) { - XmlMappingFileRef mappingFileRef = CollectionTools.last(this.getMappingFiles()); + XmlMappingFileRef mappingFileRef = IterableTools.last(this.getMappingFiles()); return mappingFileRef.getNodeEndOffset(); } |