This is an automated email from the ASF dual-hosted git repository.
ggregory pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-jelly.git
The following commit(s) were added to refs/heads/master by this push:
new 6c031426 Camel-case parameter and internal names
6c031426 is described below
commit 6c031426d351f3ba219043c48b408053f5478016
Author: Gary Gregory <[email protected]>
AuthorDate: Thu Oct 19 08:34:10 2023 -0400
Camel-case parameter and internal names
Spelling
---
core/src/main/java/org/apache/commons/jelly/Jelly.java | 2 +-
.../main/java/org/apache/commons/jelly/task/JellyTask.java | 2 +-
.../commons/jelly/tags/jetty/JettyHttpServerTag.java | 6 +++---
.../jelly/tags/jface/preference/PreferencePageTag.java | 14 +++++++-------
.../org/apache/commons/jelly/tags/velocity/MergeTag.java | 4 ++--
5 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/core/src/main/java/org/apache/commons/jelly/Jelly.java
b/core/src/main/java/org/apache/commons/jelly/Jelly.java
index d1ebf0a3..ec96c2bd 100644
--- a/core/src/main/java/org/apache/commons/jelly/Jelly.java
+++ b/core/src/main/java/org/apache/commons/jelly/Jelly.java
@@ -171,7 +171,7 @@ public class Jelly {
//-------------------------------------------------------------------------
/**
- * Sets the script URL to use as an absolute URL or a relative filename
+ * Sets the script URL to use as an absolute URL or a relative file name
*/
public void setScript(String script) throws MalformedURLException {
setUrl(resolveURL(script));
diff --git
a/jelly-tags/ant/src/main/java/org/apache/commons/jelly/task/JellyTask.java
b/jelly-tags/ant/src/main/java/org/apache/commons/jelly/task/JellyTask.java
index 6522c679..499d8520 100644
--- a/jelly-tags/ant/src/main/java/org/apache/commons/jelly/task/JellyTask.java
+++ b/jelly-tags/ant/src/main/java/org/apache/commons/jelly/task/JellyTask.java
@@ -93,7 +93,7 @@ public class JellyTask extends Task {
//-------------------------------------------------------------------------
/**
- * Sets the script URL to use as an absolute URL or a relative filename
+ * Sets the script URL to use as an absolute URL or a relative file name
*/
public void setScript(String script) throws MalformedURLException {
setUrl(resolveURL(script));
diff --git
a/jelly-tags/jetty/src/main/java/org/apache/commons/jelly/tags/jetty/JettyHttpServerTag.java
b/jelly-tags/jetty/src/main/java/org/apache/commons/jelly/tags/jetty/JettyHttpServerTag.java
index 3a006dae..3f2226f6 100644
---
a/jelly-tags/jetty/src/main/java/org/apache/commons/jelly/tags/jetty/JettyHttpServerTag.java
+++
b/jelly-tags/jetty/src/main/java/org/apache/commons/jelly/tags/jetty/JettyHttpServerTag.java
@@ -68,7 +68,7 @@ public class JettyHttpServerTag extends TagSupport {
// static initialisation
{
- // setup a log for Jetty with a default filename
+ // setup a log for Jetty with a default file name
try {
_logSink = new OutputStreamLogSink(DEFAULT_LOG_FILE);
//_logSink.start();
@@ -82,10 +82,10 @@ public class JettyHttpServerTag extends TagSupport {
/** unique identifier of the tag/ variable to store result in */
private String _var;
- /** the http server for this tag */
+ /** the HTTP server for this tag */
private HttpServer _server;
- /** filename of Jetty log file - with default */
+ /** file name of Jetty log file - with default */
private String _logFileName = DEFAULT_LOG_FILE;
/** Creates a new instance of JettyHttpServerTag */
diff --git
a/jelly-tags/jface/src/main/java/org/apache/commons/jelly/tags/jface/preference/PreferencePageTag.java
b/jelly-tags/jface/src/main/java/org/apache/commons/jelly/tags/jface/preference/PreferencePageTag.java
index 790d8f72..022c2e6b 100644
---
a/jelly-tags/jface/src/main/java/org/apache/commons/jelly/tags/jface/preference/PreferencePageTag.java
+++
b/jelly-tags/jface/src/main/java/org/apache/commons/jelly/tags/jface/preference/PreferencePageTag.java
@@ -51,7 +51,7 @@ public class PreferencePageTag extends TagSupport {
public PreferencePageImpl(String title) {
super(title, FieldEditorPreferencePage.GRID);
try {
- preferenceStore = new PreferenceStore(filename);
+ preferenceStore = new PreferenceStore(fileName);
preferenceStore.load();
setPreferenceStore(preferenceStore);
} catch (IOException e) {
@@ -88,7 +88,7 @@ public class PreferencePageTag extends TagSupport {
private static final Log log = LogFactory.getLog(PreferencePageTag.class);
/** Filename of the store */
- private String filename;
+ private String fileName;
/** Jelly XMLOutput */
private XMLOutput output;
@@ -112,7 +112,7 @@ public class PreferencePageTag extends TagSupport {
}
// check for missing attributes
- if (filename == null) {
+ if (fileName == null) {
throw new MissingAttributeException("filename");
}
if (title == null) {
@@ -143,11 +143,11 @@ public class PreferencePageTag extends TagSupport {
}
/**
- * Sets the filename.
- * @param filename The filename to set
+ * Sets the file name.
+ * @param fileName The filename to set
*/
- public void setFilename(String filename) {
- this.filename = filename;
+ public void setFilename(String fileName) {
+ this.fileName = fileName;
}
/**
diff --git
a/jelly-tags/velocity/src/main/java/org/apache/commons/jelly/tags/velocity/MergeTag.java
b/jelly-tags/velocity/src/main/java/org/apache/commons/jelly/tags/velocity/MergeTag.java
index 1c19e8d1..5c1db95b 100644
---
a/jelly-tags/velocity/src/main/java/org/apache/commons/jelly/tags/velocity/MergeTag.java
+++
b/jelly-tags/velocity/src/main/java/org/apache/commons/jelly/tags/velocity/MergeTag.java
@@ -122,10 +122,10 @@ public class MergeTag extends VelocityTagSupport
}
/**
- * Sets the filename of the template used to merge with the
+ * Sets the fil ename of the template used to merge with the
* JellyContext.
*
- * @param template The filename of the template to be merged.
+ * @param template The file name of the template to be merged.
*/
public void setTemplate( String template )
{
