summaryrefslogtreecommitdiff
path: root/src/main/java/org/apache/maven/plugin/nar/Linker.java
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/org/apache/maven/plugin/nar/Linker.java')
-rw-r--r--src/main/java/org/apache/maven/plugin/nar/Linker.java13
1 files changed, 6 insertions, 7 deletions
diff --git a/src/main/java/org/apache/maven/plugin/nar/Linker.java b/src/main/java/org/apache/maven/plugin/nar/Linker.java
index 810c540..b88f67b 100644
--- a/src/main/java/org/apache/maven/plugin/nar/Linker.java
+++ b/src/main/java/org/apache/maven/plugin/nar/Linker.java
@@ -25,7 +25,6 @@ import java.util.HashSet;
import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
-import java.util.Properties;
import java.util.Set;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -161,12 +160,12 @@ public class Linker
return name;
}
- public final String getName( Properties defaults, String prefix )
+ public final String getName( NarProperties properties, String prefix )
throws MojoFailureException, MojoExecutionException
{
- if ( ( name == null ) && ( defaults != null ) && ( prefix != null ) )
+ if ( ( name == null ) && ( properties != null ) && ( prefix != null ) )
{
- name = defaults.getProperty( prefix + "linker" );
+ name = properties.getProperty( prefix + "linker" );
}
if ( name == null )
{
@@ -365,7 +364,7 @@ public class Linker
if ( !clearDefaultOptions )
{
- String option = NarUtil.getDefaults().getProperty( prefix + "options" );
+ String option = NarProperties.getInstance(mojo.getMavenProject()).getProperty( prefix + "options" );
if ( option != null )
{
String[] opt = option.split( " " );
@@ -417,7 +416,7 @@ public class Linker
else
{
- String libsList = NarUtil.getDefaults().getProperty( prefix + "libs" );
+ String libsList = NarProperties.getInstance(mojo.getMavenProject()).getProperty( prefix + "libs" );
addLibraries( libsList, linker, antProject, false );
}
@@ -445,7 +444,7 @@ public class Linker
else
{
- String sysLibsList = NarUtil.getDefaults().getProperty( prefix + "sysLibs" );
+ String sysLibsList = NarProperties.getInstance(mojo.getMavenProject()).getProperty( prefix + "sysLibs" );
addLibraries( sysLibsList, linker, antProject, true );
}