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 2004/09/09 14:07:38 UTC
cvs commit: jakarta-commons/jelly/jelly-tags/html/src/test/org/apache/commons/jelly/html TestJelly.java
dion 2004/09/09 05:07:38
Modified: jelly/jelly-tags/dynabean/src/test/org/apache/commons/jelly/tags/dynabean
TestJelly.java
jelly/jelly-tags/dynabean/src/java/org/apache/commons/jelly/tags/dynabean
DynaclassTag.java PropertyTag.java DynabeanTag.java
SetTag.java DynabeanTagLibrary.java
jelly/jelly-tags/email/src/java/org/apache/commons/jelly/tags/email
EmailTagLibrary.java
jelly/jelly-tags/html/src/java/org/apache/commons/jelly/tags/html
HTMLTagLibrary.java ParseTag.java
jelly/jelly-tags/html/src/test/org/apache/commons/jelly/html
TestJelly.java
Log:
Fix license file whitespace
Revision Changes Path
1.4 +7 -7 jakarta-commons/jelly/jelly-tags/dynabean/src/test/org/apache/commons/jelly/tags/dynabean/TestJelly.java
Index: TestJelly.java
===================================================================
RCS file: /home/cvs/jakarta-commons/jelly/jelly-tags/dynabean/src/test/org/apache/commons/jelly/tags/dynabean/TestJelly.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TestJelly.java 25 Feb 2004 01:31:51 -0000 1.3
+++ TestJelly.java 9 Sep 2004 12:07:37 -0000 1.4
@@ -1,12 +1,12 @@
/*
* Copyright 2002,2004 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -20,7 +20,7 @@
import org.apache.commons.jelly.tags.junit.JellyTestSuite;
-/**
+/**
* A helper class to run jelly test cases as part of Ant's JUnit tests
*
* @author <a href="mailto:jstrachan@apache.org">James Strachan</a>
@@ -31,8 +31,8 @@
public static void main( String[] args ) throws Exception {
TestRunner.run( suite() );
}
-
+
public static TestSuite suite() throws Exception {
- return createTestSuite(TestJelly.class, "suite.jelly");
+ return createTestSuite(TestJelly.class, "suite.jelly");
}
}
1.5 +5 -5 jakarta-commons/jelly/jelly-tags/dynabean/src/java/org/apache/commons/jelly/tags/dynabean/DynaclassTag.java
Index: DynaclassTag.java
===================================================================
RCS file: /home/cvs/jakarta-commons/jelly/jelly-tags/dynabean/src/java/org/apache/commons/jelly/tags/dynabean/DynaclassTag.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DynaclassTag.java 25 Feb 2004 01:31:58 -0000 1.4
+++ DynaclassTag.java 9 Sep 2004 12:07:37 -0000 1.5
@@ -1,12 +1,12 @@
/*
* Copyright 2002,2004 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -83,9 +83,9 @@
// Properties
//-------------------------------------------------------------------------
-
+
/**
- * Sets the name of the new DynaClass
+ * Sets the name of the new DynaClass
*/
public void setName(String name) {
this.name = name;
1.5 +15 -15 jakarta-commons/jelly/jelly-tags/dynabean/src/java/org/apache/commons/jelly/tags/dynabean/PropertyTag.java
Index: PropertyTag.java
===================================================================
RCS file: /home/cvs/jakarta-commons/jelly/jelly-tags/dynabean/src/java/org/apache/commons/jelly/tags/dynabean/PropertyTag.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- PropertyTag.java 25 Feb 2004 01:31:59 -0000 1.4
+++ PropertyTag.java 9 Sep 2004 12:07:37 -0000 1.5
@@ -1,12 +1,12 @@
/*
* Copyright 2002,2004 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -27,7 +27,7 @@
* The properties are added to the properties array
* of the parent context, and will be used to
* create the DynaClass object
- *
+ *
* @author Theo Niemeijer
* @version 1.0
*/
@@ -61,34 +61,34 @@
// Lookup appropriate property class
Class propClass = propertyClass;
if (propClass == null) {
-
+
// Check property type
if (type == null) {
throw new MissingAttributeException( "type" );
}
-
+
if (type.equals("String")) {
propClass = String.class;
- }
+ }
else if (type.equals("Integer")) {
propClass = Integer.TYPE;
- }
+ }
else if (type.equals("Short")) {
propClass = Short.TYPE;
- }
+ }
else if (type.equals("Long")) {
propClass = Long.TYPE;
- }
+ }
else if (type.equals("Float")) {
propClass = Float.TYPE;
- }
+ }
else if (type.equals("Double")) {
propClass = Double.TYPE;
- }
+ }
else if (type.equals("Long")) {
propClass = Long.TYPE;
}
-
+
if (propClass == null) {
try {
propClass = Class.forName(type);
@@ -110,7 +110,7 @@
// Properties
//-------------------------------------------------------------------------
-
+
/**
* Sets the name of this property
*/
@@ -124,7 +124,7 @@
public void setType(String type) {
this.type = type;
}
-
+
/**
* Returns the Class for this property
*/
1.5 +5 -5 jakarta-commons/jelly/jelly-tags/dynabean/src/java/org/apache/commons/jelly/tags/dynabean/DynabeanTag.java
Index: DynabeanTag.java
===================================================================
RCS file: /home/cvs/jakarta-commons/jelly/jelly-tags/dynabean/src/java/org/apache/commons/jelly/tags/dynabean/DynabeanTag.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DynabeanTag.java 25 Feb 2004 01:31:58 -0000 1.4
+++ DynabeanTag.java 9 Sep 2004 12:07:37 -0000 1.5
@@ -1,12 +1,12 @@
/*
* Copyright 2002,2004 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -63,7 +63,7 @@
// Properties
//-------------------------------------------------------------------------
-
+
/**
* Sets the DynaClass of the new instance to create
*/
1.5 +3 -3 jakarta-commons/jelly/jelly-tags/dynabean/src/java/org/apache/commons/jelly/tags/dynabean/SetTag.java
Index: SetTag.java
===================================================================
RCS file: /home/cvs/jakarta-commons/jelly/jelly-tags/dynabean/src/java/org/apache/commons/jelly/tags/dynabean/SetTag.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- SetTag.java 25 Feb 2004 01:31:58 -0000 1.4
+++ SetTag.java 9 Sep 2004 12:07:37 -0000 1.5
@@ -1,12 +1,12 @@
/*
* Copyright 2002,2004 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1.4 +4 -4 jakarta-commons/jelly/jelly-tags/dynabean/src/java/org/apache/commons/jelly/tags/dynabean/DynabeanTagLibrary.java
Index: DynabeanTagLibrary.java
===================================================================
RCS file: /home/cvs/jakarta-commons/jelly/jelly-tags/dynabean/src/java/org/apache/commons/jelly/tags/dynabean/DynabeanTagLibrary.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- DynabeanTagLibrary.java 25 Feb 2004 01:31:59 -0000 1.3
+++ DynabeanTagLibrary.java 9 Sep 2004 12:07:37 -0000 1.4
@@ -1,12 +1,12 @@
/*
* Copyright 2002,2004 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
1.4 +5 -5 jakarta-commons/jelly/jelly-tags/email/src/java/org/apache/commons/jelly/tags/email/EmailTagLibrary.java
Index: EmailTagLibrary.java
===================================================================
RCS file: /home/cvs/jakarta-commons/jelly/jelly-tags/email/src/java/org/apache/commons/jelly/tags/email/EmailTagLibrary.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- EmailTagLibrary.java 25 Feb 2004 01:32:00 -0000 1.3
+++ EmailTagLibrary.java 9 Sep 2004 12:07:37 -0000 1.4
@@ -1,12 +1,12 @@
/*
* Copyright 2002,2004 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -29,7 +29,7 @@
/** The Log to which logging calls will be made. */
private Log log = LogFactory.getLog(EmailTagLibrary.class);
-
+
public EmailTagLibrary() {
registerTag("email", EmailTag.class);
}
1.5 +4 -4 jakarta-commons/jelly/jelly-tags/html/src/java/org/apache/commons/jelly/tags/html/HTMLTagLibrary.java
Index: HTMLTagLibrary.java
===================================================================
RCS file: /home/cvs/jakarta-commons/jelly/jelly-tags/html/src/java/org/apache/commons/jelly/tags/html/HTMLTagLibrary.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- HTMLTagLibrary.java 25 Feb 2004 01:31:51 -0000 1.4
+++ HTMLTagLibrary.java 9 Sep 2004 12:07:37 -0000 1.5
@@ -1,12 +1,12 @@
/*
* Copyright 2002,2004 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -29,7 +29,7 @@
/** The Log to which logging calls will be made. */
private Log log = LogFactory.getLog(HTMLTagLibrary.class);
-
+
public HTMLTagLibrary() {
registerTag("parse", ParseTag.class);
}
1.10 +10 -10 jakarta-commons/jelly/jelly-tags/html/src/java/org/apache/commons/jelly/tags/html/ParseTag.java
Index: ParseTag.java
===================================================================
RCS file: /home/cvs/jakarta-commons/jelly/jelly-tags/html/src/java/org/apache/commons/jelly/tags/html/ParseTag.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ParseTag.java 25 Feb 2004 01:31:51 -0000 1.9
+++ ParseTag.java 9 Sep 2004 12:07:37 -0000 1.10
@@ -1,12 +1,12 @@
/*
* Copyright 2002,2004 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -45,13 +45,13 @@
/** The HTML to parse, either a String URI, a Reader or InputStream */
private Object html;
private String element = "match";
- private String attribute = "no-change";
+ private String attribute = "no-change";
public ParseTag() {
}
// Tag interface
- //-------------------------------------------------------------------------
+ //-------------------------------------------------------------------------
public void doTag(XMLOutput output) throws JellyTagException {
if (getVar() == null) {
throw new IllegalArgumentException("The var attribute cannot be null");
@@ -73,7 +73,7 @@
}
// Properties
- //-------------------------------------------------------------------------
+ //-------------------------------------------------------------------------
/** Sets the source of the HTML which is either a String URI, Reader or InputStream */
public void setHtml(Object html) {
this.html = html;
@@ -82,7 +82,7 @@
/**
* Sets whether attributes should be converted to a different case.
* Possible values are "upper", "lower" or "no-change"
- *
+ *
* @param attribute The processing mode of attributes
*/
public void setAttribute(String attribute) {
@@ -92,7 +92,7 @@
/**
* Sets whether elements should be converted to a different case
* Possible values are "upper", "lower" or "match"
- *
+ *
* @param element The processing mode of elements
*/
public void setElement(String element) {
@@ -101,11 +101,11 @@
// Implementation methods
- //-------------------------------------------------------------------------
+ //-------------------------------------------------------------------------
/**
* Factory method to create a new SAXReader
- */
+ */
protected SAXReader createSAXReader() throws SAXException {
// installs the NeckHTML parser
SAXParser parser = new SAXParser();
1.4 +6 -6 jakarta-commons/jelly/jelly-tags/html/src/test/org/apache/commons/jelly/html/TestJelly.java
Index: TestJelly.java
===================================================================
RCS file: /home/cvs/jakarta-commons/jelly/jelly-tags/html/src/test/org/apache/commons/jelly/html/TestJelly.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- TestJelly.java 25 Feb 2004 01:32:00 -0000 1.3
+++ TestJelly.java 9 Sep 2004 12:07:38 -0000 1.4
@@ -1,12 +1,12 @@
/*
* Copyright 2002,2004 The Apache Software Foundation.
- *
+ *
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -20,7 +20,7 @@
import org.apache.commons.jelly.tags.junit.JellyTestSuite;
-/**
+/**
* A helper class to run jelly test cases as part of Ant's JUnit tests
*
* @author <a href="mailto:jstrachan@apache.org">James Strachan</a>
@@ -31,8 +31,8 @@
public static void main( String[] args ) throws Exception {
TestRunner.run( suite() );
}
-
+
public static TestSuite suite() throws Exception {
- return createTestSuite(TestJelly.class, "suite.jelly");
+ return createTestSuite(TestJelly.class, "suite.jelly");
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: commons-dev-help@jakarta.apache.org