From a0d19af3df01f465aee6c04a8fef4b626fa4eb11 Mon Sep 17 00:00:00 2001 From: Mark Donszelmann Date: Mon, 16 Nov 2009 22:02:45 +0100 Subject: Clean up --- .../java/org/apache/maven/plugin/nar/Executable.java | 4 ++-- .../java/org/apache/maven/plugin/nar/NarConstants.java | 18 +++++++++--------- .../java/org/apache/maven/plugin/nar/NarLayout.java | 8 ++++---- src/main/java/org/apache/maven/plugin/nar/OS.java | 8 ++++---- .../java/org/apache/maven/plugin/nar/TextStream.java | 2 +- 5 files changed, 20 insertions(+), 20 deletions(-) (limited to 'src/main/java') diff --git a/src/main/java/org/apache/maven/plugin/nar/Executable.java b/src/main/java/org/apache/maven/plugin/nar/Executable.java index d591e61..814828b 100644 --- a/src/main/java/org/apache/maven/plugin/nar/Executable.java +++ b/src/main/java/org/apache/maven/plugin/nar/Executable.java @@ -27,7 +27,7 @@ import java.util.List; public interface Executable { - public boolean shouldRun(); + boolean shouldRun(); - public List/* */getArgs(); + List/* */getArgs(); } diff --git a/src/main/java/org/apache/maven/plugin/nar/NarConstants.java b/src/main/java/org/apache/maven/plugin/nar/NarConstants.java index c25dc1e..97def90 100644 --- a/src/main/java/org/apache/maven/plugin/nar/NarConstants.java +++ b/src/main/java/org/apache/maven/plugin/nar/NarConstants.java @@ -24,21 +24,21 @@ package org.apache.maven.plugin.nar; */ public interface NarConstants { - public final static String NAR_EXTENSION = "nar"; + String NAR_EXTENSION = "nar"; - public final static String NAR_NO_ARCH = "noarch"; + String NAR_NO_ARCH = "noarch"; - public final static String NAR_ROLE_HINT = "nar-library"; + String NAR_ROLE_HINT = "nar-library"; - public final static String NAR_TYPE = "nar"; + String NAR_TYPE = "nar"; - public final static int LOG_LEVEL_ERROR = 0; + int LOG_LEVEL_ERROR = 0; - public final static int LOG_LEVEL_WARNING = 1; + int LOG_LEVEL_WARNING = 1; - public final static int LOG_LEVEL_INFO = 2; + int LOG_LEVEL_INFO = 2; - public final static int LOG_LEVEL_VERBOSE = 3; + int LOG_LEVEL_VERBOSE = 3; - public final static int LOG_LEVEL_DEBUG = 4; + int LOG_LEVEL_DEBUG = 4; } diff --git a/src/main/java/org/apache/maven/plugin/nar/NarLayout.java b/src/main/java/org/apache/maven/plugin/nar/NarLayout.java index 56ad6f5..9d03cff 100644 --- a/src/main/java/org/apache/maven/plugin/nar/NarLayout.java +++ b/src/main/java/org/apache/maven/plugin/nar/NarLayout.java @@ -41,26 +41,26 @@ public interface NarLayout * @return * @throws MojoExecutionException, MojoFailureException */ - public File getLibDirectory( File baseDir, String aol, String type ) throws MojoExecutionException, MojoFailureException; + File getLibDirectory( File baseDir, String aol, String type ) throws MojoExecutionException, MojoFailureException; /** * Specifies where includes are stored * * @return */ - public File getIncludeDirectory( File targetDirectory ) throws MojoExecutionException, MojoFailureException; + File getIncludeDirectory( File targetDirectory ) throws MojoExecutionException, MojoFailureException; /** * Specifies where binaries are stored * * @return */ - public File getBinDirectory( File baseDir, String aol ) throws MojoExecutionException, MojoFailureException; + File getBinDirectory( File baseDir, String aol ) throws MojoExecutionException, MojoFailureException; /** * Called to attach nars to main jar file. This method needs to produce all the attached nar files and set NarInfo * accordingly. */ - public void attachNars( File baseDir, MavenProjectHelper projectHelper, MavenProject project, NarInfo narInfo ) + void attachNars( File baseDir, MavenProjectHelper projectHelper, MavenProject project, NarInfo narInfo ) throws MojoExecutionException, MojoFailureException; } diff --git a/src/main/java/org/apache/maven/plugin/nar/OS.java b/src/main/java/org/apache/maven/plugin/nar/OS.java index 12d2a91..1581bdd 100644 --- a/src/main/java/org/apache/maven/plugin/nar/OS.java +++ b/src/main/java/org/apache/maven/plugin/nar/OS.java @@ -25,11 +25,11 @@ package org.apache.maven.plugin.nar; public interface OS { - public final String MACOSX = "MacOSX"; + String MACOSX = "MacOSX"; - public final String WINDOWS = "Windows"; + String WINDOWS = "Windows"; - public final String LINUX = "Linux"; + String LINUX = "Linux"; - public final String SUNOS = "SunOS"; + String SUNOS = "SunOS"; } diff --git a/src/main/java/org/apache/maven/plugin/nar/TextStream.java b/src/main/java/org/apache/maven/plugin/nar/TextStream.java index 4f3950c..35fe0cb 100644 --- a/src/main/java/org/apache/maven/plugin/nar/TextStream.java +++ b/src/main/java/org/apache/maven/plugin/nar/TextStream.java @@ -27,5 +27,5 @@ package org.apache.maven.plugin.nar; */ public interface TextStream { - public void println(String text); + void println(String text); } -- cgit v1.2.3