diff options
| author | Brian Vosburgh | 2013-02-08 19:11:57 +0000 |
|---|---|---|
| committer | Brian Vosburgh | 2013-02-11 22:16:15 +0000 |
| commit | 85b37023d0a583652b98613a6b17a0c2795c8440 (patch) | |
| tree | 48f1184c892afe8b7e1005b5300fa20e09b45468 /jaxb/tests | |
| parent | c3766a4031446101b96cf94874d0bdfb8e3da7b8 (diff) | |
| download | webtools.dali-85b37023d0a583652b98613a6b17a0c2795c8440.tar.gz webtools.dali-85b37023d0a583652b98613a6b17a0c2795c8440.tar.xz webtools.dali-85b37023d0a583652b98613a6b17a0c2795c8440.zip | |
remove extra Iterator and Iterable constructors
Diffstat (limited to 'jaxb/tests')
70 files changed, 447 insertions, 446 deletions
diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/GenericContextRootTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/GenericContextRootTests.java index 2d54b88c5f..93932a2733 100644 --- a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/GenericContextRootTests.java +++ b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/GenericContextRootTests.java @@ -30,7 +30,7 @@ import org.eclipse.jpt.common.core.utility.jdt.Member; import org.eclipse.jpt.common.core.utility.jdt.ModifiedDeclaration; import org.eclipse.jpt.common.utility.internal.ArrayTools; import org.eclipse.jpt.common.utility.internal.iterable.IterableTools; -import org.eclipse.jpt.common.utility.internal.iterator.ArrayIterator; +import org.eclipse.jpt.common.utility.internal.iterator.IteratorTools; import org.eclipse.jpt.jaxb.core.context.JaxbPackage; import org.eclipse.jpt.jaxb.core.context.java.JavaClass; import org.eclipse.jpt.jaxb.core.context.java.JavaType; @@ -55,7 +55,7 @@ public class GenericContextRootTests return this.createTestType(new DefaultAnnotationWriter() { @Override public Iterator<String> imports() { - return new ArrayIterator<String>(JAXB.XML_TYPE); + return IteratorTools.iterator(JAXB.XML_TYPE); } @Override public void appendTypeAnnotationTo(StringBuilder sb) { @@ -73,7 +73,7 @@ public class GenericContextRootTests return this.createTestType(new DefaultAnnotationWriter() { @Override public Iterator<String> imports() { - return new ArrayIterator<String>(JAXB.XML_TYPE); + return IteratorTools.iterator(JAXB.XML_TYPE); } @Override public void appendTypeAnnotationTo(StringBuilder sb) { @@ -92,7 +92,7 @@ public class GenericContextRootTests return this.createTestType(new DefaultAnnotationWriter() { @Override public Iterator<String> imports() { - return new ArrayIterator<String>("java.util.List", JAXB.XML_TYPE); + return IteratorTools.iterator("java.util.List", JAXB.XML_TYPE); } @Override public void appendTypeAnnotationTo(StringBuilder sb) { diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/JaxbContextModelTestCase.java b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/JaxbContextModelTestCase.java index 6cbcf51e69..c1ebe0f2d5 100644 --- a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/JaxbContextModelTestCase.java +++ b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/JaxbContextModelTestCase.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2010, 2011 Oracle. All rights reserved. + * Copyright (c) 2010, 2013 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0, which accompanies this distribution * and is available at http://www.eclipse.org/legal/epl-v10.html. @@ -16,7 +16,7 @@ import org.eclipse.jpt.common.core.resource.java.JavaResourceAnnotatedElement; import org.eclipse.jpt.common.core.tests.internal.projects.TestJavaProject; import org.eclipse.jpt.common.core.utility.jdt.AnnotatedElement; import org.eclipse.jpt.common.utility.internal.ObjectTools; -import org.eclipse.jpt.common.utility.internal.iterator.ArrayIterator; +import org.eclipse.jpt.common.utility.internal.iterator.IteratorTools; import org.eclipse.jpt.jaxb.core.context.JaxbContextRoot; import org.eclipse.jpt.jaxb.core.resource.java.JAXB; import org.eclipse.jpt.jaxb.core.tests.internal.JaxbTestCase; @@ -53,7 +53,7 @@ public abstract class JaxbContextModelTestCase return this.createTestType(new DefaultAnnotationWriter() { @Override public Iterator<String> imports() { - return new ArrayIterator<String>(JAXB.XML_TYPE); + return IteratorTools.iterator(JAXB.XML_TYPE); } @Override public void appendTypeAnnotationTo(StringBuilder sb) { @@ -66,7 +66,7 @@ public abstract class JaxbContextModelTestCase return this.createTestType(new DefaultAnnotationWriter() { @Override public Iterator<String> imports() { - return new ArrayIterator<String>(JAXB.XML_REGISTRY); + return IteratorTools.iterator(JAXB.XML_REGISTRY); } @Override public void appendTypeAnnotationTo(StringBuilder sb) { @@ -83,7 +83,7 @@ public abstract class JaxbContextModelTestCase return this.createTestEnum(new DefaultEnumAnnotationWriter() { @Override public Iterator<String> imports() { - return new ArrayIterator<String>(JAXB.XML_TYPE); + return IteratorTools.iterator(JAXB.XML_TYPE); } @Override public void appendEnumAnnotationTo(StringBuilder sb) { diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaAttributeXmlJavaTypeAdapterTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaAttributeXmlJavaTypeAdapterTests.java index 47725c82c2..c29278d18f 100644 --- a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaAttributeXmlJavaTypeAdapterTests.java +++ b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaAttributeXmlJavaTypeAdapterTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2011 Oracle. All rights reserved. + * Copyright (c) 2011, 2013 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0, which accompanies this distribution * and is available at http://www.eclipse.org/legal/epl-v10.html. @@ -18,7 +18,7 @@ import org.eclipse.jpt.common.core.utility.jdt.AnnotatedElement; import org.eclipse.jpt.common.core.utility.jdt.Member; import org.eclipse.jpt.common.core.utility.jdt.ModifiedDeclaration; import org.eclipse.jpt.common.utility.internal.iterable.IterableTools; -import org.eclipse.jpt.common.utility.internal.iterator.ArrayIterator; +import org.eclipse.jpt.common.utility.internal.iterator.IteratorTools; import org.eclipse.jpt.jaxb.core.context.XmlAttributeMapping; import org.eclipse.jpt.jaxb.core.context.XmlJavaTypeAdapter; import org.eclipse.jpt.jaxb.core.context.java.JavaClass; @@ -40,7 +40,7 @@ public class GenericJavaAttributeXmlJavaTypeAdapterTests extends JaxbContextMode return this.createTestType(new DefaultAnnotationWriter() { @Override public Iterator<String> imports() { - return new ArrayIterator<String>(JAXB.XML_TYPE, JAXB.XML_ATTRIBUTE, JAXB.XML_JAVA_TYPE_ADAPTER); + return IteratorTools.iterator(JAXB.XML_TYPE, JAXB.XML_ATTRIBUTE, JAXB.XML_JAVA_TYPE_ADAPTER); } @Override public void appendTypeAnnotationTo(StringBuilder sb) { diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaClassMappingTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaClassMappingTests.java index af9c6638be..6afcdfc34b 100644 --- a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaClassMappingTests.java +++ b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaClassMappingTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2010, 2011 Oracle. All rights reserved. + * Copyright (c) 2010, 2013 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0, which accompanies this distribution * and is available at http://www.eclipse.org/legal/epl-v10.html. @@ -33,7 +33,7 @@ import org.eclipse.jpt.common.core.utility.jdt.Member; import org.eclipse.jpt.common.core.utility.jdt.ModifiedDeclaration; import org.eclipse.jpt.common.utility.internal.ObjectTools; import org.eclipse.jpt.common.utility.internal.iterable.IterableTools; -import org.eclipse.jpt.common.utility.internal.iterator.ArrayIterator; +import org.eclipse.jpt.common.utility.internal.iterator.IteratorTools; import org.eclipse.jpt.jaxb.core.context.JaxbPackageInfo; import org.eclipse.jpt.jaxb.core.context.JaxbPersistentAttribute; import org.eclipse.jpt.jaxb.core.context.TypeKind; @@ -83,7 +83,7 @@ public class GenericJavaClassMappingTests return this.createTestType(new DefaultAnnotationWriter() { @Override public Iterator<String> imports() { - return new ArrayIterator<String>(JAXB.XML_TYPE, JAXB.XML_ACCESS_TYPE, JAXB.XML_ACCESSOR_TYPE); + return IteratorTools.iterator(JAXB.XML_TYPE, JAXB.XML_ACCESS_TYPE, JAXB.XML_ACCESSOR_TYPE); } @Override public void appendTypeAnnotationTo(StringBuilder sb) { @@ -97,7 +97,7 @@ public class GenericJavaClassMappingTests return this.createTestType(new DefaultAnnotationWriter() { @Override public Iterator<String> imports() { - return new ArrayIterator<String>(JAXB.XML_TYPE, JAXB.XML_ACCESS_ORDER, JAXB.XML_ACCESSOR_ORDER); + return IteratorTools.iterator(JAXB.XML_TYPE, JAXB.XML_ACCESS_ORDER, JAXB.XML_ACCESSOR_ORDER); } @Override public void appendTypeAnnotationTo(StringBuilder sb) { diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaElementFactoryMethodTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaElementFactoryMethodTests.java index 93b6557a79..7e5eabde36 100644 --- a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaElementFactoryMethodTests.java +++ b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaElementFactoryMethodTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2010, 2011 Oracle. All rights reserved. + * Copyright (c) 2010, 2013 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0, which accompanies this distribution * and is available at http://www.eclipse.org/legal/epl-v10.html. @@ -17,7 +17,7 @@ import org.eclipse.jpt.common.core.resource.java.JavaResourceMethod; import org.eclipse.jpt.common.core.utility.jdt.AnnotatedElement; import org.eclipse.jpt.common.core.utility.jdt.Member; import org.eclipse.jpt.common.core.utility.jdt.ModifiedDeclaration; -import org.eclipse.jpt.common.utility.internal.iterator.ArrayIterator; +import org.eclipse.jpt.common.utility.internal.iterator.IteratorTools; import org.eclipse.jpt.jaxb.core.context.JaxbElementFactoryMethod; import org.eclipse.jpt.jaxb.core.context.XmlRegistry; import org.eclipse.jpt.jaxb.core.context.java.JavaClass; @@ -38,7 +38,7 @@ public class GenericJavaElementFactoryMethodTests return this.createTestType(PACKAGE_NAME, "ObjectFactory.java", "ObjectFactory", new DefaultAnnotationWriter() { @Override public Iterator<String> imports() { - return new ArrayIterator<String>(JAXB.XML_REGISTRY, JAXB.XML_ELEMENT_DECL, "javax.xml.bind.JAXBElement"); + return IteratorTools.iterator(JAXB.XML_REGISTRY, JAXB.XML_ELEMENT_DECL, "javax.xml.bind.JAXBElement"); } @Override public void appendTypeAnnotationTo(StringBuilder sb) { diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaEnumConstantTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaEnumConstantTests.java index dc9cfeae6d..041fe85c3f 100644 --- a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaEnumConstantTests.java +++ b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaEnumConstantTests.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2010, 2011 Oracle. All rights reserved. + * Copyright (c) 2010, 2013 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0, which accompanies this distribution * and is available at http://www.eclipse.org/legal/epl-v10.html. @@ -19,7 +19,7 @@ import org.eclipse.jpt.common.core.utility.jdt.AnnotatedElement; import org.eclipse.jpt.common.core.utility.jdt.Member; import org.eclipse.jpt.common.core.utility.jdt.ModifiedDeclaration; import org.eclipse.jpt.common.utility.internal.iterable.IterableTools; -import org.eclipse.jpt.common.utility.internal.iterator.ArrayIterator; +import org.eclipse.jpt.common.utility.internal.iterator.IteratorTools; import org.eclipse.jpt.jaxb.core.context.JaxbEnumConstant; import org.eclipse.jpt.jaxb.core.context.JaxbEnumMapping; import org.eclipse.jpt.jaxb.core.context.java.JavaEnum; @@ -40,7 +40,7 @@ public class GenericJavaEnumConstantTests extends JaxbContextModelTestCase return createTestEnum(new DefaultEnumAnnotationWriter() { @Override public Iterator<String> imports() { - return new ArrayIterator<String>(JAXB.XML_TYPE); + return IteratorTools.iterator(JAXB.XML_TYPE); } @Override public void appendEnumAnnotationTo(StringBuilder sb) { diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaRegistryTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaRegistryTests.java index 4025dc22a8..a56cb425fe 100644 --- a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaRegistryTests.java +++ b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaRegistryTests.java @@ -1,9 +1,9 @@ /******************************************************************************* - * Copyright (c) 2010, 2011 Oracle. All rights reserved. + * Copyright (c) 2010, 2013 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0, which accompanies this distribution * and is available at http://www.eclipse.org/legal/epl-v10.html. - * + * * Contributors: * Oracle - initial API and implementation ******************************************************************************/ @@ -24,7 +24,7 @@ import org.eclipse.jpt.common.core.resource.java.JavaResourceType; import org.eclipse.jpt.common.core.utility.jdt.AnnotatedElement; import org.eclipse.jpt.common.core.utility.jdt.Member; import org.eclipse.jpt.common.core.utility.jdt.ModifiedDeclaration; -import org.eclipse.jpt.common.utility.internal.iterator.ArrayIterator; +import org.eclipse.jpt.common.utility.internal.iterator.IteratorTools; import org.eclipse.jpt.jaxb.core.context.JaxbElementFactoryMethod; import org.eclipse.jpt.jaxb.core.context.XmlRegistry; import org.eclipse.jpt.jaxb.core.context.java.JavaClass; @@ -44,7 +44,7 @@ public class GenericJavaRegistryTests extends JaxbContextModelTestCase return this.createTestType(PACKAGE_NAME, "ObjectFactory.java", "ObjectFactory", new DefaultAnnotationWriter() { @Override public Iterator<String> imports() { - return new ArrayIterator<String>(JAXB.XML_REGISTRY, JAXB.XML_ELEMENT_DECL, "javax.xml.bind.JAXBElement"); + return IteratorTools.iterator(JAXB.XML_REGISTRY, JAXB.XML_ELEMENT_DECL, "javax.xml.bind.JAXBElement"); } @Override public void appendTypeAnnotationTo(StringBuilder sb) { diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaTypeXmlJavaTypeAdapterTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaTypeXmlJavaTypeAdapterTests.java index 46b276e20b..49bca72ad6 100644 --- a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaTypeXmlJavaTypeAdapterTests.java +++ b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaTypeXmlJavaTypeAdapterTests.java @@ -1,9 +1,9 @@ /******************************************************************************* - * Copyright (c) 2011 Oracle. All rights reserved. + * Copyright (c) 2011, 2013 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0, which accompanies this distribution * and is available at http://www.eclipse.org/legal/epl-v10.html. - * + * * Contributors: * Oracle - initial API and implementation ******************************************************************************/ @@ -18,7 +18,7 @@ import org.eclipse.jpt.common.core.utility.jdt.AnnotatedElement; import org.eclipse.jpt.common.core.utility.jdt.Member; import org.eclipse.jpt.common.core.utility.jdt.ModifiedDeclaration; import org.eclipse.jpt.common.utility.internal.iterable.IterableTools; -import org.eclipse.jpt.common.utility.internal.iterator.ArrayIterator; +import org.eclipse.jpt.common.utility.internal.iterator.IteratorTools; import org.eclipse.jpt.jaxb.core.context.XmlJavaTypeAdapter; import org.eclipse.jpt.jaxb.core.context.java.JavaClass; import org.eclipse.jpt.jaxb.core.resource.java.JAXB; @@ -38,7 +38,7 @@ public class GenericJavaTypeXmlJavaTypeAdapterTests extends JaxbContextModelTest return this.createTestType(new DefaultAnnotationWriter() { @Override public Iterator<String> imports() { - return new ArrayIterator<String>(JAXB.XML_JAVA_TYPE_ADAPTER); + return IteratorTools.iterator(JAXB.XML_JAVA_TYPE_ADAPTER); } @Override public void appendTypeAnnotationTo(StringBuilder sb) { diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaXmlAdapterTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaXmlAdapterTests.java index c27c1b88d3..f4a7878fd3 100644 --- a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaXmlAdapterTests.java +++ b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaXmlAdapterTests.java @@ -1,12 +1,12 @@ /******************************************************************************* - * Copyright (c) 2011, 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 - *******************************************************************************/ + * Copyright (c) 2011, 2013 Oracle. All rights reserved. + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License v1.0, which accompanies this distribution + * and is available at http://www.eclipse.org/legal/epl-v10.html. + * + * Contributors: + * Oracle - initial API and implementation + ******************************************************************************/ package org.eclipse.jpt.jaxb.core.tests.internal.context.java; import java.util.Iterator; @@ -14,7 +14,7 @@ import org.eclipse.core.runtime.CoreException; import org.eclipse.jdt.core.ICompilationUnit; import org.eclipse.jpt.common.core.tests.internal.projects.TestJavaProject.SourceWriter; import org.eclipse.jpt.common.utility.internal.iterable.IterableTools; -import org.eclipse.jpt.common.utility.internal.iterator.ArrayIterator; +import org.eclipse.jpt.common.utility.internal.iterator.IteratorTools; import org.eclipse.jpt.jaxb.core.context.JaxbPersistentAttribute; import org.eclipse.jpt.jaxb.core.context.XmlAdapter; import org.eclipse.jpt.jaxb.core.context.XmlElementMapping; @@ -38,7 +38,7 @@ public class GenericJavaXmlAdapterTests new DefaultAnnotationWriter() { @Override public Iterator<String> imports() { - return new ArrayIterator<String>(JAXB.XML_TYPE); + return IteratorTools.iterator(JAXB.XML_TYPE); } @Override diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaXmlAnyAttributeMappingTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaXmlAnyAttributeMappingTests.java index aa47bcb605..36a23eaad0 100644 --- a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaXmlAnyAttributeMappingTests.java +++ b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaXmlAnyAttributeMappingTests.java @@ -1,9 +1,9 @@ /******************************************************************************* - * Copyright (c) 2011 Oracle. All rights reserved. + * Copyright (c) 2011, 2013 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0, which accompanies this distribution * and is available at http://www.eclipse.org/legal/epl-v10.html. - * + * * Contributors: * Oracle - initial API and implementation ******************************************************************************/ @@ -16,7 +16,7 @@ import org.eclipse.jpt.common.core.utility.jdt.AnnotatedElement; import org.eclipse.jpt.common.core.utility.jdt.Member; import org.eclipse.jpt.common.core.utility.jdt.ModifiedDeclaration; import org.eclipse.jpt.common.utility.internal.iterable.IterableTools; -import org.eclipse.jpt.common.utility.internal.iterator.ArrayIterator; +import org.eclipse.jpt.common.utility.internal.iterator.IteratorTools; import org.eclipse.jpt.jaxb.core.MappingKeys; import org.eclipse.jpt.jaxb.core.context.JaxbPersistentAttribute; import org.eclipse.jpt.jaxb.core.context.XmlAnyAttributeMapping; @@ -40,7 +40,7 @@ public class GenericJavaXmlAnyAttributeMappingTests extends JaxbContextModelTest return this.createTestType(new DefaultAnnotationWriter() { @Override public Iterator<String> imports() { - return new ArrayIterator<String>(JAXB.XML_TYPE, JAXB.XML_ANY_ATTRIBUTE); + return IteratorTools.iterator(JAXB.XML_TYPE, JAXB.XML_ANY_ATTRIBUTE); } @Override public void appendTypeAnnotationTo(StringBuilder sb) { diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaXmlAnyElementMappingTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaXmlAnyElementMappingTests.java index ea4c508fbf..a3fb6fcf64 100644 --- a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaXmlAnyElementMappingTests.java +++ b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaXmlAnyElementMappingTests.java @@ -1,9 +1,9 @@ /******************************************************************************* - * Copyright (c) 2011 Oracle. All rights reserved. + * Copyright (c) 2011, 2013 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0, which accompanies this distribution * and is available at http://www.eclipse.org/legal/epl-v10.html. - * + * * Contributors: * Oracle - initial API and implementation ******************************************************************************/ @@ -19,7 +19,7 @@ import org.eclipse.jpt.common.core.utility.jdt.AnnotatedElement; import org.eclipse.jpt.common.core.utility.jdt.Member; import org.eclipse.jpt.common.core.utility.jdt.ModifiedDeclaration; import org.eclipse.jpt.common.utility.internal.iterable.IterableTools; -import org.eclipse.jpt.common.utility.internal.iterator.ArrayIterator; +import org.eclipse.jpt.common.utility.internal.iterator.IteratorTools; import org.eclipse.jpt.jaxb.core.MappingKeys; import org.eclipse.jpt.jaxb.core.context.JaxbPersistentAttribute; import org.eclipse.jpt.jaxb.core.context.XmlAnyElementMapping; @@ -48,7 +48,7 @@ public class GenericJavaXmlAnyElementMappingTests extends JaxbContextModelTestCa return this.createTestType(new DefaultAnnotationWriter() { @Override public Iterator<String> imports() { - return new ArrayIterator<String>(JAXB.XML_TYPE, JAXB.XML_ANY_ELEMENT); + return IteratorTools.iterator(JAXB.XML_TYPE, JAXB.XML_ANY_ELEMENT); } @Override public void appendTypeAnnotationTo(StringBuilder sb) { diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaXmlAttributeMappingTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaXmlAttributeMappingTests.java index 80d6471abe..779736b4ae 100644 --- a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaXmlAttributeMappingTests.java +++ b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaXmlAttributeMappingTests.java @@ -1,9 +1,9 @@ /******************************************************************************* - * Copyright (c) 2011 Oracle. All rights reserved. + * Copyright (c) 2011, 2013 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0, which accompanies this distribution * and is available at http://www.eclipse.org/legal/epl-v10.html. - * + * * Contributors: * Oracle - initial API and implementation ******************************************************************************/ @@ -20,7 +20,7 @@ import org.eclipse.jpt.common.core.utility.jdt.AnnotatedElement; import org.eclipse.jpt.common.core.utility.jdt.Member; import org.eclipse.jpt.common.core.utility.jdt.ModifiedDeclaration; import org.eclipse.jpt.common.utility.internal.iterable.IterableTools; -import org.eclipse.jpt.common.utility.internal.iterator.ArrayIterator; +import org.eclipse.jpt.common.utility.internal.iterator.IteratorTools; import org.eclipse.jpt.jaxb.core.MappingKeys; import org.eclipse.jpt.jaxb.core.context.JaxbPersistentAttribute; import org.eclipse.jpt.jaxb.core.context.XmlAttributeMapping; @@ -47,7 +47,7 @@ public class GenericJavaXmlAttributeMappingTests extends JaxbContextModelTestCas return this.createTestType(new DefaultAnnotationWriter() { @Override public Iterator<String> imports() { - return new ArrayIterator<String>(JAXB.XML_TYPE, JAXB.XML_ATTRIBUTE); + return IteratorTools.iterator(JAXB.XML_TYPE, JAXB.XML_ATTRIBUTE); } @Override public void appendTypeAnnotationTo(StringBuilder sb) { diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaXmlElementMappingTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaXmlElementMappingTests.java index d76c1f513a..7b01526fb5 100644 --- a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaXmlElementMappingTests.java +++ b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaXmlElementMappingTests.java @@ -1,9 +1,9 @@ /******************************************************************************* - * Copyright (c) 2011 Oracle. All rights reserved. + * Copyright (c) 2011, 2013 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0, which accompanies this distribution * and is available at http://www.eclipse.org/legal/epl-v10.html. - * + * * Contributors: * Oracle - initial API and implementation ******************************************************************************/ @@ -21,7 +21,7 @@ import org.eclipse.jpt.common.core.utility.jdt.AnnotatedElement; import org.eclipse.jpt.common.core.utility.jdt.Member; import org.eclipse.jpt.common.core.utility.jdt.ModifiedDeclaration; import org.eclipse.jpt.common.utility.internal.iterable.IterableTools; -import org.eclipse.jpt.common.utility.internal.iterator.ArrayIterator; +import org.eclipse.jpt.common.utility.internal.iterator.IteratorTools; import org.eclipse.jpt.jaxb.core.MappingKeys; import org.eclipse.jpt.jaxb.core.context.JaxbPersistentAttribute; import org.eclipse.jpt.jaxb.core.context.XmlAttributeMapping; @@ -50,7 +50,7 @@ public class GenericJavaXmlElementMappingTests extends JaxbContextModelTestCase return this.createTestType(new DefaultAnnotationWriter() { @Override public Iterator<String> imports() { - return new ArrayIterator<String>(JAXB.XML_TYPE, JAXB.XML_ELEMENT); + return IteratorTools.iterator(JAXB.XML_TYPE, JAXB.XML_ELEMENT); } @Override public void appendTypeAnnotationTo(StringBuilder sb) { diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaXmlElementRefMappingTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaXmlElementRefMappingTests.java index 0344fa8a02..4a76c13bc2 100644 --- a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaXmlElementRefMappingTests.java +++ b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaXmlElementRefMappingTests.java @@ -1,12 +1,12 @@ /******************************************************************************* - * Copyright (c) 2011, 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 - *******************************************************************************/ + * Copyright (c) 2011, 2013 Oracle. All rights reserved. + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License v1.0, which accompanies this distribution + * and is available at http://www.eclipse.org/legal/epl-v10.html. + * + * Contributors: + * Oracle - initial API and implementation + ******************************************************************************/ package org.eclipse.jpt.jaxb.core.tests.internal.context.java; import java.util.Iterator; @@ -19,7 +19,7 @@ import org.eclipse.jpt.common.core.utility.jdt.AnnotatedElement; import org.eclipse.jpt.common.core.utility.jdt.Member; import org.eclipse.jpt.common.core.utility.jdt.ModifiedDeclaration; import org.eclipse.jpt.common.utility.internal.iterable.IterableTools; -import org.eclipse.jpt.common.utility.internal.iterator.ArrayIterator; +import org.eclipse.jpt.common.utility.internal.iterator.IteratorTools; import org.eclipse.jpt.jaxb.core.MappingKeys; import org.eclipse.jpt.jaxb.core.context.JaxbPersistentAttribute; import org.eclipse.jpt.jaxb.core.context.XmlAttributeMapping; @@ -48,7 +48,7 @@ public class GenericJavaXmlElementRefMappingTests @Override public Iterator<String> imports() { - return new ArrayIterator<String>(JAXB.XML_TYPE, JAXB.XML_ELEMENT_REF); + return IteratorTools.iterator(JAXB.XML_TYPE, JAXB.XML_ELEMENT_REF); } @Override @@ -68,7 +68,7 @@ public class GenericJavaXmlElementRefMappingTests @Override public Iterator<String> imports() { - return new ArrayIterator<String>(JAXB.XML_TYPE, JAXB.XML_ELEMENT_REF, JAXB.JAXB_ELEMENT); + return IteratorTools.iterator(JAXB.XML_TYPE, JAXB.XML_ELEMENT_REF, JAXB.JAXB_ELEMENT); } @Override @@ -89,7 +89,7 @@ public class GenericJavaXmlElementRefMappingTests @Override public Iterator<String> imports() { - return new ArrayIterator<String>(JAXB.XML_TYPE, JAXB.XML_ELEMENT_REF, JAXB.XML_ROOT_ELEMENT); + return IteratorTools.iterator(JAXB.XML_TYPE, JAXB.XML_ELEMENT_REF, JAXB.XML_ROOT_ELEMENT); } @Override diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaXmlElementRefsMappingTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaXmlElementRefsMappingTests.java index d7fcdbafdc..4f24ff587e 100644 --- a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaXmlElementRefsMappingTests.java +++ b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaXmlElementRefsMappingTests.java @@ -1,12 +1,12 @@ /******************************************************************************* - * Copyright (c) 2011, 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 - *******************************************************************************/ + * Copyright (c) 2011, 2013 Oracle. All rights reserved. + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License v1.0, which accompanies this distribution + * and is available at http://www.eclipse.org/legal/epl-v10.html. + * + * Contributors: + * Oracle - initial API and implementation + ******************************************************************************/ package org.eclipse.jpt.jaxb.core.tests.internal.context.java; import java.util.Iterator; @@ -20,7 +20,7 @@ import org.eclipse.jpt.common.core.utility.jdt.AnnotatedElement; import org.eclipse.jpt.common.core.utility.jdt.Member; import org.eclipse.jpt.common.core.utility.jdt.ModifiedDeclaration; import org.eclipse.jpt.common.utility.internal.iterable.IterableTools; -import org.eclipse.jpt.common.utility.internal.iterator.ArrayIterator; +import org.eclipse.jpt.common.utility.internal.iterator.IteratorTools; import org.eclipse.jpt.jaxb.core.MappingKeys; import org.eclipse.jpt.jaxb.core.context.JaxbPersistentAttribute; import org.eclipse.jpt.jaxb.core.context.XmlAttributeMapping; @@ -50,7 +50,7 @@ public class GenericJavaXmlElementRefsMappingTests @Override public Iterator<String> imports() { - return new ArrayIterator<String>(JAXB.XML_TYPE, JAXB.XML_ELEMENT_REFS); + return IteratorTools.iterator(JAXB.XML_TYPE, JAXB.XML_ELEMENT_REFS); } @Override diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaXmlElementsMappingTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaXmlElementsMappingTests.java index 774085f623..394b0d0c23 100644 --- a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaXmlElementsMappingTests.java +++ b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaXmlElementsMappingTests.java @@ -1,12 +1,12 @@ /******************************************************************************* - * Copyright (c) 2011, 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 - *******************************************************************************/ + * Copyright (c) 2011, 2013 Oracle. All rights reserved. + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License v1.0, which accompanies this distribution + * and is available at http://www.eclipse.org/legal/epl-v10.html. + * + * Contributors: + * Oracle - initial API and implementation + ******************************************************************************/ package org.eclipse.jpt.jaxb.core.tests.internal.context.java; import java.util.Iterator; @@ -18,7 +18,7 @@ import org.eclipse.jpt.common.core.utility.jdt.AnnotatedElement; import org.eclipse.jpt.common.core.utility.jdt.Member; import org.eclipse.jpt.common.core.utility.jdt.ModifiedDeclaration; import org.eclipse.jpt.common.utility.internal.iterable.IterableTools; -import org.eclipse.jpt.common.utility.internal.iterator.ArrayIterator; +import org.eclipse.jpt.common.utility.internal.iterator.IteratorTools; import org.eclipse.jpt.jaxb.core.context.XmlElement; import org.eclipse.jpt.jaxb.core.context.XmlElementsMapping; import org.eclipse.jpt.jaxb.core.context.java.JavaClass; @@ -46,7 +46,7 @@ public class GenericJavaXmlElementsMappingTests @Override public Iterator<String> imports() { - return new ArrayIterator<String>(JAXB.XML_TYPE, JAXB.XML_ELEMENTS); + return IteratorTools.iterator(JAXB.XML_TYPE, JAXB.XML_ELEMENTS); } @Override diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaXmlRootElementTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaXmlRootElementTests.java index 5eb1e5cff6..84010888e9 100644 --- a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaXmlRootElementTests.java +++ b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaXmlRootElementTests.java @@ -1,9 +1,9 @@ /******************************************************************************* - * Copyright (c) 2010, 2011 Oracle. All rights reserved. + * Copyright (c) 2010, 2013 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0, which accompanies this distribution * and is available at http://www.eclipse.org/legal/epl-v10.html. - * + * * Contributors: * Oracle - initial API and implementation ******************************************************************************/ @@ -19,7 +19,7 @@ import org.eclipse.jpt.common.core.utility.jdt.AnnotatedElement; import org.eclipse.jpt.common.core.utility.jdt.Member; import org.eclipse.jpt.common.core.utility.jdt.ModifiedDeclaration; import org.eclipse.jpt.common.utility.internal.iterable.IterableTools; -import org.eclipse.jpt.common.utility.internal.iterator.ArrayIterator; +import org.eclipse.jpt.common.utility.internal.iterator.IteratorTools; import org.eclipse.jpt.jaxb.core.context.JaxbClassMapping; import org.eclipse.jpt.jaxb.core.context.XmlRootElement; import org.eclipse.jpt.jaxb.core.context.java.JavaClass; @@ -40,7 +40,7 @@ public class GenericJavaXmlRootElementTests return this.createTestType(new DefaultAnnotationWriter() { @Override public Iterator<String> imports() { - return new ArrayIterator<String>(JAXB.XML_TYPE, JAXB.XML_ROOT_ELEMENT); + return IteratorTools.iterator(JAXB.XML_TYPE, JAXB.XML_ROOT_ELEMENT); } @Override public void appendTypeAnnotationTo(StringBuilder sb) { diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaXmlSeeAlsoTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaXmlSeeAlsoTests.java index 4b5d3ecc84..e91269bcc3 100644 --- a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaXmlSeeAlsoTests.java +++ b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaXmlSeeAlsoTests.java @@ -1,12 +1,12 @@ /******************************************************************************* - * 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 - *******************************************************************************/ + * Copyright (c) 2011, 2013 Oracle. All rights reserved. + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License v1.0, which accompanies this distribution + * and is available at http://www.eclipse.org/legal/epl-v10.html. + * + * Contributors: + * Oracle - initial API and implementation + ******************************************************************************/ package org.eclipse.jpt.jaxb.core.tests.internal.context.java; import java.util.Iterator; @@ -18,7 +18,7 @@ import org.eclipse.jpt.common.core.utility.jdt.AnnotatedElement; import org.eclipse.jpt.common.core.utility.jdt.Member; import org.eclipse.jpt.common.core.utility.jdt.ModifiedDeclaration; import org.eclipse.jpt.common.utility.internal.iterable.IterableTools; -import org.eclipse.jpt.common.utility.internal.iterator.ArrayIterator; +import org.eclipse.jpt.common.utility.internal.iterator.IteratorTools; import org.eclipse.jpt.jaxb.core.context.JaxbClassMapping; import org.eclipse.jpt.jaxb.core.context.XmlSeeAlso; import org.eclipse.jpt.jaxb.core.context.java.JavaClass; @@ -40,7 +40,7 @@ public class GenericJavaXmlSeeAlsoTests return this.createTestType(new DefaultAnnotationWriter() { @Override public Iterator<String> imports() { - return new ArrayIterator<String>(JAXB.XML_TYPE, JAXB.XML_SEE_ALSO); + return IteratorTools.iterator(JAXB.XML_TYPE, JAXB.XML_SEE_ALSO); } @Override public void appendTypeAnnotationTo(StringBuilder sb) { diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaXmlValueMappingTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaXmlValueMappingTests.java index a37b2cff78..b929b8976c 100644 --- a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaXmlValueMappingTests.java +++ b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/context/java/GenericJavaXmlValueMappingTests.java @@ -1,9 +1,9 @@ /******************************************************************************* - * Copyright (c) 2011 Oracle. All rights reserved. + * Copyright (c) 2011, 2013 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0, which accompanies this distribution * and is available at http://www.eclipse.org/legal/epl-v10.html. - * + * * Contributors: * Oracle - initial API and implementation ******************************************************************************/ @@ -17,7 +17,7 @@ import org.eclipse.jpt.common.core.utility.jdt.AnnotatedElement; import org.eclipse.jpt.common.core.utility.jdt.Member; import org.eclipse.jpt.common.core.utility.jdt.ModifiedDeclaration; import org.eclipse.jpt.common.utility.internal.iterable.IterableTools; -import org.eclipse.jpt.common.utility.internal.iterator.ArrayIterator; +import org.eclipse.jpt.common.utility.internal.iterator.IteratorTools; import org.eclipse.jpt.jaxb.core.MappingKeys; import org.eclipse.jpt.jaxb.core.context.JaxbPersistentAttribute; import org.eclipse.jpt.jaxb.core.context.XmlAttributeMapping; @@ -41,7 +41,7 @@ public class GenericJavaXmlValueMappingTests extends JaxbContextModelTestCase return this.createTestType(new DefaultAnnotationWriter() { @Override public Iterator<String> imports() { - return new ArrayIterator<String>(JAXB.XML_TYPE, JAXB.XML_VALUE); + return IteratorTools.iterator(JAXB.XML_TYPE, JAXB.XML_VALUE); } @Override public void appendTypeAnnotationTo(StringBuilder sb) { diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/JaxbIndexResourceTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/JaxbIndexResourceTests.java index f8ffdc68d8..f5964c42ac 100644 --- a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/JaxbIndexResourceTests.java +++ b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/JaxbIndexResourceTests.java @@ -1,12 +1,12 @@ /******************************************************************************* - * Copyright (c) 2011, 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 - *******************************************************************************/ + * Copyright (c) 2011, 2013 Oracle. All rights reserved. + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License v1.0, which accompanies this distribution + * and is available at http://www.eclipse.org/legal/epl-v10.html. + * + * Contributors: + * Oracle - initial API and implementation + ******************************************************************************/ package org.eclipse.jpt.jaxb.core.tests.internal.resource; import java.io.ByteArrayInputStream; @@ -16,7 +16,6 @@ import org.eclipse.core.resources.IFolder; import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.Path; import org.eclipse.jpt.common.core.tests.internal.utility.jdt.AnnotationTestCase; -import org.eclipse.jpt.common.utility.internal.iterable.ArrayIterable; import org.eclipse.jpt.common.utility.internal.iterable.IterableTools; import org.eclipse.jpt.jaxb.core.internal.resource.jaxbindex.JaxbIndexResourceModelProvider; import org.eclipse.jpt.jaxb.core.resource.jaxbindex.JaxbIndexResource; @@ -34,12 +33,14 @@ public class JaxbIndexResourceTests } + @SuppressWarnings("resource") private IFile createJaxbIndex(IPath projectRelativePath, String... classNames) throws Exception { IFolder folder = getJavaProject().getProject().getFolder(projectRelativePath); if (! folder.exists()) { folder.create(true, false, null); } IFile jaxbIndex = getJavaProject().getProject().getFile(projectRelativePath.append(new Path(JAXB_INDEX))); + // stream is closed by IFile.create(...) InputStream stream = inputStream(classNames); jaxbIndex.create(stream, true, null); return jaxbIndex; @@ -63,13 +64,13 @@ public class JaxbIndexResourceTests assertTrue(IterableTools.elementsAreEqual( resource.getFullyQualifiedClassNames(), - new ArrayIterable<String>(new String[] {"test.foo", "test.bar"}))); + IterableTools.iterable(new String[] {"test.foo", "test.bar"}))); setClassNames(jaxbIndex, "foo", "bar", "baz"); assertTrue(IterableTools.elementsAreEqual( resource.getFullyQualifiedClassNames(), - new ArrayIterable<String>(new String[] {"test.foo", "test.bar", "test.baz"}))); + IterableTools.iterable(new String[] {"test.foo", "test.bar", "test.baz"}))); setClassNames(jaxbIndex); @@ -80,13 +81,13 @@ public class JaxbIndexResourceTests assertTrue(IterableTools.elementsAreEqual( resource.getFullyQualifiedClassNames(), - new ArrayIterable<String>(new String[] {"foo", "bar"}))); + IterableTools.iterable(new String[] {"foo", "bar"}))); setClassNames(jaxbIndex, "foo", "bar", "baz"); assertTrue(IterableTools.elementsAreEqual( resource.getFullyQualifiedClassNames(), - new ArrayIterable<String>(new String[] {"foo", "bar", "baz"}))); + IterableTools.iterable(new String[] {"foo", "bar", "baz"}))); setClassNames(jaxbIndex); diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlAccessorOrderTypeAnnotationTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlAccessorOrderTypeAnnotationTests.java index 14c0237c91..969099f1a4 100644 --- a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlAccessorOrderTypeAnnotationTests.java +++ b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlAccessorOrderTypeAnnotationTests.java @@ -1,9 +1,9 @@ /******************************************************************************* - * Copyright (c) 2010 Oracle. All rights reserved. + * Copyright (c) 2010, 2013 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0, which accompanies this distribution * and is available at http://www.eclipse.org/legal/epl-v10.html. - * + * * Contributors: * Oracle - initial API and implementation ******************************************************************************/ @@ -12,7 +12,7 @@ package org.eclipse.jpt.jaxb.core.tests.internal.resource.java; import java.util.Iterator; import org.eclipse.jdt.core.ICompilationUnit; import org.eclipse.jpt.common.core.resource.java.JavaResourceType; -import org.eclipse.jpt.common.utility.internal.iterator.ArrayIterator; +import org.eclipse.jpt.common.utility.internal.iterator.IteratorTools; import org.eclipse.jpt.jaxb.core.resource.java.JAXB; import org.eclipse.jpt.jaxb.core.resource.java.XmlAccessOrder; import org.eclipse.jpt.jaxb.core.resource.java.XmlAccessorOrderAnnotation; @@ -29,7 +29,7 @@ public class XmlAccessorOrderTypeAnnotationTests return this.createTestType(new DefaultAnnotationWriter() { @Override public Iterator<String> imports() { - return new ArrayIterator<String>(JAXB.XML_ACCESSOR_ORDER); + return IteratorTools.iterator(JAXB.XML_ACCESSOR_ORDER); } @Override public void appendTypeAnnotationTo(StringBuilder sb) { @@ -42,7 +42,7 @@ public class XmlAccessorOrderTypeAnnotationTests return this.createTestType(new DefaultAnnotationWriter() { @Override public Iterator<String> imports() { - return new ArrayIterator<String>(JAXB.XML_ACCESSOR_ORDER, JAXB.XML_ACCESS_ORDER); + return IteratorTools.iterator(JAXB.XML_ACCESSOR_ORDER, JAXB.XML_ACCESS_ORDER); } @Override public void appendTypeAnnotationTo(StringBuilder sb) { diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlAccessorTypeTypeAnnotationTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlAccessorTypeTypeAnnotationTests.java index 1c49fdb205..8911293d01 100644 --- a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlAccessorTypeTypeAnnotationTests.java +++ b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlAccessorTypeTypeAnnotationTests.java @@ -1,9 +1,9 @@ /******************************************************************************* - * Copyright (c) 2010 Oracle. All rights reserved. + * Copyright (c) 2010, 2013 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0, which accompanies this distribution * and is available at http://www.eclipse.org/legal/epl-v10.html. - * + * * Contributors: * Oracle - initial API and implementation ******************************************************************************/ @@ -12,7 +12,7 @@ package org.eclipse.jpt.jaxb.core.tests.internal.resource.java; import java.util.Iterator; import org.eclipse.jdt.core.ICompilationUnit; import org.eclipse.jpt.common.core.resource.java.JavaResourceType; -import org.eclipse.jpt.common.utility.internal.iterator.ArrayIterator; +import org.eclipse.jpt.common.utility.internal.iterator.IteratorTools; import org.eclipse.jpt.jaxb.core.resource.java.JAXB; import org.eclipse.jpt.jaxb.core.resource.java.XmlAccessType; import org.eclipse.jpt.jaxb.core.resource.java.XmlAccessorTypeAnnotation; @@ -29,7 +29,7 @@ public class XmlAccessorTypeTypeAnnotationTests return this.createTestType(new DefaultAnnotationWriter() { @Override public Iterator<String> imports() { - return new ArrayIterator<String>(JAXB.XML_ACCESSOR_TYPE); + return IteratorTools.iterator(JAXB.XML_ACCESSOR_TYPE); } @Override public void appendTypeAnnotationTo(StringBuilder sb) { @@ -42,7 +42,7 @@ public class XmlAccessorTypeTypeAnnotationTests return this.createTestType(new DefaultAnnotationWriter() { @Override public Iterator<String> imports() { - return new ArrayIterator<String>(JAXB.XML_ACCESSOR_TYPE, JAXB.XML_ACCESS_TYPE); + return IteratorTools.iterator(JAXB.XML_ACCESSOR_TYPE, JAXB.XML_ACCESS_TYPE); } @Override public void appendTypeAnnotationTo(StringBuilder sb) { diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlAnyAttributeAnnotationTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlAnyAttributeAnnotationTests.java index ed65afe4ea..626f149724 100644 --- a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlAnyAttributeAnnotationTests.java +++ b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlAnyAttributeAnnotationTests.java @@ -1,9 +1,9 @@ /******************************************************************************* - * Copyright (c) 2010 Oracle. All rights reserved. + * Copyright (c) 2010, 2013 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0, which accompanies this distribution * and is available at http://www.eclipse.org/legal/epl-v10.html. - * + * * Contributors: * Oracle - initial API and implementation ******************************************************************************/ @@ -13,7 +13,7 @@ import java.util.Iterator; import org.eclipse.jdt.core.ICompilationUnit; import org.eclipse.jpt.common.core.resource.java.JavaResourceField; import org.eclipse.jpt.common.core.resource.java.JavaResourceType; -import org.eclipse.jpt.common.utility.internal.iterator.ArrayIterator; +import org.eclipse.jpt.common.utility.internal.iterator.IteratorTools; import org.eclipse.jpt.jaxb.core.resource.java.JAXB; import org.eclipse.jpt.jaxb.core.resource.java.XmlAnyAttributeAnnotation; @@ -28,7 +28,7 @@ public class XmlAnyAttributeAnnotationTests extends JaxbJavaResourceModelTestCas return this.createTestType(new DefaultAnnotationWriter() { @Override public Iterator<String> imports() { - return new ArrayIterator<String>(JAXB.XML_ANY_ATTRIBUTE); + return IteratorTools.iterator(JAXB.XML_ANY_ATTRIBUTE); } @Override public void appendIdFieldAnnotationTo(StringBuilder sb) { diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlAnyElementAnnotationTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlAnyElementAnnotationTests.java index 7a16dfc42d..1625b02890 100644 --- a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlAnyElementAnnotationTests.java +++ b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlAnyElementAnnotationTests.java @@ -1,9 +1,9 @@ /******************************************************************************* - * Copyright (c) 2010 Oracle. All rights reserved. + * Copyright (c) 2010, 2013 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0, which accompanies this distribution * and is available at http://www.eclipse.org/legal/epl-v10.html. - * + * * Contributors: * Oracle - initial API and implementation ******************************************************************************/ @@ -13,7 +13,7 @@ import java.util.Iterator; import org.eclipse.jdt.core.ICompilationUnit; import org.eclipse.jpt.common.core.resource.java.JavaResourceField; import org.eclipse.jpt.common.core.resource.java.JavaResourceType; -import org.eclipse.jpt.common.utility.internal.iterator.ArrayIterator; +import org.eclipse.jpt.common.utility.internal.iterator.IteratorTools; import org.eclipse.jpt.jaxb.core.resource.java.JAXB; import org.eclipse.jpt.jaxb.core.resource.java.XmlAnyElementAnnotation; @@ -30,7 +30,7 @@ public class XmlAnyElementAnnotationTests extends JaxbJavaResourceModelTestCase return this.createTestType(new DefaultAnnotationWriter() { @Override public Iterator<String> imports() { - return new ArrayIterator<String>(JAXB.XML_ANY_ELEMENT); + return IteratorTools.iterator(JAXB.XML_ANY_ELEMENT); } @Override public void appendIdFieldAnnotationTo(StringBuilder sb) { @@ -43,7 +43,7 @@ public class XmlAnyElementAnnotationTests extends JaxbJavaResourceModelTestCase return this.createTestType(new DefaultAnnotationWriter() { @Override public Iterator<String> imports() { - return new ArrayIterator<String>(JAXB.XML_ANY_ELEMENT); + return IteratorTools.iterator(JAXB.XML_ANY_ELEMENT); } @Override public void appendIdFieldAnnotationTo(StringBuilder sb) { @@ -56,7 +56,7 @@ public class XmlAnyElementAnnotationTests extends JaxbJavaResourceModelTestCase return this.createTestType(new DefaultAnnotationWriter() { @Override public Iterator<String> imports() { - return new ArrayIterator<String>(JAXB.XML_ANY_ELEMENT); + return IteratorTools.iterator(JAXB.XML_ANY_ELEMENT); } @Override public void appendIdFieldAnnotationTo(StringBuilder sb) { diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlAttachmentRefAnnotationTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlAttachmentRefAnnotationTests.java index cff28586ed..93b43f3f1e 100644 --- a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlAttachmentRefAnnotationTests.java +++ b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlAttachmentRefAnnotationTests.java @@ -1,9 +1,9 @@ /******************************************************************************* - * Copyright (c) 2010 Oracle. All rights reserved. + * Copyright (c) 2010, 2013 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0, which accompanies this distribution * and is available at http://www.eclipse.org/legal/epl-v10.html. - * + * * Contributors: * Oracle - initial API and implementation ******************************************************************************/ @@ -13,7 +13,7 @@ import java.util.Iterator; import org.eclipse.jdt.core.ICompilationUnit; import org.eclipse.jpt.common.core.resource.java.JavaResourceField; import org.eclipse.jpt.common.core.resource.java.JavaResourceType; -import org.eclipse.jpt.common.utility.internal.iterator.ArrayIterator; +import org.eclipse.jpt.common.utility.internal.iterator.IteratorTools; import org.eclipse.jpt.jaxb.core.resource.java.JAXB; import org.eclipse.jpt.jaxb.core.resource.java.XmlAttachmentRefAnnotation; @@ -28,7 +28,7 @@ public class XmlAttachmentRefAnnotationTests extends JaxbJavaResourceModelTestCa return this.createTestType(new DefaultAnnotationWriter() { @Override public Iterator<String> imports() { - return new ArrayIterator<String>(JAXB.XML_ATTACHMENT_REF); + return IteratorTools.iterator(JAXB.XML_ATTACHMENT_REF); } @Override public void appendIdFieldAnnotationTo(StringBuilder sb) { diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlAttributeAnnotationTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlAttributeAnnotationTests.java index 8cd3b5e718..06c1565905 100644 --- a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlAttributeAnnotationTests.java +++ b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlAttributeAnnotationTests.java @@ -1,9 +1,9 @@ /******************************************************************************* - * Copyright (c) 2010 Oracle. All rights reserved. + * Copyright (c) 2010, 2013 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0, which accompanies this distribution * and is available at http://www.eclipse.org/legal/epl-v10.html. - * + * * Contributors: * Oracle - initial API and implementation ******************************************************************************/ @@ -13,7 +13,7 @@ import java.util.Iterator; import org.eclipse.jdt.core.ICompilationUnit; import org.eclipse.jpt.common.core.resource.java.JavaResourceField; import org.eclipse.jpt.common.core.resource.java.JavaResourceType; -import org.eclipse.jpt.common.utility.internal.iterator.ArrayIterator; +import org.eclipse.jpt.common.utility.internal.iterator.IteratorTools; import org.eclipse.jpt.jaxb.core.resource.java.JAXB; import org.eclipse.jpt.jaxb.core.resource.java.XmlAttributeAnnotation; @@ -31,7 +31,7 @@ public class XmlAttributeAnnotationTests extends JaxbJavaResourceModelTestCase { return this.createTestType(new DefaultAnnotationWriter() { @Override public Iterator<String> imports() { - return new ArrayIterator<String>(JAXB.XML_ATTRIBUTE); + return IteratorTools.iterator(JAXB.XML_ATTRIBUTE); } @Override public void appendIdFieldAnnotationTo(StringBuilder sb) { @@ -52,7 +52,7 @@ public class XmlAttributeAnnotationTests extends JaxbJavaResourceModelTestCase { return this.createTestType(new DefaultAnnotationWriter() { @Override public Iterator<String> imports() { - return new ArrayIterator<String>(JAXB.XML_ATTRIBUTE); + return IteratorTools.iterator(JAXB.XML_ATTRIBUTE); } @Override public void appendIdFieldAnnotationTo(StringBuilder sb) { @@ -65,7 +65,7 @@ public class XmlAttributeAnnotationTests extends JaxbJavaResourceModelTestCase { return this.createTestType(new DefaultAnnotationWriter() { @Override public Iterator<String> imports() { - return new ArrayIterator<String>(JAXB.XML_ATTRIBUTE); + return IteratorTools.iterator(JAXB.XML_ATTRIBUTE); } @Override public void appendIdFieldAnnotationTo(StringBuilder sb) { diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlElementAnnotationTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlElementAnnotationTests.java index 049ba69500..46ed0bff8d 100644 --- a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlElementAnnotationTests.java +++ b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlElementAnnotationTests.java @@ -1,9 +1,9 @@ /******************************************************************************* - * Copyright (c) 2010 Oracle. All rights reserved. + * Copyright (c) 2010, 2013 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0, which accompanies this distribution * and is available at http://www.eclipse.org/legal/epl-v10.html. - * + * * Contributors: * Oracle - initial API and implementation ******************************************************************************/ @@ -13,7 +13,7 @@ import java.util.Iterator; import org.eclipse.jdt.core.ICompilationUnit; import org.eclipse.jpt.common.core.resource.java.JavaResourceField; import org.eclipse.jpt.common.core.resource.java.JavaResourceType; -import org.eclipse.jpt.common.utility.internal.iterator.ArrayIterator; +import org.eclipse.jpt.common.utility.internal.iterator.IteratorTools; import org.eclipse.jpt.jaxb.core.resource.java.JAXB; import org.eclipse.jpt.jaxb.core.resource.java.XmlElementAnnotation; @@ -38,7 +38,7 @@ public class XmlElementAnnotationTests @Override public Iterator<String> imports() { - return new ArrayIterator<String>(JAXB.XML_ELEMENT); + return IteratorTools.iterator(JAXB.XML_ELEMENT); } @Override @@ -66,7 +66,7 @@ public class XmlElementAnnotationTests @Override public Iterator<String> imports() { - return new ArrayIterator<String>(JAXB.XML_ELEMENT); + return IteratorTools.iterator(JAXB.XML_ELEMENT); } @Override @@ -82,7 +82,7 @@ public class XmlElementAnnotationTests @Override public Iterator<String> imports() { - return new ArrayIterator<String>(JAXB.XML_ELEMENT); + return IteratorTools.iterator(JAXB.XML_ELEMENT); } @Override @@ -98,7 +98,7 @@ public class XmlElementAnnotationTests @Override public Iterator<String> imports() { - return new ArrayIterator<String>(JAXB.XML_ELEMENT); + return IteratorTools.iterator(JAXB.XML_ELEMENT); } @Override diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlElementDeclAnnotationTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlElementDeclAnnotationTests.java index bf71304e8d..8d3c8591bc 100644 --- a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlElementDeclAnnotationTests.java +++ b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlElementDeclAnnotationTests.java @@ -1,9 +1,9 @@ /******************************************************************************* - * Copyright (c) 2010 Oracle. All rights reserved. + * Copyright (c) 2010, 2013 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0, which accompanies this distribution * and is available at http://www.eclipse.org/legal/epl-v10.html. - * + * * Contributors: * Oracle - initial API and implementation ******************************************************************************/ @@ -13,7 +13,7 @@ import java.util.Iterator; import org.eclipse.jdt.core.ICompilationUnit; import org.eclipse.jpt.common.core.resource.java.JavaResourceMethod; import org.eclipse.jpt.common.core.resource.java.JavaResourceType; -import org.eclipse.jpt.common.utility.internal.iterator.ArrayIterator; +import org.eclipse.jpt.common.utility.internal.iterator.IteratorTools; import org.eclipse.jpt.jaxb.core.resource.java.JAXB; import org.eclipse.jpt.jaxb.core.resource.java.XmlElementDeclAnnotation; @@ -33,7 +33,7 @@ public class XmlElementDeclAnnotationTests extends JaxbJavaResourceModelTestCase return this.createTestType(new DefaultAnnotationWriter() { @Override public Iterator<String> imports() { - return new ArrayIterator<String>(JAXB.XML_ELEMENT_DECL); + return IteratorTools.iterator(JAXB.XML_ELEMENT_DECL); } @Override public void appendGetIdMethodAnnotationTo(StringBuilder sb) { @@ -66,7 +66,7 @@ public class XmlElementDeclAnnotationTests extends JaxbJavaResourceModelTestCase return this.createTestType(new DefaultAnnotationWriter() { @Override public Iterator<String> imports() { - return new ArrayIterator<String>(JAXB.XML_ELEMENT_DECL); + return IteratorTools.iterator(JAXB.XML_ELEMENT_DECL); } @Override public void appendGetIdMethodAnnotationTo(StringBuilder sb) { @@ -79,7 +79,7 @@ public class XmlElementDeclAnnotationTests extends JaxbJavaResourceModelTestCase return this.createTestType(new DefaultAnnotationWriter() { @Override public Iterator<String> imports() { - return new ArrayIterator<String>(JAXB.XML_ELEMENT_DECL); + return IteratorTools.iterator(JAXB.XML_ELEMENT_DECL); } @Override public void appendGetIdMethodAnnotationTo(StringBuilder sb) { diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlElementRefAnnotationTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlElementRefAnnotationTests.java index 4d077bae47..474611c42f 100644 --- a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlElementRefAnnotationTests.java +++ b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlElementRefAnnotationTests.java @@ -1,9 +1,9 @@ /******************************************************************************* - * Copyright (c) 2010 Oracle. All rights reserved. + * Copyright (c) 2010, 2013 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0, which accompanies this distribution * and is available at http://www.eclipse.org/legal/epl-v10.html. - * + * * Contributors: * Oracle - initial API and implementation ******************************************************************************/ @@ -13,7 +13,7 @@ import java.util.Iterator; import org.eclipse.jdt.core.ICompilationUnit; import org.eclipse.jpt.common.core.resource.java.JavaResourceField; import org.eclipse.jpt.common.core.resource.java.JavaResourceType; -import org.eclipse.jpt.common.utility.internal.iterator.ArrayIterator; +import org.eclipse.jpt.common.utility.internal.iterator.IteratorTools; import org.eclipse.jpt.jaxb.core.resource.java.JAXB; import org.eclipse.jpt.jaxb.core.resource.java.XmlElementRefAnnotation; @@ -37,7 +37,7 @@ public class XmlElementRefAnnotationTests @Override public Iterator<String> imports() { - return new ArrayIterator<String>(JAXB.XML_ELEMENT_REF); + return IteratorTools.iterator(JAXB.XML_ELEMENT_REF); } @Override @@ -61,7 +61,7 @@ public class XmlElementRefAnnotationTests @Override public Iterator<String> imports() { - return new ArrayIterator<String>(JAXB.XML_ELEMENT_REF); + return IteratorTools.iterator(JAXB.XML_ELEMENT_REF); } @Override @@ -77,7 +77,7 @@ public class XmlElementRefAnnotationTests @Override public Iterator<String> imports() { - return new ArrayIterator<String>(JAXB.XML_ELEMENT_REF); + return IteratorTools.iterator(JAXB.XML_ELEMENT_REF); } @Override @@ -93,7 +93,7 @@ public class XmlElementRefAnnotationTests @Override public Iterator<String> imports() { - return new ArrayIterator<String>(JAXB.XML_ELEMENT_REF); + return IteratorTools.iterator(JAXB.XML_ELEMENT_REF); } @Override diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlElementRefsAnnotationTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlElementRefsAnnotationTests.java index 5b8c121272..2754cf4ec3 100644 --- a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlElementRefsAnnotationTests.java +++ b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlElementRefsAnnotationTests.java @@ -1,12 +1,12 @@ /******************************************************************************* - * Copyright (c) 2011, 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 - *******************************************************************************/ + * Copyright (c) 2011, 2013 Oracle. All rights reserved. + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License v1.0, which accompanies this distribution + * and is available at http://www.eclipse.org/legal/epl-v10.html. + * + * Contributors: + * Oracle - initial API and implementation + ******************************************************************************/ package org.eclipse.jpt.jaxb.core.tests.internal.resource.java; import java.util.Iterator; @@ -14,7 +14,7 @@ import org.eclipse.jdt.core.ICompilationUnit; import org.eclipse.jpt.common.core.resource.java.JavaResourceAttribute; import org.eclipse.jpt.common.core.resource.java.JavaResourceField; import org.eclipse.jpt.common.core.resource.java.JavaResourceType; -import org.eclipse.jpt.common.utility.internal.iterator.ArrayIterator; +import org.eclipse.jpt.common.utility.internal.iterator.IteratorTools; import org.eclipse.jpt.jaxb.core.resource.java.JAXB; import org.eclipse.jpt.jaxb.core.resource.java.XmlElementRefAnnotation; import org.eclipse.jpt.jaxb.core.resource.java.XmlElementRefsAnnotation; @@ -40,7 +40,7 @@ public class XmlElementRefsAnnotationTests @Override public Iterator<String> imports() { - return new ArrayIterator<String>(JAXB.XML_ELEMENT_REF, JAXB.XML_ELEMENT_REFS); + return IteratorTools.iterator(JAXB.XML_ELEMENT_REF, JAXB.XML_ELEMENT_REFS); } @Override @@ -64,7 +64,7 @@ public class XmlElementRefsAnnotationTests @Override public Iterator<String> imports() { - return new ArrayIterator<String>(JAXB.XML_ELEMENT_REF, JAXB.XML_ELEMENT_REFS); + return IteratorTools.iterator(JAXB.XML_ELEMENT_REF, JAXB.XML_ELEMENT_REFS); } @Override @@ -80,7 +80,7 @@ public class XmlElementRefsAnnotationTests @Override public Iterator<String> imports() { - return new ArrayIterator<String>(JAXB.XML_ELEMENT_REF, JAXB.XML_ELEMENT_REFS); + return IteratorTools.iterator(JAXB.XML_ELEMENT_REF, JAXB.XML_ELEMENT_REFS); } @Override @@ -96,7 +96,7 @@ public class XmlElementRefsAnnotationTests @Override public Iterator<String> imports() { - return new ArrayIterator<String>(JAXB.XML_ELEMENT_REF, JAXB.XML_ELEMENT_REFS); + return IteratorTools.iterator(JAXB.XML_ELEMENT_REF, JAXB.XML_ELEMENT_REFS); } @Override diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlElementWrapperAnnotationTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlElementWrapperAnnotationTests.java index f15acb606b..4cb325453c 100644 --- a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlElementWrapperAnnotationTests.java +++ b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlElementWrapperAnnotationTests.java @@ -1,9 +1,9 @@ /******************************************************************************* - * Copyright (c) 2010 Oracle. All rights reserved. + * Copyright (c) 2010, 2013 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0, which accompanies this distribution * and is available at http://www.eclipse.org/legal/epl-v10.html. - * + * * Contributors: * Oracle - initial API and implementation ******************************************************************************/ @@ -13,7 +13,7 @@ import java.util.Iterator; import org.eclipse.jdt.core.ICompilationUnit; import org.eclipse.jpt.common.core.resource.java.JavaResourceField; import org.eclipse.jpt.common.core.resource.java.JavaResourceType; -import org.eclipse.jpt.common.utility.internal.iterator.ArrayIterator; +import org.eclipse.jpt.common.utility.internal.iterator.IteratorTools; import org.eclipse.jpt.jaxb.core.resource.java.JAXB; import org.eclipse.jpt.jaxb.core.resource.java.XmlElementWrapperAnnotation; @@ -31,7 +31,7 @@ public class XmlElementWrapperAnnotationTests extends JaxbJavaResourceModelTestC return this.createTestType(new DefaultAnnotationWriter() { @Override public Iterator<String> imports() { - return new ArrayIterator<String>(JAXB.XML_ELEMENT_WRAPPER); + return IteratorTools.iterator(JAXB.XML_ELEMENT_WRAPPER); } @Override public void appendIdFieldAnnotationTo(StringBuilder sb) { @@ -52,7 +52,7 @@ public class XmlElementWrapperAnnotationTests extends JaxbJavaResourceModelTestC return this.createTestType(new DefaultAnnotationWriter() { @Override public Iterator<String> imports() { - return new ArrayIterator<String>(JAXB.XML_ELEMENT_WRAPPER); + return IteratorTools.iterator(JAXB.XML_ELEMENT_WRAPPER); } @Override public void appendIdFieldAnnotationTo(StringBuilder sb) { @@ -65,7 +65,7 @@ public class XmlElementWrapperAnnotationTests extends JaxbJavaResourceModelTestC return this.createTestType(new DefaultAnnotationWriter() { @Override public Iterator<String> imports() { - return new ArrayIterator<String>(JAXB.XML_ELEMENT_WRAPPER); + return IteratorTools.iterator(JAXB.XML_ELEMENT_WRAPPER); } @Override public void appendIdFieldAnnotationTo(StringBuilder sb) { diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlElementsAnnotationTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlElementsAnnotationTests.java index a8c596d124..5490b9ae17 100644 --- a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlElementsAnnotationTests.java +++ b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlElementsAnnotationTests.java @@ -1,12 +1,12 @@ /******************************************************************************* - * Copyright (c) 2011, 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 - *******************************************************************************/ + * Copyright (c) 2011, 2013 Oracle. All rights reserved. + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License v1.0, which accompanies this distribution + * and is available at http://www.eclipse.org/legal/epl-v10.html. + * + * Contributors: + * Oracle - initial API and implementation + ******************************************************************************/ package org.eclipse.jpt.jaxb.core.tests.internal.resource.java; import java.util.Iterator; @@ -14,7 +14,7 @@ import org.eclipse.jdt.core.ICompilationUnit; import org.eclipse.jpt.common.core.resource.java.JavaResourceAttribute; import org.eclipse.jpt.common.core.resource.java.JavaResourceField; import org.eclipse.jpt.common.core.resource.java.JavaResourceType; -import org.eclipse.jpt.common.utility.internal.iterator.ArrayIterator; +import org.eclipse.jpt.common.utility.internal.iterator.IteratorTools; import org.eclipse.jpt.jaxb.core.resource.java.JAXB; import org.eclipse.jpt.jaxb.core.resource.java.XmlElementAnnotation; import org.eclipse.jpt.jaxb.core.resource.java.XmlElementsAnnotation; @@ -41,7 +41,7 @@ public class XmlElementsAnnotationTests @Override public Iterator<String> imports() { - return new ArrayIterator<String>(JAXB.XML_ELEMENTS, JAXB.XML_ELEMENT); + return IteratorTools.iterator(JAXB.XML_ELEMENTS, JAXB.XML_ELEMENT); } @Override @@ -69,7 +69,7 @@ public class XmlElementsAnnotationTests @Override public Iterator<String> imports() { - return new ArrayIterator<String>(JAXB.XML_ELEMENTS, JAXB.XML_ELEMENT); + return IteratorTools.iterator(JAXB.XML_ELEMENTS, JAXB.XML_ELEMENT); } @Override @@ -85,7 +85,7 @@ public class XmlElementsAnnotationTests @Override public Iterator<String> imports() { - return new ArrayIterator<String>(JAXB.XML_ELEMENTS, JAXB.XML_ELEMENT); + return IteratorTools.iterator(JAXB.XML_ELEMENTS, JAXB.XML_ELEMENT); } @Override @@ -101,7 +101,7 @@ public class XmlElementsAnnotationTests @Override public Iterator<String> imports() { - return new ArrayIterator<String>(JAXB.XML_ELEMENTS, JAXB.XML_ELEMENT); + return IteratorTools.iterator(JAXB.XML_ELEMENTS, JAXB.XML_ELEMENT); } @Override diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlEnumAnnotationTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlEnumAnnotationTests.java index 9c1c3ced8c..b14ecb4c1d 100644 --- a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlEnumAnnotationTests.java +++ b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlEnumAnnotationTests.java @@ -1,9 +1,9 @@ /******************************************************************************* - * Copyright (c) 2010 Oracle. All rights reserved. + * Copyright (c) 2010, 2013 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0, which accompanies this distribution * and is available at http://www.eclipse.org/legal/epl-v10.html. - * + * * Contributors: * Oracle - initial API and implementation ******************************************************************************/ @@ -12,7 +12,7 @@ package org.eclipse.jpt.jaxb.core.tests.internal.resource.java; import java.util.Iterator; import org.eclipse.jdt.core.ICompilationUnit; import org.eclipse.jpt.common.core.resource.java.JavaResourceEnum; -import org.eclipse.jpt.common.utility.internal.iterator.ArrayIterator; +import org.eclipse.jpt.common.utility.internal.iterator.IteratorTools; import org.eclipse.jpt.jaxb.core.resource.java.JAXB; import org.eclipse.jpt.jaxb.core.resource.java.XmlEnumAnnotation; @@ -29,7 +29,7 @@ public class XmlEnumAnnotationTests extends JaxbJavaResourceModelTestCase { return this.createTestEnum(new DefaultEnumAnnotationWriter() { @Override public Iterator<String> imports() { - return new ArrayIterator<String>(JAXB.XML_ENUM); + return IteratorTools.iterator(JAXB.XML_ENUM); } @Override public void appendEnumAnnotationTo(StringBuilder sb) { @@ -42,7 +42,7 @@ public class XmlEnumAnnotationTests extends JaxbJavaResourceModelTestCase { return this.createTestEnum(new DefaultEnumAnnotationWriter() { @Override public Iterator<String> imports() { - return new ArrayIterator<String>(JAXB.XML_ENUM); + return IteratorTools.iterator(JAXB.XML_ENUM); } @Override public void appendEnumAnnotationTo(StringBuilder sb) { diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlEnumValueAnnotationTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlEnumValueAnnotationTests.java index d32fbb85da..c529a8d9b0 100644 --- a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlEnumValueAnnotationTests.java +++ b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlEnumValueAnnotationTests.java @@ -1,9 +1,9 @@ /******************************************************************************* - * Copyright (c) 2010 Oracle. All rights reserved. + * Copyright (c) 2010, 2013 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0, which accompanies this distribution * and is available at http://www.eclipse.org/legal/epl-v10.html. - * + * * Contributors: * Oracle - initial API and implementation ******************************************************************************/ @@ -13,7 +13,7 @@ import java.util.Iterator; import org.eclipse.jdt.core.ICompilationUnit; import org.eclipse.jpt.common.core.resource.java.JavaResourceEnum; import org.eclipse.jpt.common.core.resource.java.JavaResourceEnumConstant; -import org.eclipse.jpt.common.utility.internal.iterator.ArrayIterator; +import org.eclipse.jpt.common.utility.internal.iterator.IteratorTools; import org.eclipse.jpt.jaxb.core.resource.java.JAXB; import org.eclipse.jpt.jaxb.core.resource.java.XmlEnumValueAnnotation; @@ -30,7 +30,7 @@ public class XmlEnumValueAnnotationTests extends JaxbJavaResourceModelTestCase { return this.createTestEnum(new DefaultEnumAnnotationWriter() { @Override public Iterator<String> imports() { - return new ArrayIterator<String>(JAXB.XML_ENUM_VALUE); + return IteratorTools.iterator(JAXB.XML_ENUM_VALUE); } @Override public void appendSundayEnumConstantAnnotationTo(StringBuilder sb) { @@ -47,7 +47,7 @@ public class XmlEnumValueAnnotationTests extends JaxbJavaResourceModelTestCase { return this.createTestEnum(new DefaultEnumAnnotationWriter() { @Override public Iterator<String> imports() { - return new ArrayIterator<String>(JAXB.XML_ENUM_VALUE); + return IteratorTools.iterator(JAXB.XML_ENUM_VALUE); } @Override public void appendSundayEnumConstantAnnotationTo(StringBuilder sb) { diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlIDAnnotationTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlIDAnnotationTests.java index ebcc57c255..7aca62af7a 100644 --- a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlIDAnnotationTests.java +++ b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlIDAnnotationTests.java @@ -1,9 +1,9 @@ /******************************************************************************* - * Copyright (c) 2010 Oracle. All rights reserved. + * Copyright (c) 2010, 2013 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0, which accompanies this distribution * and is available at http://www.eclipse.org/legal/epl-v10.html. - * + * * Contributors: * Oracle - initial API and implementation ******************************************************************************/ @@ -13,7 +13,7 @@ import java.util.Iterator; import org.eclipse.jdt.core.ICompilationUnit; import org.eclipse.jpt.common.core.resource.java.JavaResourceField; import org.eclipse.jpt.common.core.resource.java.JavaResourceType; -import org.eclipse.jpt.common.utility.internal.iterator.ArrayIterator; +import org.eclipse.jpt.common.utility.internal.iterator.IteratorTools; import org.eclipse.jpt.jaxb.core.resource.java.JAXB; import org.eclipse.jpt.jaxb.core.resource.java.XmlIDAnnotation; @@ -28,7 +28,7 @@ public class XmlIDAnnotationTests extends JaxbJavaResourceModelTestCase { return this.createTestType(new DefaultAnnotationWriter() { @Override public Iterator<String> imports() { - return new ArrayIterator<String>(JAXB.XML_ID); + return IteratorTools.iterator(JAXB.XML_ID); } @Override public void appendIdFieldAnnotationTo(StringBuilder sb) { diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlIDREFAnnotationTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlIDREFAnnotationTests.java index a4e3856227..bfdbc5d8a9 100644 --- a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlIDREFAnnotationTests.java +++ b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlIDREFAnnotationTests.java @@ -1,9 +1,9 @@ /******************************************************************************* - * Copyright (c) 2010 Oracle. All rights reserved. + * Copyright (c) 2010, 2013 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0, which accompanies this distribution * and is available at http://www.eclipse.org/legal/epl-v10.html. - * + * * Contributors: * Oracle - initial API and implementation ******************************************************************************/ @@ -13,7 +13,7 @@ import java.util.Iterator; import org.eclipse.jdt.core.ICompilationUnit; import org.eclipse.jpt.common.core.resource.java.JavaResourceField; import org.eclipse.jpt.common.core.resource.java.JavaResourceType; -import org.eclipse.jpt.common.utility.internal.iterator.ArrayIterator; +import org.eclipse.jpt.common.utility.internal.iterator.IteratorTools; import org.eclipse.jpt.jaxb.core.resource.java.JAXB; import org.eclipse.jpt.jaxb.core.resource.java.XmlIDREFAnnotation; @@ -28,7 +28,7 @@ public class XmlIDREFAnnotationTests extends JaxbJavaResourceModelTestCase { return this.createTestType(new DefaultAnnotationWriter() { @Override public Iterator<String> imports() { - return new ArrayIterator<String>(JAXB.XML_IDREF); + return IteratorTools.iterator(JAXB.XML_IDREF); } @Override public void appendIdFieldAnnotationTo(StringBuilder sb) { diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlInlineBinaryDataAttributeAnnotationTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlInlineBinaryDataAttributeAnnotationTests.java index 7678d38608..b5c815fa98 100644 --- a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlInlineBinaryDataAttributeAnnotationTests.java +++ b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlInlineBinaryDataAttributeAnnotationTests.java @@ -1,9 +1,9 @@ /******************************************************************************* - * Copyright (c) 2010 Oracle. All rights reserved. + * Copyright (c) 2010, 2013 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0, which accompanies this distribution * and is available at http://www.eclipse.org/legal/epl-v10.html. - * + * * Contributors: * Oracle - initial API and implementation ******************************************************************************/ @@ -13,7 +13,7 @@ import java.util.Iterator; import org.eclipse.jdt.core.ICompilationUnit; import org.eclipse.jpt.common.core.resource.java.JavaResourceMethod; import org.eclipse.jpt.common.core.resource.java.JavaResourceType; -import org.eclipse.jpt.common.utility.internal.iterator.ArrayIterator; +import org.eclipse.jpt.common.utility.internal.iterator.IteratorTools; import org.eclipse.jpt.jaxb.core.resource.java.JAXB; import org.eclipse.jpt.jaxb.core.resource.java.XmlInlineBinaryDataAnnotation; @@ -28,7 +28,7 @@ public class XmlInlineBinaryDataAttributeAnnotationTests extends JaxbJavaResourc return this.createTestType(new DefaultAnnotationWriter() { @Override public Iterator<String> imports() { - return new ArrayIterator<String>(JAXB.XML_INLINE_BINARY_DATA); + return IteratorTools.iterator(JAXB.XML_INLINE_BINARY_DATA); } @Override public void appendGetIdMethodAnnotationTo(StringBuilder sb) { diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlInlineBinaryDataTypeAnnotationTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlInlineBinaryDataTypeAnnotationTests.java index d4ac88a52b..85eb08a277 100644 --- a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlInlineBinaryDataTypeAnnotationTests.java +++ b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlInlineBinaryDataTypeAnnotationTests.java @@ -1,9 +1,9 @@ /******************************************************************************* - * Copyright (c) 2010 Oracle. All rights reserved. + * Copyright (c) 2010, 2013 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0, which accompanies this distribution * and is available at http://www.eclipse.org/legal/epl-v10.html. - * + * * Contributors: * Oracle - initial API and implementation ******************************************************************************/ @@ -12,7 +12,7 @@ package org.eclipse.jpt.jaxb.core.tests.internal.resource.java; import java.util.Iterator; import org.eclipse.jdt.core.ICompilationUnit; import org.eclipse.jpt.common.core.resource.java.JavaResourceType; -import org.eclipse.jpt.common.utility.internal.iterator.ArrayIterator; +import org.eclipse.jpt.common.utility.internal.iterator.IteratorTools; import org.eclipse.jpt.jaxb.core.resource.java.JAXB; import org.eclipse.jpt.jaxb.core.resource.java.XmlInlineBinaryDataAnnotation; @@ -27,7 +27,7 @@ public class XmlInlineBinaryDataTypeAnnotationTests extends JaxbJavaResourceMode return this.createTestType(new DefaultAnnotationWriter() { @Override public Iterator<String> imports() { - return new ArrayIterator<String>(JAXB.XML_INLINE_BINARY_DATA); + return IteratorTools.iterator(JAXB.XML_INLINE_BINARY_DATA); } @Override public void appendTypeAnnotationTo(StringBuilder sb) { diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlJavaTypeAdapterTypeAnnotationTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlJavaTypeAdapterTypeAnnotationTests.java index a7c1c785d2..a8d977228c 100644 --- a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlJavaTypeAdapterTypeAnnotationTests.java +++ b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlJavaTypeAdapterTypeAnnotationTests.java @@ -1,9 +1,9 @@ /******************************************************************************* - * Copyright (c) 2010 Oracle. All rights reserved. + * Copyright (c) 2010, 2013 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0, which accompanies this distribution * and is available at http://www.eclipse.org/legal/epl-v10.html. - * + * * Contributors: * Oracle - initial API and implementation ******************************************************************************/ @@ -13,7 +13,7 @@ import java.util.Iterator; import org.eclipse.jdt.core.ICompilationUnit; import org.eclipse.jpt.common.core.resource.java.JavaResourceType; import org.eclipse.jpt.common.core.tests.internal.projects.TestJavaProject.SourceWriter; -import org.eclipse.jpt.common.utility.internal.iterator.ArrayIterator; +import org.eclipse.jpt.common.utility.internal.iterator.IteratorTools; import org.eclipse.jpt.jaxb.core.resource.java.JAXB; import org.eclipse.jpt.jaxb.core.resource.java.XmlJavaTypeAdapterAnnotation; @@ -30,7 +30,7 @@ public class XmlJavaTypeAdapterTypeAnnotationTests extends JaxbJavaResourceModel return this.createTestType(new DefaultAnnotationWriter() { @Override public Iterator<String> imports() { - return new ArrayIterator<String>(JAXB.XML_JAVA_TYPE_ADAPTER); + return IteratorTools.iterator(JAXB.XML_JAVA_TYPE_ADAPTER); } @Override public void appendTypeAnnotationTo(StringBuilder sb) { @@ -44,7 +44,7 @@ public class XmlJavaTypeAdapterTypeAnnotationTests extends JaxbJavaResourceModel return this.createTestType(new DefaultAnnotationWriter() { @Override public Iterator<String> imports() { - return new ArrayIterator<String>(JAXB.XML_JAVA_TYPE_ADAPTER); + return IteratorTools.iterator(JAXB.XML_JAVA_TYPE_ADAPTER); } @Override public void appendTypeAnnotationTo(StringBuilder sb) { diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlListAnnotationTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlListAnnotationTests.java index 1b992515c3..501a7b96d1 100644 --- a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlListAnnotationTests.java +++ b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlListAnnotationTests.java @@ -1,9 +1,9 @@ /******************************************************************************* - * Copyright (c) 2010 Oracle. All rights reserved. + * Copyright (c) 2010, 2013 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0, which accompanies this distribution * and is available at http://www.eclipse.org/legal/epl-v10.html. - * + * * Contributors: * Oracle - initial API and implementation ******************************************************************************/ @@ -13,7 +13,7 @@ import java.util.Iterator; import org.eclipse.jdt.core.ICompilationUnit; import org.eclipse.jpt.common.core.resource.java.JavaResourceField; import org.eclipse.jpt.common.core.resource.java.JavaResourceType; -import org.eclipse.jpt.common.utility.internal.iterator.ArrayIterator; +import org.eclipse.jpt.common.utility.internal.iterator.IteratorTools; import org.eclipse.jpt.jaxb.core.resource.java.JAXB; import org.eclipse.jpt.jaxb.core.resource.java.XmlListAnnotation; @@ -28,7 +28,7 @@ public class XmlListAnnotationTests extends JaxbJavaResourceModelTestCase { return this.createTestType(new DefaultAnnotationWriter() { @Override public Iterator<String> imports() { - return new ArrayIterator<String>(JAXB.XML_LIST); + return IteratorTools.iterator(JAXB.XML_LIST); } @Override public void appendIdFieldAnnotationTo(StringBuilder sb) { diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlMimeTypeAnnotationTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlMimeTypeAnnotationTests.java index 304834ea12..a937d70c5a 100644 --- a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlMimeTypeAnnotationTests.java +++ b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlMimeTypeAnnotationTests.java @@ -1,9 +1,9 @@ /******************************************************************************* - * Copyright (c) 2010 Oracle. All rights reserved. + * Copyright (c) 2010, 2013 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0, which accompanies this distribution * and is available at http://www.eclipse.org/legal/epl-v10.html. - * + * * Contributors: * Oracle - initial API and implementation ******************************************************************************/ @@ -13,7 +13,7 @@ import java.util.Iterator; import org.eclipse.jdt.core.ICompilationUnit; import org.eclipse.jpt.common.core.resource.java.JavaResourceField; import org.eclipse.jpt.common.core.resource.java.JavaResourceType; -import org.eclipse.jpt.common.utility.internal.iterator.ArrayIterator; +import org.eclipse.jpt.common.utility.internal.iterator.IteratorTools; import org.eclipse.jpt.jaxb.core.resource.java.JAXB; import org.eclipse.jpt.jaxb.core.resource.java.XmlMimeTypeAnnotation; @@ -30,7 +30,7 @@ public class XmlMimeTypeAnnotationTests extends JaxbJavaResourceModelTestCase { return this.createTestType(new DefaultAnnotationWriter() { @Override public Iterator<String> imports() { - return new ArrayIterator<String>(JAXB.XML_MIME_TYPE); + return IteratorTools.iterator(JAXB.XML_MIME_TYPE); } @Override public void appendIdFieldAnnotationTo(StringBuilder sb) { @@ -47,7 +47,7 @@ public class XmlMimeTypeAnnotationTests extends JaxbJavaResourceModelTestCase { return this.createTestType(new DefaultAnnotationWriter() { @Override public Iterator<String> imports() { - return new ArrayIterator<String>(JAXB.XML_MIME_TYPE); + return IteratorTools.iterator(JAXB.XML_MIME_TYPE); } @Override public void appendIdFieldAnnotationTo(StringBuilder sb) { diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlMixedAnnotationTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlMixedAnnotationTests.java index 2abef98af1..4df0ac9ca4 100644 --- a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlMixedAnnotationTests.java +++ b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlMixedAnnotationTests.java @@ -1,9 +1,9 @@ /******************************************************************************* - * Copyright (c) 2010 Oracle. All rights reserved. + * Copyright (c) 2010, 2013 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0, which accompanies this distribution * and is available at http://www.eclipse.org/legal/epl-v10.html. - * + * * Contributors: * Oracle - initial API and implementation ******************************************************************************/ @@ -13,7 +13,7 @@ import java.util.Iterator; import org.eclipse.jdt.core.ICompilationUnit; import org.eclipse.jpt.common.core.resource.java.JavaResourceField; import org.eclipse.jpt.common.core.resource.java.JavaResourceType; -import org.eclipse.jpt.common.utility.internal.iterator.ArrayIterator; +import org.eclipse.jpt.common.utility.internal.iterator.IteratorTools; import org.eclipse.jpt.jaxb.core.resource.java.JAXB; import org.eclipse.jpt.jaxb.core.resource.java.XmlMixedAnnotation; @@ -28,7 +28,7 @@ public class XmlMixedAnnotationTests extends JaxbJavaResourceModelTestCase { return this.createTestType(new DefaultAnnotationWriter() { @Override public Iterator<String> imports() { - return new ArrayIterator<String>(JAXB.XML_MIXED); + return IteratorTools.iterator(JAXB.XML_MIXED); } @Override public void appendIdFieldAnnotationTo(StringBuilder sb) { diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlRegistryAnnotationTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlRegistryAnnotationTests.java index bd3dd8ff9d..f629a05b09 100644 --- a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlRegistryAnnotationTests.java +++ b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlRegistryAnnotationTests.java @@ -1,9 +1,9 @@ /******************************************************************************* - * Copyright (c) 2010 Oracle. All rights reserved. + * Copyright (c) 2010, 2013 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0, which accompanies this distribution * and is available at http://www.eclipse.org/legal/epl-v10.html. - * + * * Contributors: * Oracle - initial API and implementation ******************************************************************************/ @@ -12,7 +12,7 @@ package org.eclipse.jpt.jaxb.core.tests.internal.resource.java; import java.util.Iterator; import org.eclipse.jdt.core.ICompilationUnit; import org.eclipse.jpt.common.core.resource.java.JavaResourceType; -import org.eclipse.jpt.common.utility.internal.iterator.ArrayIterator; +import org.eclipse.jpt.common.utility.internal.iterator.IteratorTools; import org.eclipse.jpt.jaxb.core.resource.java.JAXB; import org.eclipse.jpt.jaxb.core.resource.java.XmlRegistryAnnotation; @@ -27,7 +27,7 @@ public class XmlRegistryAnnotationTests extends JaxbJavaResourceModelTestCase { return this.createTestType(new DefaultAnnotationWriter() { @Override public Iterator<String> imports() { - return new ArrayIterator<String>(JAXB.XML_REGISTRY); + return IteratorTools.iterator(JAXB.XML_REGISTRY); } @Override public void appendTypeAnnotationTo(StringBuilder sb) { diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlRootElementAnnotationTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlRootElementAnnotationTests.java index 700d6711db..5ddae21584 100644 --- a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlRootElementAnnotationTests.java +++ b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlRootElementAnnotationTests.java @@ -1,9 +1,9 @@ /******************************************************************************* - * Copyright (c) 2010 Oracle. All rights reserved. + * Copyright (c) 2010, 2013 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0, which accompanies this distribution * and is available at http://www.eclipse.org/legal/epl-v10.html. - * + * * Contributors: * Oracle - initial API and implementation ******************************************************************************/ @@ -12,7 +12,7 @@ package org.eclipse.jpt.jaxb.core.tests.internal.resource.java; import java.util.Iterator; import org.eclipse.jdt.core.ICompilationUnit; import org.eclipse.jpt.common.core.resource.java.JavaResourceType; -import org.eclipse.jpt.common.utility.internal.iterator.ArrayIterator; +import org.eclipse.jpt.common.utility.internal.iterator.IteratorTools; import org.eclipse.jpt.jaxb.core.resource.java.JAXB; import org.eclipse.jpt.jaxb.core.resource.java.XmlRootElementAnnotation; @@ -30,7 +30,7 @@ public class XmlRootElementAnnotationTests extends JaxbJavaResourceModelTestCase return this.createTestType(new DefaultAnnotationWriter() { @Override public Iterator<String> imports() { - return new ArrayIterator<String>(JAXB.XML_ROOT_ELEMENT); + return IteratorTools.iterator(JAXB.XML_ROOT_ELEMENT); } @Override public void appendTypeAnnotationTo(StringBuilder sb) { @@ -43,7 +43,7 @@ public class XmlRootElementAnnotationTests extends JaxbJavaResourceModelTestCase return this.createTestType(new DefaultAnnotationWriter() { @Override public Iterator<String> imports() { - return new ArrayIterator<String>(JAXB.XML_ROOT_ELEMENT); + return IteratorTools.iterator(JAXB.XML_ROOT_ELEMENT); } @Override public void appendTypeAnnotationTo(StringBuilder sb) { @@ -56,7 +56,7 @@ public class XmlRootElementAnnotationTests extends JaxbJavaResourceModelTestCase return this.createTestType(new DefaultAnnotationWriter() { @Override public Iterator<String> imports() { - return new ArrayIterator<String>(JAXB.XML_ROOT_ELEMENT); + return IteratorTools.iterator(JAXB.XML_ROOT_ELEMENT); } @Override public void appendTypeAnnotationTo(StringBuilder sb) { diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlSchemaTypeAttributeAnnotationTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlSchemaTypeAttributeAnnotationTests.java index 46910e844e..319a298687 100644 --- a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlSchemaTypeAttributeAnnotationTests.java +++ b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlSchemaTypeAttributeAnnotationTests.java @@ -1,12 +1,12 @@ /******************************************************************************* - * Copyright (c) 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 - *******************************************************************************/ + * Copyright (c) 2010, 2013 Oracle. All rights reserved. + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License v1.0, which accompanies this distribution + * and is available at http://www.eclipse.org/legal/epl-v10.html. + * + * Contributors: + * Oracle - initial API and implementation + ******************************************************************************/ package org.eclipse.jpt.jaxb.core.tests.internal.resource.java; import java.util.Date; @@ -15,7 +15,7 @@ import java.util.Iterator; import org.eclipse.jdt.core.ICompilationUnit; import org.eclipse.jpt.common.core.resource.java.JavaResourceField; import org.eclipse.jpt.common.core.resource.java.JavaResourceType; -import org.eclipse.jpt.common.utility.internal.iterator.ArrayIterator; +import org.eclipse.jpt.common.utility.internal.iterator.IteratorTools; import org.eclipse.jpt.jaxb.core.resource.java.JAXB; import org.eclipse.jpt.jaxb.core.resource.java.XmlSchemaTypeAnnotation; @@ -43,7 +43,7 @@ public class XmlSchemaTypeAttributeAnnotationTests return this.createTestType(new DefaultAnnotationWriter() { @Override public Iterator<String> imports() { - return new ArrayIterator<String>(JAXB.XML_SCHEMA_TYPE); + return IteratorTools.iterator(JAXB.XML_SCHEMA_TYPE); } @Override public void appendIdFieldAnnotationTo(StringBuilder sb) { @@ -56,7 +56,7 @@ public class XmlSchemaTypeAttributeAnnotationTests return this.createTestType(new DefaultAnnotationWriter() { @Override public Iterator<String> imports() { - return new ArrayIterator<String>(JAXB.XML_SCHEMA_TYPE); + return IteratorTools.iterator(JAXB.XML_SCHEMA_TYPE); } @Override public void appendIdFieldAnnotationTo(StringBuilder sb) { @@ -69,7 +69,7 @@ public class XmlSchemaTypeAttributeAnnotationTests return this.createTestType(new DefaultAnnotationWriter() { @Override public Iterator<String> imports() { - return new ArrayIterator<String>(JAXB.XML_SCHEMA_TYPE, FQ_TEST_CLASS, FQ_TEST_CLASS_2); + return IteratorTools.iterator(JAXB.XML_SCHEMA_TYPE, FQ_TEST_CLASS, FQ_TEST_CLASS_2); } @Override public void appendIdFieldAnnotationTo(StringBuilder sb) { diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlSeeAlsoAnnotationTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlSeeAlsoAnnotationTests.java index a71b064be3..3dad8c465b 100644 --- a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlSeeAlsoAnnotationTests.java +++ b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlSeeAlsoAnnotationTests.java @@ -1,9 +1,9 @@ /******************************************************************************* - * Copyright (c) 2010 Oracle. All rights reserved. + * Copyright (c) 2010, 2013 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0, which accompanies this distribution * and is available at http://www.eclipse.org/legal/epl-v10.html. - * + * * Contributors: * Oracle - initial API and implementation ******************************************************************************/ @@ -13,7 +13,7 @@ import java.util.Iterator; import java.util.ListIterator; import org.eclipse.jdt.core.ICompilationUnit; import org.eclipse.jpt.common.core.resource.java.JavaResourceType; -import org.eclipse.jpt.common.utility.internal.iterator.ArrayIterator; +import org.eclipse.jpt.common.utility.internal.iterator.IteratorTools; import org.eclipse.jpt.jaxb.core.resource.java.JAXB; import org.eclipse.jpt.jaxb.core.resource.java.XmlSeeAlsoAnnotation; @@ -29,7 +29,7 @@ public class XmlSeeAlsoAnnotationTests return this.createTestType(new DefaultAnnotationWriter() { @Override public Iterator<String> imports() { - return new ArrayIterator<String>(JAXB.XML_SEE_ALSO); + return IteratorTools.iterator(JAXB.XML_SEE_ALSO); } @Override public void appendTypeAnnotationTo(StringBuilder sb) { @@ -42,7 +42,7 @@ public class XmlSeeAlsoAnnotationTests return this.createTestType(new DefaultAnnotationWriter() { @Override public Iterator<String> imports() { - return new ArrayIterator<String>(JAXB.XML_SEE_ALSO); + return IteratorTools.iterator(JAXB.XML_SEE_ALSO); } @Override public void appendTypeAnnotationTo(StringBuilder sb) { diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlTransientAttributeAnnotationTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlTransientAttributeAnnotationTests.java index 225d34ca2b..ab6bdbdced 100644 --- a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlTransientAttributeAnnotationTests.java +++ b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlTransientAttributeAnnotationTests.java @@ -1,9 +1,9 @@ /******************************************************************************* - * Copyright (c) 2010 Oracle. All rights reserved. + * Copyright (c) 2010, 2013 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0, which accompanies this distribution * and is available at http://www.eclipse.org/legal/epl-v10.html. - * + * * Contributors: * Oracle - initial API and implementation ******************************************************************************/ @@ -13,7 +13,7 @@ import java.util.Iterator; import org.eclipse.jdt.core.ICompilationUnit; import org.eclipse.jpt.common.core.resource.java.JavaResourceMethod; import org.eclipse.jpt.common.core.resource.java.JavaResourceType; -import org.eclipse.jpt.common.utility.internal.iterator.ArrayIterator; +import org.eclipse.jpt.common.utility.internal.iterator.IteratorTools; import org.eclipse.jpt.jaxb.core.resource.java.JAXB; import org.eclipse.jpt.jaxb.core.resource.java.XmlTransientAnnotation; @@ -28,7 +28,7 @@ public class XmlTransientAttributeAnnotationTests extends JaxbJavaResourceModelT return this.createTestType(new DefaultAnnotationWriter() { @Override public Iterator<String> imports() { - return new ArrayIterator<String>(JAXB.XML_TRANSIENT); + return IteratorTools.iterator(JAXB.XML_TRANSIENT); } @Override public void appendGetIdMethodAnnotationTo(StringBuilder sb) { diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlTransientTypeAnnotationTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlTransientTypeAnnotationTests.java index 4364f38382..54c445d972 100644 --- a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlTransientTypeAnnotationTests.java +++ b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlTransientTypeAnnotationTests.java @@ -1,9 +1,9 @@ /******************************************************************************* - * Copyright (c) 2010 Oracle. All rights reserved. + * Copyright (c) 2010, 2013 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0, which accompanies this distribution * and is available at http://www.eclipse.org/legal/epl-v10.html. - * + * * Contributors: * Oracle - initial API and implementation ******************************************************************************/ @@ -12,7 +12,7 @@ package org.eclipse.jpt.jaxb.core.tests.internal.resource.java; import java.util.Iterator; import org.eclipse.jdt.core.ICompilationUnit; import org.eclipse.jpt.common.core.resource.java.JavaResourceType; -import org.eclipse.jpt.common.utility.internal.iterator.ArrayIterator; +import org.eclipse.jpt.common.utility.internal.iterator.IteratorTools; import org.eclipse.jpt.jaxb.core.resource.java.JAXB; import org.eclipse.jpt.jaxb.core.resource.java.XmlTransientAnnotation; @@ -27,7 +27,7 @@ public class XmlTransientTypeAnnotationTests extends JaxbJavaResourceModelTestCa return this.createTestType(new DefaultAnnotationWriter() { @Override public Iterator<String> imports() { - return new ArrayIterator<String>(JAXB.XML_TRANSIENT); + return IteratorTools.iterator(JAXB.XML_TRANSIENT); } @Override public void appendTypeAnnotationTo(StringBuilder sb) { diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlTypeAnnotationTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlTypeAnnotationTests.java index 7eed33911e..6d9112e0c7 100644 --- a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlTypeAnnotationTests.java +++ b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlTypeAnnotationTests.java @@ -1,9 +1,9 @@ /******************************************************************************* - * Copyright (c) 2010 Oracle. All rights reserved. + * Copyright (c) 2010, 2013 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0, which accompanies this distribution * and is available at http://www.eclipse.org/legal/epl-v10.html. - * + * * Contributors: * Oracle - initial API and implementation ******************************************************************************/ @@ -14,7 +14,7 @@ import java.util.ListIterator; import org.eclipse.jdt.core.ICompilationUnit; import org.eclipse.jpt.common.core.resource.java.JavaResourceType; import org.eclipse.jpt.common.core.tests.internal.projects.TestJavaProject.SourceWriter; -import org.eclipse.jpt.common.utility.internal.iterator.ArrayIterator; +import org.eclipse.jpt.common.utility.internal.iterator.IteratorTools; import org.eclipse.jpt.jaxb.core.resource.java.JAXB; import org.eclipse.jpt.jaxb.core.resource.java.XmlTypeAnnotation; @@ -34,7 +34,7 @@ public class XmlTypeAnnotationTests extends JaxbJavaResourceModelTestCase { return this.createTestType(new DefaultAnnotationWriter() { @Override public Iterator<String> imports() { - return new ArrayIterator<String>(JAXB.XML_TYPE); + return IteratorTools.iterator(JAXB.XML_TYPE); } @Override public void appendTypeAnnotationTo(StringBuilder sb) { @@ -47,7 +47,7 @@ public class XmlTypeAnnotationTests extends JaxbJavaResourceModelTestCase { return this.createTestType(new DefaultAnnotationWriter() { @Override public Iterator<String> imports() { - return new ArrayIterator<String>(JAXB.XML_TYPE); + return IteratorTools.iterator(JAXB.XML_TYPE); } @Override public void appendTypeAnnotationTo(StringBuilder sb) { @@ -60,7 +60,7 @@ public class XmlTypeAnnotationTests extends JaxbJavaResourceModelTestCase { return this.createTestType(new DefaultAnnotationWriter() { @Override public Iterator<String> imports() { - return new ArrayIterator<String>(JAXB.XML_TYPE); + return IteratorTools.iterator(JAXB.XML_TYPE); } @Override public void appendTypeAnnotationTo(StringBuilder sb) { @@ -73,7 +73,7 @@ public class XmlTypeAnnotationTests extends JaxbJavaResourceModelTestCase { return this.createTestType(new DefaultAnnotationWriter() { @Override public Iterator<String> imports() { - return new ArrayIterator<String>(JAXB.XML_TYPE); + return IteratorTools.iterator(JAXB.XML_TYPE); } @Override public void appendTypeAnnotationTo(StringBuilder sb) { @@ -87,7 +87,7 @@ public class XmlTypeAnnotationTests extends JaxbJavaResourceModelTestCase { return this.createTestType(new DefaultAnnotationWriter() { @Override public Iterator<String> imports() { - return new ArrayIterator<String>(JAXB.XML_TYPE); + return IteratorTools.iterator(JAXB.XML_TYPE); } @Override public void appendTypeAnnotationTo(StringBuilder sb) { @@ -111,7 +111,7 @@ public class XmlTypeAnnotationTests extends JaxbJavaResourceModelTestCase { return this.createTestType(new DefaultAnnotationWriter() { @Override public Iterator<String> imports() { - return new ArrayIterator<String>(JAXB.XML_TYPE); + return IteratorTools.iterator(JAXB.XML_TYPE); } @Override public void appendTypeAnnotationTo(StringBuilder sb) { diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlValueAnnotationTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlValueAnnotationTests.java index 01ba8f2bf5..49b0fe1b20 100644 --- a/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlValueAnnotationTests.java +++ b/jaxb/tests/org.eclipse.jpt.jaxb.core.tests/src/org/eclipse/jpt/jaxb/core/tests/internal/resource/java/XmlValueAnnotationTests.java @@ -1,9 +1,9 @@ /******************************************************************************* - * Copyright (c) 2010 Oracle. All rights reserved. + * Copyright (c) 2010, 2013 Oracle. All rights reserved. * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0, which accompanies this distribution * and is available at http://www.eclipse.org/legal/epl-v10.html. - * + * * Contributors: * Oracle - initial API and implementation ******************************************************************************/ @@ -13,7 +13,7 @@ import java.util.Iterator; import org.eclipse.jdt.core.ICompilationUnit; import org.eclipse.jpt.common.core.resource.java.JavaResourceField; import org.eclipse.jpt.common.core.resource.java.JavaResourceType; -import org.eclipse.jpt.common.utility.internal.iterator.ArrayIterator; +import org.eclipse.jpt.common.utility.internal.iterator.IteratorTools; import org.eclipse.jpt.jaxb.core.resource.java.JAXB; import org.eclipse.jpt.jaxb.core.resource.java.XmlValueAnnotation; @@ -28,7 +28,7 @@ public class XmlValueAnnotationTests extends JaxbJavaResourceModelTestCase { return this.createTestType(new DefaultAnnotationWriter() { @Override public Iterator<String> imports() { - return new ArrayIterator<String>(JAXB.XML_VALUE); + return IteratorTools.iterator(JAXB.XML_VALUE); } @Override public void appendIdFieldAnnotationTo(StringBuilder sb) { diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/java/ELJavaXmlAnyAttributeMappingTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/java/ELJavaXmlAnyAttributeMappingTests.java index e15d95f141..436f88078d 100644 --- a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/java/ELJavaXmlAnyAttributeMappingTests.java +++ b/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/java/ELJavaXmlAnyAttributeMappingTests.java @@ -1,12 +1,12 @@ /******************************************************************************* - * Copyright (c) 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 - *******************************************************************************/ + * Copyright (c) 2012, 2013 Oracle. All rights reserved. + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License v1.0, which accompanies this distribution + * and is available at http://www.eclipse.org/legal/epl-v10.html. + * + * Contributors: + * Oracle - initial API and implementation + ******************************************************************************/ package org.eclipse.jpt.jaxb.eclipselink.core.tests.internal.context.java; import java.util.Iterator; @@ -16,7 +16,7 @@ import org.eclipse.jpt.common.core.utility.jdt.AnnotatedElement; import org.eclipse.jpt.common.core.utility.jdt.Member; import org.eclipse.jpt.common.core.utility.jdt.ModifiedDeclaration; import org.eclipse.jpt.common.utility.internal.iterable.IterableTools; -import org.eclipse.jpt.common.utility.internal.iterator.ArrayIterator; +import org.eclipse.jpt.common.utility.internal.iterator.IteratorTools; import org.eclipse.jpt.jaxb.core.context.JaxbPersistentAttribute; import org.eclipse.jpt.jaxb.core.context.java.JavaClass; import org.eclipse.jpt.jaxb.core.context.java.JavaClassMapping; @@ -39,7 +39,7 @@ public class ELJavaXmlAnyAttributeMappingTests return this.createTestType(new DefaultAnnotationWriter() { @Override public Iterator<String> imports() { - return new ArrayIterator<String>(JAXB.XML_TYPE, JAXB.XML_ANY_ATTRIBUTE); + return IteratorTools.iterator(JAXB.XML_TYPE, JAXB.XML_ANY_ATTRIBUTE); } @Override diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/java/ELJavaXmlAnyElementMappingTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/java/ELJavaXmlAnyElementMappingTests.java index f2b4c46d07..c267954060 100644 --- a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/java/ELJavaXmlAnyElementMappingTests.java +++ b/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/java/ELJavaXmlAnyElementMappingTests.java @@ -1,12 +1,12 @@ /******************************************************************************* - * Copyright (c) 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 - *******************************************************************************/ + * Copyright (c) 2012, 2013 Oracle. All rights reserved. + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License v1.0, which accompanies this distribution + * and is available at http://www.eclipse.org/legal/epl-v10.html. + * + * Contributors: + * Oracle - initial API and implementation + ******************************************************************************/ package org.eclipse.jpt.jaxb.eclipselink.core.tests.internal.context.java; import java.util.Iterator; @@ -16,7 +16,7 @@ import org.eclipse.jpt.common.core.utility.jdt.AnnotatedElement; import org.eclipse.jpt.common.core.utility.jdt.Member; import org.eclipse.jpt.common.core.utility.jdt.ModifiedDeclaration; import org.eclipse.jpt.common.utility.internal.iterable.IterableTools; -import org.eclipse.jpt.common.utility.internal.iterator.ArrayIterator; +import org.eclipse.jpt.common.utility.internal.iterator.IteratorTools; import org.eclipse.jpt.jaxb.core.context.JaxbPersistentAttribute; import org.eclipse.jpt.jaxb.core.context.java.JavaClass; import org.eclipse.jpt.jaxb.core.context.java.JavaClassMapping; @@ -38,7 +38,7 @@ public class ELJavaXmlAnyElementMappingTests return this.createTestType(new DefaultAnnotationWriter() { @Override public Iterator<String> imports() { - return new ArrayIterator<String>(JAXB.XML_TYPE, JAXB.XML_ANY_ELEMENT); + return IteratorTools.iterator(JAXB.XML_TYPE, JAXB.XML_ANY_ELEMENT); } @Override diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/java/ELJavaXmlAttributeMappingTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/java/ELJavaXmlAttributeMappingTests.java index 897fce0eee..4fa672d7c1 100644 --- a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/java/ELJavaXmlAttributeMappingTests.java +++ b/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/java/ELJavaXmlAttributeMappingTests.java @@ -16,7 +16,7 @@ import org.eclipse.jpt.common.core.utility.jdt.AnnotatedElement; import org.eclipse.jpt.common.core.utility.jdt.Member; import org.eclipse.jpt.common.core.utility.jdt.ModifiedDeclaration; import org.eclipse.jpt.common.utility.internal.iterable.IterableTools; -import org.eclipse.jpt.common.utility.internal.iterator.ArrayIterator; +import org.eclipse.jpt.common.utility.internal.iterator.IteratorTools; import org.eclipse.jpt.jaxb.core.MappingKeys; import org.eclipse.jpt.jaxb.core.context.JaxbPersistentAttribute; import org.eclipse.jpt.jaxb.core.context.java.JavaClass; @@ -46,7 +46,7 @@ public class ELJavaXmlAttributeMappingTests return this.createTestType(new DefaultAnnotationWriter() { @Override public Iterator<String> imports() { - return new ArrayIterator<String>(JAXB.XML_TYPE, JAXB.XML_ATTRIBUTE); + return IteratorTools.iterator(JAXB.XML_TYPE, JAXB.XML_ATTRIBUTE); } @Override @@ -65,7 +65,7 @@ public class ELJavaXmlAttributeMappingTests return this.createTestType(new DefaultAnnotationWriter() { @Override public Iterator<String> imports() { - return new ArrayIterator<String>(JAXB.XML_TYPE, ELJaxb.XML_PATH); + return IteratorTools.iterator(JAXB.XML_TYPE, ELJaxb.XML_PATH); } @Override diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/java/ELJavaXmlDiscriminatorNodeTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/java/ELJavaXmlDiscriminatorNodeTests.java index a90433455d..4129ba4509 100644 --- a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/java/ELJavaXmlDiscriminatorNodeTests.java +++ b/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/java/ELJavaXmlDiscriminatorNodeTests.java @@ -16,7 +16,7 @@ import org.eclipse.jpt.common.core.utility.jdt.AnnotatedElement; import org.eclipse.jpt.common.core.utility.jdt.Member; import org.eclipse.jpt.common.core.utility.jdt.ModifiedDeclaration; import org.eclipse.jpt.common.utility.internal.iterable.IterableTools; -import org.eclipse.jpt.common.utility.internal.iterator.ArrayIterator; +import org.eclipse.jpt.common.utility.internal.iterator.IteratorTools; import org.eclipse.jpt.jaxb.core.context.java.JavaClass; import org.eclipse.jpt.jaxb.core.resource.java.JAXB; import org.eclipse.jpt.jaxb.eclipselink.core.context.java.ELClassMapping; @@ -45,7 +45,7 @@ public class ELJavaXmlDiscriminatorNodeTests return this.createTestType(new DefaultAnnotationWriter() { @Override public Iterator<String> imports() { - return new ArrayIterator<String>(JAXB.XML_TYPE, ELJaxb.XML_DISCRIMINATOR_NODE); + return IteratorTools.iterator(JAXB.XML_TYPE, ELJaxb.XML_DISCRIMINATOR_NODE); } @Override diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/java/ELJavaXmlDiscriminatorValueTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/java/ELJavaXmlDiscriminatorValueTests.java index 8ce65af1e8..6a5ef9c5ac 100644 --- a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/java/ELJavaXmlDiscriminatorValueTests.java +++ b/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/java/ELJavaXmlDiscriminatorValueTests.java @@ -16,7 +16,7 @@ import org.eclipse.jpt.common.core.utility.jdt.AnnotatedElement; import org.eclipse.jpt.common.core.utility.jdt.Member; import org.eclipse.jpt.common.core.utility.jdt.ModifiedDeclaration; import org.eclipse.jpt.common.utility.internal.iterable.IterableTools; -import org.eclipse.jpt.common.utility.internal.iterator.ArrayIterator; +import org.eclipse.jpt.common.utility.internal.iterator.IteratorTools; import org.eclipse.jpt.jaxb.core.context.java.JavaClass; import org.eclipse.jpt.jaxb.core.resource.java.JAXB; import org.eclipse.jpt.jaxb.eclipselink.core.context.java.ELClassMapping; @@ -45,7 +45,7 @@ public class ELJavaXmlDiscriminatorValueTests return this.createTestType(new DefaultAnnotationWriter() { @Override public Iterator<String> imports() { - return new ArrayIterator<String>(JAXB.XML_TYPE, ELJaxb.XML_DISCRIMINATOR_VALUE); + return IteratorTools.iterator(JAXB.XML_TYPE, ELJaxb.XML_DISCRIMINATOR_VALUE); } @Override diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/java/ELJavaXmlElementMappingTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/java/ELJavaXmlElementMappingTests.java index 36737311f1..0d21c7412b 100644 --- a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/java/ELJavaXmlElementMappingTests.java +++ b/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/java/ELJavaXmlElementMappingTests.java @@ -16,7 +16,7 @@ import org.eclipse.jpt.common.core.utility.jdt.AnnotatedElement; import org.eclipse.jpt.common.core.utility.jdt.Member; import org.eclipse.jpt.common.core.utility.jdt.ModifiedDeclaration; import org.eclipse.jpt.common.utility.internal.iterable.IterableTools; -import org.eclipse.jpt.common.utility.internal.iterator.ArrayIterator; +import org.eclipse.jpt.common.utility.internal.iterator.IteratorTools; import org.eclipse.jpt.jaxb.core.MappingKeys; import org.eclipse.jpt.jaxb.core.context.JaxbPersistentAttribute; import org.eclipse.jpt.jaxb.core.context.java.JavaClass; @@ -47,7 +47,7 @@ public class ELJavaXmlElementMappingTests return this.createTestType(new DefaultAnnotationWriter() { @Override public Iterator<String> imports() { - return new ArrayIterator<String>(JAXB.XML_TYPE, JAXB.XML_ELEMENT); + return IteratorTools.iterator(JAXB.XML_TYPE, JAXB.XML_ELEMENT); } @Override @@ -66,7 +66,7 @@ public class ELJavaXmlElementMappingTests return this.createTestType(new DefaultAnnotationWriter() { @Override public Iterator<String> imports() { - return new ArrayIterator<String>(JAXB.XML_TYPE, ELJaxb.XML_PATH); + return IteratorTools.iterator(JAXB.XML_TYPE, ELJaxb.XML_PATH); } @Override diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/java/ELJavaXmlElementsMappingTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/java/ELJavaXmlElementsMappingTests.java index 660bcdf183..6e679fc5dd 100644 --- a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/java/ELJavaXmlElementsMappingTests.java +++ b/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/java/ELJavaXmlElementsMappingTests.java @@ -1,12 +1,12 @@ /******************************************************************************* - * Copyright (c) 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 - *******************************************************************************/ + * Copyright (c) 2012, 2013 Oracle. All rights reserved. + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License v1.0, which accompanies this distribution + * and is available at http://www.eclipse.org/legal/epl-v10.html. + * + * Contributors: + * Oracle - initial API and implementation + ******************************************************************************/ package org.eclipse.jpt.jaxb.eclipselink.core.tests.internal.context.java; import java.util.Iterator; @@ -19,7 +19,7 @@ import org.eclipse.jpt.common.core.utility.jdt.Member; import org.eclipse.jpt.common.core.utility.jdt.ModifiedDeclaration; 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.iterator.ArrayIterator; +import org.eclipse.jpt.common.utility.internal.iterator.IteratorTools; import org.eclipse.jpt.jaxb.core.context.java.JavaClass; import org.eclipse.jpt.jaxb.core.context.java.JavaClassMapping; import org.eclipse.jpt.jaxb.core.resource.java.JAXB; @@ -42,7 +42,7 @@ public class ELJavaXmlElementsMappingTests return this.createTestType(new DefaultAnnotationWriter() { @Override public Iterator<String> imports() { - return new ArrayIterator<String>(JAXB.XML_TYPE, JAXB.XML_ELEMENTS); + return IteratorTools.iterator(JAXB.XML_TYPE, JAXB.XML_ELEMENTS); } @Override diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/java/ELJavaXmlInverseReferenceMappingTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/java/ELJavaXmlInverseReferenceMappingTests.java index d75e640459..33b1907b13 100644 --- a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/java/ELJavaXmlInverseReferenceMappingTests.java +++ b/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/java/ELJavaXmlInverseReferenceMappingTests.java @@ -1,12 +1,12 @@ /******************************************************************************* - * Copyright (c) 2011, 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 - *******************************************************************************/ + * Copyright (c) 2011, 2013 Oracle. All rights reserved. + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License v1.0, which accompanies this distribution + * and is available at http://www.eclipse.org/legal/epl-v10.html. + * + * Contributors: + * Oracle - initial API and implementation + ******************************************************************************/ package org.eclipse.jpt.jaxb.eclipselink.core.tests.internal.context.java; import java.util.Iterator; @@ -18,7 +18,7 @@ import org.eclipse.jpt.common.core.utility.jdt.AnnotatedElement; import org.eclipse.jpt.common.core.utility.jdt.Member; import org.eclipse.jpt.common.core.utility.jdt.ModifiedDeclaration; import org.eclipse.jpt.common.utility.internal.iterable.IterableTools; -import org.eclipse.jpt.common.utility.internal.iterator.ArrayIterator; +import org.eclipse.jpt.common.utility.internal.iterator.IteratorTools; import org.eclipse.jpt.jaxb.core.context.JaxbPersistentAttribute; import org.eclipse.jpt.jaxb.core.context.java.JavaClass; import org.eclipse.jpt.jaxb.core.context.java.JavaClassMapping; @@ -41,7 +41,7 @@ public class ELJavaXmlInverseReferenceMappingTests return this.createTestType(new DefaultAnnotationWriter() { @Override public Iterator<String> imports() { - return new ArrayIterator<String>(JAXB.XML_TYPE, ELJaxb.XML_INVERSE_REFERENCE); + return IteratorTools.iterator(JAXB.XML_TYPE, ELJaxb.XML_INVERSE_REFERENCE); } @Override public void appendTypeAnnotationTo(StringBuilder sb) { diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/java/ELJavaXmlJoinNodeTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/java/ELJavaXmlJoinNodeTests.java index a489b4e2e9..8a671d1ae3 100644 --- a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/java/ELJavaXmlJoinNodeTests.java +++ b/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/java/ELJavaXmlJoinNodeTests.java @@ -16,7 +16,7 @@ import org.eclipse.jpt.common.core.utility.jdt.AnnotatedElement; import org.eclipse.jpt.common.core.utility.jdt.Member; import org.eclipse.jpt.common.core.utility.jdt.ModifiedDeclaration; import org.eclipse.jpt.common.utility.internal.iterable.IterableTools; -import org.eclipse.jpt.common.utility.internal.iterator.ArrayIterator; +import org.eclipse.jpt.common.utility.internal.iterator.IteratorTools; import org.eclipse.jpt.jaxb.core.context.JaxbPersistentAttribute; import org.eclipse.jpt.jaxb.core.context.java.JavaClass; import org.eclipse.jpt.jaxb.core.context.java.JavaClassMapping; @@ -47,7 +47,7 @@ public class ELJavaXmlJoinNodeTests return this.createTestType(new DefaultAnnotationWriter() { @Override public Iterator<String> imports() { - return new ArrayIterator<String>(JAXB.XML_TYPE, ELJaxb.XML_JOIN_NODE); + return IteratorTools.iterator(JAXB.XML_TYPE, ELJaxb.XML_JOIN_NODE); } @Override diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/java/ELJavaXmlJoinNodesMappingTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/java/ELJavaXmlJoinNodesMappingTests.java index 0383a905d8..8887828e26 100644 --- a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/java/ELJavaXmlJoinNodesMappingTests.java +++ b/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/java/ELJavaXmlJoinNodesMappingTests.java @@ -19,7 +19,7 @@ import org.eclipse.jpt.common.core.utility.jdt.Member; import org.eclipse.jpt.common.core.utility.jdt.ModifiedDeclaration; 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.iterator.ArrayIterator; +import org.eclipse.jpt.common.utility.internal.iterator.IteratorTools; import org.eclipse.jpt.jaxb.core.context.java.JavaClass; import org.eclipse.jpt.jaxb.core.context.java.JavaClassMapping; import org.eclipse.jpt.jaxb.core.resource.java.JAXB; @@ -48,7 +48,7 @@ public class ELJavaXmlJoinNodesMappingTests return this.createTestType(new DefaultAnnotationWriter() { @Override public Iterator<String> imports() { - return new ArrayIterator<String>(JAXB.XML_TYPE, ELJaxb.XML_JOIN_NODES); + return IteratorTools.iterator(JAXB.XML_TYPE, ELJaxb.XML_JOIN_NODES); } @Override diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/java/ELJavaXmlPathTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/java/ELJavaXmlPathTests.java index 633f944bc1..9f574c6753 100644 --- a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/java/ELJavaXmlPathTests.java +++ b/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/java/ELJavaXmlPathTests.java @@ -1,12 +1,12 @@ /******************************************************************************* - * Copyright (c) 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 - *******************************************************************************/ + * Copyright (c) 2012, 2013 Oracle. All rights reserved. + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License v1.0, which accompanies this distribution + * and is available at http://www.eclipse.org/legal/epl-v10.html. + * + * Contributors: + * Oracle - initial API and implementation + ******************************************************************************/ package org.eclipse.jpt.jaxb.eclipselink.core.tests.internal.context.java; import java.util.Iterator; @@ -16,7 +16,7 @@ import org.eclipse.jpt.common.core.utility.jdt.AnnotatedElement; import org.eclipse.jpt.common.core.utility.jdt.Member; import org.eclipse.jpt.common.core.utility.jdt.ModifiedDeclaration; import org.eclipse.jpt.common.utility.internal.iterable.IterableTools; -import org.eclipse.jpt.common.utility.internal.iterator.ArrayIterator; +import org.eclipse.jpt.common.utility.internal.iterator.IteratorTools; import org.eclipse.jpt.jaxb.core.context.JaxbPersistentAttribute; import org.eclipse.jpt.jaxb.core.context.java.JavaClass; import org.eclipse.jpt.jaxb.core.context.java.JavaClassMapping; @@ -41,7 +41,7 @@ public class ELJavaXmlPathTests return this.createTestType(new DefaultAnnotationWriter() { @Override public Iterator<String> imports() { - return new ArrayIterator<String>(JAXB.XML_TYPE, ELJaxb.XML_PATH); + return IteratorTools.iterator(JAXB.XML_TYPE, ELJaxb.XML_PATH); } @Override diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/java/ELJavaXmlValueMappingTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/java/ELJavaXmlValueMappingTests.java index 24a84ba7e5..8ce1433064 100644 --- a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/java/ELJavaXmlValueMappingTests.java +++ b/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/context/java/ELJavaXmlValueMappingTests.java @@ -16,7 +16,7 @@ import org.eclipse.jpt.common.core.utility.jdt.AnnotatedElement; import org.eclipse.jpt.common.core.utility.jdt.Member; import org.eclipse.jpt.common.core.utility.jdt.ModifiedDeclaration; import org.eclipse.jpt.common.utility.internal.iterable.IterableTools; -import org.eclipse.jpt.common.utility.internal.iterator.ArrayIterator; +import org.eclipse.jpt.common.utility.internal.iterator.IteratorTools; import org.eclipse.jpt.jaxb.core.context.JaxbPersistentAttribute; import org.eclipse.jpt.jaxb.core.context.java.JavaClass; import org.eclipse.jpt.jaxb.core.context.java.JavaClassMapping; @@ -44,7 +44,7 @@ public class ELJavaXmlValueMappingTests return this.createTestType(new DefaultAnnotationWriter() { @Override public Iterator<String> imports() { - return new ArrayIterator<String>(JAXB.XML_TYPE, JAXB.XML_VALUE); + return IteratorTools.iterator(JAXB.XML_TYPE, JAXB.XML_VALUE); } @Override diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/resource/java/XmlCDATAAnnotationTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/resource/java/XmlCDATAAnnotationTests.java index 4b91331f6d..f8de4f915b 100644 --- a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/resource/java/XmlCDATAAnnotationTests.java +++ b/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/resource/java/XmlCDATAAnnotationTests.java @@ -1,12 +1,12 @@ /******************************************************************************* - * Copyright (c) 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 - *******************************************************************************/ + * Copyright (c) 2012, 2013 Oracle. All rights reserved. + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License v1.0, which accompanies this distribution + * and is available at http://www.eclipse.org/legal/epl-v10.html. + * + * Contributors: + * Oracle - initial API and implementation + ******************************************************************************/ package org.eclipse.jpt.jaxb.eclipselink.core.tests.internal.resource.java; import java.util.Iterator; @@ -16,7 +16,7 @@ import org.eclipse.jpt.common.core.resource.java.JavaResourceAttribute; import org.eclipse.jpt.common.core.resource.java.JavaResourceField; import org.eclipse.jpt.common.core.resource.java.JavaResourceType; import org.eclipse.jpt.common.core.resource.java.NestableAnnotationDefinition; -import org.eclipse.jpt.common.utility.internal.iterator.ArrayIterator; +import org.eclipse.jpt.common.utility.internal.iterator.IteratorTools; import org.eclipse.jpt.jaxb.eclipselink.core.internal.v2_2.ELJaxb_2_2_PlatformDefinition; import org.eclipse.jpt.jaxb.eclipselink.core.resource.java.ELJaxb; import org.eclipse.jpt.jaxb.eclipselink.core.resource.java.XmlCDATAAnnotation; @@ -48,7 +48,7 @@ public class XmlCDATAAnnotationTests @Override public Iterator<String> imports() { - return new ArrayIterator<String>(ELJaxb.XML_CDATA); + return IteratorTools.iterator(ELJaxb.XML_CDATA); } @Override diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/resource/java/XmlDiscriminatorNodeAnnotationTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/resource/java/XmlDiscriminatorNodeAnnotationTests.java index 300a84cf07..a81b180ae3 100644 --- a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/resource/java/XmlDiscriminatorNodeAnnotationTests.java +++ b/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/resource/java/XmlDiscriminatorNodeAnnotationTests.java @@ -1,12 +1,12 @@ /******************************************************************************* - * Copyright (c) 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 - *******************************************************************************/ + * Copyright (c) 2012, 2013 Oracle. All rights reserved. + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License v1.0, which accompanies this distribution + * and is available at http://www.eclipse.org/legal/epl-v10.html. + * + * Contributors: + * Oracle - initial API and implementation + ******************************************************************************/ package org.eclipse.jpt.jaxb.eclipselink.core.tests.internal.resource.java; import java.util.Iterator; @@ -14,7 +14,7 @@ import org.eclipse.jdt.core.ICompilationUnit; import org.eclipse.jpt.common.core.resource.java.AnnotationDefinition; import org.eclipse.jpt.common.core.resource.java.JavaResourceType; import org.eclipse.jpt.common.core.resource.java.NestableAnnotationDefinition; -import org.eclipse.jpt.common.utility.internal.iterator.ArrayIterator; +import org.eclipse.jpt.common.utility.internal.iterator.IteratorTools; import org.eclipse.jpt.jaxb.eclipselink.core.internal.v2_2.ELJaxb_2_2_PlatformDefinition; import org.eclipse.jpt.jaxb.eclipselink.core.resource.java.ELJaxb; import org.eclipse.jpt.jaxb.eclipselink.core.resource.java.XmlDiscriminatorNodeAnnotation; @@ -46,7 +46,7 @@ public class XmlDiscriminatorNodeAnnotationTests @Override public Iterator<String> imports() { - return new ArrayIterator<String>(ELJaxb.XML_DISCRIMINATOR_NODE); + return IteratorTools.iterator(ELJaxb.XML_DISCRIMINATOR_NODE); } @Override diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/resource/java/XmlDiscriminatorValueAnnotationTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/resource/java/XmlDiscriminatorValueAnnotationTests.java index ea9f5e35a1..b4db769da0 100644 --- a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/resource/java/XmlDiscriminatorValueAnnotationTests.java +++ b/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/resource/java/XmlDiscriminatorValueAnnotationTests.java @@ -1,12 +1,12 @@ /******************************************************************************* - * Copyright (c) 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 - *******************************************************************************/ + * Copyright (c) 2012, 2013 Oracle. All rights reserved. + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License v1.0, which accompanies this distribution + * and is available at http://www.eclipse.org/legal/epl-v10.html. + * + * Contributors: + * Oracle - initial API and implementation + ******************************************************************************/ package org.eclipse.jpt.jaxb.eclipselink.core.tests.internal.resource.java; import java.util.Iterator; @@ -14,7 +14,7 @@ import org.eclipse.jdt.core.ICompilationUnit; import org.eclipse.jpt.common.core.resource.java.AnnotationDefinition; import org.eclipse.jpt.common.core.resource.java.JavaResourceType; import org.eclipse.jpt.common.core.resource.java.NestableAnnotationDefinition; -import org.eclipse.jpt.common.utility.internal.iterator.ArrayIterator; +import org.eclipse.jpt.common.utility.internal.iterator.IteratorTools; import org.eclipse.jpt.jaxb.eclipselink.core.internal.v2_2.ELJaxb_2_2_PlatformDefinition; import org.eclipse.jpt.jaxb.eclipselink.core.resource.java.ELJaxb; import org.eclipse.jpt.jaxb.eclipselink.core.resource.java.XmlDiscriminatorValueAnnotation; @@ -46,7 +46,7 @@ public class XmlDiscriminatorValueAnnotationTests @Override public Iterator<String> imports() { - return new ArrayIterator<String>(ELJaxb.XML_DISCRIMINATOR_VALUE); + return IteratorTools.iterator(ELJaxb.XML_DISCRIMINATOR_VALUE); } @Override diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/resource/java/XmlInverseReferenceAnnotationTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/resource/java/XmlInverseReferenceAnnotationTests.java index 7b38d5dba8..0583f8df53 100644 --- a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/resource/java/XmlInverseReferenceAnnotationTests.java +++ b/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/resource/java/XmlInverseReferenceAnnotationTests.java @@ -1,12 +1,12 @@ /******************************************************************************* - * Copyright (c) 2011, 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 - *******************************************************************************/ + * Copyright (c) 2011, 2013 Oracle. All rights reserved. + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License v1.0, which accompanies this distribution + * and is available at http://www.eclipse.org/legal/epl-v10.html. + * + * Contributors: + * Oracle - initial API and implementation + ******************************************************************************/ package org.eclipse.jpt.jaxb.eclipselink.core.tests.internal.resource.java; import java.util.Iterator; @@ -14,7 +14,7 @@ import org.eclipse.jdt.core.ICompilationUnit; import org.eclipse.jpt.common.core.resource.java.JavaResourceAttribute; import org.eclipse.jpt.common.core.resource.java.JavaResourceField; import org.eclipse.jpt.common.core.resource.java.JavaResourceType; -import org.eclipse.jpt.common.utility.internal.iterator.ArrayIterator; +import org.eclipse.jpt.common.utility.internal.iterator.IteratorTools; import org.eclipse.jpt.jaxb.eclipselink.core.resource.java.ELJaxb; import org.eclipse.jpt.jaxb.eclipselink.core.resource.java.XmlInverseReferenceAnnotation; @@ -34,7 +34,7 @@ public class XmlInverseReferenceAnnotationTests @Override public Iterator<String> imports() { - return new ArrayIterator<String>(ELJaxb.XML_INVERSE_REFERENCE); + return IteratorTools.iterator(ELJaxb.XML_INVERSE_REFERENCE); } @Override @@ -51,7 +51,7 @@ public class XmlInverseReferenceAnnotationTests @Override public Iterator<String> imports() { - return new ArrayIterator<String>(ELJaxb.XML_INVERSE_REFERENCE); + return IteratorTools.iterator(ELJaxb.XML_INVERSE_REFERENCE); } @Override diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/resource/java/XmlJoinNodeAnnotationTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/resource/java/XmlJoinNodeAnnotationTests.java index bd60e85a46..f74dffa889 100644 --- a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/resource/java/XmlJoinNodeAnnotationTests.java +++ b/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/resource/java/XmlJoinNodeAnnotationTests.java @@ -1,12 +1,12 @@ /******************************************************************************* - * Copyright (c) 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 - *******************************************************************************/ + * Copyright (c) 2012, 2013 Oracle. All rights reserved. + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License v1.0, which accompanies this distribution + * and is available at http://www.eclipse.org/legal/epl-v10.html. + * + * Contributors: + * Oracle - initial API and implementation + ******************************************************************************/ package org.eclipse.jpt.jaxb.eclipselink.core.tests.internal.resource.java; import java.util.Iterator; @@ -16,7 +16,7 @@ import org.eclipse.jpt.common.core.resource.java.JavaResourceAttribute; import org.eclipse.jpt.common.core.resource.java.JavaResourceField; import org.eclipse.jpt.common.core.resource.java.JavaResourceType; import org.eclipse.jpt.common.core.resource.java.NestableAnnotationDefinition; -import org.eclipse.jpt.common.utility.internal.iterator.ArrayIterator; +import org.eclipse.jpt.common.utility.internal.iterator.IteratorTools; import org.eclipse.jpt.jaxb.eclipselink.core.internal.v2_2.ELJaxb_2_2_PlatformDefinition; import org.eclipse.jpt.jaxb.eclipselink.core.resource.java.ELJaxb; import org.eclipse.jpt.jaxb.eclipselink.core.resource.java.XmlJoinNodeAnnotation; @@ -48,7 +48,7 @@ public class XmlJoinNodeAnnotationTests @Override public Iterator<String> imports() { - return new ArrayIterator<String>(ELJaxb.XML_JOIN_NODE); + return IteratorTools.iterator(ELJaxb.XML_JOIN_NODE); } @Override @@ -65,7 +65,7 @@ public class XmlJoinNodeAnnotationTests @Override public Iterator<String> imports() { - return new ArrayIterator<String>(ELJaxb.XML_JOIN_NODE); + return IteratorTools.iterator(ELJaxb.XML_JOIN_NODE); } @Override @@ -82,7 +82,7 @@ public class XmlJoinNodeAnnotationTests @Override public Iterator<String> imports() { - return new ArrayIterator<String>(ELJaxb.XML_JOIN_NODE); + return IteratorTools.iterator(ELJaxb.XML_JOIN_NODE); } @Override @@ -99,7 +99,7 @@ public class XmlJoinNodeAnnotationTests @Override public Iterator<String> imports() { - return new ArrayIterator<String>(ELJaxb.XML_JOIN_NODES, ELJaxb.XML_JOIN_NODE); + return IteratorTools.iterator(ELJaxb.XML_JOIN_NODES, ELJaxb.XML_JOIN_NODE); } @Override diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/resource/java/XmlKeyAnnotationTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/resource/java/XmlKeyAnnotationTests.java index b2abce66c4..fa2ee15267 100644 --- a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/resource/java/XmlKeyAnnotationTests.java +++ b/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/resource/java/XmlKeyAnnotationTests.java @@ -1,12 +1,12 @@ /******************************************************************************* - * Copyright (c) 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 - *******************************************************************************/ + * Copyright (c) 2011, 2013 Oracle. All rights reserved. + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License v1.0, which accompanies this distribution + * and is available at http://www.eclipse.org/legal/epl-v10.html. + * + * Contributors: + * Oracle - initial API and implementation + ******************************************************************************/ package org.eclipse.jpt.jaxb.eclipselink.core.tests.internal.resource.java; import java.util.Iterator; @@ -16,7 +16,7 @@ import org.eclipse.jpt.common.core.resource.java.JavaResourceAttribute; import org.eclipse.jpt.common.core.resource.java.JavaResourceField; import org.eclipse.jpt.common.core.resource.java.JavaResourceType; import org.eclipse.jpt.common.core.resource.java.NestableAnnotationDefinition; -import org.eclipse.jpt.common.utility.internal.iterator.ArrayIterator; +import org.eclipse.jpt.common.utility.internal.iterator.IteratorTools; import org.eclipse.jpt.jaxb.eclipselink.core.internal.v2_2.ELJaxb_2_2_PlatformDefinition; import org.eclipse.jpt.jaxb.eclipselink.core.resource.java.ELJaxb; import org.eclipse.jpt.jaxb.eclipselink.core.resource.java.XmlKeyAnnotation; @@ -48,7 +48,7 @@ public class XmlKeyAnnotationTests @Override public Iterator<String> imports() { - return new ArrayIterator<String>(ELJaxb.XML_KEY); + return IteratorTools.iterator(ELJaxb.XML_KEY); } @Override diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/resource/java/XmlPathAnnotationTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/resource/java/XmlPathAnnotationTests.java index fbbd6b0fa0..c109965a10 100644 --- a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/resource/java/XmlPathAnnotationTests.java +++ b/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/resource/java/XmlPathAnnotationTests.java @@ -1,12 +1,12 @@ /******************************************************************************* - * Copyright (c) 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 - *******************************************************************************/ + * Copyright (c) 2011, 2013 Oracle. All rights reserved. + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License v1.0, which accompanies this distribution + * and is available at http://www.eclipse.org/legal/epl-v10.html. + * + * Contributors: + * Oracle - initial API and implementation + ******************************************************************************/ package org.eclipse.jpt.jaxb.eclipselink.core.tests.internal.resource.java; import java.util.Iterator; @@ -15,7 +15,7 @@ import org.eclipse.jdt.core.ICompilationUnit; import org.eclipse.jpt.common.core.resource.java.JavaResourceAttribute; import org.eclipse.jpt.common.core.resource.java.JavaResourceField; import org.eclipse.jpt.common.core.resource.java.JavaResourceType; -import org.eclipse.jpt.common.utility.internal.iterator.ArrayIterator; +import org.eclipse.jpt.common.utility.internal.iterator.IteratorTools; import org.eclipse.jpt.jaxb.eclipselink.core.resource.java.ELJaxb; import org.eclipse.jpt.jaxb.eclipselink.core.resource.java.XmlPathAnnotation; @@ -35,7 +35,7 @@ public class XmlPathAnnotationTests @Override public Iterator<String> imports() { - return new ArrayIterator<String>(ELJaxb.XML_PATH); + return IteratorTools.iterator(ELJaxb.XML_PATH); } @Override @@ -52,7 +52,7 @@ public class XmlPathAnnotationTests @Override public Iterator<String> imports() { - return new ArrayIterator<String>(ELJaxb.XML_PATH); + return IteratorTools.iterator(ELJaxb.XML_PATH); } @Override @@ -69,7 +69,7 @@ public class XmlPathAnnotationTests @Override public Iterator<String> imports() { - return new ArrayIterator<String>(ELJaxb.XML_PATHS, ELJaxb.XML_PATH); + return IteratorTools.iterator(ELJaxb.XML_PATHS, ELJaxb.XML_PATH); } @Override diff --git a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/resource/java/XmlTransformationAnnotationTests.java b/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/resource/java/XmlTransformationAnnotationTests.java index 25ee6920dc..ece56c6748 100644 --- a/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/resource/java/XmlTransformationAnnotationTests.java +++ b/jaxb/tests/org.eclipse.jpt.jaxb.eclipselink.core.tests/src/org/eclipse/jpt/jaxb/eclipselink/core/tests/internal/resource/java/XmlTransformationAnnotationTests.java @@ -1,12 +1,12 @@ /******************************************************************************* - * Copyright (c) 2011, 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 - *******************************************************************************/ + * Copyright (c) 2011, 2013 Oracle. All rights reserved. + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License v1.0, which accompanies this distribution + * and is available at http://www.eclipse.org/legal/epl-v10.html. + * + * Contributors: + * Oracle - initial API and implementation + ******************************************************************************/ package org.eclipse.jpt.jaxb.eclipselink.core.tests.internal.resource.java; import java.util.Iterator; @@ -16,7 +16,7 @@ import org.eclipse.jpt.common.core.resource.java.JavaResourceAttribute; import org.eclipse.jpt.common.core.resource.java.JavaResourceField; import org.eclipse.jpt.common.core.resource.java.JavaResourceType; import org.eclipse.jpt.common.core.resource.java.NestableAnnotationDefinition; -import org.eclipse.jpt.common.utility.internal.iterator.ArrayIterator; +import org.eclipse.jpt.common.utility.internal.iterator.IteratorTools; import org.eclipse.jpt.jaxb.eclipselink.core.internal.v2_2.ELJaxb_2_2_PlatformDefinition; import org.eclipse.jpt.jaxb.eclipselink.core.resource.java.ELJaxb; import org.eclipse.jpt.jaxb.eclipselink.core.resource.java.XmlTransformationAnnotation; @@ -48,7 +48,7 @@ public class XmlTransformationAnnotationTests @Override public Iterator<String> imports() { - return new ArrayIterator<String>(ELJaxb.XML_TRANSFORMATION); + return IteratorTools.iterator(ELJaxb.XML_TRANSFORMATION); } @Override @@ -65,7 +65,7 @@ public class XmlTransformationAnnotationTests @Override public Iterator<String> imports() { - return new ArrayIterator<String>(ELJaxb.XML_TRANSFORMATION); + return IteratorTools.iterator(ELJaxb.XML_TRANSFORMATION); } @Override |