From 06b1e55190c54b17a7f36b1fec4c6bf23d0ef010 Mon Sep 17 00:00:00 2001
From: Florian Angerer <florian.angerer@oracle.com>
Date: Thu, 27 Jul 2017 17:27:37 +0200
Subject: [PATCH] Consistency cleanup: renamed "getPkg()" to "getPackage()".
---
.../com/oracle/truffle/r/test/packages/analyzer/Problem.java | 4 ++--
.../truffle/r/test/packages/analyzer/RPackageTestRun.java | 2 +-
.../analyzer/detectors/InstallationProblemDetector.java | 4 ++--
.../r/test/packages/analyzer/detectors/RErrorDetector.java | 2 +-
.../r/test/packages/analyzer/detectors/SegfaultDetector.java | 4 ++--
.../truffle/r/test/packages/analyzer/dump/AbstractDumper.java | 2 +-
.../r/test/packages/analyzer/parser/LogFileParser.java | 2 +-
7 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/com.oracle.truffle.r.test.packages.analyzer/src/com/oracle/truffle/r/test/packages/analyzer/Problem.java b/com.oracle.truffle.r.test.packages.analyzer/src/com/oracle/truffle/r/test/packages/analyzer/Problem.java
index 1060eadff6..b526ba6cd4 100644
--- a/com.oracle.truffle.r.test.packages.analyzer/src/com/oracle/truffle/r/test/packages/analyzer/Problem.java
+++ b/com.oracle.truffle.r.test.packages.analyzer/src/com/oracle/truffle/r/test/packages/analyzer/Problem.java
@@ -37,8 +37,8 @@ public abstract class Problem {
this.location = Objects.requireNonNull(location);
}
- public RPackage getPkg() {
- return pkgTestRun.getPkg();
+ public RPackage getPackage() {
+ return pkgTestRun.getPackage();
}
public RPackageTestRun getPackageTestRun() {
diff --git a/com.oracle.truffle.r.test.packages.analyzer/src/com/oracle/truffle/r/test/packages/analyzer/RPackageTestRun.java b/com.oracle.truffle.r.test.packages.analyzer/src/com/oracle/truffle/r/test/packages/analyzer/RPackageTestRun.java
index cb2eccc583..72526ca718 100644
--- a/com.oracle.truffle.r.test.packages.analyzer/src/com/oracle/truffle/r/test/packages/analyzer/RPackageTestRun.java
+++ b/com.oracle.truffle.r.test.packages.analyzer/src/com/oracle/truffle/r/test/packages/analyzer/RPackageTestRun.java
@@ -36,7 +36,7 @@ public class RPackageTestRun {
this.nr = nr;
}
- public RPackage getPkg() {
+ public RPackage getPackage() {
return pkg;
}
diff --git a/com.oracle.truffle.r.test.packages.analyzer/src/com/oracle/truffle/r/test/packages/analyzer/detectors/InstallationProblemDetector.java b/com.oracle.truffle.r.test.packages.analyzer/src/com/oracle/truffle/r/test/packages/analyzer/detectors/InstallationProblemDetector.java
index b6a1b4d8bf..9bb80f4be8 100644
--- a/com.oracle.truffle.r.test.packages.analyzer/src/com/oracle/truffle/r/test/packages/analyzer/detectors/InstallationProblemDetector.java
+++ b/com.oracle.truffle.r.test.packages.analyzer/src/com/oracle/truffle/r/test/packages/analyzer/detectors/InstallationProblemDetector.java
@@ -71,13 +71,13 @@ public class InstallationProblemDetector extends LineDetector {
@Override
public String toString() {
- return String.format("%s: Installation failed in '%s'; message: %s", getLocation(), getPkg().getName(),
+ return String.format("%s: Installation failed in '%s'; message: %s", getLocation(), getPackage().getName(),
message);
}
@Override
public String getSummary() {
- return String.format("Installation failed in pacakge '%s'", getPkg().getName());
+ return String.format("Installation failed in package '%s'", getPackage().getName());
}
@Override
diff --git a/com.oracle.truffle.r.test.packages.analyzer/src/com/oracle/truffle/r/test/packages/analyzer/detectors/RErrorDetector.java b/com.oracle.truffle.r.test.packages.analyzer/src/com/oracle/truffle/r/test/packages/analyzer/detectors/RErrorDetector.java
index 58e533f0fc..097e746ce8 100644
--- a/com.oracle.truffle.r.test.packages.analyzer/src/com/oracle/truffle/r/test/packages/analyzer/detectors/RErrorDetector.java
+++ b/com.oracle.truffle.r.test.packages.analyzer/src/com/oracle/truffle/r/test/packages/analyzer/detectors/RErrorDetector.java
@@ -88,7 +88,7 @@ public class RErrorDetector extends LineDetector {
@Override
public String toString() {
- return String.format("%s: RError in '%s' (msg = '%s'), args)", getLocation(), getPkg().getName(), message);
+ return String.format("%s: RError in '%s' (msg = '%s'), args)", getLocation(), getPackage().getName(), message);
}
@Override
diff --git a/com.oracle.truffle.r.test.packages.analyzer/src/com/oracle/truffle/r/test/packages/analyzer/detectors/SegfaultDetector.java b/com.oracle.truffle.r.test.packages.analyzer/src/com/oracle/truffle/r/test/packages/analyzer/detectors/SegfaultDetector.java
index 06e2962024..4212ec4b8c 100644
--- a/com.oracle.truffle.r.test.packages.analyzer/src/com/oracle/truffle/r/test/packages/analyzer/detectors/SegfaultDetector.java
+++ b/com.oracle.truffle.r.test.packages.analyzer/src/com/oracle/truffle/r/test/packages/analyzer/detectors/SegfaultDetector.java
@@ -79,12 +79,12 @@ public class SegfaultDetector extends LineDetector {
@Override
public String toString() {
- return getLocation() + ": SIGSEGV in " + getPkg();
+ return getLocation() + ": SIGSEGV in " + getPackage();
}
@Override
public String getSummary() {
- return ": SIGSEGV in " + getPkg();
+ return ": SIGSEGV in " + getPackage();
}
@Override
diff --git a/com.oracle.truffle.r.test.packages.analyzer/src/com/oracle/truffle/r/test/packages/analyzer/dump/AbstractDumper.java b/com.oracle.truffle.r.test.packages.analyzer/src/com/oracle/truffle/r/test/packages/analyzer/dump/AbstractDumper.java
index 51ad0631f4..76cae7fb6e 100644
--- a/com.oracle.truffle.r.test.packages.analyzer/src/com/oracle/truffle/r/test/packages/analyzer/dump/AbstractDumper.java
+++ b/com.oracle.truffle.r.test.packages.analyzer/src/com/oracle/truffle/r/test/packages/analyzer/dump/AbstractDumper.java
@@ -39,7 +39,7 @@ public abstract class AbstractDumper {
}
protected Map<RPackage, List<Problem>> groupByPkg(Collection<Problem> problems) {
- return problems.stream().collect(Collectors.groupingBy(p -> p.getPackageTestRun().getPkg()));
+ return problems.stream().collect(Collectors.groupingBy(p -> p.getPackageTestRun().getPackage()));
}
}
diff --git a/com.oracle.truffle.r.test.packages.analyzer/src/com/oracle/truffle/r/test/packages/analyzer/parser/LogFileParser.java b/com.oracle.truffle.r.test.packages.analyzer/src/com/oracle/truffle/r/test/packages/analyzer/parser/LogFileParser.java
index 234d7dd649..e3d6a97130 100644
--- a/com.oracle.truffle.r.test.packages.analyzer/src/com/oracle/truffle/r/test/packages/analyzer/parser/LogFileParser.java
+++ b/com.oracle.truffle.r.test.packages.analyzer/src/com/oracle/truffle/r/test/packages/analyzer/parser/LogFileParser.java
@@ -277,7 +277,7 @@ public class LogFileParser {
}
private String getPkgName() {
- return pkg.getPkg().getName();
+ return pkg.getPackage().getName();
}
private static boolean parseStatus(String substring) {
--
GitLab