diff options
| author | Alexander Kriegisch <Alexander@Kriegisch.name> | 2021-06-04 07:58:52 +0700 |
|---|---|---|
| committer | Alexander Kriegisch <Alexander@Kriegisch.name> | 2021-06-04 07:58:52 +0700 |
| commit | 49cb924f5402c9d24379ae1af62def6fa5892649 (patch) | |
| tree | 69844405209043e2e18aa9eef0f01f287bc1ae52 /testing-util/src/main/java/org/aspectj | |
| parent | 82df3f0fc9842758f15f12299c9113e48f1ccb5c (diff) | |
| download | aspectj-49cb924f5402c9d24379ae1af62def6fa5892649.tar.gz aspectj-49cb924f5402c9d24379ae1af62def6fa5892649.zip | |
Upgrade license from CPLv1/EPLv1 to EPLv2
This was required by the Eclipse team as one precondition for the next
release.
Signed-off-by: Alexander Kriegisch <Alexander@Kriegisch.name>
Diffstat (limited to 'testing-util/src/main/java/org/aspectj')
| -rw-r--r-- | testing-util/src/main/java/org/aspectj/testing/util/TestUtil.java | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/testing-util/src/main/java/org/aspectj/testing/util/TestUtil.java b/testing-util/src/main/java/org/aspectj/testing/util/TestUtil.java index 51c940277..a6f8303ce 100644 --- a/testing-util/src/main/java/org/aspectj/testing/util/TestUtil.java +++ b/testing-util/src/main/java/org/aspectj/testing/util/TestUtil.java @@ -2,9 +2,9 @@ * Copyright (c) 2002 Palo Alto Research Center, Incorporated (PARC). * All rights reserved. * This program and the accompanying materials are made available - * under the terms of the Eclipse Public License v1.0 + * under the terms of the Eclipse Public License v 2.0 * which accompanies this distribution and is available at - * http://www.eclipse.org/legal/epl-v10.html + * https://www.eclipse.org/org/documents/epl-2.0/EPL-2.0.txt * * Contributors: * Xerox/PARC initial implementation @@ -540,7 +540,7 @@ public final class TestUtil { File expectedFile = new File(expectedBaseDir, path); return doSameFile(handler, expectedBaseDir, actualBaseDir, expectedFile, actualFile); } - + public static String disassembleClass(File basedir, File file) { String basedirPath = FileUtil.normalizedPath(basedir); String name = FileUtil.fileToClassName(basedir, file); @@ -555,7 +555,7 @@ public final class TestUtil { throw new IllegalStateException(t); } } - + public static List<String> toLines(String inputString) { List<String> lines = new ArrayList<>(); try (BufferedReader br = new BufferedReader(new StringReader(inputString))) { @@ -568,11 +568,11 @@ public final class TestUtil { } return lines; } - + public static String toString(List<String> lines) { return String.join("\n", lines); } - + private static int longestLine(List<String> lines) { int longest = -1; for (String line: lines) { |