Update of /var/cvs/src/org/mmbase/util
In directory james.mmbase.org:/tmp/cvs-serv5834
Modified Files:
EncodingDetectingOutputStreamWriter.java Entry.java
LocalizedString.java PublicCloneable.java
ReplacingLocalizedString.java
Log Message:
made PublicCloneable a generic. Why not..
See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/util
Index: EncodingDetectingOutputStreamWriter.java
===================================================================
RCS file:
/var/cvs/src/org/mmbase/util/EncodingDetectingOutputStreamWriter.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- EncodingDetectingOutputStreamWriter.java 6 Dec 2007 08:20:09 -0000
1.3
+++ EncodingDetectingOutputStreamWriter.java 27 Aug 2008 17:07:34 -0000
1.4
@@ -22,8 +22,7 @@
*
* @author Michiel Meeuwissen
* @since MMBase-1.8
- * @version $Id: EncodingDetectingOutputStreamWriter.java,v 1.3 2007/12/06
08:20:09 michiel Exp $
- * @todo Is it named correctly?
+ * @version $Id: EncodingDetectingOutputStreamWriter.java,v 1.4 2008/08/27
17:07:34 michiel Exp $
*/
public class EncodingDetectingOutputStreamWriter extends Writer {
Index: Entry.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/util/Entry.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- Entry.java 27 Aug 2008 09:06:45 -0000 1.8
+++ Entry.java 27 Aug 2008 17:07:34 -0000 1.9
@@ -15,10 +15,10 @@
* [EMAIL PROTECTED] java.util.Map.Entry}, and can be used as a utility for
Map implementations.
*
* @since MMBase-1.8
- * @version $Id: Entry.java,v 1.8 2008/08/27 09:06:45 michiel Exp $
+ * @version $Id: Entry.java,v 1.9 2008/08/27 17:07:34 michiel Exp $
* @author Michiel Meeuwissen
*/
-public final class Entry<K, V> implements Map.Entry<K, V>, PublicCloneable,
java.io.Serializable {
+public final class Entry<K, V> implements Map.Entry<K, V>,
PublicCloneable<Entry<K, V>>, java.io.Serializable {
private final K key;
private V value;
@@ -53,7 +53,7 @@
return r;
}
- public Object clone() {
+ public Entry<K, V> clone() {
return new Entry<K, V>(key, value); // can do this, because this class
is final
}
Index: LocalizedString.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/util/LocalizedString.java,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -b -r1.33 -r1.34
--- LocalizedString.java 23 Aug 2008 18:56:31 -0000 1.33
+++ LocalizedString.java 27 Aug 2008 17:07:34 -0000 1.34
@@ -32,10 +32,10 @@
*</p>
*
* @author Michiel Meeuwissen
- * @version $Id: LocalizedString.java,v 1.33 2008/08/23 18:56:31 michiel Exp $
+ * @version $Id: LocalizedString.java,v 1.34 2008/08/27 17:07:34 michiel Exp $
* @since MMBase-1.8
*/
-public class LocalizedString implements java.io.Serializable, Cloneable {
+public class LocalizedString implements java.io.Serializable,
PublicCloneable<LocalizedString> {
private static final Logger log =
Logging.getLoggerInstance(LocalizedString.class);
@@ -404,8 +404,8 @@
}
}
-
- public Object clone() {
+ @Override
+ public LocalizedString clone() {
try {
LocalizedString clone = (LocalizedString)super.clone();
if (values != null) {
Index: PublicCloneable.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/util/PublicCloneable.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- PublicCloneable.java 19 Apr 2006 21:10:58 -0000 1.2
+++ PublicCloneable.java 27 Aug 2008 17:07:34 -0000 1.3
@@ -16,8 +16,8 @@
*
* @since MMBase-1.8
* @author Michiel Meeuwissen
- * @version $Id: PublicCloneable.java,v 1.2 2006/04/19 21:10:58 michiel Exp $
+ * @version $Id: PublicCloneable.java,v 1.3 2008/08/27 17:07:34 michiel Exp $
*/
-public interface PublicCloneable extends Cloneable {
- public Object clone();
+public interface PublicCloneable<C> extends Cloneable {
+ public C clone();
}
Index: ReplacingLocalizedString.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/util/ReplacingLocalizedString.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- ReplacingLocalizedString.java 24 Feb 2007 21:57:50 -0000 1.6
+++ ReplacingLocalizedString.java 27 Aug 2008 17:07:34 -0000 1.7
@@ -22,7 +22,7 @@
*
*
* @author Michiel Meeuwissen
- * @version $Id: ReplacingLocalizedString.java,v 1.6 2007/02/24 21:57:50
nklasens Exp $
+ * @version $Id: ReplacingLocalizedString.java,v 1.7 2008/08/27 17:07:34
michiel Exp $
* @since MMBase-1.8
*/
public class ReplacingLocalizedString extends WrappedLocalizedString {
@@ -110,7 +110,7 @@
@SuppressWarnings("unchecked")
- public Object clone() {
+ public ReplacingLocalizedString clone() {
ReplacingLocalizedString clone = (ReplacingLocalizedString)
super.clone();
clone.replacements = (List)((ArrayList)replacements).clone();
return clone;
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
