Skip to main content
summaryrefslogtreecommitdiffstats
path: root/jaxb
diff options
context:
space:
mode:
authorBrian Vosburgh2015-11-19 12:41:44 -0500
committerBrian Vosburgh2015-11-19 12:41:44 -0500
commit8fac72e2d9ac4e6ff1e89bc2cb51ce02e4445c20 (patch)
tree9fdb325b6a1ca68f91412446aad15381b032e80b /jaxb
parentd541e9d2bc5c7c46d29f8afdfd864993e1e5a13a (diff)
downloadwebtools.dali-8fac72e2d9ac4e6ff1e89bc2cb51ce02e4445c20.tar.gz
webtools.dali-8fac72e2d9ac4e6ff1e89bc2cb51ce02e4445c20.tar.xz
webtools.dali-8fac72e2d9ac4e6ff1e89bc2cb51ce02e4445c20.zip
[482134] clear up ArrayTools API
Diffstat (limited to 'jaxb')
-rw-r--r--jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/v2_1/AbstractELJaxb_2_1_PlatformDefinition.java16
-rw-r--r--jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/v2_2/AbstractELJaxb_2_2_PlatformDefinition.java28
2 files changed, 22 insertions, 22 deletions
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/v2_1/AbstractELJaxb_2_1_PlatformDefinition.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/v2_1/AbstractELJaxb_2_1_PlatformDefinition.java
index 7c808f51b1..652a549b3f 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/v2_1/AbstractELJaxb_2_1_PlatformDefinition.java
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/v2_1/AbstractELJaxb_2_1_PlatformDefinition.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2011, 2013 Oracle. All rights reserved.
+ * Copyright (c) 2011, 2015 Oracle. All rights reserved.
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v1.0, which accompanies this distribution
* and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -65,17 +65,19 @@ public abstract class AbstractELJaxb_2_1_PlatformDefinition
@Override
protected AnnotationDefinition[] buildAnnotationDefinitions() {
- return ArrayTools.addAll(
- getGenericJaxbPlatformDefinition().getAnnotationDefinitions(),
- XmlInverseReferenceAnnotationDefinition.instance(),
- XmlPathsAnnotationDefinition.instance());
+ return ArrayTools.addAll(getGenericJaxbPlatformDefinition().getAnnotationDefinitions(),
+ new AnnotationDefinition[] {
+ XmlInverseReferenceAnnotationDefinition.instance(),
+ XmlPathsAnnotationDefinition.instance()
+ });
}
@Override
protected NestableAnnotationDefinition[] buildNestableAnnotationDefinitions() {
- return ArrayTools.addAll(
+ return ArrayTools.add(
getGenericJaxbPlatformDefinition().getNestableAnnotationDefinitions(),
- XmlPathAnnotationDefinition.instance());
+ XmlPathAnnotationDefinition.instance()
+ );
}
@Override
diff --git a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/v2_2/AbstractELJaxb_2_2_PlatformDefinition.java b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/v2_2/AbstractELJaxb_2_2_PlatformDefinition.java
index f78001de00..1974331ec1 100644
--- a/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/v2_2/AbstractELJaxb_2_2_PlatformDefinition.java
+++ b/jaxb/plugins/org.eclipse.jpt.jaxb.eclipselink.core/src/org/eclipse/jpt/jaxb/eclipselink/core/internal/v2_2/AbstractELJaxb_2_2_PlatformDefinition.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2011, 2013 Oracle. All rights reserved.
+ * Copyright (c) 2011, 2015 Oracle. All rights reserved.
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v1.0, which accompanies this distribution
* and is available at http://www.eclipse.org/legal/epl-v10.html.
@@ -43,28 +43,26 @@ public abstract class AbstractELJaxb_2_2_PlatformDefinition
@Override
protected JaxbResourceModelProvider[] buildResourceModelProviders() {
- return ArrayTools.addAll(
- super.buildResourceModelProviders(),
- OxmResourceModelProvider.instance());
+ return ArrayTools.add(super.buildResourceModelProviders(), OxmResourceModelProvider.instance());
}
@Override
protected AnnotationDefinition[] buildAnnotationDefinitions() {
- return ArrayTools.addAll(
- super.buildAnnotationDefinitions(),
- XmlCDATAAnnotationDefinition.instance(),
- XmlDiscriminatorNodeAnnotationDefinition.instance(),
- XmlDiscriminatorValueAnnotationDefinition.instance(),
- XmlJoinNodesAnnotationDefinition.instance(),
- XmlKeyAnnotationDefinition.instance(),
- XmlTransformationAnnotationDefinition.instance());
+ return ArrayTools.addAll(super.buildAnnotationDefinitions(),
+ new AnnotationDefinition[] {
+ XmlCDATAAnnotationDefinition.instance(),
+ XmlDiscriminatorNodeAnnotationDefinition.instance(),
+ XmlDiscriminatorValueAnnotationDefinition.instance(),
+ XmlJoinNodesAnnotationDefinition.instance(),
+ XmlKeyAnnotationDefinition.instance(),
+ XmlTransformationAnnotationDefinition.instance()
+ }
+ );
}
@Override
protected NestableAnnotationDefinition[] buildNestableAnnotationDefinitions() {
- return ArrayTools.addAll(
- super.buildNestableAnnotationDefinitions(),
- XmlJoinNodeAnnotationDefinition.instance());
+ return ArrayTools.add(super.buildNestableAnnotationDefinitions(), XmlJoinNodeAnnotationDefinition.instance());
}
@Override

Back to the top