You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ni...@apache.org on 2009/11/05 14:00:10 UTC
svn commit: r833043 -
/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/ide/IdeUtils.java
Author: nicolas
Date: Thu Nov 5 12:59:43 2009
New Revision: 833043
URL: http://svn.apache.org/viewvc?rev=833043&view=rev
Log:
[MECLIPSE-156] Plugin should support setting file encoding
o Applied Jerome Lacoste patch
Modified:
maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/ide/IdeUtils.java
Modified: maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/ide/IdeUtils.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/ide/IdeUtils.java?rev=833043&r1=833042&r2=833043&view=diff
==============================================================================
--- maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/ide/IdeUtils.java (original)
+++ maven/plugins/trunk/maven-eclipse-plugin/src/main/java/org/apache/maven/plugin/ide/IdeUtils.java Thu Nov 5 12:59:43 2009
@@ -163,10 +163,6 @@
findCompilerPluginSettingInPlugins( project.getModel().getBuild().getPluginManagement().getPlugins(),
optionName );
}
- if ( value == null )
- {
- project.getProperties().getProperty( "project.build.sourceEncoding" );
- }
return value;
}
@@ -191,7 +187,12 @@
*/
public static String getCompilerSourceEncoding( MavenProject project )
{
- return IdeUtils.getCompilerPluginSetting( project, PROPERTY_ENCODING );
+ String value = IdeUtils.getCompilerPluginSetting( project, PROPERTY_ENCODING );
+ if ( value == null )
+ {
+ project.getProperties().getProperty( "project.build.sourceEncoding" );
+ }
+ return value;
}
/**