diff options
author | Brian Vosburgh | 2015-09-23 22:29:57 +0000 |
---|---|---|
committer | Brian Vosburgh | 2015-09-23 22:29:57 +0000 |
commit | 1d62c97e1dada43ee9a58bbc48f540ee34e8a51d (patch) | |
tree | 71387cf45073d7d4d65b10c53f43a4e9b71ef2ca /jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core | |
parent | aaaf2bd5bb576ee318328eab417f32bad0a68b67 (diff) | |
download | webtools.dali-1d62c97e1dada43ee9a58bbc48f540ee34e8a51d.tar.gz webtools.dali-1d62c97e1dada43ee9a58bbc48f540ee34e8a51d.tar.xz webtools.dali-1d62c97e1dada43ee9a58bbc48f540ee34e8a51d.zip |
major rework of collections, stacks, queues, and deques
Diffstat (limited to 'jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core')
5 files changed, 14 insertions, 14 deletions
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/persistence/EclipseLinkPersistenceUnit.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/persistence/EclipseLinkPersistenceUnit.java index 66c734d2bc..902a23f655 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/persistence/EclipseLinkPersistenceUnit.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/context/persistence/EclipseLinkPersistenceUnit.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008, 2013 Oracle. All rights reserved. + * Copyright (c) 2008, 2015 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. @@ -440,7 +440,7 @@ public class EclipseLinkPersistenceUnit * unit's scope, with duplicates removed. */ public Iterable<String> getUniqueConverterNames() { - return CollectionTools.set(this.getNonEmptyConverterNames(), this.getConvertersSize()); + return CollectionTools.hashSet(this.getNonEmptyConverterNames(), this.getConvertersSize()); } protected Iterable<String> getNonEmptyConverterNames() { @@ -460,7 +460,7 @@ public class EclipseLinkPersistenceUnit * @see #buildQueries() */ protected Iterable<EclipseLinkConverter> buildConverters() { - ArrayList<EclipseLinkConverter> result = ListTools.list(this.getMappingFileConverters()); + ArrayList<EclipseLinkConverter> result = ListTools.arrayList(this.getMappingFileConverters()); HashSet<String> mappingFileConverterNames = this.convertToNames(result); HashMap<String, ArrayList<EclipseLinkConverter>> javaConverters = this.mapByName(this.getAllJavaConverters()); @@ -1370,7 +1370,7 @@ public class EclipseLinkPersistenceUnit protected <M extends JpaNamedContextModel> HashMap<String, ArrayList<M>> extractEclipseLinkConvertibleJavaModels(Iterable<M> allJavaModels, Iterable<M> mappingFileModels, EquivalencyAdapter<M> adapter) { HashMap<String, ArrayList<M>> convertibleModels = new HashMap<String, ArrayList<M>>(); - HashSet<String> mappingFileModelNames = this.convertToNames(ListTools.list(mappingFileModels)); + HashSet<String> mappingFileModelNames = this.convertToNames(ListTools.arrayList(mappingFileModels)); HashMap<String, ArrayList<M>> allJavaModelsByName = this.mapByName(allJavaModels); for (Map.Entry<String, ArrayList<M>> entry : allJavaModelsByName.entrySet()) { String javaModelName = entry.getKey(); diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaObjectTypeConverter.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaObjectTypeConverter.java index 5916887d72..ac65fd2c67 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaObjectTypeConverter.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/java/EclipseLinkJavaObjectTypeConverter.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008, 2013 Oracle. All rights reserved. + * Copyright (c) 2008, 2015 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. @@ -299,8 +299,8 @@ public class EclipseLinkJavaObjectTypeConverter protected boolean conversionValuesAreEquivalentTo(EclipseLinkObjectTypeConverter converter) { // get fixed lists of the conversion values - ArrayList<EclipseLinkJavaConversionValue> conversionValues1 = ListTools.list(this.getConversionValues()); - ArrayList<? extends EclipseLinkConversionValue> conversionValues2 = ListTools.list(converter.getConversionValues()); + ArrayList<EclipseLinkJavaConversionValue> conversionValues1 = ListTools.arrayList(this.getConversionValues()); + ArrayList<? extends EclipseLinkConversionValue> conversionValues2 = ListTools.arrayList(converter.getConversionValues()); if (conversionValues1.size() != conversionValues2.size()) { return false; } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmObjectTypeConverter.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmObjectTypeConverter.java index e4c0714a17..8dc5144393 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmObjectTypeConverter.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/orm/EclipseLinkOrmObjectTypeConverter.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008, 2013 Oracle. All rights reserved. + * Copyright (c) 2008, 2015 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. @@ -431,8 +431,8 @@ public class EclipseLinkOrmObjectTypeConverter protected boolean conversionValuesAreEquivalentTo(EclipseLinkObjectTypeConverter converter) { // get fixed lists of the conversion values - ArrayList<EclipseLinkOrmConversionValue> conversionValues1 = ListTools.list(this.getConversionValues()); - ArrayList<? extends EclipseLinkConversionValue> conversionValues2 = ListTools.list(converter.getConversionValues()); + ArrayList<EclipseLinkOrmConversionValue> conversionValues1 = ListTools.arrayList(this.getConversionValues()); + ArrayList<? extends EclipseLinkConversionValue> conversionValues2 = ListTools.arrayList(converter.getConversionValues()); if (conversionValues1.size() != conversionValues2.size()) { return false; } diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/persistence/EclipseLinkCustomization.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/persistence/EclipseLinkCustomization.java index 8cd1d0c61b..a77196bbf6 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/persistence/EclipseLinkCustomization.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/persistence/EclipseLinkCustomization.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008, 2013 Oracle. All rights reserved. + * Copyright (c) 2008, 2015 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. @@ -96,7 +96,7 @@ public class EclipseLinkCustomization } private List<String> buildSessionCustomizers() { - return ListTools.list(this.convertToValues(this.getPropertiesSetWithPrefix(ECLIPSELINK_SESSION_CUSTOMIZER))); + return ListTools.arrayList(this.convertToValues(this.getPropertiesSetWithPrefix(ECLIPSELINK_SESSION_CUSTOMIZER))); } private Iterable<String> convertToValues(Iterable<PersistenceUnit.Property> properties) { diff --git a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/persistence/EclipseLinkPersistenceUnitProperties.java b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/persistence/EclipseLinkPersistenceUnitProperties.java index 97e57fbff9..dbd316c749 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/persistence/EclipseLinkPersistenceUnitProperties.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.eclipselink.core/src/org/eclipse/jpt/jpa/eclipselink/core/internal/context/persistence/EclipseLinkPersistenceUnitProperties.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008, 2011 Oracle. All rights reserved. + * Copyright (c) 2008, 2015 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. @@ -30,7 +30,7 @@ public abstract class EclipseLinkPersistenceUnitProperties extends AbstractPersi // ******** Convenience methods ******** protected Set<PersistenceUnit.Property> getPropertiesSetWithPrefix(String keyPrefix) { - return CollectionTools.set(this.getPersistenceUnit().getPropertiesWithNamePrefix(keyPrefix)); + return CollectionTools.hashSet(this.getPersistenceUnit().getPropertiesWithNamePrefix(keyPrefix)); } /** |