| 1 |
commit: 6997747f61ccd821b0f31a1f0228a57ba9a2ded6 |
| 2 |
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Oct 30 19:26:31 2019 +0000 |
| 4 |
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Oct 30 19:26:31 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/java-ebuilder.git/commit/?id=6997747f |
| 7 |
|
| 8 |
reformatted |
| 9 |
|
| 10 |
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org> |
| 11 |
|
| 12 |
src/main/java/org/gentoo/java/ebuilder/maven/MavenCache.java | 4 ++-- |
| 13 |
.../java/org/gentoo/java/ebuilder/portage/PortageParser.java | 11 ++++++----- |
| 14 |
2 files changed, 8 insertions(+), 7 deletions(-) |
| 15 |
|
| 16 |
diff --git a/src/main/java/org/gentoo/java/ebuilder/maven/MavenCache.java b/src/main/java/org/gentoo/java/ebuilder/maven/MavenCache.java |
| 17 |
index 4772e61..0aa33c5 100644 |
| 18 |
--- a/src/main/java/org/gentoo/java/ebuilder/maven/MavenCache.java |
| 19 |
+++ b/src/main/java/org/gentoo/java/ebuilder/maven/MavenCache.java |
| 20 |
@@ -98,8 +98,8 @@ public class MavenCache { |
| 21 |
|
| 22 |
cache.clear(); |
| 23 |
|
| 24 |
- try (final BufferedReader reader = new BufferedReader(new FileReader( |
| 25 |
- config.getCacheFile().toFile()))) { |
| 26 |
+ try (final BufferedReader reader = new BufferedReader( |
| 27 |
+ new FileReader(config.getCacheFile().toFile()))) { |
| 28 |
String line = reader.readLine(); |
| 29 |
|
| 30 |
if (!PortageParser.CACHE_VERSION.equals(line)) { |
| 31 |
|
| 32 |
diff --git a/src/main/java/org/gentoo/java/ebuilder/portage/PortageParser.java b/src/main/java/org/gentoo/java/ebuilder/portage/PortageParser.java |
| 33 |
index 6b0ae3c..d504b2c 100644 |
| 34 |
--- a/src/main/java/org/gentoo/java/ebuilder/portage/PortageParser.java |
| 35 |
+++ b/src/main/java/org/gentoo/java/ebuilder/portage/PortageParser.java |
| 36 |
@@ -174,7 +174,8 @@ public class PortageParser { |
| 37 |
*/ |
| 38 |
private void parseEbuild(final File ebuild) { |
| 39 |
final String filename = ebuild.getName().replaceAll("\\.ebuild$", ""); |
| 40 |
- final String category = ebuild.getParentFile().getParentFile().getName(); |
| 41 |
+ final String category |
| 42 |
+ = ebuild.getParentFile().getParentFile().getName(); |
| 43 |
final String pkg = ebuild.getParentFile().getName(); |
| 44 |
final String version = filename.substring(pkg.length() + 1); |
| 45 |
final Map<String, String> variables = new HashMap<>(20); |
| 46 |
@@ -206,8 +207,8 @@ public class PortageParser { |
| 47 |
final Matcher matcher = PATTERN_VARIABLE.matcher(line); |
| 48 |
|
| 49 |
if (matcher.matches()) { |
| 50 |
- variables.put(matcher.group(1), matcher.group(2). |
| 51 |
- replaceAll("(^\"|\"$)", "")); |
| 52 |
+ variables.put(matcher.group(1), |
| 53 |
+ matcher.group(2).replaceAll("(^\"|\"$)", "")); |
| 54 |
} |
| 55 |
|
| 56 |
if (line.startsWith("inherit ")) { |
| 57 |
@@ -336,8 +337,8 @@ public class PortageParser { |
| 58 |
} |
| 59 |
|
| 60 |
if (result.indexOf('$') != -1) { |
| 61 |
- final Matcher matcher = PATTERN_SLOT_VERSION_COMPOPONENT_RANGE. |
| 62 |
- matcher(result); |
| 63 |
+ final Matcher matcher |
| 64 |
+ = PATTERN_SLOT_VERSION_COMPOPONENT_RANGE.matcher(result); |
| 65 |
|
| 66 |
if (matcher.matches()) { |
| 67 |
final int start = Integer.parseInt(matcher.group(1), 10); |
Archives