From: "Miroslav Šulc" <fordfrog@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/java-ebuilder:master commit in: src/main/java/org/gentoo/java/ebuilder/portage/, ...
Date: Wed, 30 Oct 2019 17:43:50 +0000 (UTC) [thread overview]
Message-ID: <1572457411.93acbb64ecbc2d5da73c96033d047209b3f74963.fordfrog@gentoo> (raw)
commit: 93acbb64ecbc2d5da73c96033d047209b3f74963
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 30 17:42:12 2019 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Wed Oct 30 17:43:31 2019 +0000
URL: https://gitweb.gentoo.org/proj/java-ebuilder.git/commit/?id=93acbb64
reformatted and improved style
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
.../gentoo/java/ebuilder/maven/MavenParser.java | 5 +++--
.../gentoo/java/ebuilder/portage/MavenVersion.java | 22 ++++++++++++++--------
.../java/ebuilder/portage/PortageParser.java | 12 ++++++------
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
@@ -29,6 +29,10 @@ public class PortageParser {
* Cache version.
*/
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.
*/
@@ -45,10 +49,6 @@ public class PortageParser {
* Current java utilities eclass name.
*/
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.
*/
@@ -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;
}
next reply other threads:[~2019-10-30 17:43 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-30 17:43 Miroslav Šulc [this message]
-- strict thread matches above, loose matches on Subject: below --
2019-11-01 19:41 [gentoo-commits] proj/java-ebuilder:master commit in: src/main/java/org/gentoo/java/ebuilder/portage/, Miroslav Šulc
2019-11-01 20:21 Miroslav Šulc
2020-07-12 15:58 Miroslav Šulc
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1572457411.93acbb64ecbc2d5da73c96033d047209b3f74963.fordfrog@gentoo \
--to=fordfrog@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox