Skip to content

Commit 386035f

Browse files
committed
Renamed variables for clarity
1 parent 7cc2bd1 commit 386035f

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

Diff for: impl/src/main/java/com/sun/faces/config/manager/tasks/ProvideMetadataToAnnotationScanTask.java

+6-6
Original file line numberDiff line numberDiff line change
@@ -55,15 +55,15 @@ private void initializeIvars(Set<Class<?>> annotatedSet) {
5555

5656
for (DocumentInfo docInfo : documentInfos) {
5757

58-
URI sourceURI = docInfo.getSourceURI();
59-
Matcher jarMatcher = FACES_CONFIG_XML_IN_JAR_PATTERN.matcher(sourceURI == null ? "" : sourceURI.toString());
58+
URI facesConfigURI = docInfo.getSourceURI();
59+
Matcher jarMatcher = FACES_CONFIG_XML_IN_JAR_PATTERN.matcher(facesConfigURI == null ? "" : facesConfigURI.toString());
6060

6161
if (jarMatcher.matches()) {
6262
String jarName = jarMatcher.group(2);
6363
if (!jarNames.contains(jarName)) {
6464
FacesConfigInfo configInfo = new FacesConfigInfo(docInfo);
6565
if (!configInfo.isMetadataComplete()) {
66-
uris.add(sourceURI);
66+
uris.add(facesConfigURI);
6767
jarNames.add(jarName);
6868
} else {
6969
/*
@@ -74,12 +74,12 @@ private void initializeIvars(Set<Class<?>> annotatedSet) {
7474
* annotatedSet because the faces-config.xml that owns it has metadata-complete="true".
7575
*/
7676
ArrayList<Class<?>> toRemove = new ArrayList<>(1);
77-
String sourceURIString = sourceURI.toString();
77+
String facesConfigURIString = facesConfigURI.toString();
7878
if (annotatedSet != null) {
7979
for (Class<?> clazz : annotatedSet) {
80-
String location = CURRENT_RESOURCE_IN_JAR_PATTERN.split(clazz.getResource(".").toString(), 2)[0];
80+
String jarURIString = CURRENT_RESOURCE_IN_JAR_PATTERN.split(clazz.getResource(".").toString(), 2)[0];
8181

82-
if (sourceURIString.startsWith(location)) {
82+
if (facesConfigURIString.startsWith(jarURIString)) {
8383
toRemove.add(clazz);
8484
}
8585
}

0 commit comments

Comments
 (0)