Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fix code format

  • Loading branch information...
commit 7d935fea793af4da660f7b3ba0b9dd24cad24231 1 parent 47c4bfa
@velo velo authored
View
21 flexmojos-maven-plugin/src/main/java/org/sonatype/flexmojos/plugin/compiler/AbstractFlexCompilerMojo.java
@@ -585,7 +585,7 @@
* @parameter default-name="${project.build.finalName}" expression="${flex.finalName}"
*/
protected String finalName;
-
+
/**
* Pattern to be used for locales resurce bundles names generation. Accepts special tokens:
*
@@ -595,13 +595,12 @@
* {groupId} - replace by groupId
* {version} - replace by version
* {classifier} - replace by classifier
- *
* </pre>
*
- * @parameter
+ * @parameter
*/
- protected String resourceBundleNamePattern;
-
+ protected String resourceBundleNames;
+
/**
* Fonts configurations to be used on SWF compilation
* <p>
@@ -707,7 +706,8 @@
* Usually, you must use the same compiler and framework versions. Set this to true to avoid this check. EXTREMELLY
* UN-ADVISIBLE.
*
- * @parameter default-value="false" expression="${flex.iKnowWhatImDoingPleaseBreakMyBuildIwontBlameFlexmojosForStopWorking}"
+ * @parameter default-value="false"
+ * expression="${flex.iKnowWhatImDoingPleaseBreakMyBuildIwontBlameFlexmojosForStopWorking}"
*/
private boolean iKnowWhatImDoingPleaseBreakMyBuildIwontBlameFlexmojosForStopWorking;
@@ -1572,10 +1572,13 @@ protected void configureResourceBundle( String locale, AbstractFlexCompilerMojo<
{
cfg.classifier = locale;
}
- if(resourceBundleNamePattern != null){
- cfg.finalName = MavenUtils.getRuntimeLocaleOutputName(resourceBundleNamePattern, project.getArtifact(), cfg.classifier);
+
+ if ( resourceBundleNames != null )
+ {
+ cfg.finalName =
+ MavenUtils.getRuntimeLocaleOutputName( resourceBundleNames, project.getArtifact(), cfg.classifier );
}
-
+
cfg.includeResourceBundles = getResourceBundleListContent();
cfg.getCache().put( EXTERNAL_LIBRARY_PATH, MavenUtils.getFiles( getDependencies( type( SWC ) ) ) );
cfg.getCache().put( LIBRARY_PATH, MavenUtils.getFiles( cfg.getCompiledResouceBundles() ) );
View
8 flexmojos-maven-plugin/src/main/java/org/sonatype/flexmojos/plugin/test/TestCompilerMojo.java
@@ -585,9 +585,11 @@ protected File getSourceFile()
files.addAll( PathUtil.existingFilesList( testCompileSourceRoots ) );
files.addAll( Arrays.asList( super.getSourcePath() ) );
-
- if ( getLocale() != null ) {
- if ( localesSourcePath.getParentFile().exists() ) {
+
+ if ( getLocale() != null )
+ {
+ if ( localesSourcePath.getParentFile().exists() )
+ {
files.add( localesSourcePath );
}
}
View
6 flexmojos-maven-plugin/src/main/java/org/sonatype/flexmojos/plugin/utilities/MavenUtils.java
@@ -301,13 +301,15 @@ public static String getRuntimeLocaleOutputPath( String sample, Artifact artifac
return path;
}
- public static String getRuntimeLocaleOutputName( String sample, Artifact artifact, String locale )
+
+ public static String getRuntimeLocaleOutputName( String sample, Artifact artifact, String locale )
{
String path = replaceArtifactCoordinatesTokens( sample, artifact );
path = path.replace( "{locale}", locale );
-
+
return path;
}
+
public static Set<File> getFilesSet( Collection<Artifact>... dependenciesSet )
{
if ( dependenciesSet == null )
Please sign in to comment.
Something went wrong with that request. Please try again.