stephenc
/
maven-plugin-tools
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

code simplification 

git-svn-id: https://svn.apache.org/repos/asf/maven/plugin-tools/trunk@1637747 13f79535-47bb-0310-9956-ffa450edef68
master
Herve Boutemy 2014-11-09 21:26:03 +00:00
parent f10b51e352
commit f516f754c5
1 changed files with 9 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
maven-plugin-plugin/src/main/java/org/apache/maven/plugin/plugin/PluginReport.java
View File

@ -671,7 +671,7 @@ public class PluginReport
} }
if ( jdk == null && project.getPluginManagement() != null ) if ( jdk == null && project.getPluginManagement() != null )
{ {
jdk = discoverJdkRequirementFromPlugins( project.getPluginManagement().getPluginsAsMap() ); jdk = discoverJdkRequirementFromPlugins( project.getPluginManagement().getPluginsAsMap() );
} }
if ( jdk == null ) if ( jdk == null )
{ {
@ -685,8 +685,7 @@ public class PluginReport
* @param pluginsAsMap could be null * @param pluginsAsMap could be null
* @return the value of the <code>target</code> in the configuration of <code>maven-compiler-plugin</code>. * @return the value of the <code>target</code> in the configuration of <code>maven-compiler-plugin</code>.
*/ */
@SuppressWarnings( "rawtypes" ) private static String discoverJdkRequirementFromPlugins( Map<String, Object> pluginsAsMap )
private static String discoverJdkRequirementFromPlugins( Map pluginsAsMap )
{ {
if ( pluginsAsMap == null ) if ( pluginsAsMap == null )
{ {
@ -695,16 +694,14 @@ public class PluginReport
String jdk = null; String jdk = null;
String backupJdk = null; String backupJdk = null;
for ( Iterator it = pluginsAsMap.keySet().iterator(); it.hasNext(); ) for ( Map.Entry<String, Object> entry : pluginsAsMap.entrySet() )
{ {
String key = it.next().toString(); if ( !entry.getKey().equals( "org.apache.maven.plugins:maven-compiler-plugin" ) )
if ( !key.equals( "org.apache.maven.plugins:maven-compiler-plugin" ) )
{ {
continue; continue;
} }
Object value = pluginsAsMap.get( key ); Object value = entry.getValue();
Xpp3Dom pluginConf = null; Xpp3Dom pluginConf = null;
backupJdk = "Default version for maven-compiler-plugin"; backupJdk = "Default version for maven-compiler-plugin";
@ -727,22 +724,14 @@ public class PluginReport
continue; continue;
} }
if ( pluginConf.getChild( "target" ) == null ) Xpp3Dom target = pluginConf.getChild( "target" );
if ( target != null )
{ {
continue; jdk = target.getValue();
} }
jdk = pluginConf.getChild( "target" ).getValue();
} }
if ( jdk == null ) return ( jdk == null ) ? backupJdk : jdk;
{
return backupJdk;
}
else
{
return jdk;
}
} }
} }
} }