harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From telli...@apache.org
Subject svn commit: r450911 [2/3] - in /incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java: java/beans/beancontext/ org/apache/harmony/beans/ org/apache/harmony/beans/editors/
Date Thu, 28 Sep 2006 16:04:13 GMT
Modified: incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/org/apache/harmony/beans/Argument.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/org/apache/harmony/beans/Argument.java?view=diff&rev=450911&r1=450910&r2=450911
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/org/apache/harmony/beans/Argument.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/org/apache/harmony/beans/Argument.java Thu Sep 28 09:04:10 2006
@@ -14,48 +14,47 @@
  *  limitations under the License.
  */
 
-/**
- * @author Maxim V. Berkultsev
- * @version $Revision: 1.1.2.1 $
- */
 package org.apache.harmony.beans;
 
-/**
- * @author Maxim V. Berkultsev
- * @version $Revision: 1.1.2.1 $
- */
-
 public class Argument {
-    
+
     private Class type = null;
+
     private Object value = null;
+
     private Class[] interfaces = null;
-    
+
     public Argument(Object value) {
         this.value = value;
-        if(this.value != null) {
+        if (this.value != null) {
             this.type = value.getClass();
             this.interfaces = this.type.getInterfaces();
         }
     }
-    
+
     public Argument(Class type, Object value) {
         this.type = type;
         this.value = value;
         this.interfaces = type.getInterfaces();
     }
-    
-    public Class getType() { return type; }
-    
-    public Object getValue() { return value; }
-    
-    public Class[] getInterfaces() { return interfaces; }
-    
+
+    public Class getType() {
+        return type;
+    }
+
+    public Object getValue() {
+        return value;
+    }
+
+    public Class[] getInterfaces() {
+        return interfaces;
+    }
+
     public void setType(Class type) {
         this.type = type;
         this.interfaces = type.getInterfaces();
     }
-    
+
     public void setInterfaces(Class[] interfaces) {
         this.interfaces = interfaces;
     }

Modified: incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/org/apache/harmony/beans/ArrayPersistenceDelegate.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/org/apache/harmony/beans/ArrayPersistenceDelegate.java?view=diff&rev=450911&r1=450910&r2=450911
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/org/apache/harmony/beans/ArrayPersistenceDelegate.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/org/apache/harmony/beans/ArrayPersistenceDelegate.java Thu Sep 28 09:04:10 2006
@@ -14,11 +14,6 @@
  *  limitations under the License.
  */
 
-/**
- * @author Maxim V. Berkultsev
- * @author Alexei Y. Zakharov
- * @version $Revision: 1.1.2.1 $
- */
 package org.apache.harmony.beans;
 
 import java.beans.Encoder;
@@ -27,27 +22,21 @@
 import java.beans.Statement;
 import java.lang.reflect.Array;
 
-/**
- * @author Maxim V. Berkultsev
- * @author Alexei Y. Zakharov
- * @version $Revision: 1.1.2.1 $
- */
-
 public class ArrayPersistenceDelegate extends PersistenceDelegate {
 
     private static PersistenceDelegate pd = null;
-    
+
     public static PersistenceDelegate getInstance() {
-        if(pd == null) {
+        if (pd == null) {
             pd = new ArrayPersistenceDelegate();
         }
         return pd;
     }
 
+    @Override
     protected Expression instantiate(Object oldInstance, Encoder out) {
-        assert oldInstance != null &&
-                oldInstance.getClass().isArray() : oldInstance;
-        
+        assert oldInstance != null && oldInstance.getClass().isArray() : oldInstance;
+
         int length = Array.getLength(oldInstance);
         Class componentType = oldInstance.getClass().getComponentType();
 
@@ -55,61 +44,55 @@
                 new Object[] { componentType, new Integer(length) });
     }
 
-    protected void initialize(
-            Class type, Object oldInstance, Object newInstance, Encoder out) {
-        
-        assert oldInstance != null &&
-                oldInstance.getClass().isArray() : oldInstance;
-        assert newInstance != null &&
-                newInstance.getClass().isArray() : newInstance;
-        
+    @Override
+    protected void initialize(Class type, Object oldInstance,
+            Object newInstance, Encoder out) {
+
+        assert oldInstance != null && oldInstance.getClass().isArray() : oldInstance;
+        assert newInstance != null && newInstance.getClass().isArray() : newInstance;
+
         int length = Array.getLength(oldInstance);
         Class componentType = type.getComponentType();
         Object nullValue = Array.get(Array.newInstance(componentType, 1), 0);
-        
+
         for (int i = 0; i < length; ++i) {
-            
+
             Object oldValue = Array.get(oldInstance, i);
             Object newValue = Array.get(newInstance, i);
-            
-            if (oldValue != null && !oldValue.equals(newValue) ||
-                   oldValue == null && newValue != null)
-            {
+
+            if (oldValue != null && !oldValue.equals(newValue)
+                    || oldValue == null && newValue != null) {
                 if (nullValue == null || !nullValue.equals(oldValue)) {
                     Statement s = new Statement(oldInstance, "set", //$NON-NLS-1$
-                            new Object[]{ new Integer(i), oldValue });
+                            new Object[] { new Integer(i), oldValue });
 
                     out.writeStatement(s);
                 }
             }
-            
         }
     }
 
+    @Override
     protected boolean mutatesTo(Object oldInstance, Object newInstance) {
-        assert oldInstance != null &&
-                oldInstance.getClass().isArray() : oldInstance;
-        
+        assert oldInstance != null && oldInstance.getClass().isArray() : oldInstance;
+
         if (newInstance != null) {
             Class newCl = newInstance.getClass();
 
             if (!newCl.isArray()) {
                 return false;
-            } else {
-                // both are arrays
-                int l1 = Array.getLength(oldInstance);
-                int l2 = Array.getLength(newInstance);
-                Class cType1 = oldInstance.getClass().getComponentType();
-                Class cType2 = newCl.getComponentType();
-
-                if (l1 == l2 && cType1.equals(cType2)) {
-                    return true;
-                } else {
-                    return false;
-                }
             }
-        } else {
+            // both are arrays
+            int l1 = Array.getLength(oldInstance);
+            int l2 = Array.getLength(newInstance);
+            Class cType1 = oldInstance.getClass().getComponentType();
+            Class cType2 = newCl.getComponentType();
+
+            if (l1 == l2 && cType1.equals(cType2)) {
+                return true;
+            }
             return false;
         }
+        return false;
     }
 }

Modified: incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/org/apache/harmony/beans/Command.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/org/apache/harmony/beans/Command.java?view=diff&rev=450911&r1=450910&r2=450911
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/org/apache/harmony/beans/Command.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/org/apache/harmony/beans/Command.java Thu Sep 28 09:04:10 2006
@@ -14,24 +14,18 @@
  *  limitations under the License.
  */
 
-/**
- * @author Maxim V. Berkultsev
- * @version $Revision: 1.1.2.1 $
- */
 package org.apache.harmony.beans;
 
 import java.beans.BeanInfo;
+import java.beans.Expression;
 import java.beans.IndexedPropertyDescriptor;
 import java.beans.IntrospectionException;
 import java.beans.Introspector;
 import java.beans.PropertyDescriptor;
 import java.beans.Statement;
 import java.beans.XMLDecoder;
-import java.beans.Expression;
-
 import java.lang.reflect.Array;
 import java.lang.reflect.Method;
-
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Vector;
@@ -39,11 +33,6 @@
 import org.apache.harmony.beans.internal.nls.Messages;
 import org.xml.sax.Attributes;
 
-/**
- * @author Maxim V. Berkultsev
- * @version $Revision: 1.1.2.1 $
- */
-
 public class Command {
 
     private static int INITIALIZED = 0;
@@ -60,11 +49,14 @@
 
     private String data = null; // string data
 
-    private Vector<Command> commands = new Vector<Command>(); // inner commands
+    // inner commands
+    private Vector<Command> commands = new Vector<Command>();
 
-    private Vector<Command> arguments = new Vector<Command>(); // arguments
+    // arguments
+    private Vector<Command> arguments = new Vector<Command>();
 
-    private Vector<Command> operations = new Vector<Command>(); // operations
+    // operations
+    private Vector<Command> operations = new Vector<Command>();
 
     // additonal arguments placed before others
     private Vector<Argument> auxArguments = new Vector<Argument>();
@@ -81,7 +73,7 @@
 
     private XMLDecoder decoder;
 
-    //private int tabCount = 0;
+    // private int tabCount = 0;
 
     public Command(String tagName, HashMap attrs) {
         this.tagName = tagName;
@@ -102,9 +94,9 @@
     }
 
     // set tab count to display log messages
-    //    public void setTabCount(int tabCount) {
-    //        this.tabCount = tabCount;
-    //    }
+    // public void setTabCount(int tabCount) {
+    // this.tabCount = tabCount;
+    // }
 
     // set context - upper level command
     public void setContext(Command ctx) {
@@ -121,8 +113,9 @@
 
     // remove child command
     public void removeChild(Command cmd) {
-        if ((cmd != null) && commands.remove(cmd))
+        if ((cmd != null) && commands.remove(cmd)) {
             cmd.setContext(null);
+        }
     }
 
     // command status
@@ -134,45 +127,49 @@
     private boolean isResolved() {
         if (getStatus() < Command.CHILDREN_PROCESSED) {
             return false;
-        } else {
-            for (int i = 0; i < arguments.size(); ++i) {
-                Command arg = arguments.elementAt(i);
+        }
+        for (int i = 0; i < arguments.size(); ++i) {
+            Command arg = arguments.elementAt(i);
 
-                if (!arg.isResolved()) {
-                    return false;
-                }
+            if (!arg.isResolved()) {
+                return false;
             }
-            for (int j = 0; j < operations.size(); ++j) {
-                Command opr = operations.elementAt(j);
+        }
+        for (int j = 0; j < operations.size(); ++j) {
+            Command opr = operations.elementAt(j);
 
-                if (!opr.isResolved()) {
-                    return false;
-                }
+            if (!opr.isResolved()) {
+                return false;
             }
-            return true;
         }
+        return true;
     }
 
     // execute command and return execution flags
     public int exec(HashMap references) throws Exception {
-        //System.out.println("in exec() status = " + translateStatus(status) + "...");
+        // System.out.println("in exec() status = " + translateStatus(status) +
+        // "...");
         if (status < Command.CHILDREN_PROCESSED) {
             if (status < Command.COMMAND_EXECUTED) {
                 if (status < Command.CHILDREN_FILTERED) {
                     status = doBeforeRun(references);
-                    //System.out.println("after doBeforeRun() status = " + translateStatus(status));
+                    // System.out.println("after doBeforeRun() status = " +
+                    // translateStatus(status));
                 }
                 if (status == Command.CHILDREN_FILTERED) {
                     status = doRun(references);
-                    //System.out.println("after doRun() status = " + translateStatus(status));
+                    // System.out.println("after doRun() status = " +
+                    // translateStatus(status));
                 }
             }
             if (status == Command.COMMAND_EXECUTED) {
                 status = doAfterRun(references);
-                //System.out.println("after doAfterRun() status = " + translateStatus(status));
+                // System.out.println("after doAfterRun() status = " +
+                // translateStatus(status));
             }
         }
-        //System.out.println("...out of exec() status = " + translateStatus(status));
+        // System.out.println("...out of exec() status = " +
+        // translateStatus(status));
         return status;
     }
 
@@ -180,12 +177,10 @@
     public boolean backtrack(HashMap references) throws Exception {
         for (int i = 0; i < arguments.size(); ++i) {
             Command arg = arguments.elementAt(i);
-
             arg.backtrack(references);
         }
         for (int i = 0; i < operations.size(); ++i) {
             Command opr = operations.elementAt(i);
-
             opr.backtrack(references);
         }
         if (status == Command.CHILDREN_FILTERED) {
@@ -194,9 +189,8 @@
         if (status == Command.COMMAND_EXECUTED) {
             status = doAfterRun(references);
             return (getStatus() == Command.CHILDREN_PROCESSED);
-        } else {
-            return false;
         }
+        return false;
     }
 
     // put command in one of two collections - arguments or operations
@@ -213,9 +207,8 @@
                 }
             }
             return Command.CHILDREN_FILTERED;
-        } else {
-            return status;
         }
+        return status;
     }
 
     // run command
@@ -223,69 +216,77 @@
         if (status == Command.CHILDREN_FILTERED) {
             if (isRoot()) {
                 result = new Argument(decoder);
-                //System.out.println("doRun(): result is decoder...");
+                // System.out.println("doRun(): result is decoder...");
                 return Command.COMMAND_EXECUTED;
             }
 
             if (isNull()) {
                 result = new Argument(null);
-                //System.out.println("doRun(): result is null...");
+                // System.out.println("doRun(): result is null...");
                 return Command.COMMAND_EXECUTED;
             }
 
             if (ctx != null && ctx.isArray() && (ctx.getResultValue() == null)
                     && !isExecutable()) {
-                //System.out.println("doRun(): context is array...");
+                // System.out.println("doRun(): context is array...");
                 return status;
             }
 
             Object target = getTarget(references);
             if (target == null) {
-                //System.out.println("doRun(): target is null...");
+                // System.out.println("doRun(): target is null...");
                 return status;
+            }
+            // if (target instanceof Class) {
+            // System.out.println("doRun(): target = " +
+            // ((Class)target).getName());
+            // } else {
+            // System.out.println("doRun(): target = " +
+            // target.getClass().getName());
+            // }
+            if (isReference()) {
+                result = getReferencedArgument(references);
+                // System.out.println("doRun(): reference - result is " +
+                // result.getType());
             } else {
-                if (target instanceof Class) {
-                    //System.out.println("doRun(): target = " + ((Class)target).getName());
-                } else {
-                    //System.out.println("doRun(): target = " + target.getClass().getName());
-                }
-                if (isReference()) {
-                    result = getReferencedArgument(references);
-                    //System.out.println("doRun(): reference - result is " + result.getType());
-                } else {
-                    String methodName = getMethodName(references);
-                    //System.out.println("doRun(): methodName = " + methodName);
-                    Argument[] arguments = getArguments();
-                    if (arguments == null)
-                        return status;
-                    //System.out.println("doRun(): args number is " + arguments.length);
-                    for (int i = 0; i < arguments.length; ++i) {
-                        if (arguments[i] != null) {
-                            //System.out.println("doRun(): arg [" + i + "] = " + arguments[i].getType());
-                        } else {
-                            //System.out.println("doRun(): arg [" + i + "] = null");
-                        }
-                    }
+                String methodName = getMethodName(references);
+                // System.out.println("doRun(): methodName = " +
+                // methodName);
+                Argument[] arguments = getArguments();
+                if (arguments == null) {
+                    return status;
+                }
+                // for (Argument element : arguments) {
+                // if (element != null) {
+                // System.out.println("doRun(): arg [" + i + "] = "
+                // + arguments[i].getType());
+                // } else {
+                // System.out.println("doRun(): arg [" + i + "] =
+                // null");
+                // }
+                // }
+
+                Expression expr = new Expression(target, methodName,
+                        getArgumentsValues());
+                result = new Argument(expr.getValue());
 
-                    Expression expr = new Expression(target, methodName,
-                            getArgumentsValues());
-                    result = new Argument(expr.getValue());
-
-                    if (isPrimitiveClassName(getTagName()))
-                        result.setType(getPrimitiveClass(tagName));
-
-                    //System.out.println("doRun(): method call - result is " + result.getType());
+                if (isPrimitiveClassName(getTagName())) {
+                    result.setType(getPrimitiveClass(tagName));
                 }
-                return Command.COMMAND_EXECUTED;
+
+                // System.out.println("doRun(): method call - result is " +
+                // result.getType());
             }
-        } else
-            return status;
+            return Command.COMMAND_EXECUTED;
+        }
+        return status;
     }
 
     // run child commands
     private int doAfterRun(HashMap references) throws Exception {
         if (status == Command.COMMAND_EXECUTED) {
-            //System.out.println("doAfterRun(): command " + getResultType() + " processed...");            
+            // System.out.println("doAfterRun(): command " + getResultType() + "
+            // processed...");
             Vector<Command> toBeRemoved = new Vector<Command>();
             try {
                 Statement[] statements = null;
@@ -320,10 +321,12 @@
                         cmd.exec(references);
 
                         if (cmd.isResolved()) {
-                            //System.out.println("doAfterRun(): cmd = " + cmd.methodName + " is resolved");
+                            // System.out.println("doAfterRun(): cmd = " +
+                            // cmd.methodName + " is resolved");
                             toBeRemoved.add(cmd);
                         } else {
-                            //System.out.println("doAfterRun(): cmd = " + cmd.methodName + " is unresolved");
+                            // System.out.println("doAfterRun(): cmd = " +
+                            // cmd.methodName + " is unresolved");
                             break;
                         }
 
@@ -336,16 +339,18 @@
                 operations.removeAll(toBeRemoved);
             }
 
-            if (operations.size() == 0) {
-                //System.out.println("doAfterRun(): command " + getResultType() + " completely processed.");
-            } else {
-                //System.out.println("doAfterRun(): command " + getResultType() + " contains incomplete " + 
-                //operations.size() + " commands.");
-            }
+            // if (operations.size() == 0) {
+            // System.out.println("doAfterRun(): command " + getResultType()
+            // + " completely processed.");
+            // } else {
+            // System.out.println("doAfterRun(): command " + getResultType()
+            // + " contains incomplete " +
+            // operations.size() + " commands.");
+            // }
             return (operations.size() == 0) ? Command.CHILDREN_PROCESSED
                     : status;
-        } else
-            return status;
+        }
+        return status;
     }
 
     // Result accessors
@@ -487,10 +492,11 @@
                         target = ((Class) target).getField(fieldName);
                     }
                 } else {
-                    throw new Exception(Messages.getString("beans.42", className)); //$NON-NLS-1$
+                    throw new Exception(Messages.getString(
+                            "beans.42", className)); //$NON-NLS-1$
                 }
             } else if (ctx.isArray()) {
-                //target = ctx.getTarget(references);
+                // target = ctx.getTarget(references);
                 target = Class.forName("java.lang.reflect.Array"); //$NON-NLS-1$
             }
         }
@@ -513,12 +519,12 @@
             } else if (isPrimitive()) {
                 if (isTag("char")) { //$NON-NLS-1$
                     if (data.length() != 1) {
-                        throw new IntrospectionException(Messages.getString("beans.43", //$NON-NLS-1$
+                        throw new IntrospectionException(Messages.getString(
+                                "beans.43", //$NON-NLS-1$
                                 data));
-                    } else {
-                        addArgument(new Argument(char.class, new Character(data
-                                .charAt(0))), 0);
                     }
+                    addArgument(new Argument(char.class, new Character(data
+                            .charAt(0))), 0);
                 } else {
                     addArgument(new Argument(String.class, data), 0);
                 }
@@ -544,8 +550,7 @@
 
                 boolean methodFound = false;
                 Method method = null;
-                for (int i = 0; i < pds.length; ++i) {
-                    PropertyDescriptor pd = pds[i];
+                for (PropertyDescriptor pd : pds) {
                     if (propertyValue.equals(pd.getName())) {
                         int argsNum = getArgumentsNumber();
                         if (hasAttr("index")) { //$NON-NLS-1$
@@ -559,8 +564,9 @@
                             method = pd.getReadMethod();
                         }
 
-                        if (method != null)
+                        if (method != null) {
                             methodFound = matchMethodParams(method, references);
+                        }
 
                         if (methodFound == false) {
                             if (hasAttr("index")) { //$NON-NLS-1$
@@ -575,21 +581,23 @@
                             }
                         }
 
-                        if (method != null)
+                        if (method != null) {
                             methodFound = matchMethodParams(method, references);
+                        }
                     }
                 }
 
                 if (method == null) {
-                    throw new NoSuchMethodException(Messages.getString("beans.44", //$NON-NLS-1$
+                    throw new NoSuchMethodException(Messages.getString(
+                            "beans.44", //$NON-NLS-1$
                             propertyValue));
-                } else {
-                    methodValue = method.getName();
                 }
+                methodValue = method.getName();
             } else if (hasAttr("method")) { //$NON-NLS-1$
-                if (hasAttr("index")) //$NON-NLS-1$
+                if (hasAttr("index")) { //$NON-NLS-1$
                     addArgument(new Argument(int.class, Integer
                             .valueOf(getAttr("index"))), 0); //$NON-NLS-1$
+                }
                 methodValue = getAttr("method"); //$NON-NLS-1$
             } else if (hasAttr("index")) { //$NON-NLS-1$
                 addArgument(new Argument(int.class, Integer
@@ -615,15 +623,16 @@
     private Argument[] getArguments() {
         Argument[] args = new Argument[auxArguments.size() + arguments.size()];
 
-        for (int i = 0; i < auxArguments.size(); ++i)
+        for (int i = 0; i < auxArguments.size(); ++i) {
             args[i] = auxArguments.elementAt(i);
+        }
         for (int j = 0; j < arguments.size(); ++j) {
             Command cmd = arguments.elementAt(j);
 
             if (cmd.getStatus() >= Command.COMMAND_EXECUTED) {
                 args[auxArguments.size() + j] = cmd.getResult();
             } else {
-                //System.out.println("arg: " + cmd.getResultValue());
+                // System.out.println("arg: " + cmd.getResultValue());
                 args = null;
                 break;
             }
@@ -635,8 +644,9 @@
     private Object[] getArgumentsValues() {
         Argument[] args = getArguments();
         Object[] result = new Object[args.length];
-        for (int i = 0; i < args.length; ++i)
+        for (int i = 0; i < args.length; ++i) {
             result[i] = args[i].getValue();
+        }
         return result;
     }
 
@@ -657,9 +667,9 @@
     }
 
     // return number of commands
-    //    private int getOperationsNumber() {
-    //        return operations.size();
-    //    }
+    // private int getOperationsNumber() {
+    // return operations.size();
+    // }
 
     // add argument to the beginning of arguments
     private void addArgument(Argument argument, int idx) {
@@ -720,59 +730,61 @@
     private boolean matchMethodParams(Method method, HashMap references) {
         Class<?>[] paramTypes = method.getParameterTypes();
         Argument[] args = getArguments();
-        if (args == null)
+        if (args == null) {
             return false;
+        }
         boolean result = true;
         if (paramTypes.length == args.length) {
             for (int j = 0; j < paramTypes.length; ++j) {
-                //System.out.println("paramTypes[j] = " + paramTypes[j]);
-                //System.out.println("args[j] = " + args[j].getType());
+                // System.out.println("paramTypes[j] = " + paramTypes[j]);
+                // System.out.println("args[j] = " + args[j].getType());
 
                 boolean isAssignable = (args[j].getType() == null) ? !paramTypes[j]
                         .isPrimitive()
                         : paramTypes[j].isAssignableFrom(args[j].getType());
 
-                //System.out.println("args[j] = " + args[j].getType());
+                // System.out.println("args[j] = " + args[j].getType());
 
                 if (!isAssignable) {
                     result = false;
                     break;
                 }
             }
-        } else
+        } else {
             result = false;
+        }
         return result;
     }
 
     public static HashMap parseAttrs(String tagName, Attributes attrs) {
         HashMap<String, String> result = new HashMap<String, String>();
         if (tagName.equals("object")) { //$NON-NLS-1$
-            for (int i = 0; i < objectAttrNames.length; ++i) {
-                String name = objectAttrNames[i];
+            for (String name : objectAttrNames) {
                 String value = attrs.getValue(name);
-                if (value != null)
+                if (value != null) {
                     result.put(name, value);
+                }
             }
         } else if (tagName.equals("void")) { //$NON-NLS-1$
-            for (int i = 0; i < voidAttrNames.length; ++i) {
-                String name = voidAttrNames[i];
+            for (String name : voidAttrNames) {
                 String value = attrs.getValue(name);
-                if (value != null)
+                if (value != null) {
                     result.put(name, value);
+                }
             }
         } else if (tagName.equals("array")) { //$NON-NLS-1$
-            for (int i = 0; i < arrayAttrNames.length; ++i) {
-                String name = arrayAttrNames[i];
+            for (String name : arrayAttrNames) {
                 String value = attrs.getValue(name);
-                if (value != null)
+                if (value != null) {
                     result.put(name, value);
+                }
             }
         } else if (tagName.equals("java")) { //$NON-NLS-1$
-            for (int i = 0; i < javaAttrNames.length; ++i) {
-                String name = javaAttrNames[i];
+            for (String name : javaAttrNames) {
                 String value = attrs.getValue(name);
-                if (value != null)
+                if (value != null) {
                     result.put(name, value);
+                }
             }
         }
         return result;
@@ -780,27 +792,29 @@
 
     // Auxiliary logging with tabs functions
     public static void pr(String msg) {
-    //System.out.print(msg);
+        // System.out.print(msg);
     }
 
     public static void pr(int tabCount, String msg) {
         String result = ""; //$NON-NLS-1$
-        for (int i = 0; i < tabCount; ++i)
+        for (int i = 0; i < tabCount; ++i) {
             result += '\t';
+        }
         result += msg;
-        //System.out.print(result);
+        // System.out.print(result);
     }
 
     public static void prn(String msg) {
-    //System.out.println(msg);
+        // System.out.println(msg);
     }
 
     public static void prn(int tabCount, String msg) {
         String result = ""; //$NON-NLS-1$
-        for (int i = 0; i < tabCount; ++i)
+        for (int i = 0; i < tabCount; ++i) {
             result += '\t';
+        }
         result += msg;
-        //System.out.println(result);
+        // System.out.println(result);
     }
 
     public static void printAttrs(int tabCount, String tagName, Attributes attrs) {
@@ -814,23 +828,24 @@
     }
 
     private static int initializeStatus(String tagName) {
-        // return tagName.equals("java") ? Command.COMMAND_EXECUTED : Command.INITIALIZED;
+        // return tagName.equals("java") ? Command.COMMAND_EXECUTED :
+        // Command.INITIALIZED;
         return Command.INITIALIZED;
     }
 
-    //    private static String translateStatus(int status) {
-    //        String result = "unknown";
-    //        if(status == Command.INITIALIZED) {
-    //            result = "intialized";
-    //        } else if(status == Command.CHILDREN_FILTERED) {
-    //            result = "children filtered";
-    //        } else if(status == Command.COMMAND_EXECUTED) {
-    //            result = "executed";
-    //        } else if(status == Command.CHILDREN_PROCESSED) {
-    //            result = "children processed";
-    //        }
-    //        return result;
-    //    }
+    // private static String translateStatus(int status) {
+    // String result = "unknown";
+    // if(status == Command.INITIALIZED) {
+    // result = "intialized";
+    // } else if(status == Command.CHILDREN_FILTERED) {
+    // result = "children filtered";
+    // } else if(status == Command.COMMAND_EXECUTED) {
+    // result = "executed";
+    // } else if(status == Command.CHILDREN_PROCESSED) {
+    // result = "children processed";
+    // }
+    // return result;
+    // }
 
     private static final String[] objectAttrNames = { "id", "idref", "class", //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
             "field", "method", "property", "index" }; //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$

Modified: incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/org/apache/harmony/beans/DefaultPersistenceDelegatesFactory.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/org/apache/harmony/beans/DefaultPersistenceDelegatesFactory.java?view=diff&rev=450911&r1=450910&r2=450911
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/org/apache/harmony/beans/DefaultPersistenceDelegatesFactory.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/org/apache/harmony/beans/DefaultPersistenceDelegatesFactory.java Thu Sep 28 09:04:10 2006
@@ -14,21 +14,12 @@
  *  limitations under the License.
  */
 
-/**
- * @author Maxim V. Berkultsev
- * @version $Revision: 1.1.2.1 $
- */
 package org.apache.harmony.beans;
 
 import java.beans.PersistenceDelegate;
 import java.beans.DefaultPersistenceDelegate;
 import java.util.StringTokenizer;
 import java.util.HashMap;
-
-/**
- * @author Maxim V. Berkultsev
- * @version $Revision: 1.1.2.1 $
- */
 
 public final class DefaultPersistenceDelegatesFactory {
 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/org/apache/harmony/beans/Handler.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/org/apache/harmony/beans/Handler.java?view=diff&rev=450911&r1=450910&r2=450911
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/org/apache/harmony/beans/Handler.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/org/apache/harmony/beans/Handler.java Thu Sep 28 09:04:10 2006
@@ -14,10 +14,6 @@
  *  limitations under the License.
  */
 
-/**
- * @author Maxim V. Berkultsev
- * @version $Revision: 1.1.2.1 $
- */
 package org.apache.harmony.beans;
 
 import java.util.HashMap;
@@ -31,11 +27,6 @@
 
 import java.beans.XMLDecoder;
 
-/**
- * @author Maxim V. Berkultsev
- * @version $Revision: 1.1.2.1 $
- */
-
 public class Handler extends DefaultHandler {
 
     private Vector<Object> result;
@@ -59,12 +50,14 @@
     }
 
     // clear collections to prepare parsing document
+    @Override
     public void startDocument() {
         references.clear();
         tabCount = 0;
     }
 
     // create new command and put it on stack
+    @Override
     public void startElement(String namespaceURI, String localeName,
             String tagName, Attributes attrs) throws SAXException {
         Command.printAttrs(tabCount, tagName, attrs);
@@ -76,6 +69,7 @@
     }
 
     // add data to command
+    @Override
     public void characters(char[] text, int start, int length)
             throws SAXException {
         if (length > 0) {
@@ -91,10 +85,11 @@
     }
 
     // pop command from stack and put it to one of collections
+    @Override
     public void endElement(String namespaceURI, String localeName,
             String tagName) throws SAXException {
         Command cmd = stack.pop();
-        //cmd.setTabCount(tabCount);
+        // cmd.setTabCount(tabCount);
 
         // find if command works in context
         if (!stack.isEmpty()) {
@@ -126,6 +121,7 @@
     }
 
     // iterate over deferred commands and execute them again
+    @Override
     public void endDocument() throws SAXException {
         for (int i = 0; i < commands.size(); ++i) {
             Command cmd = commands.elementAt(i);
@@ -134,9 +130,9 @@
             } catch (Exception e) {
                 throw new SAXException(Messages.getString("beans.0B")); //$NON-NLS-1$
             }
-            //            if(!backtracked)
-            //                throw new SAXException("Command " + cmd.getTagName() +
-            //                        " is unresolved on second run() call.");
+            // if(!backtracked)
+            // throw new SAXException("Command " + cmd.getTagName() +
+            // " is unresolved on second run() call.");
         }
 
         for (int i = 0; i < commands.size(); ++i) {

Modified: incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/org/apache/harmony/beans/NullPersistenceDelegate.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/org/apache/harmony/beans/NullPersistenceDelegate.java?view=diff&rev=450911&r1=450910&r2=450911
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/org/apache/harmony/beans/NullPersistenceDelegate.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/org/apache/harmony/beans/NullPersistenceDelegate.java Thu Sep 28 09:04:10 2006
@@ -14,32 +14,26 @@
  *  limitations under the License.
  */
 
-/**
- * @author Maxim V. Berkultsev
- * @version $Revision: 1.1.2.1 $
- */
 package org.apache.harmony.beans;
 
 import java.beans.Encoder;
 import java.beans.Expression;
 import java.beans.PersistenceDelegate;
 
-/**
- * @author Maxim V. Berkultsev
- * @version $Revision: 1.1.2.1 $
- */
-
 public class NullPersistenceDelegate extends PersistenceDelegate {
-    
+
+    @Override
     protected Expression instantiate(Object oldInstance, Encoder out) {
         assert oldInstance == null;
         return new Expression(null, null, null, null);
     }
-    
-    protected void initialize(
-            Class type, Object oldInstance, Object newInstance, Encoder out) {
+
+    @Override
+    protected void initialize(Class type, Object oldInstance,
+            Object newInstance, Encoder out) {
     }
-    
+
+    @Override
     public void writeObject(Object oldInstance, Encoder out) {
         assert oldInstance == null;
         out.writeExpression(instantiate(null, out));

Modified: incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/org/apache/harmony/beans/ObjectNode.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/org/apache/harmony/beans/ObjectNode.java?view=diff&rev=450911&r1=450910&r2=450911
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/org/apache/harmony/beans/ObjectNode.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/org/apache/harmony/beans/ObjectNode.java Thu Sep 28 09:04:10 2006
@@ -14,10 +14,6 @@
  *  limitations under the License.
  */
 
-/**
- * @author Maxim V. Berkultsev
- * @version $Revision: 1.1.2.1 $
- */
 package org.apache.harmony.beans;
 
 import java.beans.Expression;
@@ -27,53 +23,51 @@
 import java.util.LinkedHashSet;
 import java.util.Vector;
 
-/**
- * @author Maxim V. Berkultsev
- * @version $Revision: 1.1.2.1 $
- */
-
 public class ObjectNode {
 
     private Expression initializer;
+
     private Object objectValue = null;
+
     private HashMap<Object, ObjectNode> nodes;
 
-    private LinkedHashSet<Statement> statements =
-            new LinkedHashSet<Statement>();
+    private LinkedHashSet<Statement> statements = new LinkedHashSet<Statement>();
+
     private Vector<Expression> expressions = new Vector<Expression>();
+
     // XXX referencedExpressions is not used indeed
-    //private Vector<Expression> referencedExpressions = new Vector<Expression>();
-    
+    // private Vector<Expression> referencedExpressions = new
+    // Vector<Expression>();
+
     private int referencesNumber = 0;
+
     private String id = null;
 
     public ObjectNode(Expression initializer) {
         this.initializer = initializer;
         this.nodes = null;
     }
-    
-    public ObjectNode(Expression initializer,
-            HashMap<Object, ObjectNode> nodes)
-    {
+
+    public ObjectNode(Expression initializer, HashMap<Object, ObjectNode> nodes) {
         this.initializer = initializer;
         this.nodes = nodes;
     }
-    
+
     public Expression getInitializer() {
         return initializer;
     }
-    
+
     public Object getObjectValue() throws Exception {
-        if(objectValue != null) {
+        if (objectValue != null) {
             return objectValue;
         }
-        
-        if(nodes != null) {
-            Object[] oldArgs = initializer.getArguments();            
+
+        if (nodes != null) {
+            Object[] oldArgs = initializer.getArguments();
             Object[] newArgs = new Object[oldArgs.length];
-            
-            for(int i = 0; i < oldArgs.length; ++i) {
-                if(oldArgs[i] != null) {
+
+            for (int i = 0; i < oldArgs.length; ++i) {
+                if (oldArgs[i] != null) {
                     ObjectNode node = nodes.get(oldArgs[i]);
 
                     newArgs[i] = node.getObjectValue();
@@ -81,52 +75,52 @@
                     newArgs[i] = null;
                 }
             }
-            
-            objectValue = (new Expression(initializer.getTarget(),
-                    initializer.getMethodName(), newArgs)).getValue();
+
+            objectValue = (new Expression(initializer.getTarget(), initializer
+                    .getMethodName(), newArgs)).getValue();
         } else {
             objectValue = initializer.getValue();
         }
-        
-        return objectValue; 
+
+        return objectValue;
     }
-    
+
     public Class getObjectType() throws Exception {
         Object value = getObjectValue();
 
         return (value != null) ? value.getClass() : null;
     }
-    
+
     public Object[] getObjectArguments() {
         return initializer.getArguments();
-        //return (nodes == null) ? new Object[0] : initializer.getArguments();
+        // return (nodes == null) ? new Object[0] : initializer.getArguments();
     }
-    
+
     public int getReferencesNumber() {
         return referencesNumber;
     }
 
     // XXX never called by other classes
-//    public int getReferencedExpressionsNumber() {
-//        return referencedExpressions.size();
-//    }
-    
+    // public int getReferencedExpressionsNumber() {
+    // return referencedExpressions.size();
+    // }
+
     public void addReference() {
         referencesNumber++;
     }
-    
-//    public void addReferencedExpression(Expression expr) {
-//        referencedExpressions.add(expr);
-//    }
-    
+
+    // public void addReferencedExpression(Expression expr) {
+    // referencedExpressions.add(expr);
+    // }
+
     public String getId() {
         return id;
     }
-    
+
     public void setId(String id) {
         this.id = id;
     }
-    
+
     public void addExpression(Expression expression) {
         expressions.add(expression);
     }
@@ -134,16 +128,16 @@
     public void addStatement(Statement statement) {
         statements.add(statement);
     }
-    
+
     public Iterator<Expression> expressions() {
         return expressions.iterator();
     }
-    
-    // XXX never called by other classes 
-//    public Iterator<Expression> referencedExpressions() {
-//        return referencedExpressions.iterator();
-//    }
-    
+
+    // XXX never called by other classes
+    // public Iterator<Expression> referencedExpressions() {
+    // return referencedExpressions.iterator();
+    // }
+
     public Iterator<Statement> statements() {
         return statements.iterator();
     }

Modified: incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/org/apache/harmony/beans/editors/BooleanEditor.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/org/apache/harmony/beans/editors/BooleanEditor.java?view=diff&rev=450911&r1=450910&r2=450911
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/org/apache/harmony/beans/editors/BooleanEditor.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/org/apache/harmony/beans/editors/BooleanEditor.java Thu Sep 28 09:04:10 2006
@@ -14,61 +14,51 @@
  *  limitations under the License.
  */
 
-/**
- * @author Maxim V. Berkultsev
- * @version $Revision: 1.1.2.1 $
- */
 package org.apache.harmony.beans.editors;
 
 import java.beans.PropertyEditorSupport;
 
-/**
- * @author Maxim V. Berkultsev
- * @version $Revision: 1.1.2.1 $
- */
-
 public class BooleanEditor extends PropertyEditorSupport {
-    
-    /**
-     * 
-     * @param source
-     */
+
     public BooleanEditor(Object source) {
         super(source);
     }
 
-    /**
-     */
     public BooleanEditor() {
         super();
     }
-    
+
+    @Override
     public String getAsText() {
         return getValueAsString();
     }
-    
+
+    @Override
     public void setAsText(String text) throws IllegalArgumentException {
         setValue(new Boolean(text));
     }
-    
+
+    @Override
     public String getJavaInitializationString() {
         return getValueAsString();
     }
-    
+
+    @Override
     public String[] getTags() {
-        return new String[] {"true", "false"}; //$NON-NLS-1$ //$NON-NLS-2$
+        return new String[] { "true", "false" }; //$NON-NLS-1$ //$NON-NLS-2$
     }
-    
+
+    @Override
     public void setValue(Object value) {
-        if(value instanceof Boolean) {
+        if (value instanceof Boolean) {
             super.setValue(value);
         }
     }
-    
+
     private String getValueAsString() {
         String result = null;
         Object value = getValue();
-        if(value != null) {
+        if (value != null) {
             Boolean bValue = (Boolean) value;
             result = bValue.toString();
         }

Modified: incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/org/apache/harmony/beans/editors/ByteEditor.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/org/apache/harmony/beans/editors/ByteEditor.java?view=diff&rev=450911&r1=450910&r2=450911
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/org/apache/harmony/beans/editors/ByteEditor.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/org/apache/harmony/beans/editors/ByteEditor.java Thu Sep 28 09:04:10 2006
@@ -14,39 +14,26 @@
  *  limitations under the License.
  */
 
-/**
- * @author Maxim V. Berkultsev
- * @version $Revision: 1.1.2.1 $
- */
 package org.apache.harmony.beans.editors;
 
 import java.beans.PropertyEditorSupport;
 
-/**
- * @author Maxim V. Berkultsev
- * @version $Revision: 1.1.2.1 $
- */
-
 public class ByteEditor extends PropertyEditorSupport {
-    
-    /**
-     * 
-     * @param source
-     */
+
     public ByteEditor(Object source) {
         super(source);
     }
 
-    /**
-     */
     public ByteEditor() {
         super();
     }
-    
+
+    @Override
     public String getAsText() {
         return getValueAsText();
     }
-    
+
+    @Override
     public void setAsText(String text) throws IllegalArgumentException {
         try {
             setValue(new Byte(text));
@@ -54,25 +41,28 @@
             throw new IllegalArgumentException(nfe.toString());
         }
     }
-    
+
+    @Override
     public String getJavaInitializationString() {
         return getValueAsText();
     }
-    
+
+    @Override
     public String[] getTags() {
         return null;
     }
-    
+
+    @Override
     public void setValue(Object value) {
-        if(value instanceof Byte) {
+        if (value instanceof Byte) {
             super.setValue(value);
         }
     }
-    
+
     private String getValueAsText() {
         String result = null;
         Object value = getValue();
-        if(value != null) {
+        if (value != null) {
             Byte bValue = (Byte) value;
             result = bValue.toString();
         }

Modified: incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/org/apache/harmony/beans/editors/ColorEditor.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/org/apache/harmony/beans/editors/ColorEditor.java?view=diff&rev=450911&r1=450910&r2=450911
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/org/apache/harmony/beans/editors/ColorEditor.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/org/apache/harmony/beans/editors/ColorEditor.java Thu Sep 28 09:04:10 2006
@@ -14,10 +14,6 @@
  *  limitations under the License.
  */
 
-/**
- * @author Maxim V. Berkultsev
- * @version $Revision: 1.1.2.1 $
- */
 package org.apache.harmony.beans.editors;
 
 import java.awt.Color;
@@ -26,39 +22,31 @@
 import java.awt.Rectangle;
 import java.beans.PropertyEditorSupport;
 
-/**
- * @author Maxim V. Berkultsev
- * @version $Revision: 1.1.2.1 $
- */
-
 public class ColorEditor extends PropertyEditorSupport {
-    
-    /**
-     * 
-     * @param source
-     */
+
     public ColorEditor(Object source) {
         super(source);
     }
 
-    /**
-     */
     public ColorEditor() {
         super();
     }
-    
+
+    @Override
     public Component getCustomEditor() {
         return null;
     }
-    
+
+    @Override
     public boolean supportsCustomEditor() {
         return true;
     }
-    
+
+    @Override
     public String getJavaInitializationString() {
         String result = null;
         Color color = (Color) getValue();
-        if(color != null) {
+        if (color != null) {
             int red = color.getRed();
             int green = color.getGreen();
             int blue = color.getBlue();
@@ -66,24 +54,28 @@
         }
         return result;
     }
-    
+
+    @Override
     public String[] getTags() {
         return null;
     }
-    
+
+    @Override
     public void setValue(Object value) {
-        if(value instanceof Color) {
+        if (value instanceof Color) {
             super.setValue(value);
         }
     }
-    
+
+    @Override
     public boolean isPaintable() {
         return true;
     }
-    
+
+    @Override
     public void paintValue(Graphics gfx, Rectangle box) {
         Color color = (Color) getValue();
-        if(color != null) {
+        if (color != null) {
             gfx.setColor(color);
             gfx.drawRect(box.x, box.y, box.x + box.width, box.y + box.height);
         }

Modified: incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/org/apache/harmony/beans/editors/DoubleEditor.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/org/apache/harmony/beans/editors/DoubleEditor.java?view=diff&rev=450911&r1=450910&r2=450911
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/org/apache/harmony/beans/editors/DoubleEditor.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/org/apache/harmony/beans/editors/DoubleEditor.java Thu Sep 28 09:04:10 2006
@@ -14,39 +14,26 @@
  *  limitations under the License.
  */
 
-/**
- * @author Maxim V. Berkultsev
- * @version $Revision: 1.1.2.1 $
- */
 package org.apache.harmony.beans.editors;
 
 import java.beans.PropertyEditorSupport;
 
-/**
- * @author Maxim V. Berkultsev
- * @version $Revision: 1.1.2.1 $
- */
-
 public class DoubleEditor extends PropertyEditorSupport {
-    
-    /**
-     * 
-     * @param source
-     */
+
     public DoubleEditor(Object source) {
         super(source);
     }
 
-    /**
-     */
     public DoubleEditor() {
         super();
     }
-    
+
+    @Override
     public String getAsText() {
         return getValueAsText();
     }
-    
+
+    @Override
     public void setAsText(String text) throws IllegalArgumentException {
         try {
             setValue(new Double(text));
@@ -54,25 +41,28 @@
             throw new IllegalArgumentException(nfe.toString());
         }
     }
-    
+
+    @Override
     public String getJavaInitializationString() {
         return getValueAsText();
     }
-    
+
+    @Override
     public String[] getTags() {
         return null;
     }
-    
+
+    @Override
     public void setValue(Object value) {
-        if(value instanceof Double) {
+        if (value instanceof Double) {
             super.setValue(value);
         }
     }
-    
+
     private String getValueAsText() {
         String result = null;
         Object value = getValue();
-        if(value != null) {
+        if (value != null) {
             Double dValue = (Double) value;
             result = dValue.toString();
         }

Modified: incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/org/apache/harmony/beans/editors/FloatEditor.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/org/apache/harmony/beans/editors/FloatEditor.java?view=diff&rev=450911&r1=450910&r2=450911
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/org/apache/harmony/beans/editors/FloatEditor.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/org/apache/harmony/beans/editors/FloatEditor.java Thu Sep 28 09:04:10 2006
@@ -14,39 +14,26 @@
  *  limitations under the License.
  */
 
-/**
- * @author Maxim V. Berkultsev
- * @version $Revision: 1.1.2.1 $
- */
 package org.apache.harmony.beans.editors;
 
 import java.beans.PropertyEditorSupport;
 
-/**
- * @author Maxim V. Berkultsev
- * @version $Revision: 1.1.2.1 $
- */
-
 public class FloatEditor extends PropertyEditorSupport {
-    
-    /**
-     * 
-     * @param source
-     */
+
     public FloatEditor(Object source) {
         super(source);
     }
 
-    /**
-     */
     public FloatEditor() {
         super();
     }
-    
+
+    @Override
     public String getAsText() {
         return getValueAsText();
     }
-    
+
+    @Override
     public void setAsText(String text) throws IllegalArgumentException {
         try {
             setValue(new Float(text));
@@ -54,25 +41,28 @@
             throw new IllegalArgumentException(nfe.toString());
         }
     }
-    
+
+    @Override
     public String getJavaInitializationString() {
         return getValueAsText();
     }
-    
+
+    @Override
     public String[] getTags() {
         return null;
     }
-    
+
+    @Override
     public void setValue(Object value) {
-        if(value instanceof Float) {
+        if (value instanceof Float) {
             super.setValue(value);
         }
     }
-    
+
     private String getValueAsText() {
         String result = null;
         Object value = getValue();
-        if(value != null) {
+        if (value != null) {
             Float fValue = (Float) value;
             result = fValue.toString();
         }

Modified: incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/org/apache/harmony/beans/editors/FontEditor.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/org/apache/harmony/beans/editors/FontEditor.java?view=diff&rev=450911&r1=450910&r2=450911
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/org/apache/harmony/beans/editors/FontEditor.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/org/apache/harmony/beans/editors/FontEditor.java Thu Sep 28 09:04:10 2006
@@ -14,10 +14,6 @@
  *  limitations under the License.
  */
 
-/**
- * @author Maxim V. Berkultsev
- * @version $Revision: 1.1.2.1 $
- */
 package org.apache.harmony.beans.editors;
 
 import java.awt.Component;
@@ -26,39 +22,31 @@
 import java.awt.Rectangle;
 import java.beans.PropertyEditorSupport;
 
-/**
- * @author Maxim V. Berkultsev
- * @version $Revision: 1.1.2.1 $
- */
-
 public class FontEditor extends PropertyEditorSupport {
-    
-    /**
-     * 
-     * @param source
-     */
+
     public FontEditor(Object source) {
         super(source);
     }
 
-    /**
-     */
     public FontEditor() {
         super();
     }
-    
+
+    @Override
     public Component getCustomEditor() {
         return null;
     }
-    
+
+    @Override
     public boolean supportsCustomEditor() {
         return true;
     }
-    
+
+    @Override
     public String getJavaInitializationString() {
         String result = null;
         Font font = (Font) getValue();
-        if(font != null) {
+        if (font != null) {
             String name = font.getName();
             int style = font.getStyle();
             int size = font.getSize();
@@ -66,24 +54,28 @@
         }
         return result;
     }
-    
+
+    @Override
     public String[] getTags() {
         return null;
     }
-    
+
+    @Override
     public void setValue(Object value) {
-        if(value instanceof Font) {
+        if (value instanceof Font) {
             super.setValue(value);
         }
     }
-    
+
+    @Override
     public boolean isPaintable() {
         return true;
     }
-    
+
+    @Override
     public void paintValue(Graphics gfx, Rectangle box) {
         Font font = (Font) getValue();
-        if(font != null) {
+        if (font != null) {
             gfx.setFont(font);
             gfx.drawBytes("Hello".getBytes(), box.x, box.y, box.x + box.width, //$NON-NLS-1$
                     box.y + box.height);

Modified: incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/org/apache/harmony/beans/editors/IntEditor.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/org/apache/harmony/beans/editors/IntEditor.java?view=diff&rev=450911&r1=450910&r2=450911
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/org/apache/harmony/beans/editors/IntEditor.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/org/apache/harmony/beans/editors/IntEditor.java Thu Sep 28 09:04:10 2006
@@ -14,39 +14,26 @@
  *  limitations under the License.
  */
 
-/**
- * @author Maxim V. Berkultsev
- * @version $Revision: 1.1.2.1 $
- */
 package org.apache.harmony.beans.editors;
 
 import java.beans.PropertyEditorSupport;
 
-/**
- * @author Maxim V. Berkultsev
- * @version $Revision: 1.1.2.1 $
- */
-
 public class IntEditor extends PropertyEditorSupport {
-    
-    /**
-     * 
-     * @param source
-     */
+
     public IntEditor(Object source) {
         super(source);
     }
 
-    /**
-     */
     public IntEditor() {
         super();
     }
-    
+
+    @Override
     public String getAsText() {
         return getValueAsText();
     }
-    
+
+    @Override
     public void setAsText(String text) throws IllegalArgumentException {
         try {
             setValue(new Integer(text));
@@ -54,25 +41,28 @@
             throw new IllegalArgumentException(nfe.toString());
         }
     }
-    
+
+    @Override
     public String getJavaInitializationString() {
         return getValueAsText();
     }
-    
+
+    @Override
     public String[] getTags() {
         return null;
     }
-    
+
+    @Override
     public void setValue(Object value) {
-        if(value instanceof Integer) {
+        if (value instanceof Integer) {
             super.setValue(value);
         }
     }
-    
+
     private String getValueAsText() {
         String result = null;
         Object value = getValue();
-        if(value != null) {
+        if (value != null) {
             Integer iValue = (Integer) value;
             result = iValue.toString();
         }

Modified: incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/org/apache/harmony/beans/editors/LongEditor.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/org/apache/harmony/beans/editors/LongEditor.java?view=diff&rev=450911&r1=450910&r2=450911
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/org/apache/harmony/beans/editors/LongEditor.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/org/apache/harmony/beans/editors/LongEditor.java Thu Sep 28 09:04:10 2006
@@ -14,39 +14,26 @@
  *  limitations under the License.
  */
 
-/**
- * @author Maxim V. Berkultsev
- * @version $Revision: 1.1.2.1 $
- */
 package org.apache.harmony.beans.editors;
 
 import java.beans.PropertyEditorSupport;
 
-/**
- * @author Maxim V. Berkultsev
- * @version $Revision: 1.1.2.1 $
- */
-
 public class LongEditor extends PropertyEditorSupport {
-    
-    /**
-     * 
-     * @param source
-     */
+
     public LongEditor(Object source) {
         super(source);
     }
 
-    /**
-     */
     public LongEditor() {
         super();
     }
-    
+
+    @Override
     public String getAsText() {
         return getValueAsText();
     }
-    
+
+    @Override
     public void setAsText(String text) throws IllegalArgumentException {
         try {
             setValue(new Long(text));
@@ -54,25 +41,28 @@
             throw new IllegalArgumentException(nfe.toString());
         }
     }
-    
+
+    @Override
     public String getJavaInitializationString() {
         return getValueAsText();
     }
-    
+
+    @Override
     public String[] getTags() {
         return null;
     }
-    
+
+    @Override
     public void setValue(Object value) {
-        if(value instanceof Long) {
+        if (value instanceof Long) {
             super.setValue(value);
         }
     }
-    
+
     private String getValueAsText() {
         String result = null;
         Object value = getValue();
-        if(value != null) {
+        if (value != null) {
             Long lValue = (Long) value;
             result = lValue.toString();
         }

Modified: incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/org/apache/harmony/beans/editors/ShortEditor.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/org/apache/harmony/beans/editors/ShortEditor.java?view=diff&rev=450911&r1=450910&r2=450911
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/org/apache/harmony/beans/editors/ShortEditor.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/org/apache/harmony/beans/editors/ShortEditor.java Thu Sep 28 09:04:10 2006
@@ -14,39 +14,26 @@
  *  limitations under the License.
  */
 
-/**
- * @author Maxim V. Berkultsev
- * @version $Revision: 1.1.2.1 $
- */
 package org.apache.harmony.beans.editors;
 
 import java.beans.PropertyEditorSupport;
 
-/**
- * @author Maxim V. Berkultsev
- * @version $Revision: 1.1.2.1 $
- */
-
 public class ShortEditor extends PropertyEditorSupport {
-    
-    /**
-     * 
-     * @param source
-     */
+
     public ShortEditor(Object source) {
         super(source);
     }
 
-    /**
-     */
     public ShortEditor() {
         super();
     }
-    
+
+    @Override
     public String getAsText() {
         return getValueAsText();
     }
-    
+
+    @Override
     public void setAsText(String text) throws IllegalArgumentException {
         try {
             setValue(new Short(text));
@@ -54,25 +41,28 @@
             throw new IllegalArgumentException(nfe.toString());
         }
     }
-    
+
+    @Override
     public String getJavaInitializationString() {
         return getValueAsText();
     }
-    
+
+    @Override
     public String[] getTags() {
         return null;
     }
-    
+
+    @Override
     public void setValue(Object value) {
-        if(value instanceof Short) {
+        if (value instanceof Short) {
             super.setValue(value);
         }
     }
-    
+
     private String getValueAsText() {
         String result = null;
         Object value = getValue();
-        if(value != null) {
+        if (value != null) {
             Short sValue = (Short) value;
             result = sValue.toString();
         }

Modified: incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/org/apache/harmony/beans/editors/StringEditor.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/org/apache/harmony/beans/editors/StringEditor.java?view=diff&rev=450911&r1=450910&r2=450911
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/org/apache/harmony/beans/editors/StringEditor.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/org/apache/harmony/beans/editors/StringEditor.java Thu Sep 28 09:04:10 2006
@@ -14,36 +14,22 @@
  *  limitations under the License.
  */
 
-/**
- * @author Maxim V. Berkultsev
- * @version $Revision: 1.1.2.1 $
- */
 package org.apache.harmony.beans.editors;
 
 import java.beans.PropertyEditorSupport;
 
-/**
- * @author Maxim V. Berkultsev
- * @version $Revision: 1.1.2.1 $
- */
-
 public class StringEditor extends PropertyEditorSupport {
 
-    /**
-     * 
-     * @param source
-     */
     public StringEditor(Object source) {
         super(source);
     }
 
-    /**
-     */
     public StringEditor() {
         super();
     }
-    
-    public void setAsText(String text){
+
+    @Override
+    public void setAsText(String text) {
         setValue(text);
     }
 }

Modified: incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/org/apache/harmony/beans/java_lang_BooleanPersistenceDelegate.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/org/apache/harmony/beans/java_lang_BooleanPersistenceDelegate.java?view=diff&rev=450911&r1=450910&r2=450911
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/org/apache/harmony/beans/java_lang_BooleanPersistenceDelegate.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/org/apache/harmony/beans/java_lang_BooleanPersistenceDelegate.java Thu Sep 28 09:04:10 2006
@@ -14,30 +14,23 @@
  *  limitations under the License.
  */
 
-/**
- * @author Maxim V. Berkultsev
- * @version $Revision: 1.1.2.1 $
- */
 package org.apache.harmony.beans;
 
 import java.beans.Encoder;
 import java.beans.Expression;
 import java.beans.PersistenceDelegate;
 
-/**
- * @author Maxim V. Berkultsev
- * @version $Revision: 1.1.2.1 $
- */
-
 public class java_lang_BooleanPersistenceDelegate extends PersistenceDelegate {
-    
+
+    @Override
     protected Expression instantiate(Object oldInstance, Encoder out) {
         boolean value = ((Boolean) oldInstance).booleanValue();
         return new Expression(oldInstance, Boolean.class, "new", //$NON-NLS-1$
                 new Object[] { new Boolean(value) });
     }
-    
-    protected void initialize(
-            Class type, Object oldInstance, Object newInstance, Encoder out) {
+
+    @Override
+    protected void initialize(Class type, Object oldInstance,
+            Object newInstance, Encoder out) {
     }
 }

Modified: incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/org/apache/harmony/beans/java_lang_BytePersistenceDelegate.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/org/apache/harmony/beans/java_lang_BytePersistenceDelegate.java?view=diff&rev=450911&r1=450910&r2=450911
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/org/apache/harmony/beans/java_lang_BytePersistenceDelegate.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/org/apache/harmony/beans/java_lang_BytePersistenceDelegate.java Thu Sep 28 09:04:10 2006
@@ -14,30 +14,23 @@
  *  limitations under the License.
  */
 
-/**
- * @author Maxim V. Berkultsev
- * @version $Revision: 1.1.2.1 $
- */
 package org.apache.harmony.beans;
 
 import java.beans.Encoder;
 import java.beans.Expression;
 import java.beans.PersistenceDelegate;
 
-/**
- * @author Maxim V. Berkultsev
- * @version $Revision: 1.1.2.1 $
- */
-
 public class java_lang_BytePersistenceDelegate extends PersistenceDelegate {
-    
+
+    @Override
     protected Expression instantiate(Object oldInstance, Encoder out) {
         Byte value = (Byte) oldInstance;
         return new Expression(oldInstance, Byte.class, "new", //$NON-NLS-1$
                 new Object[] { new Byte(value.byteValue()) });
     }
-    
-    protected void initialize(
-            Class type, Object oldInstance, Object newInstance, Encoder out) {
+
+    @Override
+    protected void initialize(Class type, Object oldInstance,
+            Object newInstance, Encoder out) {
     }
 }

Modified: incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/org/apache/harmony/beans/java_lang_CharacterPersistenceDelegate.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/org/apache/harmony/beans/java_lang_CharacterPersistenceDelegate.java?view=diff&rev=450911&r1=450910&r2=450911
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/org/apache/harmony/beans/java_lang_CharacterPersistenceDelegate.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/org/apache/harmony/beans/java_lang_CharacterPersistenceDelegate.java Thu Sep 28 09:04:10 2006
@@ -14,30 +14,23 @@
  *  limitations under the License.
  */
 
-/**
- * @author Maxim V. Berkultsev
- * @version $Revision: 1.1.2.1 $
- */
 package org.apache.harmony.beans;
 
 import java.beans.Encoder;
 import java.beans.Expression;
 import java.beans.PersistenceDelegate;
 
-/**
- * @author Maxim V. Berkultsev
- * @version $Revision: 1.1.2.1 $
- */
-
 public class java_lang_CharacterPersistenceDelegate extends PersistenceDelegate {
-    
+
+    @Override
     protected Expression instantiate(Object oldInstance, Encoder out) {
         Character value = (Character) oldInstance;
         return new Expression(oldInstance, Character.class, "new", //$NON-NLS-1$
                 new Object[] { new Character(value.charValue()) });
     }
-    
-    protected void initialize(
-            Class type, Object oldInstance, Object newInstance, Encoder out) {
+
+    @Override
+    protected void initialize(Class type, Object oldInstance,
+            Object newInstance, Encoder out) {
     }
 }

Modified: incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/org/apache/harmony/beans/java_lang_ClassPersistenceDelegate.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/org/apache/harmony/beans/java_lang_ClassPersistenceDelegate.java?view=diff&rev=450911&r1=450910&r2=450911
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/org/apache/harmony/beans/java_lang_ClassPersistenceDelegate.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/org/apache/harmony/beans/java_lang_ClassPersistenceDelegate.java Thu Sep 28 09:04:10 2006
@@ -14,11 +14,6 @@
  *  limitations under the License.
  */
 
-/**
- * @author Maxim V. Berkultsev
- * @author Alexei Y. Zakharov
- * @version $Revision: 1.1.2.1 $
- */
 package org.apache.harmony.beans;
 
 import java.beans.Encoder;
@@ -26,14 +21,9 @@
 import java.beans.PersistenceDelegate;
 import java.lang.reflect.Field;
 
-/**
- * @author Maxim V. Berkultsev
- * @author Alexei Y. Zakharov
- * @version $Revision: 1.1.2.1 $
- */
-
 public class java_lang_ClassPersistenceDelegate extends PersistenceDelegate {
 
+    @Override
     protected Expression instantiate(Object oldInstance, Encoder out) {
         Class value = (Class) oldInstance;
         Field fld = null;
@@ -65,7 +55,7 @@
         if (fld != null) {
             // we have primitive type
             result = new Expression(oldInstance, fld, "get", //$NON-NLS-1$
-                                    new Object[] {null});
+                    new Object[] { null });
         } else {
             result = new Expression(oldInstance, Class.class, "forName", //$NON-NLS-1$
                     new Object[] { new String(value.getName()) });
@@ -73,9 +63,12 @@
         return result;
     }
 
+    @Override
     protected void initialize(Class type, Object oldInstance,
-                              Object newInstance, Encoder out) {}
+            Object newInstance, Encoder out) {
+    }
 
+    @Override
     protected boolean mutatesTo(Object oldInstance, Object newInstance) {
         if (oldInstance instanceof Class && newInstance instanceof Class) {
             Class c1 = (Class) oldInstance;

Modified: incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/org/apache/harmony/beans/java_lang_DoublePersistenceDelegate.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/org/apache/harmony/beans/java_lang_DoublePersistenceDelegate.java?view=diff&rev=450911&r1=450910&r2=450911
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/org/apache/harmony/beans/java_lang_DoublePersistenceDelegate.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/org/apache/harmony/beans/java_lang_DoublePersistenceDelegate.java Thu Sep 28 09:04:10 2006
@@ -14,30 +14,23 @@
  *  limitations under the License.
  */
 
-/**
- * @author Maxim V. Berkultsev
- * @version $Revision: 1.1.2.1 $
- */
 package org.apache.harmony.beans;
 
 import java.beans.Encoder;
 import java.beans.Expression;
 import java.beans.PersistenceDelegate;
 
-/**
- * @author Maxim V. Berkultsev
- * @version $Revision: 1.1.2.1 $
- */
-
 public class java_lang_DoublePersistenceDelegate extends PersistenceDelegate {
-    
+
+    @Override
     protected Expression instantiate(Object oldInstance, Encoder out) {
         Double value = (Double) oldInstance;
         return new Expression(oldInstance, Double.class, "new", //$NON-NLS-1$
                 new Object[] { new Double(value.doubleValue()) });
     }
-    
-    protected void initialize(
-            Class type, Object oldInstance, Object newInstance, Encoder out) {
+
+    @Override
+    protected void initialize(Class type, Object oldInstance,
+            Object newInstance, Encoder out) {
     }
 }

Modified: incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/org/apache/harmony/beans/java_lang_FloatPersistenceDelegate.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/org/apache/harmony/beans/java_lang_FloatPersistenceDelegate.java?view=diff&rev=450911&r1=450910&r2=450911
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/org/apache/harmony/beans/java_lang_FloatPersistenceDelegate.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/org/apache/harmony/beans/java_lang_FloatPersistenceDelegate.java Thu Sep 28 09:04:10 2006
@@ -14,30 +14,23 @@
  *  limitations under the License.
  */
 
-/**
- * @author Maxim V. Berkultsev
- * @version $Revision: 1.1.2.1 $
- */
 package org.apache.harmony.beans;
 
 import java.beans.Encoder;
 import java.beans.Expression;
 import java.beans.PersistenceDelegate;
 
-/**
- * @author Maxim V. Berkultsev
- * @version $Revision: 1.1.2.1 $
- */
-
 public class java_lang_FloatPersistenceDelegate extends PersistenceDelegate {
-    
+
+    @Override
     protected Expression instantiate(Object oldInstance, Encoder out) {
         Float value = (Float) oldInstance;
         return new Expression(oldInstance, Float.class, "new", //$NON-NLS-1$
                 new Object[] { new Float(value.floatValue()) });
     }
-    
-    protected void initialize(
-            Class type, Object oldInstance, Object newInstance, Encoder out) {
+
+    @Override
+    protected void initialize(Class type, Object oldInstance,
+            Object newInstance, Encoder out) {
     }
 }

Modified: incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/org/apache/harmony/beans/java_lang_IntegerPersistenceDelegate.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/org/apache/harmony/beans/java_lang_IntegerPersistenceDelegate.java?view=diff&rev=450911&r1=450910&r2=450911
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/org/apache/harmony/beans/java_lang_IntegerPersistenceDelegate.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/org/apache/harmony/beans/java_lang_IntegerPersistenceDelegate.java Thu Sep 28 09:04:10 2006
@@ -14,30 +14,23 @@
  *  limitations under the License.
  */
 
-/**
- * @author Maxim V. Berkultsev
- * @version $Revision: 1.1.2.1 $
- */
 package org.apache.harmony.beans;
 
 import java.beans.Encoder;
 import java.beans.Expression;
 import java.beans.PersistenceDelegate;
 
-/**
- * @author Maxim V. Berkultsev
- * @version $Revision: 1.1.2.1 $
- */
-
 public class java_lang_IntegerPersistenceDelegate extends PersistenceDelegate {
-    
+
+    @Override
     protected Expression instantiate(Object oldInstance, Encoder out) {
         Integer value = (Integer) oldInstance;
         return new Expression(oldInstance, Integer.class, "new", //$NON-NLS-1$
                 new Object[] { new Integer(value.intValue()) });
     }
-    
-    protected void initialize(
-            Class type, Object oldInstance, Object newInstance, Encoder out) {
+
+    @Override
+    protected void initialize(Class type, Object oldInstance,
+            Object newInstance, Encoder out) {
     }
 }

Modified: incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/org/apache/harmony/beans/java_lang_LongPersistenceDelegate.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/org/apache/harmony/beans/java_lang_LongPersistenceDelegate.java?view=diff&rev=450911&r1=450910&r2=450911
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/org/apache/harmony/beans/java_lang_LongPersistenceDelegate.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/org/apache/harmony/beans/java_lang_LongPersistenceDelegate.java Thu Sep 28 09:04:10 2006
@@ -14,30 +14,23 @@
  *  limitations under the License.
  */
 
-/**
- * @author Maxim V. Berkultsev
- * @version $Revision: 1.1.2.1 $
- */
 package org.apache.harmony.beans;
 
 import java.beans.Encoder;
 import java.beans.Expression;
 import java.beans.PersistenceDelegate;
 
-/**
- * @author Maxim V. Berkultsev
- * @version $Revision: 1.1.2.1 $
- */
-
 public class java_lang_LongPersistenceDelegate extends PersistenceDelegate {
-	
+
+    @Override
     protected Expression instantiate(Object oldInstance, Encoder out) {
         Long value = (Long) oldInstance;
         return new Expression(oldInstance, Long.class, "new", //$NON-NLS-1$
                 new Object[] { new Long(value.longValue()) });
     }
-    
-    protected void initialize(
-            Class type, Object oldInstance, Object newInstance, Encoder out) {
+
+    @Override
+    protected void initialize(Class type, Object oldInstance,
+            Object newInstance, Encoder out) {
     }
 }

Modified: incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/org/apache/harmony/beans/java_lang_ShortPersistenceDelegate.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/org/apache/harmony/beans/java_lang_ShortPersistenceDelegate.java?view=diff&rev=450911&r1=450910&r2=450911
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/org/apache/harmony/beans/java_lang_ShortPersistenceDelegate.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/org/apache/harmony/beans/java_lang_ShortPersistenceDelegate.java Thu Sep 28 09:04:10 2006
@@ -14,30 +14,23 @@
  *  limitations under the License.
  */
 
-/**
- * @author Maxim V. Berkultsev
- * @version $Revision: 1.1.2.1 $
- */
 package org.apache.harmony.beans;
 
 import java.beans.Encoder;
 import java.beans.Expression;
 import java.beans.PersistenceDelegate;
 
-/**
- * @author Maxim V. Berkultsev
- * @version $Revision: 1.1.2.1 $
- */
-
 public class java_lang_ShortPersistenceDelegate extends PersistenceDelegate {
-    
+
+    @Override
     protected Expression instantiate(Object oldInstance, Encoder out) {
         Short value = (Short) oldInstance;
         return new Expression(oldInstance, Short.class, "new", //$NON-NLS-1$
                 new Object[] { new Short(value.shortValue()) });
     }
-    
-    protected void initialize(
-            Class type, Object oldInstance, Object newInstance, Encoder out) {
+
+    @Override
+    protected void initialize(Class type, Object oldInstance,
+            Object newInstance, Encoder out) {
     }
 }

Modified: incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/org/apache/harmony/beans/java_lang_StringPersistenceDelegate.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/org/apache/harmony/beans/java_lang_StringPersistenceDelegate.java?view=diff&rev=450911&r1=450910&r2=450911
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/org/apache/harmony/beans/java_lang_StringPersistenceDelegate.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/org/apache/harmony/beans/java_lang_StringPersistenceDelegate.java Thu Sep 28 09:04:10 2006
@@ -14,33 +14,28 @@
  *  limitations under the License.
  */
 
-/**
- * @author Maxim V. Berkultsev
- * @version $Revision: 1.1.2.1 $
- */
 package org.apache.harmony.beans;
 
 import java.beans.Encoder;
 import java.beans.Expression;
 import java.beans.PersistenceDelegate;
 
-/**
- * @author Maxim V. Berkultsev
- * @version $Revision: 1.1.2.1 $
- */
-
 public class java_lang_StringPersistenceDelegate extends PersistenceDelegate {
 
+    @Override
     protected Expression instantiate(Object oldInstance, Encoder out) {
         String value = (String) oldInstance;
 
         return new Expression(oldInstance, String.class, "new", //$NON-NLS-1$
-                              new Object[] {new String(value)});
+                new Object[] { new String(value) });
     }
 
+    @Override
     protected void initialize(Class type, Object oldInstance,
-                              Object newInstance, Encoder out) {}
+            Object newInstance, Encoder out) {
+    }
 
+    @Override
     protected boolean mutatesTo(Object oldInstance, Object newInstance) {
         if (oldInstance instanceof String && newInstance instanceof String) {
             return newInstance.equals(oldInstance);

Modified: incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/org/apache/harmony/beans/java_lang_reflect_FieldPersistenceDelegate.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/org/apache/harmony/beans/java_lang_reflect_FieldPersistenceDelegate.java?view=diff&rev=450911&r1=450910&r2=450911
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/org/apache/harmony/beans/java_lang_reflect_FieldPersistenceDelegate.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/org/apache/harmony/beans/java_lang_reflect_FieldPersistenceDelegate.java Thu Sep 28 09:04:10 2006
@@ -12,6 +12,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.apache.harmony.beans;
 
 import java.lang.reflect.Field;
@@ -21,39 +22,41 @@
 import java.beans.PersistenceDelegate;
 
 /**
- * This is a persistence delegate for the {@link java.lang.reflect.Field} class. 
+ * This is a persistence delegate for the {@link java.lang.reflect.Field} class.
  */
 public class java_lang_reflect_FieldPersistenceDelegate extends
         PersistenceDelegate {
 
+    @Override
     protected Expression instantiate(Object oldInstance, Encoder out) {
         // should not be null or have a type other than Field
         assert oldInstance instanceof Field : oldInstance;
 
         Field oldField = (Field) oldInstance;
         Class declClass = oldField.getDeclaringClass();
-        
+
         return new Expression(oldField, declClass, "getDeclaredField", //$NON-NLS-1$
                 new Object[] { oldField.getName() });
     }
 
+    @Override
     protected void initialize(Class type, Object oldInstance,
-            Object newInstance, Encoder out)
-    {
+            Object newInstance, Encoder out) {
         // check for consistency
         assert oldInstance instanceof Field : oldInstance;
         assert newInstance instanceof Field : newInstance;
         assert newInstance.equals(oldInstance);
     }
 
+    @Override
     protected boolean mutatesTo(Object oldInstance, Object newInstance) {
         assert oldInstance instanceof Field : oldInstance;
-        
+
         if (!(newInstance instanceof Field)) {
             // if null or not a Field
             return false;
         }
-        
+
         return oldInstance.equals(newInstance);
     }
 }

Modified: incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/org/apache/harmony/beans/java_lang_reflect_MethodPersistenceDelegate.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/org/apache/harmony/beans/java_lang_reflect_MethodPersistenceDelegate.java?view=diff&rev=450911&r1=450910&r2=450911
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/org/apache/harmony/beans/java_lang_reflect_MethodPersistenceDelegate.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/org/apache/harmony/beans/java_lang_reflect_MethodPersistenceDelegate.java Thu Sep 28 09:04:10 2006
@@ -12,6 +12,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.apache.harmony.beans;
 
 import java.beans.Encoder;
@@ -20,11 +21,12 @@
 import java.lang.reflect.Method;
 
 /**
- * Persistence delegate for {@link java.lang.reflect.Method} class. 
+ * Persistence delegate for {@link java.lang.reflect.Method} class.
  */
 public class java_lang_reflect_MethodPersistenceDelegate extends
         PersistenceDelegate {
 
+    @Override
     protected Expression instantiate(Object oldInstance, Encoder out) {
         // should not be null or have a type other than Method
         assert oldInstance instanceof Method : oldInstance;
@@ -37,6 +39,7 @@
                         oldMethod.getParameterTypes() });
     }
 
+    @Override
     protected void initialize(Class type, Object oldInstance,
             Object newInstance, Encoder out) {
         // check for consistency
@@ -45,6 +48,7 @@
         assert newInstance.equals(oldInstance);
     }
 
+    @Override
     protected boolean mutatesTo(Object oldInstance, Object newInstance) {
         assert oldInstance instanceof Method : oldInstance;
 



Mime
View raw message