You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by mg...@apache.org on 2015/05/27 07:48:27 UTC
[4/5] wicket git commit: Minor non-functional improvements:
Minor non-functional improvements:
- use SLF4J placeholders
- fix a typo in error message
- simplify condition
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/60870466
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/60870466
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/60870466
Branch: refs/heads/master
Commit: 608704669faa9a4753d445a204c39bca963df3ef
Parents: cdf9a73
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Wed May 27 08:40:07 2015 +0300
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Wed May 27 08:41:37 2015 +0300
----------------------------------------------------------------------
.../apache/wicket/core/util/resource/UrlResourceStream.java | 2 +-
.../wicket/core/util/resource/WebExternalResourceStream.java | 2 +-
.../org/apache/wicket/util/resource/ZipResourceStream.java | 6 +++---
3 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/60870466/wicket-core/src/main/java/org/apache/wicket/core/util/resource/UrlResourceStream.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/core/util/resource/UrlResourceStream.java b/wicket-core/src/main/java/org/apache/wicket/core/util/resource/UrlResourceStream.java
index e9d751c..cb905df 100644
--- a/wicket-core/src/main/java/org/apache/wicket/core/util/resource/UrlResourceStream.java
+++ b/wicket-core/src/main/java/org/apache/wicket/core/util/resource/UrlResourceStream.java
@@ -219,7 +219,7 @@ public class UrlResourceStream extends AbstractResourceStream
}
catch (IOException e)
{
- log.warn("getLastModified for " + url + " failed: " + e.getMessage());
+ log.warn("getLastModified() for '{}' failed: {}", url, e.getMessage());
// allow modification watcher to detect the problem
return null;
http://git-wip-us.apache.org/repos/asf/wicket/blob/60870466/wicket-core/src/main/java/org/apache/wicket/core/util/resource/WebExternalResourceStream.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/core/util/resource/WebExternalResourceStream.java b/wicket-core/src/main/java/org/apache/wicket/core/util/resource/WebExternalResourceStream.java
index 3991b28..9697a18 100644
--- a/wicket-core/src/main/java/org/apache/wicket/core/util/resource/WebExternalResourceStream.java
+++ b/wicket-core/src/main/java/org/apache/wicket/core/util/resource/WebExternalResourceStream.java
@@ -88,7 +88,7 @@ public class WebExternalResourceStream extends AbstractResourceStream
if (resourceURL == null)
{
throw new FileNotFoundException("Unable to find resource '" + url +
- "' in the serlvet context");
+ "' in the servlet context");
}
return Connections.getLastModified(resourceURL);
http://git-wip-us.apache.org/repos/asf/wicket/blob/60870466/wicket-util/src/main/java/org/apache/wicket/util/resource/ZipResourceStream.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/resource/ZipResourceStream.java b/wicket-util/src/main/java/org/apache/wicket/util/resource/ZipResourceStream.java
index 0be44ae..cea2a45 100644
--- a/wicket-util/src/main/java/org/apache/wicket/util/resource/ZipResourceStream.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/resource/ZipResourceStream.java
@@ -129,7 +129,7 @@ public class ZipResourceStream extends AbstractResourceStream
String[] files = dir.list();
int BUFFER = 2048;
- BufferedInputStream origin = null;
+ BufferedInputStream origin;
byte data[] = new byte[BUFFER];
for (String file : files)
@@ -141,7 +141,7 @@ public class ZipResourceStream extends AbstractResourceStream
File f = new File(dir, file);
if (f.isDirectory())
{
- if (recursive == true)
+ if (recursive)
{
zipDir(f, out, path + f.getName() + "/", recursive);
}
@@ -215,4 +215,4 @@ public class ZipResourceStream extends AbstractResourceStream
{
return null;
}
-}
\ No newline at end of file
+}