From 06dbbb5f7f1a884fee54d5938b0906f8e8374de6 Mon Sep 17 00:00:00 2001 From: Herve Boutemy Date: Mon, 2 Jul 2012 16:29:45 +0000 Subject: [PATCH] code formatting git-svn-id: https://svn.apache.org/repos/asf/maven/plugin-tools/trunk@1356324 13f79535-47bb-0310-9956-ffa450edef68 --- .../JavaAnnotationsMojoDescriptorExtractor.java | 2 +- .../annotations/datamodel/MojoAnnotationContent.java | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/JavaAnnotationsMojoDescriptorExtractor.java b/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/JavaAnnotationsMojoDescriptorExtractor.java index 58639e6..e92c85a 100644 --- a/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/JavaAnnotationsMojoDescriptorExtractor.java +++ b/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/JavaAnnotationsMojoDescriptorExtractor.java @@ -510,7 +510,7 @@ public class JavaAnnotationsMojoDescriptorExtractor /* Perhaps the original spelling is there. */ instantiationStrategy = mojo.instanciationStrategy().id(); } - mojoDescriptor.setInstantiationStrategy(instantiationStrategy); + mojoDescriptor.setInstantiationStrategy( instantiationStrategy ); mojoDescriptor.setAggregator( mojo.aggregator() ); mojoDescriptor.setDependencyResolutionRequired( mojo.requiresDependencyResolution().id() ); diff --git a/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/datamodel/MojoAnnotationContent.java b/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/datamodel/MojoAnnotationContent.java index 2724c42..d6400b6 100644 --- a/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/datamodel/MojoAnnotationContent.java +++ b/maven-plugin-tools-annotations/src/main/java/org/apache/maven/tools/plugin/annotations/datamodel/MojoAnnotationContent.java @@ -20,6 +20,7 @@ package org.apache.maven.tools.plugin.annotations.datamodel; */ import org.apache.maven.plugins.annotations.InstantiationStrategy; +import org.apache.maven.plugins.annotations.InstanciationStrategy; import org.apache.maven.plugins.annotations.LifecyclePhase; import org.apache.maven.plugins.annotations.Mojo; import org.apache.maven.plugins.annotations.ResolutionScope; @@ -111,18 +112,19 @@ public class MojoAnnotationContent * @return the instantiation strategy * @see #instantiationStrategy() */ - @SuppressWarnings("deprecation") - public org.apache.maven.plugins.annotations.InstanciationStrategy instanciationStrategy() { + @SuppressWarnings( "deprecation" ) + public InstanciationStrategy instanciationStrategy() + { if ( instantiationStrategy == null ) { return null; } - return org.apache.maven.plugins.annotations.InstanciationStrategy.valueOf(instanciationStrategy().name()); + return InstanciationStrategy.valueOf( instanciationStrategy().name() ); } public void instantiationStrategy( String instantiationStrategy ) { - this.instantiationStrategy = InstantiationStrategy.valueOf(instantiationStrategy); + this.instantiationStrategy = InstantiationStrategy.valueOf( instantiationStrategy ); } public String executionStrategy()