PatchSet 4536 Date: 2004/03/18 07:05:14 Author: dalibor Branch: HEAD Tag: (none) Log: Removed unused classes
2004-03-17 Dalibor Topic <[EMAIL PROTECTED]> * libraries/javalib/java/text/SimpleLineIterator.java, libraries/javalib/java/text/SimpleSentenceIterator.java, libraries/javalib/java/text/SimpleWordIterator.java: Removed unused files. * libraries/javalib/Makefile.am, libraries/javalib/Makefile.in: Regenerated. * libraries/javalib/profiles/allatonce/all.files, libraries/javalib/profiles/default/core.files: Purged removed files. Members: ChangeLog:1.2114->1.2115 libraries/javalib/Makefile.am:1.173->1.174 libraries/javalib/Makefile.in:1.232->1.233 libraries/javalib/java/text/SimpleLineIterator.java:1.4->1.5(DEAD) libraries/javalib/java/text/SimpleSentenceIterator.java:1.5->1.6(DEAD) libraries/javalib/java/text/SimpleWordIterator.java:1.4->1.5(DEAD) libraries/javalib/profiles/allatonce/all.files:1.39->1.40 libraries/javalib/profiles/default/core.files:1.26->1.27 Index: kaffe/ChangeLog diff -u kaffe/ChangeLog:1.2114 kaffe/ChangeLog:1.2115 --- kaffe/ChangeLog:1.2114 Wed Mar 17 22:42:07 2004 +++ kaffe/ChangeLog Thu Mar 18 07:05:14 2004 @@ -1,3 +1,18 @@ +2004-03-17 Dalibor Topic <[EMAIL PROTECTED]> + + * libraries/javalib/java/text/SimpleLineIterator.java, + libraries/javalib/java/text/SimpleSentenceIterator.java, + libraries/javalib/java/text/SimpleWordIterator.java: + Removed unused files. + + * libraries/javalib/Makefile.am, + libraries/javalib/Makefile.in: + Regenerated. + + * libraries/javalib/profiles/allatonce/all.files, + libraries/javalib/profiles/default/core.files: + Purged removed files. + 2004-03-17 Ito Kazumitsu <[EMAIL PROTECTED]> * libraries/javalib/java/net/ServerSocket.java Index: kaffe/libraries/javalib/Makefile.am diff -u kaffe/libraries/javalib/Makefile.am:1.173 kaffe/libraries/javalib/Makefile.am:1.174 --- kaffe/libraries/javalib/Makefile.am:1.173 Wed Mar 17 00:59:49 2004 +++ kaffe/libraries/javalib/Makefile.am Thu Mar 18 07:05:16 2004 @@ -1586,9 +1586,6 @@ java/text/ParsePosition.java \ java/text/RuleBasedCollator.java \ java/text/SimpleDateFormat.java \ - java/text/SimpleLineIterator.java \ - java/text/SimpleSentenceIterator.java \ - java/text/SimpleWordIterator.java \ java/text/StringCharacterIterator.java java_util_SRCS = \ java/util/AbstractCollection.java \ Index: kaffe/libraries/javalib/Makefile.in diff -u kaffe/libraries/javalib/Makefile.in:1.232 kaffe/libraries/javalib/Makefile.in:1.233 --- kaffe/libraries/javalib/Makefile.in:1.232 Wed Mar 17 00:59:50 2004 +++ kaffe/libraries/javalib/Makefile.in Thu Mar 18 07:05:17 2004 @@ -1945,9 +1945,6 @@ java/text/ParsePosition.java \ java/text/RuleBasedCollator.java \ java/text/SimpleDateFormat.java \ - java/text/SimpleLineIterator.java \ - java/text/SimpleSentenceIterator.java \ - java/text/SimpleWordIterator.java \ java/text/StringCharacterIterator.java java_util_SRCS = \ =================================================================== Checking out kaffe/libraries/javalib/java/text/SimpleLineIterator.java RCS: /home/cvs/kaffe/kaffe/libraries/javalib/java/text/Attic/SimpleLineIterator.java,v VERS: 1.4 *************** --- kaffe/libraries/javalib/java/text/SimpleLineIterator.java Thu Mar 18 07:08:33 2004 +++ /dev/null Sun Aug 4 19:57:58 2002 @@ -1,95 +0,0 @@ -package java.text; - - -/* - * Java core library component. - * - * Copyright (c) 1997, 1998 - * Transvirtual Technologies, Inc. All rights reserved. - * - * See the file "license.terms" for information on usage and redistribution - * of this file. - */ -class SimpleLineIterator - extends BreakIterator -{ - CharacterIterator iterator = new StringCharacterIterator(""); - -public int current() { - return (iterator.getIndex()); -} - -public int first() { - iterator.first(); - return (iterator.getIndex()); -} - -public int following( int offs) { - int pos = iterator.getIndex(); - iterator.setIndex( iterator.getBeginIndex() + offs); - if ( iterator.current() == CharacterIterator.DONE ) { - iterator.setIndex( pos); - return DONE; - } - return (next()); -} - -public CharacterIterator getText() { - return iterator; -} - -public int last() { - iterator.last(); - return (previous()); -} - -public int next() { - int pos = iterator.getIndex(); - boolean nl = false; - - for ( char c = iterator.next();;c = iterator.next() ) { - if ( c == CharacterIterator.DONE ) - break; - if ( Character.getType( c) == Character.LINE_SEPARATOR ) - nl = true; - else if ( nl ) - return (iterator.getIndex()); - } - - iterator.setIndex( pos); - return DONE; -} - -public int next( int num) { - int max = (num > 0) ? num : -num; - - for ( int idx=0; idx<max; idx++) { - if ( CharacterIterator.DONE == ((num > 0) ? next() : previous()) ) - return (DONE); - } - - return (iterator.getIndex()); -} - -public int previous() { - int nl = 0; - - for ( char c = iterator.previous();;c = iterator.previous() ) { - if ( c == CharacterIterator.DONE ) - break; - if ( Character.getType( c) == Character.LINE_SEPARATOR ) { - nl++; - if ( nl == 2) { - iterator.next(); - return (iterator.getIndex()); - } - } - } - - return (DONE); -} - -public void setText( CharacterIterator ci) { - iterator = ci; -} -} =================================================================== Checking out kaffe/libraries/javalib/java/text/SimpleSentenceIterator.java RCS: /home/cvs/kaffe/kaffe/libraries/javalib/java/text/Attic/SimpleSentenceIterator.java,v VERS: 1.5 *************** --- kaffe/libraries/javalib/java/text/SimpleSentenceIterator.java Thu Mar 18 07:08:33 2004 +++ /dev/null Sun Aug 4 19:57:58 2002 @@ -1,90 +0,0 @@ - -/* - * Java core library component. - * - * Copyright (c) 1997, 1998 - * Transvirtual Technologies, Inc. All rights reserved. - * - * See the file "license.terms" for information on usage and redistribution - * of this file. - */ - -package java.text; - -class SimpleSentenceIterator extends BreakIterator { - CharacterIterator iterator = new StringCharacterIterator(""); - -public int current() { - return iterator.getIndex(); -} - -public int first() { - iterator.first(); - return iterator.getIndex(); -} - -public int following(int offs) { - iterator.setIndex(iterator.getBeginIndex() + offs); - return next(); -} - -public CharacterIterator getText() { - return iterator; -} - -public int last() { - iterator.last(); - return previous(); -} - -public int next() { - - if (iterator.current() == CharacterIterator.DONE) - return DONE; - - for (char c = iterator.next(); c != CharacterIterator.DONE; ) { - if (c == '.') { - c = iterator.next(); - if (c != CharacterIterator.DONE && c != ' ') - continue; - break; - } - c = iterator.next(); - } - return iterator.getIndex(); -} - -public int next( int num) { - int max = (num > 0) ? num : -num; - - for (int idx = 0; idx < max; idx++) { - int c = (num > 0) ? next() : previous(); - if (c == CharacterIterator.DONE) - return (DONE); - } - - return iterator.getIndex(); -} - -public int previous() { - int nl = 0; - - for (char c = iterator.previous(); - c != CharacterIterator.DONE; - c = iterator.previous()) { - if ( c == '.' ) { - if (++nl == 2) { - iterator.next(); - return iterator.getIndex(); - } - } - } - - return (DONE); -} - -public void setText( CharacterIterator ci) { - iterator = ci; -} - -} =================================================================== Checking out kaffe/libraries/javalib/java/text/SimpleWordIterator.java RCS: /home/cvs/kaffe/kaffe/libraries/javalib/java/text/Attic/SimpleWordIterator.java,v VERS: 1.4 *************** --- kaffe/libraries/javalib/java/text/SimpleWordIterator.java Thu Mar 18 07:08:34 2004 +++ /dev/null Sun Aug 4 19:57:58 2002 @@ -1,123 +0,0 @@ -package java.text; - - -/* - * Java core library component. - * - * Copyright (c) 1997, 1998 - * Transvirtual Technologies, Inc. All rights reserved. - * - * See the file "license.terms" for information on usage and redistribution - * of this file. - */ -class SimpleWordIterator - extends BreakIterator -{ - CharacterIterator iterator = new StringCharacterIterator(""); - -public int current() { - return (iterator.getIndex()); -} - -public int first() { - int fi = iterator.getBeginIndex(); - iterator.setIndex( fi); - return (fi); -} - -public int following( int offs) { - char c; - int bi = iterator.getBeginIndex(); - int ei = iterator.getEndIndex(); - - if ( (offs < bi) || (offs > ei) ) - return (DONE); - - //get word end index from offset - iterator.setIndex( offs); - for ( c = iterator.current(); Character.isSpaceChar( c); c = iterator.next() ) { - if ( c == CharacterIterator.DONE ) - return (ei); - } - for (; !Character.isSpaceChar( c); c = iterator.next() ) { - if ( c == CharacterIterator.DONE ) - return (ei); - } - - return (iterator.getIndex()); -} - -public CharacterIterator getText() { - return (iterator); -} - -public int last() { - int li = iterator.getEndIndex(); - iterator.setIndex( li); - return (li); -} - -public int next() { - int pos = iterator.getIndex(); - int ei = iterator.getEndIndex(); - - //already at end - if ( pos == ei ) - return (DONE); - - char c = iterator.current(); - - if ( ! Character.isSpaceChar( c ) ) { - for ( ; !Character.isSpaceChar( c) ; c = iterator.next() ){ - if ( c == CharacterIterator.DONE ) - return (ei); - } - } - - for ( ; Character.isSpaceChar( c) ; c = iterator.next() ){ - if ( c == CharacterIterator.DONE ) - return (ei); - } - - return ( iterator.getIndex() ); -} - -public int next( int num) { - boolean fwd = num > 0; - int absn = Math.abs( num); - int ret = current(); - - for ( int i=0; i<absn; i++) { - if ( ( ret = (fwd ? next() : previous()) ) == DONE ) - return (DONE); - } - - return ret; -} - -public int previous() { - char c; - int pos = iterator.getIndex(); - int bi = iterator.getBeginIndex(); - - //already at start - if ( pos == bi ) - return (DONE); - - for ( c = iterator.previous(); Character.isSpaceChar( c) ; c = iterator.previous() ){ - if ( c == CharacterIterator.DONE ) - return (bi); - } - for ( ; !Character.isSpaceChar( c) ; c = iterator.previous() ){ - if ( c == CharacterIterator.DONE ) - return (bi); - } - - iterator.next(); - return (iterator.getIndex()); -} - -public void setText( CharacterIterator ci) { - iterator = ci; -} -} Index: kaffe/libraries/javalib/profiles/allatonce/all.files diff -u kaffe/libraries/javalib/profiles/allatonce/all.files:1.39 kaffe/libraries/javalib/profiles/allatonce/all.files:1.40 --- kaffe/libraries/javalib/profiles/allatonce/all.files:1.39 Wed Mar 17 00:59:52 2004 +++ kaffe/libraries/javalib/profiles/allatonce/all.files Thu Mar 18 07:05:19 2004 @@ -951,9 +951,6 @@ java/text/CollationKey.java java/text/Collator.java java/text/RuleBasedCollator.java -java/text/SimpleLineIterator.java -java/text/SimpleSentenceIterator.java -java/text/SimpleWordIterator.java java/text/StringCharacterIterator.java java/util/EmptyStackException.java java/util/EventListener.java Index: kaffe/libraries/javalib/profiles/default/core.files diff -u kaffe/libraries/javalib/profiles/default/core.files:1.26 kaffe/libraries/javalib/profiles/default/core.files:1.27 --- kaffe/libraries/javalib/profiles/default/core.files:1.26 Wed Mar 17 00:59:54 2004 +++ kaffe/libraries/javalib/profiles/default/core.files Thu Mar 18 07:05:20 2004 @@ -225,9 +225,6 @@ java/text/CollationKey.java java/text/Collator.java java/text/RuleBasedCollator.java -java/text/SimpleLineIterator.java -java/text/SimpleSentenceIterator.java -java/text/SimpleWordIterator.java java/text/StringCharacterIterator.java java/util/EmptyStackException.java java/util/EventListener.java _______________________________________________ kaffe mailing list [EMAIL PROTECTED] http://kaffe.org/cgi-bin/mailman/listinfo/kaffe