cvs commit: jakarta-commons/collections/src/java/org/apache/commons/collections DoubleOrderedMap.java
scolebourne2003/12/14 04:54:42 Modified:collections/src/java/org/apache/commons/collections DoubleOrderedMap.java Log: Javadoc fix Revision ChangesPath 1.10 +6 -6 jakarta-commons/collections/src/java/org/apache/commons/collections/DoubleOrderedMap.java Index: DoubleOrderedMap.java === RCS file: /home/cvs/jakarta-commons/collections/src/java/org/apache/commons/collections/DoubleOrderedMap.java,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- DoubleOrderedMap.java 6 Dec 2003 13:03:15 - 1.9 +++ DoubleOrderedMap.java 14 Dec 2003 12:54:42 - 1.10 @@ -85,8 +85,8 @@ * particularly when trying to keep the two TreeMaps synchronized with * each other. And if the data contained in the TreeMaps is large, the * cost of redundant storage becomes significant. (See also the new - * [EMAIL PROTECTED] org.apache.commons.collections.DualTreeBidiMap DualTreeBidiMap} and - * [EMAIL PROTECTED] org.apache.commons.collections.DualHashBidiMap DualHashBidiMap} + * [EMAIL PROTECTED] org.apache.commons.collections.bidimap.DualTreeBidiMap DualTreeBidiMap} and + * [EMAIL PROTECTED] org.apache.commons.collections.bidimap.DualHashBidiMap DualHashBidiMap} * implementations.) * p * This solution keeps the data properly synchronized and minimizes @@ -138,8 +138,8 @@ * * @deprecated Use TreeBidiMap in bidimap subpackage. Due to be removed in v4.0. * @see BidiMap - * @see DualTreeBidiMap - * @see DualHashBidiMap + * @see org.apache.commons.collections.bidimap.DualTreeBidiMap + * @see org.apache.commons.collections.bidimap.DualHashBidiMap * @since Commons Collections 2.0 * @version $Revision$ $Date$ * - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons/collections/src/java/org/apache/commons/collections/bidimap AbstractDualBidiMap.java
scolebourne2003/12/14 04:59:38
Modified:collections/src/java/org/apache/commons/collections/bidimap
AbstractDualBidiMap.java
Log:
Fix bug in iterator method from coverage testing
Revision ChangesPath
1.5 +3 -3
jakarta-commons/collections/src/java/org/apache/commons/collections/bidimap/AbstractDualBidiMap.java
Index: AbstractDualBidiMap.java
===
RCS file:
/home/cvs/jakarta-commons/collections/src/java/org/apache/commons/collections/bidimap/AbstractDualBidiMap.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- AbstractDualBidiMap.java 5 Dec 2003 20:23:58 - 1.4
+++ AbstractDualBidiMap.java 14 Dec 2003 12:59:38 - 1.5
@@ -616,7 +616,7 @@
}
public String toString() {
-if (last == null) {
+if (last != null) {
return MapIterator[ + getKey() + = + getValue() + ];
} else {
return MapIterator[];
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons/collections/src/java/org/apache/commons/collections/map StaticBucketMap.java
scolebourne2003/12/14 05:00:03
Modified:collections/src/java/org/apache/commons/collections/map
StaticBucketMap.java
Log:
Fix bug in remove method from coverage testing
Revision ChangesPath
1.3 +7 -4
jakarta-commons/collections/src/java/org/apache/commons/collections/map/StaticBucketMap.java
Index: StaticBucketMap.java
===
RCS file:
/home/cvs/jakarta-commons/collections/src/java/org/apache/commons/collections/map/StaticBucketMap.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- StaticBucketMap.java 6 Dec 2003 13:03:15 - 1.2
+++ StaticBucketMap.java 14 Dec 2003 13:00:03 - 1.3
@@ -611,8 +611,11 @@
return false;
}
-public boolean remove(Object o) {
-Map.Entry entry = (Map.Entry)o;
+public boolean remove(Object obj) {
+if (obj instanceof Map.Entry == false) {
+return false;
+}
+Map.Entry entry = (Map.Entry)obj;
int hash = getHash(entry.getKey());
synchronized (m_locks[hash]) {
for (Node n = m_buckets[hash]; n != null; n = n.next) {
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons/collections/src/test/org/apache/commons/collections/bidimap AbstractTestBidiMap.java
scolebourne2003/12/14 05:00:37
Modified:collections/src/test/org/apache/commons/collections/bidimap
AbstractTestBidiMap.java
Log:
Add additional tests for coverage
Revision ChangesPath
1.7 +22 -4
jakarta-commons/collections/src/test/org/apache/commons/collections/bidimap/AbstractTestBidiMap.java
Index: AbstractTestBidiMap.java
===
RCS file:
/home/cvs/jakarta-commons/collections/src/test/org/apache/commons/collections/bidimap/AbstractTestBidiMap.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- AbstractTestBidiMap.java 3 Dec 2003 12:59:36 - 1.6
+++ AbstractTestBidiMap.java 14 Dec 2003 13:00:37 - 1.7
@@ -277,7 +277,13 @@
//---
public void testBidiClear() {
-if (isRemoveSupported() == false) return;
+if (isRemoveSupported() == false) {
+try {
+makeFullBidiMap().clear();
+fail();
+} catch(UnsupportedOperationException ex) {}
+return;
+}
BidiMap map = makeFullBidiMap();
map.clear();
@@ -294,13 +300,25 @@
//---
public void testBidiRemove() {
-if (isRemoveSupported() == false) return;
+if (isRemoveSupported() == false) {
+try {
+makeFullBidiMap().remove(entries[0][0]);
+fail();
+} catch(UnsupportedOperationException ex) {}
+try {
+makeFullBidiMap().removeValue(entries[0][1]);
+fail();
+} catch(UnsupportedOperationException ex) {}
+return;
+}
remove(makeFullBidiMap(), entries[0][0]);
remove(makeFullBidiMap().inverseBidiMap(), entries[0][1]);
removeValue(makeFullBidiMap(), entries[0][1]);
removeValue(makeFullBidiMap().inverseBidiMap(), entries[0][0]);
+
+assertEquals(null, makeFullBidiMap().removeValue(NotPresent));
}
private final void remove(BidiMap map, Object key) {
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons/collections/src/test/org/apache/commons/collections/map AbstractTestMap.java
scolebourne2003/12/14 05:01:07
Modified:collections/src/test/org/apache/commons/collections/iterators
AbstractTestIterator.java
collections/src/test/org/apache/commons/collections/map
AbstractTestMap.java
Log:
Add additional tests for coverage
Revision ChangesPath
1.6 +6 -2
jakarta-commons/collections/src/test/org/apache/commons/collections/iterators/AbstractTestIterator.java
Index: AbstractTestIterator.java
===
RCS file:
/home/cvs/jakarta-commons/collections/src/test/org/apache/commons/collections/iterators/AbstractTestIterator.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- AbstractTestIterator.java 18 Nov 2003 22:37:14 - 1.5
+++ AbstractTestIterator.java 14 Dec 2003 13:01:07 - 1.6
@@ -169,6 +169,8 @@
} catch (NoSuchElementException e) {
}
verify();
+
+assertNotNull(it.toString());
}
/**
@@ -203,6 +205,8 @@
fail(NoSuchElementException must be thrown when Iterator is
exhausted);
} catch (NoSuchElementException e) {
}
+
+assertNotNull(it.toString());
}
/**
1.4 +9 -2
jakarta-commons/collections/src/test/org/apache/commons/collections/map/AbstractTestMap.java
Index: AbstractTestMap.java
===
RCS file:
/home/cvs/jakarta-commons/collections/src/test/org/apache/commons/collections/map/AbstractTestMap.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- AbstractTestMap.java 7 Dec 2003 01:21:51 - 1.3
+++ AbstractTestMap.java 14 Dec 2003 13:01:07 - 1.4
@@ -1280,6 +1280,13 @@
return entry;
}
+public void testMapEntrySetRemoveNonMapEntry() {
+if (isRemoveSupported() == false) return;
+resetFull();
+assertEquals(false, getSet().remove(null));
+assertEquals(false, getSet().remove(new Object()));
+}
+
public void verify() {
super.verify();
AbstractTestMap.this.verify();
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons/collections/xdocs index.xml
scolebourne2003/12/14 05:01:32 Modified:collections/xdocs index.xml Log: Fix reference to moved Sun page Revision ChangesPath 1.6 +1 -1 jakarta-commons/collections/xdocs/index.xml Index: index.xml === RCS file: /home/cvs/jakarta-commons/collections/xdocs/index.xml,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- index.xml 16 Oct 2003 20:52:03 - 1.5 +++ index.xml 14 Dec 2003 13:01:32 - 1.6 @@ -12,7 +12,7 @@ section name=The Collections Component p -The introduction of the a href=http://java.sun.com/products/jdk/1.2/docs/guide/collections/;Collections API/a by Sun in JDK 1.2 has been a +The introduction of the a href=http://java.sun.com/products/j2se/1.3/docs/guide/collections/;Collections API/a by Sun in JDK 1.2 has been a boon to quick and effective Java programming. Ready access to powerful data structures has accelerated development by reducing the need for custom container classes around each core object. Most Java2 - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 25511] New: - allow for database clusters/clustering
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=25511. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=25511 allow for database clusters/clustering Summary: allow for database clusters/clustering Product: Commons Version: 1.0 Beta 1 Platform: Other URL: http://lists.mysql.com/list.php?6:mss:6688:200312:afadmd hcjpfffjaofnde OS/Version: Other Status: NEW Severity: Enhancement Priority: Other Component: Dbcp AssignedTo: [EMAIL PROTECTED] ReportedBy: [EMAIL PROTECTED] Since open source becomes used more and more also in high-traffic volume environments, it would be great not to have to rely on commercial add-on's to be able to do clustering (http://www.mysql.com/newsletter/2003-11/a000271.html). As per the above posting, Dane appears to have done a first step in that direction, but IMHO this is too much for one person alone and why start a separate effort when dbcp is such an excellent basis to enhance? (P.S.: I'll ask Dane whether he is willing to license his code also under an apache license!) - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons-sandbox/launcher/xdocs index.xml
dirkv 2003/12/14 05:06:39 Removed: launcher .cvsignore LICENSE LICENSE.txt PROPOSAL.html RELEASE-NOTES.txt STATUS.html build-maven.xml build.properties.sample build.xml project.xml launcher/src/bin launch-ant.bat launch-ant.sh launcher.properties launcher.xml launcher/src/conf MANIFEST.MF launcher/src/java LauncherBootstrap.java launcher/src/java/org/apache/commons/launcher ChildMain.java ExitOnErrorThreadGroup.java LaunchCommand.java LaunchFilter.java LaunchTask.java LaunchTask_en.properties Launcher.java Launcher_en.properties ParentListener.java StreamConnector.java launcher/src/java/org/apache/commons/launcher/types ArgumentSet.java ArgumentSet_en.properties ConditionalArgument.java ConditionalArgumentSet.java ConditionalVariable.java ConditionalVariableSet.java JVMArgumentSet.java JVMArgumentSet_en.properties SysPropertySet.java SysPropertySet_en.properties launcher/xdocs index.xml Log: launcher has been promoted to commons proper - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Bug report for Commons [2003/12/14]
+---+ | Bugzilla Bug ID | | +-+ | | Status: UNC=Unconfirmed NEW=New ASS=Assigned| | | OPN=ReopenedVER=Verified(Skipped Closed/Resolved) | | | +-+ | | | Severity: BLK=Blocker CRI=CriticalMAJ=Major | | | | MIN=Minor NOR=Normal ENH=Enhancement | | | | +-+ | | | | Date Posted | | | | | +--+ | | | | | Description | | | | | | | | 599|Opn|Enh|2001-02-13|Add ability to set parameter with CallParam that i| | 3893|Opn|Enh|2001-10-01|Multiple element body parts problem | | 6508|Ass|Enh|2002-02-17|HttpClient now supports proxyHost and proxyPort - | | 6826|Ass|Enh|2002-03-04|Need to have xml files validated against DTDs as p| | 6829|Ass|Enh|2002-03-04|Allow easier way of user specified tests | | 7069|Ass|Enh|2002-03-13|DTD and DOM Validators| | 7135|Opn|Enh|2002-03-14|Misleading error message when beaninfo class confl| | 7226|Opn|Enh|2002-03-19|Nested Bean Collection| | 7367|New|Nor|2002-03-22|[unspecified] ServiceManager not actually serializ| | 7465|New|Nor|2002-03-25|Need better 'dist' build | | 7981|Ver|Nor|2002-04-11|[codec][PATCH] add 2 new methods for encoding stri| | 8140|Ver|Nor|2002-04-16|Incorrect credentials loop infinitely | |10319|New|Enh|2002-06-28|Instantiate property if null in form bean | |10543|Ass|Enh|2002-07-08|generate ant task automatically from CLI | |10793|New|Enh|2002-07-15|User definable default headers support| |10794|New|Enh|2002-07-15|User interaction for authentication | |10810|New|Enh|2002-07-15|Response handlers | |10813|New|Enh|2002-07-15|RFC 2965 Support (Port sensitive cookies) | |10815|New|Enh|2002-07-15|Instrumentation for Timings | |10818|Opn|Enh|2002-07-15|Add method enter() and exit() methods to public Lo| |10930|New|Enh|2002-07-18|J2EE FORM authentication (also affects pluggable a| |10957|New|Nor|2002-07-18|Change Header/HeaderElement to handle a list as th| |12807|New|Nor|2002-09-19|[PATCH] x 2 Update build.xml to use commons-loggin| |12858|Ass|Nor|2002-09-20|Style variation in CVS $Header$ tag in embedded LI| |12997|Opn|Nor|2002-09-25|Call the method as soon as the last parameter is e| |13031|New|Enh|2002-09-26|Use regular expression (regex) pattern matching fo| |13370|New|Nor|2002-10-07|[sql] DDL for INTEGER data type incorrect | |13381|New|Enh|2002-10-07|[sql] commons-sql database.xml - OJB repository.x| |13390|New|Nor|2002-10-07|ResponseHeaderHandler and ResponseHeaderValidator | |13426|New|Enh|2002-10-08|[PATCH] xml-reference.xml responseHeader addition | |13743|Opn|Enh|2002-10-17|Need getPropertyType(Class theClass, String propNa| |14036|New|Enh|2002-10-29|MultipartPostMethod does not check for error messa| |14262|Opn|Maj|2002-11-05|SAXBeanWriter produces invalid XML| |14394|Ver|Nor|2002-11-08|Excessive exceptions log under security manager | |14667|Ver|Maj|2002-11-19|PropertyUtils.copyProperties does not copy to Dyna| |15082|Ass|Enh|2002-12-04|[lang] elapsed time formatting utility method | |15297|New|Enh|2002-12-12|[HttpClient] Authenticator() - ability to perform | |15451|Opn|Enh|2002-12-17|Multiple mapped properties not possible / Direct m| |15519|Ver|Maj|2002-12-19|PropertyUtils.getPropertyType() for java.util.Coll| |15534|New|Nor|2002-12-19|Inadequate HTTP proxy server support in HttpClient| |15744|New|Nor|2002-12-31|[unspecified] Scaffold ResultSet used after statem| |15895|Unc|Nor|2003-01-08|In BeanMap all properties are writable (some with | |16038|Opn|Enh|2003-01-13|[beanutils] LocaleBeanUtils.copyProperties() does | |16124|New|Nor|2003-01-15|isHttp11 should have HttpClient scope | |16132|New|Maj|2003-01-15|[Jelly] core:file convert html to lt;htmlgt; | |16394|New|Enh|2003-01-24|Enhance the IndexedListProperty to handle nested l| |16465|New|Enh|2003-01-27|[collections] MultiMap ideas - ChainedHashMap | |16484|Ass|Maj|2003-01-28|Error parsing options a-la Java property option | |16504|New|Enh|2003-01-28|[configuration][submit] Enhancement: Configuration| |16525|Opn|Enh|2003-01-29|BeanUtils.setProperty is over-zealous at convertin| |16600|New|Nor|2003-01-30|JUnitTestAdapter throws SAXException because no DT|
cvs commit: jakarta-commons/collections/src/java/org/apache/commons/collections StaticBucketMap.java
scolebourne2003/12/14 08:10:38
Modified:collections/src/java/org/apache/commons/collections
StaticBucketMap.java
Log:
Fix bug in remove method from coverage testing
Revision ChangesPath
1.15 +7 -4
jakarta-commons/collections/src/java/org/apache/commons/collections/StaticBucketMap.java
Index: StaticBucketMap.java
===
RCS file:
/home/cvs/jakarta-commons/collections/src/java/org/apache/commons/collections/StaticBucketMap.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- StaticBucketMap.java 6 Dec 2003 13:03:15 - 1.14
+++ StaticBucketMap.java 14 Dec 2003 16:10:38 - 1.15
@@ -625,8 +625,11 @@
return false;
}
-public boolean remove(Object o) {
-Map.Entry entry = (Map.Entry)o;
+public boolean remove(Object obj) {
+if (obj instanceof Map.Entry == false) {
+return false;
+}
+Map.Entry entry = (Map.Entry) obj;
int hash = getHash(entry.getKey());
synchronized (m_locks[hash]) {
for (Node n = m_buckets[hash]; n != null; n = n.next) {
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
[jira] Commented: (JELLY-13) Jelly should throw an exception if an unknown tag is used in a TagLibrary
The following comment has been added to this issue: Author: Christian Hargraves Created: Sun, 14 Dec 2003 12:09 PM Body: I vote this be fixed. I am the author of Jameleon which uses Jelly as it's core engine. It is very annoying to mispell a tag name and think that everything went well when in fact that tag just didn't executed without ANY warning. - View the issue: http://jira.codehaus.org/secure/ViewIssue.jspa?key=JELLY-13 Here is an overview of the issue: - Key: JELLY-13 Summary: Jelly should throw an exception if an unknown tag is used in a TagLibrary Type: Improvement Status: Open Priority: Major Original Estimate: Unknown Time Spent: Unknown Remaining: Unknown Project: jelly Components: core / taglib.core Fix Fors: 1.0 Assignee: james strachan Reporter: james strachan Created: Tue, 12 Nov 2002 5:24 AM Updated: Sun, 14 Dec 2003 12:09 PM Description: Many tag libraries only have a strict number of tags defined. So default behaviour for these libraries should be that if a typo is made on a tag name, then an exception is thrown. Some libraries, like the Ant library, are more soft-coded and will try their best to instantiate whatever they are given. However the default case is typically known at compile time. - JIRA INFORMATION: This message is automatically generated by JIRA. If you think it was sent incorrectly contact one of the administrators: http://jira.codehaus.org/secure/Administrators.jspa If you want more information on JIRA, or have a bug to report see: http://www.atlassian.com/software/jira - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 25514] New: - add initialSize parameter to do pre-loading of the connection pool
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
http://nagoya.apache.org/bugzilla/show_bug.cgi?id=25514.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND
INSERTED IN THE BUG DATABASE.
http://nagoya.apache.org/bugzilla/show_bug.cgi?id=25514
add initialSize parameter to do pre-loading of the connection pool
Summary: add initialSize parameter to do pre-loading of the
connection pool
Product: Commons
Version: 1.1 Final
Platform: All
OS/Version: All
Status: NEW
Severity: Enhancement
Priority: Other
Component: Dbcp
AssignedTo: [EMAIL PROTECTED]
ReportedBy: [EMAIL PROTECTED]
This is a simple feature requested by multiple users
for (int i=0; i initialSize; i++) {
connectionPool.addObject();
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 25511] - allow for database clusters/clustering
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=25511. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=25511 allow for database clusters/clustering --- Additional Comments From [EMAIL PROTECTED] 2003-12-14 20:35 --- Good idea but like you suggested the author should be contacted first. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons/collections/src/test/org/apache/commons/collections/set TestCompositeSet.java TestAll.java
psteitz 2003/12/14 13:42:55
Modified:collections/src/java/org/apache/commons/collections/collection
CompositeCollection.java
collections/src/test/org/apache/commons/collections/collection
TestCompositeCollection.java
collections/src/test/org/apache/commons/collections/map
TestAll.java
collections/src/test/org/apache/commons/collections/set
TestAll.java
Added: collections/src/java/org/apache/commons/collections/map
CompositeMap.java
collections/src/java/org/apache/commons/collections/set
CompositeSet.java
collections/src/test/org/apache/commons/collections/map
TestCompositeMap.java
collections/src/test/org/apache/commons/collections/set
TestCompositeSet.java
Log:
Added CompositeSet, CompositeMap contributed by Brian McCallister.
Revision ChangesPath
1.3 +5 -5
jakarta-commons/collections/src/java/org/apache/commons/collections/collection/CompositeCollection.java
Index: CompositeCollection.java
===
RCS file:
/home/cvs/jakarta-commons/collections/src/java/org/apache/commons/collections/collection/CompositeCollection.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- CompositeCollection.java 3 Dec 2003 11:37:44 - 1.2
+++ CompositeCollection.java 14 Dec 2003 21:42:55 - 1.3
@@ -68,7 +68,7 @@
import org.apache.commons.collections.list.UnmodifiableList;
/**
- * Decorates a other collections to provide a single unified view.
+ * Decorates a collection of other collections to provide a single unified view.
* p
* Changes made to this collection will actually be made on the decorated
collection.
* Add and remove operations require the use of a pluggable strategy. If no
@@ -103,7 +103,7 @@
* @param coll a collection to decorate
*/
public CompositeCollection(Collection coll) {
-super();
+this();
this.addComposited(coll);
}
@@ -114,7 +114,7 @@
* @param colls an array of collections to decorate
*/
public CompositeCollection(Collection[] colls) {
-super();
+this();
this.addComposited(colls);
}
1.1
jakarta-commons/collections/src/java/org/apache/commons/collections/map/CompositeMap.java
Index: CompositeMap.java
===
/*
* $Header:
/home/cvs/jakarta-commons/collections/src/java/org/apache/commons/collections/map/CompositeMap.java,v
1.1 2003/12/14 21:42:55 psteitz Exp $
*
*
* The Apache Software License, Version 1.1
*
* Copyright (c) 2001-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
*notice, this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright
*notice, this list of conditions and the following disclaimer in
*the documentation and/or other materials provided with the
*distribution.
*
* 3. The end-user documentation included with the redistribution, if
*any, must include the following acknowledgement:
* This product includes software developed by the
*Apache Software Foundation (http://www.apache.org/).
*Alternately, this acknowledgement may appear in the software itself,
*if and wherever such third-party acknowledgements normally appear.
*
* 4. The names The Jakarta Project, Commons, and Apache Software
*Foundation must not be used to endorse or promote products derived
*from this software without prior written permission. For written
*permission, please contact [EMAIL PROTECTED]
*
* 5. Products derived from this software may not be called Apache
*nor may Apache appear in their names without prior written
*permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
cvs commit: jakarta-commons/lang project.xml
psteitz 2003/12/14 13:52:51 Modified:lang project.xml Log: Changed junit dependency version to 3.8.1 Revision ChangesPath 1.22 +1 -1 jakarta-commons/lang/project.xml Index: project.xml === RCS file: /home/cvs/jakarta-commons/lang/project.xml,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- project.xml 29 Nov 2003 13:24:33 - 1.21 +++ project.xml 14 Dec 2003 21:52:51 - 1.22 @@ -264,7 +264,7 @@ dependencies dependency idjunit/id - version3.7/version + version3.8.1/version /dependency /dependencies - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons/httpclient/src/java/org/apache/commons/httpclient HttpMethodBase.java
mbecke 2003/12/14 14:39:04 Modified:httpclient/src/java/org/apache/commons/httpclient/util HttpURLConnection.java httpclient/src/java/org/apache/commons/httpclient/methods PostMethod.java EntityEnclosingMethod.java httpclient/src/java/org/apache/commons/httpclient/auth HttpAuthRealm.java httpclient/src/java/org/apache/commons/httpclient HttpMethodBase.java Log: Fixes for unmatched javadoc tt and code tags. PR: 25004 Submitted by: Michael Becke Revision ChangesPath 1.13 +5 -5 jakarta-commons/httpclient/src/java/org/apache/commons/httpclient/util/HttpURLConnection.java Index: HttpURLConnection.java === RCS file: /home/cvs/jakarta-commons/httpclient/src/java/org/apache/commons/httpclient/util/HttpURLConnection.java,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- HttpURLConnection.java22 Apr 2003 18:11:01 - 1.12 +++ HttpURLConnection.java14 Dec 2003 22:39:03 - 1.13 @@ -79,7 +79,7 @@ * Provides a codeHttpURLConnection/code wrapper around HttpClient's * codeHttpMethod/code. This allows existing code to easily switch to * HttpClieht without breaking existing interfaces using the JDK - * codeHttpURLConnectioncode. + * codeHttpURLConnection/code. * * Note 1: The current implementations wraps only a connected * codeHttpMethod/code, ie a method that has alreayd been used to connect 1.50 +5 -5 jakarta-commons/httpclient/src/java/org/apache/commons/httpclient/methods/PostMethod.java Index: PostMethod.java === RCS file: /home/cvs/jakarta-commons/httpclient/src/java/org/apache/commons/httpclient/methods/PostMethod.java,v retrieving revision 1.49 retrieving revision 1.50 diff -u -r1.49 -r1.50 --- PostMethod.java 12 Sep 2003 07:34:16 - 1.49 +++ PostMethod.java 14 Dec 2003 22:39:03 - 1.50 @@ -199,7 +199,7 @@ * /p * * @return request body as an array of bytes. If the request content - * has not been set, returns ttnull/null. + * has not been set, returns ttnull/tt. * * @since 2.0beta1 */ 1.27 +5 -5 jakarta-commons/httpclient/src/java/org/apache/commons/httpclient/methods/EntityEnclosingMethod.java Index: EntityEnclosingMethod.java === RCS file: /home/cvs/jakarta-commons/httpclient/src/java/org/apache/commons/httpclient/methods/EntityEnclosingMethod.java,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- EntityEnclosingMethod.java9 Aug 2003 19:37:58 - 1.26 +++ EntityEnclosingMethod.java14 Dec 2003 22:39:04 - 1.27 @@ -196,7 +196,7 @@ * alternative request content input methods./p * * @return request body as an array of bytes. If the request content - * has not been set, returns ttnull/null. + * has not been set, returns ttnull/tt. * * @since 2.0beta1 */ 1.4 +5 -5 jakarta-commons/httpclient/src/java/org/apache/commons/httpclient/auth/HttpAuthRealm.java Index: HttpAuthRealm.java === RCS file: /home/cvs/jakarta-commons/httpclient/src/java/org/apache/commons/httpclient/auth/HttpAuthRealm.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- HttpAuthRealm.java26 May 2003 21:51:37 - 1.3 +++ HttpAuthRealm.java14 Dec 2003 22:39:04 - 1.4 @@ -80,10 +80,10 @@ * ttrealm/tt. * * @param domain the domain the credentials apply to. May be set - * to ttnull/null if credenticals are applicable to + * to ttnull/tt if credenticals are applicable to * any domain. * @param realm the realm the credentials apply to. May be set - * to ttnull/null if credenticals are applicable to + * to ttnull/tt if credenticals are applicable to * any realm. * */ 1.195 +7 -7 jakarta-commons/httpclient/src/java/org/apache/commons/httpclient/HttpMethodBase.java Index: HttpMethodBase.java === RCS file: /home/cvs/jakarta-commons/httpclient/src/java/org/apache/commons/httpclient/HttpMethodBase.java,v retrieving revision 1.194 retrieving revision 1.195 diff -u -r1.194 -r1.195 --- HttpMethodBase.java 11 Dec 2003 22:54:18 - 1.194 +++ HttpMethodBase.java 14 Dec 2003 22:39:04
cvs commit: jakarta-commons/httpclient/src/java/org/apache/commons/httpclient HttpMethodBase.java
mbecke 2003/12/14 14:41:37 Modified:httpclient/src/java/org/apache/commons/httpclient/methods Tag: HTTPCLIENT_2_0_BRANCH PostMethod.java EntityEnclosingMethod.java MultipartPostMethod.java httpclient/src/java/org/apache/commons/httpclient/auth Tag: HTTPCLIENT_2_0_BRANCH HttpAuthRealm.java httpclient/src/java/org/apache/commons/httpclient/util Tag: HTTPCLIENT_2_0_BRANCH HttpURLConnection.java httpclient/src/java/org/apache/commons/httpclient Tag: HTTPCLIENT_2_0_BRANCH HttpMethodBase.java Log: Fixes for unmatched javadoc tt and code tags. PR: 25004 Submitted by: Michael Becke Revision ChangesPath No revision No revision 1.45.2.4 +5 -5 jakarta-commons/httpclient/src/java/org/apache/commons/httpclient/methods/PostMethod.java Index: PostMethod.java === RCS file: /home/cvs/jakarta-commons/httpclient/src/java/org/apache/commons/httpclient/methods/PostMethod.java,v retrieving revision 1.45.2.3 retrieving revision 1.45.2.4 diff -u -r1.45.2.3 -r1.45.2.4 --- PostMethod.java 12 Sep 2003 07:33:20 - 1.45.2.3 +++ PostMethod.java 14 Dec 2003 22:41:37 - 1.45.2.4 @@ -226,7 +226,7 @@ * /p * * @return request body as an array of bytes. If the request content - * has not been set, returns ttnull/null. + * has not been set, returns ttnull/tt. * * @since 2.0beta1 */ 1.18.2.3 +5 -5 jakarta-commons/httpclient/src/java/org/apache/commons/httpclient/methods/EntityEnclosingMethod.java Index: EntityEnclosingMethod.java === RCS file: /home/cvs/jakarta-commons/httpclient/src/java/org/apache/commons/httpclient/methods/EntityEnclosingMethod.java,v retrieving revision 1.18.2.2 retrieving revision 1.18.2.3 diff -u -r1.18.2.2 -r1.18.2.3 --- EntityEnclosingMethod.java4 Oct 2003 02:31:26 - 1.18.2.2 +++ EntityEnclosingMethod.java14 Dec 2003 22:41:37 - 1.18.2.3 @@ -223,7 +223,7 @@ * alternative request content input methods./p * * @return request body as an array of bytes. If the request content - * has not been set, returns ttnull/null. + * has not been set, returns ttnull/tt. * * @since 2.0beta1 */ 1.17.2.2 +4 -4 jakarta-commons/httpclient/src/java/org/apache/commons/httpclient/methods/MultipartPostMethod.java Index: MultipartPostMethod.java === RCS file: /home/cvs/jakarta-commons/httpclient/src/java/org/apache/commons/httpclient/methods/MultipartPostMethod.java,v retrieving revision 1.17.2.1 retrieving revision 1.17.2.2 diff -u -r1.17.2.1 -r1.17.2.2 --- MultipartPostMethod.java 9 Aug 2003 19:36:39 - 1.17.2.1 +++ MultipartPostMethod.java 14 Dec 2003 22:41:37 - 1.17.2.2 @@ -83,7 +83,7 @@ * Implements the HTTP multipart POST method. * p * The HTTP multipart POST method is defined in section 3.3 of - * a href=http://http://www.ietf.org/rfc/rfc1867.txt;RFC1867/a: + * a href=http://www.ietf.org/rfc/rfc1867.txt;RFC1867/a: * blockquote * The media-type multipart/form-data follows the rules of all multipart * MIME data streams as outlined in RFC 1521. The multipart/form-data contains No revision No revision 1.3.2.1 +5 -5 jakarta-commons/httpclient/src/java/org/apache/commons/httpclient/auth/HttpAuthRealm.java Index: HttpAuthRealm.java === RCS file: /home/cvs/jakarta-commons/httpclient/src/java/org/apache/commons/httpclient/auth/HttpAuthRealm.java,v retrieving revision 1.3 retrieving revision 1.3.2.1 diff -u -r1.3 -r1.3.2.1 --- HttpAuthRealm.java26 May 2003 21:51:37 - 1.3 +++ HttpAuthRealm.java14 Dec 2003 22:41:37 - 1.3.2.1 @@ -80,10 +80,10 @@ * ttrealm/tt. * * @param domain the domain the credentials apply to. May be set - * to ttnull/null if credenticals are applicable to + * to ttnull/tt if credenticals are applicable to * any domain. * @param realm the realm the credentials apply to. May be set - * to ttnull/null if credenticals are applicable to + * to ttnull/tt if credenticals are applicable to * any realm. * */ No revision No revision 1.12.2.1 +5 -5
Re: [lang] JUnit version, broken tests
Stephen Colebourne wrote: +1, enough time has now passed for JUnit3.8 to be OK Stephen Done. The enum test remains broken, however under JDK 1.4.2. The test that is failing was added to demonstrate the problem referenced in PR 23374. Since it fails (actually just fails to demonstrate broken behavior) under 1.4.2, I would like to remove it. Any objections to this? Phil - Original Message - From: Phil Steitz [EMAIL PROTECTED] To: Jakarta Commons Developers List [EMAIL PROTECTED] Sent: Saturday, December 13, 2003 8:45 PM Subject: [lang] JUnit version, broken tests Some tests (/builder/ShortPrefixToStringStyleTest, ArrayUtils.Test) have been been added/modified to require Junit 3.8. I have no problem with this; but we need to modify the dependency in project.xml for the maven build to work in this case. Any objections to this change? I am seeing the following failure in the builder tests: Testcase: testNestedBroken took 0.006 sec FAILED expected:0 but was:3 junit.framework.AssertionFailedError: expected:0 but was:3 at org.apache.commons.lang.enum.EnumTest.testNestedBroken(EnumTest.java:432) at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:39 ) at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl .java:25) I am using Sun Linux JDK 1.4.2 Phil - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: [lang] JUnit version, broken tests
Instead of removing it, is it possible to modify the test to expect the failure? I'm not familiar with the test or class that you're speaking of, but sometimes it's nice to keep tests like this around. Maybe catch an expected RuntimeException, or change an assertTrue to an assertFalse, etc.? Phil Steitz wrote: Stephen Colebourne wrote: +1, enough time has now passed for JUnit3.8 to be OK Stephen Done. The enum test remains broken, however under JDK 1.4.2. The test that is failing was added to demonstrate the problem referenced in PR 23374. Since it fails (actually just fails to demonstrate broken behavior) under 1.4.2, I would like to remove it. Any objections to this? Phil - Original Message - From: Phil Steitz [EMAIL PROTECTED] To: Jakarta Commons Developers List [EMAIL PROTECTED] Sent: Saturday, December 13, 2003 8:45 PM Subject: [lang] JUnit version, broken tests Some tests (/builder/ShortPrefixToStringStyleTest, ArrayUtils.Test) have been been added/modified to require Junit 3.8. I have no problem with this; but we need to modify the dependency in project.xml for the maven build to work in this case. Any objections to this change? I am seeing the following failure in the builder tests: Testcase: testNestedBroken took 0.006 sec FAILED expected:0 but was:3 junit.framework.AssertionFailedError: expected:0 but was:3 at org.apache.commons.lang.enum.EnumTest.testNestedBroken(EnumTest.java:432) at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method) at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:39 ) at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl .java:25) I am using Sun Linux JDK 1.4.2 Phil - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED] - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons/lang project.xml
ggregory2003/12/14 16:09:44 Modified:lang project.xml Log: Tweak my developer entry. Revision ChangesPath 1.23 +2 -2 jakarta-commons/lang/project.xml Index: project.xml === RCS file: /home/cvs/jakarta-commons/lang/project.xml,v retrieving revision 1.22 retrieving revision 1.23 diff -u -r1.22 -r1.23 --- project.xml 14 Dec 2003 21:52:51 - 1.22 +++ project.xml 15 Dec 2003 00:09:44 - 1.23 @@ -61,10 +61,10 @@ /roles /developer developer - nameGary Gregory/name + nameGary D. Gregory/name idggregory/id email[EMAIL PROTECTED]/email - organizationSEAGULL Software/organization + organizationSeagull Software/organization roles roleJava Developer/role /roles - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons/lang/src/java/org/apache/commons/lang Tokenizer.java
ggregory2003/12/14 17:17:49
Modified:lang/src/java/org/apache/commons/lang Tokenizer.java
Log:
Javadoc.
Revision ChangesPath
1.2 +31 -6
jakarta-commons/lang/src/java/org/apache/commons/lang/Tokenizer.java
Index: Tokenizer.java
===
RCS file:
/home/cvs/jakarta-commons/lang/src/java/org/apache/commons/lang/Tokenizer.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Tokenizer.java17 Nov 2003 23:02:18 - 1.1
+++ Tokenizer.java15 Dec 2003 01:17:49 - 1.2
@@ -92,6 +92,7 @@
*
* @author Matthew Inger
* @author Stephen Colebourne
+ * @author Gary D. Gregory
*/
public class Tokenizer implements ListIterator {
// TODO: Constructors
@@ -712,7 +713,7 @@
* This character is ignored when parsing the String, unless it is
* within a quoted region.
*
- * @param quote the ignored character to use
+ * @param ignored the ignored character to use
*/
public void setIgnoredChar(char ignored) {
setIgnoredMatcher(new CharMatcher(ignored));
@@ -733,7 +734,7 @@
* Sets whether the tokenizer should return empty tokens as null.
* The default for this property is false.
*
- * @return emptyAsNull whether empty tokens are returned as null
+ * @param emptyAsNull whether empty tokens are returned as null
*/
public void setEmptyTokenAsNull(boolean emptyAsNull) {
this.emptyAsNull = emptyAsNull;
@@ -754,7 +755,7 @@
* Sets whether the tokenizer should ignore and not return empty tokens.
* The default for this property is false.
*
- * @return ignoreEmptyTokens whether empty tokens are not returned
+ * @param ignoreEmptyTokens whether empty tokens are not returned
*/
public void setIgnoreEmptyTokens(boolean ignoreEmptyTokens) {
this.ignoreEmptyTokens = ignoreEmptyTokens;
@@ -810,8 +811,14 @@
return (char[]) chars.clone();
}
-public boolean isMatch(char c) {
-return (Arrays.binarySearch(chars, c) = 0);
+/**
+ * Returns whether or not the given charatcer matches.
+ *
+ * @param ch the character to match.
+ * @return whether or not the given charatcer matches.
+ */
+public boolean isMatch(char ch) {
+return (Arrays.binarySearch(chars, ch) = 0);
}
}
@@ -825,7 +832,7 @@
/**
* Constructor that creates a matcher that matches a single character.
*
- * @param chars the character to match
+ * @param ch the character to match
*/
public CharMatcher(char ch) {
super();
@@ -841,6 +848,12 @@
return this.ch;
}
+/**
+ * Returns whether or not the given charatcer matches.
+ *
+ * @param ch the character to match.
+ * @return whether or not the given charatcer matches.
+ */
public boolean isMatch(char ch) {
return (this.ch == ch);
}
@@ -856,6 +869,12 @@
super();
}
+/**
+ * Always returns codefalse/code.
+ *
+ * @param ch the character to match.
+ * @return Always returns codefalse/code.
+ */
public boolean isMatch(char ch) {
return false;
}
@@ -871,6 +890,12 @@
super();
}
+/**
+ * Returns whether or not the given charatcer matches.
+ *
+ * @param ch the character to match.
+ * @return whether or not the given charatcer matches.
+ */
public boolean isMatch(char ch) {
return (ch = 32);
}
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
RE: [lang] JUnit version, broken tests
JUnit has a fail(This should not happen) method that you can call, usually
like so:
try {
// I'd like this to blow up please:
Thing.kaboom();
Assert.fail(Thing should have blown up);
} catch (KaBoom e) {
// expected, do nothing
}
Gary
-Original Message-
From: __matthewHawthorne [mailto:[EMAIL PROTECTED]
Sent: Sunday, December 14, 2003 16:05
To: Jakarta Commons Developers List
Subject: Re: [lang] JUnit version, broken tests
Instead of removing it, is it possible to modify the test to expect
the failure? I'm not familiar with the test or class that you're
speaking of, but sometimes it's nice to keep tests like this around.
Maybe catch an expected RuntimeException, or change an assertTrue to an
assertFalse, etc.?
Phil Steitz wrote:
Stephen Colebourne wrote:
+1, enough time has now passed for JUnit3.8 to be OK
Stephen
Done. The enum test remains broken, however under JDK 1.4.2.
The test that is failing was added to demonstrate the problem referenced
in PR 23374. Since it fails (actually just fails to demonstrate
broken behavior) under 1.4.2, I would like to remove it. Any
objections to this?
Phil
- Original Message -
From: Phil Steitz [EMAIL PROTECTED]
To: Jakarta Commons Developers List [EMAIL PROTECTED]
Sent: Saturday, December 13, 2003 8:45 PM
Subject: [lang] JUnit version, broken tests
Some tests (/builder/ShortPrefixToStringStyleTest, ArrayUtils.Test)
have
been been added/modified to require Junit 3.8. I have no problem with
this; but we need to modify the dependency in project.xml for the
maven
build to work in this case. Any objections to this change?
I am seeing the following failure in the builder tests:
Testcase: testNestedBroken took 0.006 sec
FAILED
expected:0 but was:3
junit.framework.AssertionFailedError: expected:0 but was:3
at
org.apache.commons.lang.enum.EnumTest.testNestedBroken(EnumTest.java:432)
at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
at
sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:
39
)
at
sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorIm
pl
.java:25)
I am using Sun Linux JDK 1.4.2
Phil
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
Re: [lang] JUnit version, broken tests
__matthewHawthorne wrote: Instead of removing it, is it possible to modify the test to expect the failure? I'm not familiar with the test or class that you're speaking of, but sometimes it's nice to keep tests like this around. Maybe catch an expected RuntimeException, or change an assertTrue to an assertFalse, etc.? The problem is that the test case testNestedBroken in o.a.c.l.enum.EnumTest is expecting broken behavior which does not occur under (Sun Linux) jdk 1.4.2. There is not much else in the test case. That's why I suggested removing it. Phil - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons/lang/src/java/org/apache/commons/lang StringUtils.java
ggregory2003/12/14 17:51:36
Modified:lang/src/java/org/apache/commons/lang StringUtils.java
Log:
http://nagoya.apache.org/bugzilla/show_bug.cgi?id=25454
StringUtils.replaceChars(String,String,String).
Revision ChangesPath
1.121 +14 -28
jakarta-commons/lang/src/java/org/apache/commons/lang/StringUtils.java
Index: StringUtils.java
===
RCS file:
/home/cvs/jakarta-commons/lang/src/java/org/apache/commons/lang/StringUtils.java,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -r1.120 -r1.121
--- StringUtils.java 29 Nov 2003 13:24:33 - 1.120
+++ StringUtils.java 15 Dec 2003 01:51:36 - 1.121
@@ -2699,39 +2699,25 @@
* @since 2.0
*/
public static String replaceChars(String str, String searchChars, String
replaceChars) {
-if (str == null || str.length() == 0 || searchChars == null ||
searchChars.length() == 0) {
+if (StringUtils.isEmpty(str) || StringUtils.isEmpty(searchChars)) {
return str;
}
-char[] chars = str.toCharArray();
-int len = chars.length;
-boolean modified = false;
-for (int i = 0, isize = searchChars.length(); i isize; i++) {
-char searchChar = searchChars.charAt(i);
-if (replaceChars == null || i = replaceChars.length()) {
-// delete
-int pos = 0;
-for (int j = 0; j len; j++) {
-if (chars[j] != searchChar) {
-chars[pos++] = chars[j];
-} else {
-modified = true;
-}
+if (replaceChars == null) {
+replaceChars = ;
+}
+StringBuffer buffer = new StringBuffer(str.length());
+for (int i = 0; i str.length(); i++) {
+char ch = str.charAt(i);
+int index = searchChars.indexOf(ch);
+if (index = 0) {
+if (index replaceChars.length()) {
+buffer.append(replaceChars.charAt(index));
}
-len = pos;
} else {
-// replace
-for (int j = 0; j len; j++) {
-if (chars[j] == searchChar) {
-chars[j] = replaceChars.charAt(i);
-modified = true;
-}
-}
+buffer.append(ch);
}
}
-if (modified == false) {
-return str;
-}
-return new String(chars, 0, len);
+return buffer.toString();
}
// Overlay
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons/lang/src/test/org/apache/commons/lang StringUtilsTest.java
ggregory2003/12/14 17:52:32
Modified:lang/src/test/org/apache/commons/lang StringUtilsTest.java
Log:
http://nagoya.apache.org/bugzilla/show_bug.cgi?id=25454
StringUtils.replaceChars(String,String,String).
Revision ChangesPath
1.57 +17 -6
jakarta-commons/lang/src/test/org/apache/commons/lang/StringUtilsTest.java
Index: StringUtilsTest.java
===
RCS file:
/home/cvs/jakarta-commons/lang/src/test/org/apache/commons/lang/StringUtilsTest.java,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- StringUtilsTest.java 23 Nov 2003 20:44:39 - 1.56
+++ StringUtilsTest.java 15 Dec 2003 01:52:32 - 1.57
@@ -74,7 +74,7 @@
* @author Holger Krauth
* @author a href=[EMAIL PROTECTED]Henning P. Schmiedehausen/a
* @author Phil Steitz
- * @author a href=mailto:[EMAIL PROTECTED]Gary Gregory/a
+ * @author Gary D. Gregory
* @author Al Chou
* @version $Id$
*/
@@ -437,7 +437,7 @@
assertEquals(, StringUtils.replace(foofoofoo, foo, ));
assertEquals(barbarbar, StringUtils.replace(foofoofoo, foo, bar));
assertEquals(farfarfar, StringUtils.replace(foofoofoo, oo, ar));
-}
+ }
public void testReplace_StringStringStringInt() {
assertEquals(null, StringUtils.replace(null, null, null, 2));
@@ -480,8 +480,6 @@
}
public void testReplaceChars_StringStringString() {
-assertEquals(jelly, StringUtils.replaceChars(hello, ho, jy));
-
assertEquals(null, StringUtils.replaceChars(null, null, null));
assertEquals(null, StringUtils.replaceChars(null, , null));
assertEquals(null, StringUtils.replaceChars(null, a, null));
@@ -510,7 +508,20 @@
assertEquals(ayya, StringUtils.replaceChars(abcba, bc, y));
assertEquals(ayzya, StringUtils.replaceChars(abcba, bc, yzx));
-assertSame(abcba, StringUtils.replaceChars(abcba, z, w));
+assertEquals(abcba, StringUtils.replaceChars(abcba, z, w));
+// Comment out for now, delete later when discussion completes [Gary
Gregory, Dec 14 2003]
+//assertSame(abcba, StringUtils.replaceChars(abcba, z, w));
+
+// Javadoc examples:
+assertEquals(jelly, StringUtils.replaceChars(hello, ho, jy));
+assertEquals(ayzya, StringUtils.replaceChars(abcba, bc, yz));
+assertEquals(ayya, StringUtils.replaceChars(abcba, bc, y));
+assertEquals(ayzya, StringUtils.replaceChars(abcba, bc, yzx));
+
+// From http://nagoya.apache.org/bugzilla/show_bug.cgi?id=25454
+assertEquals(bcc, StringUtils.replaceChars(abc, ab, bc));
+assertEquals(q651.506bera, StringUtils.replaceChars(d216.102oren,
abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ123456789,
+nopqrstuvwxyzabcdefghijklmNOPQRSTUVWXYZABCDEFGHIJKLM567891234));
}
public void testOverlayString_StringStringIntInt() {
-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
[lang] How to best address Bug 25454 - Part 2
It seems that the consensus is to just fix StringUtils.replaceChars(S,S,S), so I have done so. I have added a couple more unit tests to cover more of the Javadoc examples and the example cited in the email thread. Please note the following: the pre-fix unit tests asserted that if an input string was not modified (in quotes since Java String are immutable), the return String had to be the same (Assert.assertSame as opposed to Assert.assertEquals). The current impl return a new string from the working buffer even if no replace took place. The Javadoc contract does not specify the old behavior or even hint at it, the only mention of returning the input string is if it or the search chars are empty. Please let me know if you think this is a problem. Thank you, Gary
Re: [lang] JUnit version, broken tests
Phil Steitz wrote: __matthewHawthorne wrote: Instead of removing it, is it possible to modify the test to expect the failure? I'm not familiar with the test or class that you're speaking of, but sometimes it's nice to keep tests like this around. Maybe catch an expected RuntimeException, or change an assertTrue to an assertFalse, etc.? The problem is that the test case testNestedBroken in o.a.c.l.enum.EnumTest is expecting broken behavior which does not occur under (Sun Linux) jdk 1.4.2. There is not much else in the test case. That's why I suggested removing it. Phil Ah, now I understand. Since it's such a specific test, you're probably right, it makes sense to remove it. Either that, or perhaps you could use SystemUtils to only run the test if it's on the expected version and platform. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
Re: [lang] How to best address Bug 25454 - Part 2
Gary Gregory wrote: It seems that the consensus is to just fix StringUtils.replaceChars(S,S,S), so I have done so. Looks good to me. I have added a couple more unit tests to cover more of the Javadoc examples and the example cited in the email thread. Please note the following: the pre-fix unit tests asserted that if an input string was not modified (in quotes since Java String are immutable), the return String had to be the same (Assert.assertSame as opposed to Assert.assertEquals). The current impl return a new string from the working buffer even if no replace took place. The Javadoc contract does not specify the old behavior or even hint at it, the only mention of returning the input string is if it or the search chars are empty. Please let me know if you think this is a problem. I have no problem with returning a copy from the buffer in all cases. Phil Thank you, Gary - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons/validator/src/javascript/org/apache/commons/validator/javascript package.html validateByte.js validateCreditCard.js validateDate.js validateEmail.js validateFloat.js validateFloatRange.js validateIntRange.js validateInteger.js validateMask.js validateMaxLength.js validateMinLength.js validateRequired.js validateShort.js
rleland 2003/12/14 18:56:57
Modified:validator build.xml project.xml
validator/src/javascript/org/apache/commons/validator/javascript
validateByte.js validateCreditCard.js
validateDate.js validateEmail.js validateFloat.js
validateFloatRange.js validateIntRange.js
validateInteger.js validateMask.js
validateMaxLength.js validateMinLength.js
validateRequired.js validateShort.js
Added: validator/src/javascript/org/apache/commons/validator/javascript
package.html
Removed: validator RELEASE-NOTES-1.0.2.txt RELEASE-NOTES-1.0.txt
RELEASE-NOTES.txt
Log:
Add javadoc to javascript
Revision ChangesPath
1.28 +1 -3 jakarta-commons/validator/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-commons/validator/build.xml,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- build.xml 14 Sep 2003 02:53:15 - 1.27
+++ build.xml 15 Dec 2003 02:56:57 - 1.28
@@ -248,8 +248,6 @@
mkdir dir=${dist.home}/
copy file=LICENSE.txt
todir=${dist.home}/
-copy file=RELEASE-NOTES-1.0.2.txt
- todir=${dist.home}/
mkdir dir=${build.home}/classes/META-INF/
copy file=LICENSE.txt
tofile=${build.home}/classes/META-INF/LICENSE.txt/
1.28 +1 -1 jakarta-commons/validator/project.xml
Index: project.xml
===
RCS file: /home/cvs/jakarta-commons/validator/project.xml,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- project.xml 29 Nov 2003 19:24:29 - 1.27
+++ project.xml 15 Dec 2003 02:56:57 - 1.28
@@ -3,7 +3,7 @@
project
nameValidator/name
idcommons-validator/id
- currentVersion1.1.1-dev/currentVersion
+ currentVersion1.1.1/currentVersion
organization
nameApache Software Foundation/name
1.5 +7 -4
jakarta-commons/validator/src/javascript/org/apache/commons/validator/javascript/validateByte.js
Index: validateByte.js
===
RCS file:
/home/cvs/jakarta-commons/validator/src/javascript/org/apache/commons/validator/javascript/validateByte.js,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- validateByte.js 17 Nov 2003 04:57:50 - 1.4
+++ validateByte.js 15 Dec 2003 02:56:57 - 1.5
@@ -1,8 +1,11 @@
- //$Header$
- //$Revision$
- //$Date$
-
+/*$RCSfile$ $Revision$ $Date$ */
+/**
+* Check to see if fields are a valid byte.
+* Fields are not checked if they are disabled.
+* p
+* @param form The form validation is taking place on.
+*/
function validateByte(form) {
var bValid = true;
var focusField = null;
1.5 +10 -5
jakarta-commons/validator/src/javascript/org/apache/commons/validator/javascript/validateCreditCard.js
Index: validateCreditCard.js
===
RCS file:
/home/cvs/jakarta-commons/validator/src/javascript/org/apache/commons/validator/javascript/validateCreditCard.js,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- validateCreditCard.js 17 Nov 2003 04:57:50 - 1.4
+++ validateCreditCard.js 15 Dec 2003 02:56:57 - 1.5
@@ -1,8 +1,11 @@
- //$Header$
- //$Revision$
- //$Date$
-
+/*$RCSfile$ $Revision$ $Date$ */
+/**
+* Check to see if fields are a valid creditcard number based on Luhn checksum.
+* Fields are not checked if they are disabled.
+* p
+* @param form The form validation is taking place on.
+*/
function validateCreditCard(form) {
var bValid = true;
var focusField = null;
@@ -31,7 +34,9 @@
}
/**
- * Reference: http://www.ling.nwu.edu/~sburke/pub/luhn_lib.pl
+ * Checks whether a given credit card number has a valid Luhn checksum.
+ * This allows you to spot most randomly made-up or garbled credit card numbers
immediately.
+ * Reference: http://www.speech.cs.cmu.edu/~sburke/pub/luhn_lib.html
*/
function luhnCheck(cardNumber) {
if (isLuhnNum(cardNumber)) {
1.6 +7 -5
jakarta-commons/validator/src/javascript/org/apache/commons/validator/javascript/validateDate.js
Index: validateDate.js
===
RCS file:
cvs commit: jakarta-commons/validator/etc - New directory
rleland 2003/12/14 21:56:07 jakarta-commons/validator/etc - New directory - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons/validator/xdocs tasks.xml
rleland 2003/12/14 22:10:51
Modified:validator build.properties.sample build.xml
validator/src/javascript/org/apache/commons/validator/javascript
package.html
validator/xdocs tasks.xml
Added: validator RELEASE-NOTES.readme
validator/etc jsdoc.sh
Log:
Add ant tasks to generate javadoc for javascript,
works on unix and windows machines that have cygwin.
Won't cause build to fail if cygwin not installed.
Revision ChangesPath
1.10 +15 -4 jakarta-commons/validator/build.properties.sample
Index: build.properties.sample
===
RCS file: /home/cvs/jakarta-commons/validator/build.properties.sample,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- build.properties.sample 15 Oct 2003 04:15:40 - 1.9
+++ build.properties.sample 15 Dec 2003 06:10:51 - 1.10
@@ -31,8 +31,12 @@
# JUnit Unit Testing (http://www.junit.org)
junit.jar=D:/java/Lib/junit3.8.1/junit.jar
-# Just needed for building the Javadocs
+# Needed for building the Javadocs
xerces.jar=${apache.dir}/xerces-1_4_2/xerces.jar
+
+# jsdoc 1.5.2 or Newer is needed for building the Javascript Javadocs
+jsdoc.home=/cygdrive/d/Projects/Sourceforge/JsDoc/JSDoc-1.5.2
+
#Maven Variables ###
# CVS Start Change Log date
maven.changelog.range=2000
@@ -40,4 +44,11 @@
# If you are using ssh tunneling have a .cvspass file setup
cvs.developer.host=localhost
+# Maven deploy user
cvs.developer.id=rleland
+
+ Maven Variables located in your $HOME/build.properties
+# maven.username=rleland
+# maven.mode.online=true
+# maven.debugOn=true
+
1.29 +8 -3 jakarta-commons/validator/build.xml
Index: build.xml
===
RCS file: /home/cvs/jakarta-commons/validator/build.xml,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- build.xml 15 Dec 2003 02:56:57 - 1.28
+++ build.xml 15 Dec 2003 06:10:51 - 1.29
@@ -52,7 +52,7 @@
property name=component.title value=Validator/
!-- The current version number of this component --
- property name=component.version value=1.1.1-dev/
+ property name=component.version value=1.1.1/
!-- The base directory for compilation targets --
property name=build.home value=target/
@@ -228,8 +228,11 @@
version=true
doctitle=lt;h1gt;${component.title} (Version
${component.version})lt;/h1gt;
windowtitle=${component.title} (Version ${component.version})
- bottom=Copyright (c) 2001-2002 - Apache Software Foundation
+ bottom=Copyright (c) 2001-2004 Apache Software Foundation
classpathref=compile.classpath /
+exec executable=bash failifexecutionfails=false
+ arg line=-c 'etc/jsdoc.sh ${jsdoc.home} ${javascript.home}
${dist.home}/docs/api ' /
+/exec
/target
target name=change-log
@@ -247,6 +250,8 @@
description=Create binary distribution
mkdir dir=${dist.home}/
copy file=LICENSE.txt
+ todir=${dist.home}/
+copy file=RELEASE-NOTES.readme
todir=${dist.home}/
mkdir dir=${build.home}/classes/META-INF/
copy file=LICENSE.txt
1.1 jakarta-commons/validator/RELEASE-NOTES.readme
Index: RELEASE-NOTES.readme
===
For release notes on what has changed see:
http://jakarta.apache.org/commons/validator/changelog-report.html
and
http://jakarta.apache.org/commons/validator/tasks.html
1.1 jakarta-commons/validator/etc/jsdoc.sh
Index: jsdoc.sh
===
#!/bin/sh
cmdpath=$1
dirtoprocess=$2
outputto=$3
package=/org/apache/commons/validator/javascript
perl ${cmdpath}/jsdoc.pl --project-summary ${dirtoprocess}${package}/package.html
--project-name Package org.apache.commons.validator.javascript --page-footer
Copyright © 2000-2003 - Apache Software Foundation
-d ${outputto}/${package} -r $dirtoprocess
cp -R ${dirtoprocess}/${package}/doc-files $outputto/${package}
1.2 +101 -686
jakarta-commons/validator/src/javascript/org/apache/commons/validator/javascript/package.html
Index: package.html
===
RCS file:
/home/cvs/jakarta-commons/validator/src/javascript/org/apache/commons/validator/javascript/package.html,v
retrieving revision 1.1
retrieving revision
cvs commit: jakarta-commons/validator/xdocs navigation.xml tasks.xml
rleland 2003/12/14 22:34:35 Modified:validator/xdocs navigation.xml tasks.xml Log: Doc a few items Revision ChangesPath 1.3 +1 -0 jakarta-commons/validator/xdocs/navigation.xml Index: navigation.xml === RCS file: /home/cvs/jakarta-commons/validator/xdocs/navigation.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- navigation.xml22 Aug 2003 04:15:48 - 1.2 +++ navigation.xml15 Dec 2003 06:34:35 - 1.3 @@ -10,6 +10,7 @@ item name=Community href=/community.html/ item name=To Do List href=/tasks.html/ item name=Resources href=/resources.html/ + item name=Javascript Javadoc href=/javascript/org/apache/commons/validator/javascript/allclasses-summary.html/ item name=Legacy 1.0.2 href=/1.0.2/api/org/apache/commons/validator/package-summary.html/ /menu /body 1.7 +9 -2 jakarta-commons/validator/xdocs/tasks.xml Index: tasks.xml === RCS file: /home/cvs/jakarta-commons/validator/xdocs/tasks.xml,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- tasks.xml 15 Dec 2003 06:10:51 - 1.6 +++ tasks.xml 15 Dec 2003 06:34:35 - 1.7 @@ -24,6 +24,12 @@ subsection name=Medium priority ul +li +Integrate the creation of javascript javadocs into the maven build. What will need to happen +is something similar to the exec task in the ant build.xml. Then to put a Maven template around +the javadoc it and the legacy 1.0.2 javadoc will need to be copied to a temporary directory then the +html2xdoc task will need to be run against that temporary directory. +/li li Change the validation.xml file semantics to match a more general bean validation usage. Currently, the lt;form-validationgt;, lt;formsetgt;, lt;formgt;, and lt;fieldgt; elements @@ -32,7 +38,7 @@ non-form based environments. /li li - Scenario one: + Scenario one: Replace the Jakarta ORO regex engine with the standard Java 1.4 engine. Preliminary tests show a 50% speed improvement using the standard engine. This will remove the ORO dependency and bring Validator in line with standard Java regular expressions. However, this requires a move @@ -40,7 +46,7 @@ we also change the configuration file semantics. /li li - Much more likely Scenario: + More likely Scenario: ORO provides a much richer interface to regular expression, such that we don't have to worry about bit twiddling, this includes a pluggable regex engine. Jeffrey E Friedl states in Mastering Regular Expressions 2ed, says that in speaking to the ORO developers that they @@ -84,6 +90,7 @@ li Add ability to use required condition on array types like checkboxes. /li +/ul /subsection subsection name='Since 1.0.2 Release' ul - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons/validator/src/javascript/org/apache/commons/validator/javascript/doc-files - New directory
rleland 2003/12/14 22:42:52 jakarta-commons/validator/src/javascript/org/apache/commons/validator/javascript/doc-files - New directory - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
cvs commit: jakarta-commons/validator/src/javascript/org/apache/commons/validator/javascript/doc-files sm-maybe.gif sm-no.gif sm-yes.gif
rleland 2003/12/14 22:43:34 Added: validator/src/javascript/org/apache/commons/validator/javascript/doc-files sm-maybe.gif sm-no.gif sm-yes.gif Log: Add images to CVS for javadoc Revision ChangesPath 1.1 jakarta-commons/validator/src/javascript/org/apache/commons/validator/javascript/doc-files/sm-maybe.gif Binary file 1.1 jakarta-commons/validator/src/javascript/org/apache/commons/validator/javascript/doc-files/sm-no.gif Binary file 1.1 jakarta-commons/validator/src/javascript/org/apache/commons/validator/javascript/doc-files/sm-yes.gif Binary file - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
DO NOT REPLY [Bug 25004] - javadoc often has code without /code
DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT http://nagoya.apache.org/bugzilla/show_bug.cgi?id=25004. ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND INSERTED IN THE BUG DATABASE. http://nagoya.apache.org/bugzilla/show_bug.cgi?id=25004 javadoc often has code without /code [EMAIL PROTECTED] changed: What|Removed |Added Status|ASSIGNED|RESOLVED Resolution||FIXED --- Additional Comments From [EMAIL PROTECTED] 2003-12-14 22:42 --- Javadocs patched. - To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
