reformatted and improved style

Signed-off-by: Miroslav Šulc <fordfrog@gentoo.org>

3 files changed, 23 insertions, 16 deletions

diff --git a/src/main/java/org/gentoo/java/ebuilder/maven/MavenParser.java b/src/main/java/org/gentoo/java/ebuilder/maven/MavenParser.java
index 4ab15e9..2e81541 100644
--- a/src/main/java/org/gentoo/java/ebuilder/maven/MavenParser.java
+++ b/src/main/java/org/gentoo/java/ebuilder/maven/MavenParser.java
@@ -529,8 +529,9 @@ public class MavenParser {
                         scope = reader.getElementText();
                         break;
                     case "version":
-                        version = reader.getElementText().replace("-SNAPSHOT",
-                                "");
+                        version = reader.getElementText().replace(
+                                "-SNAPSHOT", "");
+
 			/* crazy version from
 			 * org.khronos:opengl-api:gl1.1-android-2.1_r1 */
                         // TODO: this should go to a file mapping crazy versions
diff --git a/src/main/java/org/gentoo/java/ebuilder/portage/MavenVersion.java b/src/main/java/org/gentoo/java/ebuilder/portage/MavenVersion.java
index e2bf46f..657d3c4 100644
--- a/src/main/java/org/gentoo/java/ebuilder/portage/MavenVersion.java
+++ b/src/main/java/org/gentoo/java/ebuilder/portage/MavenVersion.java
@@ -18,7 +18,8 @@ public class MavenVersion implements Comparable<MavenVersion> {
     /**
      * Pattern for parsing maven version range.
      */
-    private static final Pattern p_VERSION_RANGE = Pattern.compile("\\[.*, ?(.*?)\\]");
+    private static final Pattern PATTERN_VERSION_RANGE
+            = Pattern.compile("\\[.*, ?(.*?)\\]");
     /**
      * Incremental version number.
      */
@@ -41,16 +42,21 @@ public class MavenVersion implements Comparable<MavenVersion> {
      *
      * @param version version string
      */
-    public MavenVersion(String version) {
-	Matcher m_RANGE = p_VERSION_RANGE.matcher(version);
-        if (m_RANGE.matches()) {
-            version = m_RANGE.group(1);
+    public MavenVersion(final String version) {
+        final Matcher matcherRange = PATTERN_VERSION_RANGE.matcher(version);
+        final String useVersion;
+
+        if (matcherRange.matches()) {
+            useVersion = matcherRange.group(1);
+        } else {
+            useVersion = version;
         }
-        final Matcher matcher = PATTERN_VERSION.matcher(version);
+
+        final Matcher matcher = PATTERN_VERSION.matcher(useVersion);
 
         if (!matcher.matches()) {
-            throw new RuntimeException("Maven version " + version
-                    + " is not valid.");
+            throw new RuntimeException(
+                    "Maven version " + useVersion + " is not valid.");
         }
 
         majorVersion = Integer.parseInt(matcher.group(1), 10);
diff --git a/src/main/java/org/gentoo/java/ebuilder/portage/PortageParser.java b/src/main/java/org/gentoo/java/ebuilder/portage/PortageParser.java
index aa8a14b..095e001 100644
--- a/src/main/java/org/gentoo/java/ebuilder/portage/PortageParser.java
+++ b/src/main/java/org/gentoo/java/ebuilder/portage/PortageParser.java
@@ -30,6 +30,10 @@ public class PortageParser {
      */
     public static final String CACHE_VERSION = "1.0";
     /**
+     * Current ant utilities eclass name.
+     */
+    private static final String ECLASS_ANT_TASKS = "ant-tasks";
+    /**
      * Current java package eclass name.
      */
     private static final String ECLASS_JAVA_PKG = "java-pkg-2";
@@ -46,10 +50,6 @@ public class PortageParser {
      */
     private static final String ECLASS_JAVA_UTILS = "java-utils-2";
     /**
-     * Current ant utilities eclass name.
-     */
-    private static final String ECLASS_ANT_TASKS = "ant-tasks";
-    /**
      * Pattern for parsing SLOT with bash substring.
      */
     private static final Pattern PATTERN_SLOT_SUBSTRING = Pattern.compile(
@@ -130,8 +130,8 @@ public class PortageParser {
             return ECLASS_JAVA_PKG_SIMPLE;
         } else if (inheritLine.contains(ECLASS_JAVA_UTILS)) {
             return ECLASS_JAVA_UTILS;
-	} else if (inheritLine.contains(ECLASS_ANT_TASKS)) {
-	    return ECLASS_ANT_TASKS;
+        } else if (inheritLine.contains(ECLASS_ANT_TASKS)) {
+            return ECLASS_ANT_TASKS;
         } else {
             return null;
         }