Skip to content
This repository was archived by the owner on Feb 26, 2023. It is now read-only.

Commit b267279

Browse files
dodgexdodgex
committed
Rename local variable matcher to not shadow field
(cherry picked from commit c7bc0b574234c537b4f976df35d215eba8b7f9a0)
1 parent 918227a commit b267279

1 file changed

Lines changed: 3 additions & 3 deletions

File tree

  • AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/helper

‎AndroidAnnotations/androidannotations-core/androidannotations/src/main/java/org/androidannotations/internal/helper/AndroidManifestFinder.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -220,9 +220,9 @@ private List<String> updateLocations(String path, List<String> possibleLocations
220220
String expectedLocation = path + "/" + location;
221221
File file = new File(expectedLocation + "/output.json");
222222
if (file.exists()) {
223-
Matcher matcher = OUTPUT_JSON_PATTERN.matcher(readJsonFromFile(file));
224-
if (matcher.matches()) {
225-
String relativeManifestPath = matcher.group(1);
223+
Matcher jsonMatcher = OUTPUT_JSON_PATTERN.matcher(readJsonFromFile(file));
224+
if (jsonMatcher.matches()) {
225+
String relativeManifestPath = jsonMatcher.group(1);
226226
File manifestFile = new File(expectedLocation + "/" + relativeManifestPath);
227227
String manifestDirectory = manifestFile.getParentFile().getAbsolutePath();
228228
knownLocations.add(manifestDirectory.substring(path.length()));

0 commit comments

Comments
 (0)