You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@commons.apache.org by di...@apache.org on 2002/07/14 18:51:34 UTC
cvs commit: jakarta-commons/latka/src/java/org/apache/commons/latka/util/xml BasicDelegateHandler.java
dion 2002/07/14 09:51:34
Modified: latka/src/java/org/apache/commons/latka/jelly
HttpTagSupport.java
latka/src/java/org/apache/commons/latka/jelly/validators
ResponseHeaderTag.java HttpValidatorTagSupport.java
RegexpTag.java ByteLengthTag.java
MaxResponseTimeTag.java CookieTag.java
HttpValidatorTagLibrary.java
latka/src/java/org/apache/commons/latka/util URLParser.java
latka/src/java/org/apache/commons/latka/junit
JUnitTestAdapter.java JUnitEventReporter.java
latka/src/java/org/apache/commons/latka/util/xml
BasicDelegateHandler.java
Log:
Style violations
Revision Changes Path
1.3 +8 -6 jakarta-commons/latka/src/java/org/apache/commons/latka/jelly/HttpTagSupport.java
Index: HttpTagSupport.java
===================================================================
RCS file: /home/cvs/jakarta-commons/latka/src/java/org/apache/commons/latka/jelly/HttpTagSupport.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- HttpTagSupport.java 14 Jul 2002 13:06:44 -0000 1.2
+++ HttpTagSupport.java 14 Jul 2002 16:51:33 -0000 1.3
@@ -171,9 +171,10 @@
* configure it ready for execution
*
* @return a configured {@link HttpUrlMethod method}
+ * @throws MalformedURLException when retrieving the URL fails
*/
private HttpUrlMethod getConfiguredHttpMethod() throws
- MalformedURLException{
+ MalformedURLException {
// retrieve and configure url method
HttpUrlMethod urlMethod = getHttpUrlMethod();
urlMethod.setFollowRedirects(isFollowRedirects());
@@ -200,6 +201,7 @@
/**
* Set the current parameters on the url method ready for processing
*
+ * @param method the {@link HttpUrlMethod method} to configure
* @throws MalformedURLException when {@link #getHttpUrlMethod()} does
*/
protected void setParameters(HttpUrlMethod method) throws
@@ -277,7 +279,7 @@
/**
* Setter for property var.
*
- * @param id New value of property var.
+ * @param var New value of property var.
*/
public void setVar(String var) {
_var = var;
1.3 +6 -6 jakarta-commons/latka/src/java/org/apache/commons/latka/jelly/validators/ResponseHeaderTag.java
Index: ResponseHeaderTag.java
===================================================================
RCS file: /home/cvs/jakarta-commons/latka/src/java/org/apache/commons/latka/jelly/validators/ResponseHeaderTag.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ResponseHeaderTag.java 14 Jul 2002 12:38:22 -0000 1.2
+++ ResponseHeaderTag.java 14 Jul 2002 16:51:33 -0000 1.3
@@ -96,8 +96,8 @@
// check the header is present
Header header = getRequest().getResponseHeader(getName());
if (header != null) {
- if (getValue() == null ||
- getValue().equals(header.getValue())) {
+ if (getValue() == null
+ || getValue().equals(header.getValue())) {
return;
}
}
1.2 +7 -6 jakarta-commons/latka/src/java/org/apache/commons/latka/jelly/validators/HttpValidatorTagSupport.java
Index: HttpValidatorTagSupport.java
===================================================================
RCS file: /home/cvs/jakarta-commons/latka/src/java/org/apache/commons/latka/jelly/validators/HttpValidatorTagSupport.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- HttpValidatorTagSupport.java 14 Jul 2002 13:06:04 -0000 1.1
+++ HttpValidatorTagSupport.java 14 Jul 2002 16:51:33 -0000 1.2
@@ -70,7 +70,8 @@
* A base class for all Latka validation tags
*
* @author dion
- * @version $Id$
+ * @version
+ * $Id$
*/
public class HttpValidatorTagSupport extends TagSupport {
@@ -93,8 +94,8 @@
}
if (getRequest() == null) {
- throw new IllegalStateException("the http request: " +
- getVar() + " was not found");
+ throw new IllegalStateException("the http request: "
+ + getVar() + " was not found");
}
}
1.3 +4 -5 jakarta-commons/latka/src/java/org/apache/commons/latka/jelly/validators/RegexpTag.java
Index: RegexpTag.java
===================================================================
RCS file: /home/cvs/jakarta-commons/latka/src/java/org/apache/commons/latka/jelly/validators/RegexpTag.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- RegexpTag.java 14 Jul 2002 12:38:22 -0000 1.2
+++ RegexpTag.java 14 Jul 2002 16:51:33 -0000 1.3
@@ -64,7 +64,6 @@
import org.apache.commons.jelly.MissingAttributeException;
import org.apache.commons.jelly.XMLOutput;
import org.apache.regexp.RE;
-import org.apache.regexp.RESyntaxException;
/**
* A class to match some part of the response body to a regular expression
1.4 +5 -5 jakarta-commons/latka/src/java/org/apache/commons/latka/jelly/validators/ByteLengthTag.java
Index: ByteLengthTag.java
===================================================================
RCS file: /home/cvs/jakarta-commons/latka/src/java/org/apache/commons/latka/jelly/validators/ByteLengthTag.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ByteLengthTag.java 14 Jul 2002 12:38:22 -0000 1.3
+++ ByteLengthTag.java 14 Jul 2002 16:51:33 -0000 1.4
@@ -93,8 +93,8 @@
HttpUrlMethod method = getRequest();
long responseLength = method.getResponseBodyAsString().length();
if (responseLength < getMin()
- || (getMax() != ByteLengthTag.NO_MAX &&
- responseLength > getMax())) {
+ || (getMax() != ByteLengthTag.NO_MAX
+ && responseLength > getMax())) {
xmlOutput.write(text); //fail
}
}
1.4 +5 -5 jakarta-commons/latka/src/java/org/apache/commons/latka/jelly/validators/MaxResponseTimeTag.java
Index: MaxResponseTimeTag.java
===================================================================
RCS file: /home/cvs/jakarta-commons/latka/src/java/org/apache/commons/latka/jelly/validators/MaxResponseTimeTag.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- MaxResponseTimeTag.java 14 Jul 2002 12:38:22 -0000 1.3
+++ MaxResponseTimeTag.java 14 Jul 2002 16:51:33 -0000 1.4
@@ -105,7 +105,7 @@
}
/** Setter for property limit.
- * @param maximumResponseTime New value of property limit.
+ * @param limit New value of property limit.
*/
public void setLimit(int limit) {
_limit = limit;
1.4 +6 -6 jakarta-commons/latka/src/java/org/apache/commons/latka/jelly/validators/CookieTag.java
Index: CookieTag.java
===================================================================
RCS file: /home/cvs/jakarta-commons/latka/src/java/org/apache/commons/latka/jelly/validators/CookieTag.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- CookieTag.java 14 Jul 2002 12:38:22 -0000 1.3
+++ CookieTag.java 14 Jul 2002 16:51:33 -0000 1.4
@@ -100,8 +100,8 @@
HeaderElement[] elements = cookieHeader.getValues();
for (int index = 0; index < elements.length; index++) {
if (elements[index].getName().equals(getName())) {
- if (getValue() == null ||
- getValue().equals(elements[index].getValue())) {
+ if (getValue() == null
+ || getValue().equals(elements[index].getValue())) {
return;
}
}
1.2 +5 -4 jakarta-commons/latka/src/java/org/apache/commons/latka/jelly/validators/HttpValidatorTagLibrary.java
Index: HttpValidatorTagLibrary.java
===================================================================
RCS file: /home/cvs/jakarta-commons/latka/src/java/org/apache/commons/latka/jelly/validators/HttpValidatorTagLibrary.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- HttpValidatorTagLibrary.java 14 Jul 2002 13:06:04 -0000 1.1
+++ HttpValidatorTagLibrary.java 14 Jul 2002 16:51:33 -0000 1.2
@@ -67,7 +67,8 @@
* A class to register the http validations as a jelly tag library
*
* @author dion
- * @version $Id$
+ * @version
+ * $Id$
*/
public class HttpValidatorTagLibrary extends TagLibrary {
1.9 +2 -2 jakarta-commons/latka/src/java/org/apache/commons/latka/util/URLParser.java
Index: URLParser.java
===================================================================
RCS file: /home/cvs/jakarta-commons/latka/src/java/org/apache/commons/latka/util/URLParser.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- URLParser.java 4 Jul 2002 14:06:33 -0000 1.8
+++ URLParser.java 14 Jul 2002 16:51:33 -0000 1.9
@@ -537,8 +537,8 @@
*/
public static void main(String[] args) {
- final String usageMsg = "Usage: java org.apache.commons.latka.util." +
- "URLParser <filename> [<base URL>]";
+ final String usageMsg = "Usage: java org.apache.commons.latka.util."
+ + "URLParser <filename> [<base URL>]";
final String fileMsg = "File not found: ";
final String urlMsg = "Malformed Base URL: ";
1.14 +7 -7 jakarta-commons/latka/src/java/org/apache/commons/latka/junit/JUnitTestAdapter.java
Index: JUnitTestAdapter.java
===================================================================
RCS file: /home/cvs/jakarta-commons/latka/src/java/org/apache/commons/latka/junit/JUnitTestAdapter.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- JUnitTestAdapter.java 4 Jul 2002 14:06:32 -0000 1.13
+++ JUnitTestAdapter.java 14 Jul 2002 16:51:34 -0000 1.14
@@ -128,8 +128,8 @@
if (file.exists()) {
result = createTestFromFile(file);
} else {
- _log.debug("Input file " + file.getAbsolutePath() +
- " does not exist");
+ _log.debug("Input file " + file.getAbsolutePath()
+ + " does not exist");
}
return result;
}
1.9 +6 -6 jakarta-commons/latka/src/java/org/apache/commons/latka/junit/JUnitEventReporter.java
Index: JUnitEventReporter.java
===================================================================
RCS file: /home/cvs/jakarta-commons/latka/src/java/org/apache/commons/latka/junit/JUnitEventReporter.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- JUnitEventReporter.java 4 Jul 2002 14:06:32 -0000 1.8
+++ JUnitEventReporter.java 14 Jul 2002 16:51:34 -0000 1.9
@@ -196,8 +196,8 @@
fe.getValidationException();
String requestUrl = event.getRequest().getURL().toString();
String requestLabel = event.getRequest().getLabel();
- String message = requestUrl + " -- " + requestLabel + ": " +
- ve.getReason();
+ String message = requestUrl + " -- " + requestLabel + ": "
+ + ve.getReason();
AssertionFailedError failure = new AssertionFailedError(message);
Test test = new EventTestAdapter(failure);
test.run(_testResult);
1.12 +5 -5 jakarta-commons/latka/src/java/org/apache/commons/latka/util/xml/BasicDelegateHandler.java
Index: BasicDelegateHandler.java
===================================================================
RCS file: /home/cvs/jakarta-commons/latka/src/java/org/apache/commons/latka/util/xml/BasicDelegateHandler.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- BasicDelegateHandler.java 4 Jul 2002 14:06:33 -0000 1.11
+++ BasicDelegateHandler.java 14 Jul 2002 16:51:34 -0000 1.12
@@ -150,8 +150,8 @@
_delegatorClassName = _handler.getClass().getName();
_delegateClassName = this.getClass().getName();
_log.debug("beginning delegation");
- _log.debug("delegating from " + _delegatorClassName + " to " +
- _delegateClassName);
+ _log.debug("delegating from " + _delegatorClassName + " to "
+ + _delegateClassName);
}
_reader.setContentHandler(this);
@@ -162,8 +162,8 @@
*/
public void release() {
if (_log.isDebugEnabled()) {
- _log.debug("releasing from " + _delegateClassName + " to " +
- _delegatorClassName);
+ _log.debug("releasing from " + _delegateClassName + " to "
+ + _delegatorClassName);
}
_reader.setContentHandler(_handler);
--
To unsubscribe, e-mail: <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>