From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id C850B138334 for ; Wed, 30 Oct 2019 17:43:54 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1F9ECE0805; Wed, 30 Oct 2019 17:43:54 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id DB043E0805 for ; Wed, 30 Oct 2019 17:43:53 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C007D34C5A8 for ; Wed, 30 Oct 2019 17:43:51 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1627A89B for ; Wed, 30 Oct 2019 17:43:50 +0000 (UTC) From: "Miroslav Šulc" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Miroslav Šulc" Message-ID: <1572457411.93acbb64ecbc2d5da73c96033d047209b3f74963.fordfrog@gentoo> Subject: [gentoo-commits] proj/java-ebuilder:master commit in: src/main/java/org/gentoo/java/ebuilder/portage/, ... X-VCS-Repository: proj/java-ebuilder X-VCS-Files: src/main/java/org/gentoo/java/ebuilder/maven/MavenParser.java src/main/java/org/gentoo/java/ebuilder/portage/MavenVersion.java src/main/java/org/gentoo/java/ebuilder/portage/PortageParser.java X-VCS-Directories: src/main/java/org/gentoo/java/ebuilder/portage/ src/main/java/org/gentoo/java/ebuilder/maven/ X-VCS-Committer: fordfrog X-VCS-Committer-Name: Miroslav Šulc X-VCS-Revision: 93acbb64ecbc2d5da73c96033d047209b3f74963 X-VCS-Branch: master Date: Wed, 30 Oct 2019 17:43:50 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: b418a5e2-0197-46e0-8516-0ff2c2e7a05a X-Archives-Hash: 90034fe1023d35e2e92968479ef2d6e1 commit: 93acbb64ecbc2d5da73c96033d047209b3f74963 Author: Miroslav Šulc gentoo org> AuthorDate: Wed Oct 30 17:42:12 2019 +0000 Commit: Miroslav Šulc gentoo 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 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 { /** * 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 { * * @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; }