1 |
commit: 93acbb64ecbc2d5da73c96033d047209b3f74963 |
2 |
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Oct 30 17:42:12 2019 +0000 |
4 |
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Oct 30 17:43:31 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/java-ebuilder.git/commit/?id=93acbb64 |
7 |
|
8 |
reformatted and improved style |
9 |
|
10 |
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org> |
11 |
|
12 |
.../gentoo/java/ebuilder/maven/MavenParser.java | 5 +++-- |
13 |
.../gentoo/java/ebuilder/portage/MavenVersion.java | 22 ++++++++++++++-------- |
14 |
.../java/ebuilder/portage/PortageParser.java | 12 ++++++------ |
15 |
3 files changed, 23 insertions(+), 16 deletions(-) |
16 |
|
17 |
diff --git a/src/main/java/org/gentoo/java/ebuilder/maven/MavenParser.java b/src/main/java/org/gentoo/java/ebuilder/maven/MavenParser.java |
18 |
index 4ab15e9..2e81541 100644 |
19 |
--- a/src/main/java/org/gentoo/java/ebuilder/maven/MavenParser.java |
20 |
+++ b/src/main/java/org/gentoo/java/ebuilder/maven/MavenParser.java |
21 |
@@ -529,8 +529,9 @@ public class MavenParser { |
22 |
scope = reader.getElementText(); |
23 |
break; |
24 |
case "version": |
25 |
- version = reader.getElementText().replace("-SNAPSHOT", |
26 |
- ""); |
27 |
+ version = reader.getElementText().replace( |
28 |
+ "-SNAPSHOT", ""); |
29 |
+ |
30 |
/* crazy version from |
31 |
* org.khronos:opengl-api:gl1.1-android-2.1_r1 */ |
32 |
// TODO: this should go to a file mapping crazy versions |
33 |
|
34 |
diff --git a/src/main/java/org/gentoo/java/ebuilder/portage/MavenVersion.java b/src/main/java/org/gentoo/java/ebuilder/portage/MavenVersion.java |
35 |
index e2bf46f..657d3c4 100644 |
36 |
--- a/src/main/java/org/gentoo/java/ebuilder/portage/MavenVersion.java |
37 |
+++ b/src/main/java/org/gentoo/java/ebuilder/portage/MavenVersion.java |
38 |
@@ -18,7 +18,8 @@ public class MavenVersion implements Comparable<MavenVersion> { |
39 |
/** |
40 |
* Pattern for parsing maven version range. |
41 |
*/ |
42 |
- private static final Pattern p_VERSION_RANGE = Pattern.compile("\\[.*, ?(.*?)\\]"); |
43 |
+ private static final Pattern PATTERN_VERSION_RANGE |
44 |
+ = Pattern.compile("\\[.*, ?(.*?)\\]"); |
45 |
/** |
46 |
* Incremental version number. |
47 |
*/ |
48 |
@@ -41,16 +42,21 @@ public class MavenVersion implements Comparable<MavenVersion> { |
49 |
* |
50 |
* @param version version string |
51 |
*/ |
52 |
- public MavenVersion(String version) { |
53 |
- Matcher m_RANGE = p_VERSION_RANGE.matcher(version); |
54 |
- if (m_RANGE.matches()) { |
55 |
- version = m_RANGE.group(1); |
56 |
+ public MavenVersion(final String version) { |
57 |
+ final Matcher matcherRange = PATTERN_VERSION_RANGE.matcher(version); |
58 |
+ final String useVersion; |
59 |
+ |
60 |
+ if (matcherRange.matches()) { |
61 |
+ useVersion = matcherRange.group(1); |
62 |
+ } else { |
63 |
+ useVersion = version; |
64 |
} |
65 |
- final Matcher matcher = PATTERN_VERSION.matcher(version); |
66 |
+ |
67 |
+ final Matcher matcher = PATTERN_VERSION.matcher(useVersion); |
68 |
|
69 |
if (!matcher.matches()) { |
70 |
- throw new RuntimeException("Maven version " + version |
71 |
- + " is not valid."); |
72 |
+ throw new RuntimeException( |
73 |
+ "Maven version " + useVersion + " is not valid."); |
74 |
} |
75 |
|
76 |
majorVersion = Integer.parseInt(matcher.group(1), 10); |
77 |
|
78 |
diff --git a/src/main/java/org/gentoo/java/ebuilder/portage/PortageParser.java b/src/main/java/org/gentoo/java/ebuilder/portage/PortageParser.java |
79 |
index aa8a14b..095e001 100644 |
80 |
--- a/src/main/java/org/gentoo/java/ebuilder/portage/PortageParser.java |
81 |
+++ b/src/main/java/org/gentoo/java/ebuilder/portage/PortageParser.java |
82 |
@@ -29,6 +29,10 @@ public class PortageParser { |
83 |
* Cache version. |
84 |
*/ |
85 |
public static final String CACHE_VERSION = "1.0"; |
86 |
+ /** |
87 |
+ * Current ant utilities eclass name. |
88 |
+ */ |
89 |
+ private static final String ECLASS_ANT_TASKS = "ant-tasks"; |
90 |
/** |
91 |
* Current java package eclass name. |
92 |
*/ |
93 |
@@ -45,10 +49,6 @@ public class PortageParser { |
94 |
* Current java utilities eclass name. |
95 |
*/ |
96 |
private static final String ECLASS_JAVA_UTILS = "java-utils-2"; |
97 |
- /** |
98 |
- * Current ant utilities eclass name. |
99 |
- */ |
100 |
- private static final String ECLASS_ANT_TASKS = "ant-tasks"; |
101 |
/** |
102 |
* Pattern for parsing SLOT with bash substring. |
103 |
*/ |
104 |
@@ -130,8 +130,8 @@ public class PortageParser { |
105 |
return ECLASS_JAVA_PKG_SIMPLE; |
106 |
} else if (inheritLine.contains(ECLASS_JAVA_UTILS)) { |
107 |
return ECLASS_JAVA_UTILS; |
108 |
- } else if (inheritLine.contains(ECLASS_ANT_TASKS)) { |
109 |
- return ECLASS_ANT_TASKS; |
110 |
+ } else if (inheritLine.contains(ECLASS_ANT_TASKS)) { |
111 |
+ return ECLASS_ANT_TASKS; |
112 |
} else { |
113 |
return null; |
114 |
} |