[MMBASE CVS] src/org/mmbase/core AbstractDescriptor.java AbstractField.java CoreField.java

[Michiel Meeuwissen]

Update of /var/cvs/src/org/mmbase/core
In directory james.mmbase.org:/tmp/cvs-serv6122

Modified Files:
        AbstractDescriptor.java AbstractField.java CoreField.java 
Log Message:
some adjustments because of change to PublicCloneable


See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/core


Index: AbstractDescriptor.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/core/AbstractDescriptor.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- AbstractDescriptor.java     24 Feb 2007 21:57:50 -0000      1.12
+++ AbstractDescriptor.java     27 Aug 2008 17:09:39 -0000      1.13
@@ -11,6 +11,7 @@
 package org.mmbase.core;
 
 import java.util.*;
+import org.mmbase.util.PublicCloneable;
 import org.mmbase.bridge.Descriptor;
 import org.mmbase.util.LocalizedString;
 
@@ -19,10 +20,10 @@
  *
  * @author Pierre van Rooden
  * @since  MMBase-1.8
- * @version $Id: AbstractDescriptor.java,v 1.12 2007/02/24 21:57:50 nklasens 
Exp $
+ * @version $Id: AbstractDescriptor.java,v 1.13 2008/08/27 17:09:39 michiel 
Exp $
  */
 
-abstract public class AbstractDescriptor implements Descriptor, Cloneable {
+abstract public class AbstractDescriptor implements Descriptor, 
PublicCloneable<AbstractDescriptor> {
 
     protected String key;
     protected LocalizedString description;
@@ -149,20 +150,24 @@
         return key;
     }
 
-    public Object clone() throws CloneNotSupportedException {
+    public AbstractDescriptor clone()  {
         return clone(getName() + ".clone");
     }
 
-    public Object clone(String name) throws CloneNotSupportedException {
+    public AbstractDescriptor clone(String name) {
+        try {
         AbstractDescriptor clone = (AbstractDescriptor)super.clone();
-        clone.description = (LocalizedString)description.clone();
-        clone.guiName = (LocalizedString)guiName.clone();
+            clone.description = description.clone();
+            clone.guiName = guiName.clone();
         if (name != null) {
             clone.key = name;
             clone.description.setKey(name);
             clone.guiName.setKey(name);
         }
         return clone;
+        } catch (CloneNotSupportedException cnse) {
+            throw new RuntimeException(cnse);
+        }
     }
 
 }


Index: AbstractField.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/core/AbstractField.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- AbstractField.java  19 Aug 2008 20:36:21 -0000      1.18
+++ AbstractField.java  27 Aug 2008 17:09:39 -0000      1.19
@@ -21,7 +21,7 @@
  * @author Pierre van Rooden
  * @author Michiel Meeuwissen
  * @since  MMBase-1.8
- * @version $Id: AbstractField.java,v 1.18 2008/08/19 20:36:21 michiel Exp $
+ * @version $Id: AbstractField.java,v 1.19 2008/08/27 17:09:39 michiel Exp $
  */
 
 abstract public class AbstractField extends AbstractDescriptor implements 
Field {
@@ -219,21 +219,16 @@
             getDataType();
     }
 
-    public Object clone() {
+    public AbstractField clone() {
         return clone (null, false);
     }
 
-    public Object clone(String name, boolean copyDataTypeForRewrite) {
-        try {
+    public AbstractField clone(String name, boolean copyDataTypeForRewrite) {
             AbstractField clone = (AbstractField)super.clone(name);
             if (copyDataTypeForRewrite) {
                 clone.dataType = (DataType<Object>) dataType.clone();
             }
             return clone;
-        } catch (CloneNotSupportedException cnse) {
-            // should not happen
-            throw new RuntimeException("Cannot clone this Field", cnse);
-        }
     }
 
 }


Index: CoreField.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/core/CoreField.java,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -b -r1.31 -r1.32
--- CoreField.java      24 Feb 2007 21:57:50 -0000      1.31
+++ CoreField.java      27 Aug 2008 17:09:39 -0000      1.32
@@ -22,7 +22,7 @@
 /**
  * @since MMBase-1.8
  */
-public class CoreField extends AbstractField implements Field, Storable, 
Cloneable {
+public class CoreField extends AbstractField implements Field, Storable {
 
     private static final int NO_POSITION = -1;
 
@@ -94,13 +94,13 @@
         throw new UnsupportedOperationException("Core fields currently do not 
support calls to getNodeManager.");
     }
 
-    public Object clone() {
-        return clone (null);
+    public final CoreField clone() {
+        return clone(null);
     }
 
-    public Object clone(String name) {
+    public CoreField clone(String name) {
         hashcodeChanged = true;
-        return super.clone(name, true);
+        return (CoreField) super.clone(name, true);
     }
 
     public void setReadOnly(boolean readOnly) {
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs