Author: jkuhnert
Date: Mon Mar 13 20:48:40 2006
New Revision: 385733
URL: http://svn.apache.org/viewcvs?rev=385733&view=rev
Log:
cleaned up checkstyle errors
Modified:
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/asset/AbstractAsset.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/asset/AssetFactory.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/asset/AssetFactoryContribution.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/asset/AssetMessages.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/asset/AssetService.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/asset/AssetSource.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/asset/AssetSourceImpl.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/asset/ClasspathAssetFactory.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/asset/ContextAsset.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/asset/ContextAssetFactory.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/asset/DefaultAssetFactory.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/asset/ExternalAsset.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/asset/PrivateAsset.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/asset/ResourceDigestSource.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/asset/ResourceDigestSourceImpl.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/asset/ResourceMatcher.java
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/asset/ResourceMatcherImpl.java
Modified:
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/asset/AbstractAsset.java
URL:
http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/asset/AbstractAsset.java?rev=385733&r1=385732&r2=385733&view=diff
==============================================================================
---
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/asset/AbstractAsset.java
(original)
+++
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/asset/AbstractAsset.java
Mon Mar 13 20:48:40 2006
@@ -30,12 +30,12 @@
public abstract class AbstractAsset implements IAsset
{
- private Resource _resourceLocation;
+ private Resource _resourceLocation;
private Location _location;
protected AbstractAsset(Resource resourceLocation, Location location)
{
- _resourceLocation = resourceLocation;
+ _resourceLocation = resourceLocation;
_location = location;
}
@@ -46,16 +46,16 @@
public Resource getResourceLocation()
{
- return _resourceLocation;
+ return _resourceLocation;
}
public String toString()
{
- ToStringBuilder builder = new ToStringBuilder(this);
-
- builder.append("resourceLocation", _resourceLocation);
- builder.append("location", _location);
-
- return builder.toString();
+ ToStringBuilder builder = new ToStringBuilder(this);
+
+ builder.append("resourceLocation", _resourceLocation);
+ builder.append("location", _location);
+
+ return builder.toString();
}
}
Modified:
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/asset/AssetFactory.java
URL:
http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/asset/AssetFactory.java?rev=385733&r1=385732&r2=385733&view=diff
==============================================================================
---
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/asset/AssetFactory.java
(original)
+++
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/asset/AssetFactory.java
Mon Mar 13 20:48:40 2006
@@ -48,7 +48,7 @@
* @throws org.apache.hivemind.ApplicationRuntimeException
* if no matching asset may be found.
*/
- public IAsset createAsset(Resource baseResource, String path, Locale
locale, Location location);
+ IAsset createAsset(Resource baseResource, String path, Locale locale,
Location location);
/**
* Creates a new asset relative to the root of the domain defined by the
type of asset.
@@ -61,11 +61,11 @@
* the location used to report any errors
* @return an [EMAIL PROTECTED] IAsset}
*/
- public IAsset createAbsoluteAsset(String path, Locale locale, Location
location);
+ IAsset createAbsoluteAsset(String path, Locale locale, Location location);
/**
* Creates a new asset based on a known resource.
*/
- public IAsset createAsset(Resource resource, Location location);
-}
\ No newline at end of file
+ IAsset createAsset(Resource resource, Location location);
+}
Modified:
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/asset/AssetFactoryContribution.java
URL:
http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/asset/AssetFactoryContribution.java?rev=385733&r1=385732&r2=385733&view=diff
==============================================================================
---
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/asset/AssetFactoryContribution.java
(original)
+++
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/asset/AssetFactoryContribution.java
Mon Mar 13 20:48:40 2006
@@ -47,4 +47,4 @@
{
_prefix = prefix;
}
-}
\ No newline at end of file
+}
Modified:
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/asset/AssetMessages.java
URL:
http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/asset/AssetMessages.java?rev=385733&r1=385732&r2=385733&view=diff
==============================================================================
---
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/asset/AssetMessages.java
(original)
+++
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/asset/AssetMessages.java
Mon Mar 13 20:48:40 2006
@@ -23,10 +23,13 @@
* @author Howard M. Lewis Ship
* @since 4.0
*/
-class AssetMessages
+final class AssetMessages
{
- private final static MessageFormatter _formatter = new
MessageFormatter(AssetMessages.class);
+ private static final MessageFormatter _formatter = new
MessageFormatter(AssetMessages.class);
+ /* defeat insantiation */
+ private AssetMessages() { }
+
static String missingAsset(String path, Resource resource)
{
return _formatter.format("missing-asset", path, resource);
@@ -61,4 +64,4 @@
{
return _formatter.format("missing-context-resource", path);
}
-}
\ No newline at end of file
+}
Modified:
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/asset/AssetService.java
URL:
http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/asset/AssetService.java?rev=385733&r1=385732&r2=385733&view=diff
==============================================================================
---
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/asset/AssetService.java
(original)
+++
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/asset/AssetService.java
Mon Mar 13 20:48:40 2006
@@ -57,32 +57,29 @@
public class AssetService implements IEngineService
{
+ /**
+ * Query parameter that stores the path to the resource (with a leading
slash).
+ *
+ * @since 4.0
+ */
- /** @since 4.0 */
- private ClassResolver _classResolver;
-
- /** @since 4.0 */
- private LinkFactory _linkFactory;
-
- /** @since 4.0 */
- private WebContext _context;
-
- /** @since 4.0 */
-
- private WebRequest _request;
-
- /** @since 4.0 */
- private WebResponse _response;
+ public static final String PATH = "path";
- /** @since 4.0 */
- private ResourceDigestSource _digestSource;
+ /**
+ * Query parameter that stores the digest for the file; this is used to
authenticate that the
+ * client is allowed to access the file.
+ *
+ * @since 4.0
+ */
+ public static final String DIGEST = "digest";
+
/**
* Defaults MIME types, by extension, used when the servlet container
doesn't provide MIME
* types. ServletExec Debugger, for example, fails to provide these.
*/
- private final static Map _mimeTypes;
+ private static final Map _mimeTypes;
static
{
@@ -97,6 +94,25 @@
private static final int BUFFER_SIZE = 10240;
+ /** @since 4.0 */
+ private ClassResolver _classResolver;
+
+ /** @since 4.0 */
+ private LinkFactory _linkFactory;
+
+ /** @since 4.0 */
+ private WebContext _context;
+
+ /** @since 4.0 */
+
+ private WebRequest _request;
+
+ /** @since 4.0 */
+ private WebResponse _response;
+
+ /** @since 4.0 */
+ private ResourceDigestSource _digestSource;
+
/**
* Startup time for this service; used to set the Last-Modified response
header.
*
@@ -117,23 +133,6 @@
private RequestExceptionReporter _exceptionReporter;
/**
- * Query parameter that stores the path to the resource (with a leading
slash).
- *
- * @since 4.0
- */
-
- public static final String PATH = "path";
-
- /**
- * Query parameter that stores the digest for the file; this is used to
authenticate that the
- * client is allowed to access the file.
- *
- * @since 4.0
- */
-
- public static final String DIGEST = "digest";
-
- /**
* Builds a [EMAIL PROTECTED] ILink}for a [EMAIL PROTECTED] PrivateAsset}.
* <p>
* A single parameter is expected, the resource path of the asset (which
is expected to start
@@ -172,8 +171,8 @@
{
int dotx = path.lastIndexOf('.');
if (dotx > -1) {
- String key = path.substring(dotx + 1).toLowerCase();
- result = (String) _mimeTypes.get(key);
+ String key = path.substring(dotx + 1).toLowerCase();
+ result = (String) _mimeTypes.get(key);
}
if (result == null)
@@ -322,4 +321,4 @@
{
_request = request;
}
-}
\ No newline at end of file
+}
Modified:
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/asset/AssetSource.java
URL:
http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/asset/AssetSource.java?rev=385733&r1=385732&r2=385733&view=diff
==============================================================================
---
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/asset/AssetSource.java
(original)
+++
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/asset/AssetSource.java
Mon Mar 13 20:48:40 2006
@@ -48,5 +48,5 @@
* @throws org.apache.hivemind.ApplicationRuntimeException
* if the asset does not exist
*/
- public IAsset findAsset(Resource base, String path, Locale locale,
Location location);
-}
\ No newline at end of file
+ IAsset findAsset(Resource base, String path, Locale locale, Location
location);
+}
Modified:
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/asset/AssetSourceImpl.java
URL:
http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/asset/AssetSourceImpl.java?rev=385733&r1=385732&r2=385733&view=diff
==============================================================================
---
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/asset/AssetSourceImpl.java
(original)
+++
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/asset/AssetSourceImpl.java
Mon Mar 13 20:48:40 2006
@@ -117,4 +117,4 @@
_defaultAssetFactory = defaultAssetFactory;
}
-}
\ No newline at end of file
+}
Modified:
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/asset/ClasspathAssetFactory.java
URL:
http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/asset/ClasspathAssetFactory.java?rev=385733&r1=385732&r2=385733&view=diff
==============================================================================
---
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/asset/ClasspathAssetFactory.java
(original)
+++
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/asset/ClasspathAssetFactory.java
Mon Mar 13 20:48:40 2006
@@ -85,4 +85,4 @@
{
_localizer = localizer;
}
-}
\ No newline at end of file
+}
Modified:
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/asset/ContextAsset.java
URL:
http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/asset/ContextAsset.java?rev=385733&r1=385732&r2=385733&view=diff
==============================================================================
---
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/asset/ContextAsset.java
(original)
+++
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/asset/ContextAsset.java
Mon Mar 13 20:48:40 2006
@@ -80,4 +80,4 @@
getResourceLocation()), ex);
}
}
-}
\ No newline at end of file
+}
Modified:
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/asset/ContextAssetFactory.java
URL:
http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/asset/ContextAssetFactory.java?rev=385733&r1=385732&r2=385733&view=diff
==============================================================================
---
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/asset/ContextAssetFactory.java
(original)
+++
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/asset/ContextAssetFactory.java
Mon Mar 13 20:48:40 2006
@@ -108,6 +108,6 @@
public void setRequestCycle(IRequestCycle cycle)
{
- _requestCycle = cycle;
+ _requestCycle = cycle;
}
-}
\ No newline at end of file
+}
Modified:
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/asset/DefaultAssetFactory.java
URL:
http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/asset/DefaultAssetFactory.java?rev=385733&r1=385732&r2=385733&view=diff
==============================================================================
---
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/asset/DefaultAssetFactory.java
(original)
+++
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/asset/DefaultAssetFactory.java
Mon Mar 13 20:48:40 2006
@@ -45,4 +45,4 @@
return new ExternalAsset(path, location);
}
-}
\ No newline at end of file
+}
Modified:
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/asset/ExternalAsset.java
URL:
http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/asset/ExternalAsset.java?rev=385733&r1=385732&r2=385733&view=diff
==============================================================================
---
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/asset/ExternalAsset.java
(original)
+++
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/asset/ExternalAsset.java
Mon Mar 13 20:48:40 2006
@@ -31,13 +31,13 @@
public class ExternalAsset extends AbstractAsset
{
- private String _URL;
+ private String _url;
public ExternalAsset(String URL, Location location)
{
- super(null, location);
-
- _URL = URL;
+ super(null, location);
+
+ _url = URL;
}
/**
@@ -47,7 +47,7 @@
public String buildURL()
{
- return _URL;
+ return _url;
}
public InputStream getResourceAsStream()
@@ -56,7 +56,7 @@
try
{
- url = new URL(_URL);
+ url = new URL(_url);
return url.openStream();
}
@@ -64,13 +64,13 @@
{
// MalrformedURLException or IOException
- throw new
ApplicationRuntimeException(Tapestry.format("ExternalAsset.resource-missing",
_URL), ex);
+ throw new
ApplicationRuntimeException(Tapestry.format("ExternalAsset.resource-missing",
_url), ex);
}
}
public String toString()
{
- return "ExternalAsset[" + _URL + "]";
+ return "ExternalAsset[" + _url + "]";
}
-}
\ No newline at end of file
+}
Modified:
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/asset/PrivateAsset.java
URL:
http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/asset/PrivateAsset.java?rev=385733&r1=385732&r2=385733&view=diff
==============================================================================
---
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/asset/PrivateAsset.java
(original)
+++
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/asset/PrivateAsset.java
Mon Mar 13 20:48:40 2006
@@ -88,4 +88,4 @@
}
}
-}
\ No newline at end of file
+}
Modified:
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/asset/ResourceDigestSource.java
URL:
http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/asset/ResourceDigestSource.java?rev=385733&r1=385732&r2=385733&view=diff
==============================================================================
---
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/asset/ResourceDigestSource.java
(original)
+++
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/asset/ResourceDigestSource.java
Mon Mar 13 20:48:40 2006
@@ -35,5 +35,5 @@
* if the resource does not exist, or there is an error
calculating the checksum.
*/
- public String getDigestForResource(String resourcePath);
-}
\ No newline at end of file
+ String getDigestForResource(String resourcePath);
+}
Modified:
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/asset/ResourceDigestSourceImpl.java
URL:
http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/asset/ResourceDigestSourceImpl.java?rev=385733&r1=385732&r2=385733&view=diff
==============================================================================
---
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/asset/ResourceDigestSourceImpl.java
(original)
+++
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/asset/ResourceDigestSourceImpl.java
Mon Mar 13 20:48:40 2006
@@ -41,12 +41,12 @@
public class ResourceDigestSourceImpl implements ResourceDigestSource,
ResetEventListener,
ReportStatusListener
{
+ private static final int BUFFER_SIZE = 5000;
+
private String _serviceId;
private ClassResolver _classResolver;
- private static final int BUFFER_SIZE = 5000;
-
/**
* Map keyed on resource path of DIGEST checksum (as a string).
*/
@@ -151,4 +151,4 @@
{
_serviceId = serviceId;
}
-}
\ No newline at end of file
+}
Modified:
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/asset/ResourceMatcher.java
URL:
http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/asset/ResourceMatcher.java?rev=385733&r1=385732&r2=385733&view=diff
==============================================================================
---
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/asset/ResourceMatcher.java
(original)
+++
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/asset/ResourceMatcher.java
Mon Mar 13 20:48:40 2006
@@ -34,5 +34,5 @@
* for this matcher, false otherwise.
*/
- public boolean containsResource(String path);
+ boolean containsResource(String path);
}
Modified:
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/asset/ResourceMatcherImpl.java
URL:
http://svn.apache.org/viewcvs/jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/asset/ResourceMatcherImpl.java?rev=385733&r1=385732&r2=385733&view=diff
==============================================================================
---
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/asset/ResourceMatcherImpl.java
(original)
+++
jakarta/tapestry/trunk/framework/src/java/org/apache/tapestry/asset/ResourceMatcherImpl.java
Mon Mar 13 20:48:40 2006
@@ -26,12 +26,12 @@
*/
public class ResourceMatcherImpl implements ResetEventListener,
ResourceMatcher {
- /** regexp matcher engine */
- protected RegexpMatcher matcher;
- /** Resource match configuration regexp strings */
- protected List contributions;
+ /** regexp matcher engine. */
+ protected RegexpMatcher _matcher;
+ /** Resource match configuration regexp strings. */
+ protected List _contributions;
- /** no args constructor */
+ /** no args constructor. */
public ResourceMatcherImpl() { }
/**
@@ -40,7 +40,7 @@
*/
public void initializeService()
{
- matcher = new RegexpMatcher();
+ _matcher = new RegexpMatcher();
}
/**
@@ -48,7 +48,7 @@
*/
public synchronized void resetEventDidOccur()
{
- matcher.clear();
+ _matcher.clear();
}
/**
@@ -56,12 +56,12 @@
*/
public boolean containsResource(String path)
{
- if (contributions == null || contributions.size() < 1)
+ if (_contributions == null || _contributions.size() < 1)
return false;
- for (int i = 0; i < contributions.size(); i++) {
- String pattern = (String)contributions.get(i);
- if (matcher.contains(pattern, path))
+ for (int i = 0; i < _contributions.size(); i++) {
+ String pattern = (String)_contributions.get(i);
+ if (_matcher.contains(pattern, path))
return true;
}
@@ -75,6 +75,6 @@
*/
public void setContributions(List contributions)
{
- this.contributions = contributions;
+ this._contributions = contributions;
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
