Author: markt
Date: Mon Sep 16 13:17:25 2013
New Revision: 1523636
URL: http://svn.apache.org/r1523636
Log:
Reduce visibility of fields in abstract methods
Modified:
tomcat/trunk/java/org/apache/catalina/webresources/AbstractArchiveResourceSet.java
tomcat/trunk/java/org/apache/catalina/webresources/JarResourceSet.java
tomcat/trunk/java/org/apache/catalina/webresources/JarWarResourceSet.java
Modified:
tomcat/trunk/java/org/apache/catalina/webresources/AbstractArchiveResourceSet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/webresources/AbstractArchiveResourceSet.java?rev=1523636&r1=1523635&r2=1523636&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/catalina/webresources/AbstractArchiveResourceSet.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/webresources/AbstractArchiveResourceSet.java
Mon Sep 16 13:17:25 2013
@@ -30,8 +30,22 @@ import org.apache.catalina.util.Resource
public abstract class AbstractArchiveResourceSet extends AbstractResourceSet {
- protected HashMap<String,JarEntry> jarFileEntries = new HashMap<>();
- protected String baseUrl;
+ private final HashMap<String,JarEntry> jarFileEntries = new HashMap<>();
+ private String baseUrl;
+
+
+ public String getBaseUrl() {
+ return baseUrl;
+ }
+
+ public void setBaseUrl(String baseUrl) {
+ this.baseUrl = baseUrl;
+ }
+
+ public HashMap<String,JarEntry> getJarFileEntries() {
+ return jarFileEntries;
+ }
+
@Override
public final String[] list(String path) {
Modified: tomcat/trunk/java/org/apache/catalina/webresources/JarResourceSet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/webresources/JarResourceSet.java?rev=1523636&r1=1523635&r2=1523636&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/webresources/JarResourceSet.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/webresources/JarResourceSet.java Mon
Sep 16 13:17:25 2013
@@ -74,7 +74,7 @@ public class JarResourceSet extends Abst
@Override
protected WebResource createArchiveResource(JarEntry jarEntry,
String webAppPath) {
- return new JarResource(getRoot(), webAppPath, getBase(), baseUrl,
+ return new JarResource(getRoot(), webAppPath, getBase(), getBaseUrl(),
jarEntry, getInternalPath());
}
@@ -86,14 +86,14 @@ public class JarResourceSet extends Abst
Enumeration<JarEntry> entries = jarFile.entries();
while (entries.hasMoreElements()) {
JarEntry entry = entries.nextElement();
- jarFileEntries.put(entry.getName(), entry);
+ getJarFileEntries().put(entry.getName(), entry);
}
} catch (IOException ioe) {
throw new IllegalArgumentException(ioe);
}
try {
- this.baseUrl = (new File(getBase())).toURI().toURL().toString();
+ setBaseUrl((new File(getBase())).toURI().toURL().toString());
} catch (MalformedURLException e) {
throw new IllegalArgumentException(e);
}
Modified:
tomcat/trunk/java/org/apache/catalina/webresources/JarWarResourceSet.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/webresources/JarWarResourceSet.java?rev=1523636&r1=1523635&r2=1523636&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/webresources/JarWarResourceSet.java
(original)
+++ tomcat/trunk/java/org/apache/catalina/webresources/JarWarResourceSet.java
Mon Sep 16 13:17:25 2013
@@ -77,7 +77,7 @@ public class JarWarResourceSet extends A
@Override
protected WebResource createArchiveResource(JarEntry jarEntry,
String webAppPath) {
- return new JarWarResource(getRoot(), webAppPath, getBase(), baseUrl,
+ return new JarWarResource(getRoot(), webAppPath, getBase(),
getBaseUrl(),
jarEntry, archivePath, getInternalPath());
}
@@ -92,7 +92,7 @@ public class JarWarResourceSet extends A
try (JarInputStream jarIs = new JarInputStream(jarFileIs)) {
JarEntry entry = jarIs.getNextJarEntry();
while (entry != null) {
- jarFileEntries.put(entry.getName(), entry);
+ getJarFileEntries().put(entry.getName(), entry);
entry = jarIs.getNextJarEntry();
}
}
@@ -102,7 +102,7 @@ public class JarWarResourceSet extends A
}
try {
- this.baseUrl = (new File(getBase())).toURI().toURL().toString();
+ setBaseUrl((new File(getBase())).toURI().toURL().toString());
} catch (MalformedURLException e) {
throw new IllegalArgumentException(e);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
