harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From zhouke...@apache.org
Subject svn commit: r1001187 [2/2] - in /harmony/enhanced/java/trunk/classlib/modules/beans/src/main/java: java/beans/ org/apache/harmony/beans/
Date Sat, 25 Sep 2010 10:13:25 GMT
Modified: harmony/enhanced/java/trunk/classlib/modules/beans/src/main/java/java/beans/XMLEncoder.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/beans/src/main/java/java/beans/XMLEncoder.java?rev=1001187&r1=1001186&r2=1001187&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/beans/src/main/java/java/beans/XMLEncoder.java
(original)
+++ harmony/enhanced/java/trunk/classlib/modules/beans/src/main/java/java/beans/XMLEncoder.java
Sat Sep 25 10:13:23 2010
@@ -30,11 +30,12 @@ import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
 
+import org.apache.harmony.beans.BeansUtils;
 import org.apache.harmony.beans.internal.nls.Messages;
 
 /**
- * <code>XMLEncoder</code> extends <code>Encoder</code> to write
out the
- * encoded statements and expressions in xml format. The xml can be read by
+ * <code>XMLEncoder</code> extends <code>Encoder</code> to write
out the encoded
+ * statements and expressions in XML format. The XML can be read by
  * <code>XMLDecoder</code> later to restore objects and their states.
  * <p>
  * The API is similar to <code>ObjectOutputStream</code>.
@@ -46,67 +47,67 @@ public class XMLEncoder extends Encoder 
     private static int DEADLOCK_THRESHOLD = 7;
 
     /*
-	 * Every object written by the encoder has a record.
-	 */
-	private static class Record {
-		// The expression by which the object is created or obtained.
-		Expression exp = null;
+     * Every object written by the encoder has a record.
+     */
+    private static class Record {
+        // The expression by which the object is created or obtained.
+        Expression exp = null;
 
-		// Id of the object, if it is referenced more than once.
-		String id = null;
+        // Id of the object, if it is referenced more than once.
+        String id = null;
 
-		// Count of the references of the object.
-		int refCount = 0;
+        // Count of the references of the object.
+        int refCount = 0;
 
-		// A list of statements that execute on the object.
-		ArrayList<Statement> stats = new ArrayList<Statement>();
-	}
+        // A list of statements that execute on the object.
+        ArrayList<Statement> stats = new ArrayList<Statement>();
+    }
 
-	private static final int INDENT_UNIT = 1;
+    private static final int INDENT_UNIT = 1;
 
-	private static final boolean isStaticConstantsSupported = true;
+    private static final boolean isStaticConstantsSupported = true;
 
-	// the main record of all root objects
-	private ArrayList<Object> flushPending = new ArrayList<Object>();
+    // the main record of all root objects
+    private ArrayList<Object> flushPending = new ArrayList<Object>();
 
-	// the record of root objects with a void tag
-	private ArrayList<Object> flushPendingStat = new ArrayList<Object>();
+    // the record of root objects with a void tag
+    private ArrayList<Object> flushPendingStat = new ArrayList<Object>();
 
-	// keep the pre-required objects for each root object
-	private ArrayList<Object> flushPrePending = new ArrayList<Object>();
+    // keep the pre-required objects for each root object
+    private ArrayList<Object> flushPrePending = new ArrayList<Object>();
 
-	private boolean hasXmlHeader = false;
+    private boolean hasXmlHeader = false;
 
-	/*
-	 * if any expression or statement references owner, it is set true in method
-	 * recordStatement() or recordExpressions(), and, at the first time
-	 * flushObject() meets an owner object, it calls the flushOwner() method and
-	 * then set needOwner to false, so that all succeeding flushing of owner
-	 * will call flushExpression() or flushStatement() normally, which will get
-	 * a reference of the owner property.
-	 */
-	private boolean needOwner = false;
+    /*
+     * if any expression or statement references owner, it is set true in method
+     * recordStatement() or recordExpressions(), and, at the first time
+     * flushObject() meets an owner object, it calls the flushOwner() method and
+     * then set needOwner to false, so that all succeeding flushing of owner
+     * will call flushExpression() or flushStatement() normally, which will get
+     * a reference of the owner property.
+     */
+    private boolean needOwner = false;
 
-	private PrintWriter out;
+    private PrintWriter out;
 
-	private Object owner = null;
+    private Object owner = null;
 
-	private ReferenceMap records = new ReferenceMap();
+    private ReferenceMap records = new ReferenceMap();
 
     private ReferenceMap objPrePendingCache = new ReferenceMap();
 
     private ReferenceMap clazzCounterMap = new ReferenceMap();
 
-	private boolean writingObject = false;
+    private boolean writingObject = false;
 
-	/**
-	 * Construct a <code>XMLEncoder</code>.
-	 * 
-	 * @param out
-	 *            the output stream where xml is written to
-	 */
-	public XMLEncoder(OutputStream out) {
-		if (null != out) {
+    /**
+     * Construct a <code>XMLEncoder</code>.
+     * 
+     * @param out
+     *            the output stream where XML is written to
+     */
+    public XMLEncoder(OutputStream out) {
+        if (null != out) {
             try {
                 this.out = new PrintWriter(
                         new OutputStreamWriter(out, "UTF-8"), true); //$NON-NLS-1$
@@ -115,144 +116,146 @@ public class XMLEncoder extends Encoder 
                 e.printStackTrace();
             }
         }
-	}
+    }
+
+    /**
+     * Call <code>flush()</code> first, then write out XML footer and close the
+     * underlying output stream.
+     */
+    public void close() {
+        flush();
+        out.println("</java>"); //$NON-NLS-1$
+        out.close();
+    }
 
-	/**
-	 * Call <code>flush()</code> first, then write out xml footer and close
-	 * the underlying output stream.
-	 */
-	public void close() {
-		flush();
-		out.println("</java>"); //$NON-NLS-1$
-		out.close();
-	}
-
-	private StringBuffer decapitalize(String s) {
-		StringBuffer buf = new StringBuffer(s);
-		buf.setCharAt(0, Character.toLowerCase(buf.charAt(0)));
-		return buf;
-	}
+    private StringBuffer decapitalize(String s) {
+        StringBuffer buf = new StringBuffer(s);
+        buf.setCharAt(0, Character.toLowerCase(buf.charAt(0)));
+        return buf;
+    }
 
     private String idSerialNoOfObject(Object obj) {
         Class<?> clazz = obj.getClass();
         Integer serialNo = (Integer) clazzCounterMap.get(clazz);
         serialNo = serialNo == null ? 0 : serialNo;
-        String id = nameForClass(obj.getClass()) + serialNo;
+        String id = BeansUtils.idOfClass(obj.getClass()) + serialNo;
         clazzCounterMap.put(clazz, ++serialNo);
         return id;
     }
 
-	/**
-	 * Writes out all objects since last flush to the output stream.
-	 * <p>
-	 * The implementation write the xml header first if it has not been
-	 * written. Then all pending objects since last flush are written.
-	 * </p>
-	 */
-	@SuppressWarnings("nls")
+    /**
+     * Writes out all objects since last flush to the output stream.
+     * <p>
+     * The implementation write the XML header first if it has not been written.
+     * Then all pending objects since last flush are written.
+     * </p>
+     */
+    @SuppressWarnings("nls")
     public void flush() {
-		synchronized (this) {
-			// write xml header
-			if (!hasXmlHeader) {
-				out.println("<?xml version=\"1.0\" encoding=\"UTF-8\"?>");
-				out.println("<java version=\""
-						+ System.getProperty("java.version")
-						+ "\" class=\"java.beans.XMLDecoder\">");
-				hasXmlHeader = true;
-			}
-
-			// preprocess pending objects
-			for (Iterator<Object> iter = flushPending.iterator(); iter.hasNext();) {
-				Object o = iter.next();
-				Record rec = (Record) records.get(o);
-				if (rec != null) {
-					preprocess(o, rec);
-				}
-			}
-
-			// flush pending objects
-			for (Iterator<Object> iter = flushPending.iterator(); iter.hasNext();) {
-				Object o = iter.next();
-				flushObject(o, INDENT_UNIT);
-				// remove flushed obj
-				iter.remove();
-			}
+        synchronized (this) {
+            // write xml header
+            if (!hasXmlHeader) {
+                out.println("<?xml version=\"1.0\" encoding=\"UTF-8\"?>");
+                out.println("<java version=\""
+                        + System.getProperty("java.version")
+                        + "\" class=\"java.beans.XMLDecoder\">");
+                hasXmlHeader = true;
+            }
+
+            // preprocess pending objects
+            for (Iterator<Object> iter = flushPending.iterator(); iter
+                    .hasNext();) {
+                Object o = iter.next();
+                Record rec = (Record) records.get(o);
+                if (rec != null) {
+                    preprocess(o, rec);
+                }
+            }
 
-			// clear statement records
-			records.clear();
+            // flush pending objects
+            for (Iterator<Object> iter = flushPending.iterator(); iter
+                    .hasNext();) {
+                Object o = iter.next();
+                flushObject(o, INDENT_UNIT);
+                // remove flushed obj
+                iter.remove();
+            }
+
+            // clear statement records
+            records.clear();
             flushPendingStat.clear();
             objPrePendingCache.clear();
             clazzCounterMap.clear();
 
-			// remove all old->new mappings
-			super.clear();
-		}
-	}
+            // remove all old->new mappings
+            super.clear();
+        }
+    }
 
-	@SuppressWarnings("nls")
+    @SuppressWarnings("nls")
     private void flushBasicObject(Object obj, int indent) {
-		if( obj instanceof Proxy) {
-			return;
-		}
-		flushIndent(indent);
-		if (obj == null) {
-			out.println("<null />");
-		} else if (obj instanceof String) {
-			Record rec = (Record) records.get(obj);
-			if( null != rec) {
-				if (flushPendingStat.contains(obj)) {
-					flushExpression(obj, rec, indent - 3, true);
-				} else {
-					flushExpression(obj, rec, indent - 3, false);
-				}
-				return;
-			}
-			out.print("<string>");
-			flushString((String) obj);
-			out.println("</string>");
-		} else if (obj instanceof Class<?>) {
-			out.print("<class>");
-			out.print(((Class<?>) obj).getName());
-			out.println("</class>");
-		} else if (obj instanceof Boolean) {
-			out.print("<boolean>");
-			out.print(obj);
-			out.println("</boolean>");
-		} else if (obj instanceof Byte) {
-			out.print("<byte>");
-			out.print(obj);
-			out.println("</byte>");
-		} else if (obj instanceof Character) {
-			out.print("<char>");
-			out.print(obj);
-			out.println("</char>");
-		} else if (obj instanceof Double) {
-			out.print("<double>");
-			out.print(obj);
-			out.println("</double>");
-		} else if (obj instanceof Float) {
-			out.print("<float>");
-			out.print(obj);
-			out.println("</float>");
-		} else if (obj instanceof Integer) {
-			out.print("<int>");
-			out.print(obj);
-			out.println("</int>");
-		} else if (obj instanceof Long) {
-			out.print("<long>");
-			out.print(obj);
-			out.println("</long>");
-		} else if (obj instanceof Short) {
-			out.print("<short>");
-			out.print(obj);
-			out.println("</short>");
-		} else {
-			getExceptionListener().exceptionThrown(
-                                       new Exception(Messages.getString("beans.73", obj)));
-		}
-	}
+        if (obj instanceof Proxy) {
+            return;
+        }
+        flushIndent(indent);
+        if (obj == null) {
+            out.println("<null />");
+        } else if (obj instanceof String) {
+            Record rec = (Record) records.get(obj);
+            if (null != rec) {
+                if (flushPendingStat.contains(obj)) {
+                    flushExpression(obj, rec, indent - 3, true);
+                } else {
+                    flushExpression(obj, rec, indent - 3, false);
+                }
+                return;
+            }
+            out.print("<string>");
+            flushString((String) obj);
+            out.println("</string>");
+        } else if (obj instanceof Class<?>) {
+            out.print("<class>");
+            out.print(((Class<?>) obj).getName());
+            out.println("</class>");
+        } else if (obj instanceof Boolean) {
+            out.print("<boolean>");
+            out.print(obj);
+            out.println("</boolean>");
+        } else if (obj instanceof Byte) {
+            out.print("<byte>");
+            out.print(obj);
+            out.println("</byte>");
+        } else if (obj instanceof Character) {
+            out.print("<char>");
+            out.print(obj);
+            out.println("</char>");
+        } else if (obj instanceof Double) {
+            out.print("<double>");
+            out.print(obj);
+            out.println("</double>");
+        } else if (obj instanceof Float) {
+            out.print("<float>");
+            out.print(obj);
+            out.println("</float>");
+        } else if (obj instanceof Integer) {
+            out.print("<int>");
+            out.print(obj);
+            out.println("</int>");
+        } else if (obj instanceof Long) {
+            out.print("<long>");
+            out.print(obj);
+            out.println("</long>");
+        } else if (obj instanceof Short) {
+            out.print("<short>");
+            out.print(obj);
+            out.println("</short>");
+        } else {
+            getExceptionListener().exceptionThrown(
+                    new Exception(Messages.getString("beans.73", obj)));
+        }
+    }
 
-	@SuppressWarnings("nls")
+    @SuppressWarnings("nls")
     private void flushExpression(Object obj, Record rec, int indent,
             boolean asStatement) {
         // flush
@@ -282,197 +285,197 @@ public class XMLEncoder extends Encoder 
         flushStatement(stat, rec.id, rec.stats, indent);
     }
 
-	private void flushIndent(int indent) {
-		for (int i = 0; i < indent; i++) {
-			out.print(" "); //$NON-NLS-1$
-		}
-	}
-
-	private void flushObject(Object obj, int indent) {
-		Record rec = (Record) records.get(obj);
-		if (rec == null && !isBasicType(obj))
-			return;
-
-		if (obj == owner && this.needOwner) {
-			flushOwner(obj, rec, indent);
-			this.needOwner = false;
-			return;
-		}
-
-		if (isBasicType(obj)) {
-			flushBasicObject(obj, indent);
-		} else {
-			if (flushPendingStat.contains(obj)) {
-				flushExpression(obj, rec, indent, true);
-			} else {
-				flushExpression(obj, rec, indent, false);
-			}
-		}
-	}
+    private void flushIndent(int indent) {
+        for (int i = 0; i < indent; i++) {
+            out.print(" "); //$NON-NLS-1$
+        }
+    }
+
+    private void flushObject(Object obj, int indent) {
+        Record rec = (Record) records.get(obj);
+        if (rec == null && !isBasicType(obj))
+            return;
+
+        if (obj == owner && this.needOwner) {
+            flushOwner(obj, rec, indent);
+            this.needOwner = false;
+            return;
+        }
+
+        if (isBasicType(obj)) {
+            flushBasicObject(obj, indent);
+        } else {
+            if (flushPendingStat.contains(obj)) {
+                flushExpression(obj, rec, indent, true);
+            } else {
+                flushExpression(obj, rec, indent, false);
+            }
+        }
+    }
 
-	@SuppressWarnings("nls")
+    @SuppressWarnings("nls")
     private void flushOwner(Object obj, Record rec, int indent) {
         if (rec.refCount > 1 && rec.id == null) {
             rec.id = idSerialNoOfObject(obj);
         }
 
-		flushIndent(indent);
-		String tagName = "void";
-		out.print("<");
-		out.print(tagName);
-
-		// id attribute
-		if (rec.id != null) {
-			out.print(" id=\"");
-			out.print(rec.id);
-			out.print("\"");
-		}
-
-		out.print(" property=\"owner\"");
-
-		// open tag, end
-		if (rec.exp.getArguments().length == 0 && rec.stats.isEmpty()) {
-			out.println("/>");
-			return;
-		}
-		out.println(">");
-
-		// arguments
-		for (int i = 0; i < rec.exp.getArguments().length; i++) {
-			flushObject(rec.exp.getArguments()[i], indent + INDENT_UNIT);
-		}
-
-		// sub statements
-		flushSubStatements(rec.stats, indent);
-
-		// close tag
-		flushIndent(indent);
-		out.print("</");
-		out.print(tagName);
-		out.println(">");
-	}
+        flushIndent(indent);
+        String tagName = "void";
+        out.print("<");
+        out.print(tagName);
+
+        // id attribute
+        if (rec.id != null) {
+            out.print(" id=\"");
+            out.print(rec.id);
+            out.print("\"");
+        }
+
+        out.print(" property=\"owner\"");
+
+        // open tag, end
+        if (rec.exp.getArguments().length == 0 && rec.stats.isEmpty()) {
+            out.println("/>");
+            return;
+        }
+        out.println(">");
 
-	@SuppressWarnings("nls")
+        // arguments
+        for (int i = 0; i < rec.exp.getArguments().length; i++) {
+            flushObject(rec.exp.getArguments()[i], indent + INDENT_UNIT);
+        }
+
+        // sub statements
+        flushSubStatements(rec.stats, indent);
+
+        // close tag
+        flushIndent(indent);
+        out.print("</");
+        out.print(tagName);
+        out.println(">");
+    }
+
+    @SuppressWarnings("nls")
     private void flushStatArray(Statement stat, String id, List<?> subStats,
-			int indent) {
-		// open tag, begin
-		flushIndent(indent);
-		out.print("<array");
-
-		// id attribute
-		if (id != null) {
-			out.print(" id=\"");
-			out.print(id);
-			out.print("\"");
-		}
-
-		// class & length
-		out.print(" class=\"");
-		out.print(((Class<?>) stat.getArguments()[0]).getName());
-		out.print("\" length=\"");
-		out.print(stat.getArguments()[1]);
-		out.print("\"");
-
-		// open tag, end
-		if (subStats.isEmpty()) {
-			out.println("/>");
-			return;
-		}
-		out.println(">");
-
-		// sub statements
-		flushSubStatements(subStats, indent);
-
-		// close tag
-		flushIndent(indent);
-		out.println("</array>");
-	}
+            int indent) {
+        // open tag, begin
+        flushIndent(indent);
+        out.print("<array");
+
+        // id attribute
+        if (id != null) {
+            out.print(" id=\"");
+            out.print(id);
+            out.print("\"");
+        }
+
+        // class & length
+        out.print(" class=\"");
+        out.print(((Class<?>) stat.getArguments()[0]).getName());
+        out.print("\" length=\"");
+        out.print(stat.getArguments()[1]);
+        out.print("\"");
+
+        // open tag, end
+        if (subStats.isEmpty()) {
+            out.println("/>");
+            return;
+        }
+        out.println(">");
+
+        // sub statements
+        flushSubStatements(subStats, indent);
+
+        // close tag
+        flushIndent(indent);
+        out.println("</array>");
+    }
 
-	@SuppressWarnings("nls")
+    @SuppressWarnings("nls")
     private void flushStatCommon(Statement stat, String id, List<?> subStats,
-			int indent) {
-		// open tag, begin
-		flushIndent(indent);
-		String tagName = stat instanceof Expression ? "object" : "void";
-		out.print("<");
-		out.print(tagName);
-
-		// id attribute
-		if (id != null) {
-			out.print(" id=\"");
-			out.print(id);
-			out.print("\"");
-		}
-
-		// special class attribute
-		if (stat.getTarget() instanceof Class<?>) {
-			out.print(" class=\"");
-			out.print(((Class<?>) stat.getTarget()).getName());
-			out.print("\"");
-		}
-
-		// method attribute
-		if (!"new".equals(stat.getMethodName())) {
-			out.print(" method=\"");
-			out.print(stat.getMethodName());
-			out.print("\"");
-		}
-
-		// open tag, end
-		if (stat.getArguments().length == 0 && subStats.isEmpty()) {
-			out.println("/>");
-			return;
-		}
-		out.println(">");
-
-		// arguments
-		for (int i = 0; i < stat.getArguments().length; i++) {
-			flushObject(stat.getArguments()[i], indent + INDENT_UNIT);
-		}
-
-		// sub statements
-		flushSubStatements(subStats, indent);
-
-		// close tag
-		flushIndent(indent);
-		out.print("</");
-		out.print(tagName);
-		out.println(">");
-	}
+            int indent) {
+        // open tag, begin
+        flushIndent(indent);
+        String tagName = stat instanceof Expression ? "object" : "void";
+        out.print("<");
+        out.print(tagName);
+
+        // id attribute
+        if (id != null) {
+            out.print(" id=\"");
+            out.print(id);
+            out.print("\"");
+        }
+
+        // special class attribute
+        if (stat.getTarget() instanceof Class<?>) {
+            out.print(" class=\"");
+            out.print(((Class<?>) stat.getTarget()).getName());
+            out.print("\"");
+        }
+
+        // method attribute
+        if (!"new".equals(stat.getMethodName())) {
+            out.print(" method=\"");
+            out.print(stat.getMethodName());
+            out.print("\"");
+        }
+
+        // open tag, end
+        if (stat.getArguments().length == 0 && subStats.isEmpty()) {
+            out.println("/>");
+            return;
+        }
+        out.println(">");
+
+        // arguments
+        for (int i = 0; i < stat.getArguments().length; i++) {
+            flushObject(stat.getArguments()[i], indent + INDENT_UNIT);
+        }
+
+        // sub statements
+        flushSubStatements(subStats, indent);
+
+        // close tag
+        flushIndent(indent);
+        out.print("</");
+        out.print(tagName);
+        out.println(">");
+    }
 
-	@SuppressWarnings("nls")
+    @SuppressWarnings("nls")
     private void flushStatement(Statement stat, String id, List<?> subStats,
-			int indent) {
-		Object target = stat.getTarget();
-		String method = stat.getMethodName();
-		Object args[] = stat.getArguments();
-
-		// special case for array
-		if (Array.class == target && "newInstance".equals(method)) {
-			flushStatArray(stat, id, subStats, indent);
-			return;
-		}
-		// special case for get(int) and set(int, Object)
-		if (isGetArrayStat(target, method, args)
-				|| isSetArrayStat(target, method, args)) {
-			flushStatIndexed(stat, id, subStats, indent);
-			return;
-		}
-		// special case for getProperty() and setProperty(Object)
-		if (isGetPropertyStat(method, args) || isSetPropertyStat(method, args)) {
-			flushStatGetterSetter(stat, id, subStats, indent);
-			return;
-		}
+            int indent) {
+        Object target = stat.getTarget();
+        String method = stat.getMethodName();
+        Object args[] = stat.getArguments();
 
-		if (isStaticConstantsSupported
-				&& "getField".equals(stat.getMethodName())) {
+        // special case for array
+        if (Array.class == target && "newInstance".equals(method)) {
+            flushStatArray(stat, id, subStats, indent);
+            return;
+        }
+        // special case for get(int) and set(int, Object)
+        if (isGetArrayStat(target, method, args)
+                || isSetArrayStat(target, method, args)) {
+            flushStatIndexed(stat, id, subStats, indent);
+            return;
+        }
+        // special case for getProperty() and setProperty(Object)
+        if (isGetPropertyStat(method, args) || isSetPropertyStat(method, args)) {
+            flushStatGetterSetter(stat, id, subStats, indent);
+            return;
+        }
+
+        if (isStaticConstantsSupported
+                && "getField".equals(stat.getMethodName())) {
             flushStatField(stat, indent);
-			return;
-		}
+            return;
+        }
 
-		// common case
-		flushStatCommon(stat, id, subStats, indent);
-	}
+        // common case
+        flushStatCommon(stat, id, subStats, indent);
+    }
 
     @SuppressWarnings("nls")
     private void flushStatField(Statement stat, int indent) {
@@ -515,194 +518,182 @@ public class XMLEncoder extends Encoder 
         }
     }
 
-	@SuppressWarnings("nls")
+    @SuppressWarnings("nls")
     private void flushStatGetterSetter(Statement stat, String id,
-			List<?> subStats, int indent) {
-		// open tag, begin
-		flushIndent(indent);
-		String tagName = stat instanceof Expression ? "object" : "void";
-		out.print("<");
-		out.print(tagName);
-
-		// id attribute
-		if (id != null) {
-			out.print(" id=\"");
-			out.print(id);
-			out.print("\"");
-		}
-
-		// special class attribute
-		if (stat.getTarget() instanceof Class<?>) {
-			out.print(" class=\"");
-			out.print(((Class<?>) stat.getTarget()).getName());
-			out.print("\"");
-		}
-
-		// property attribute
-		out.print(" property=\"");
-		out.print(decapitalize(stat.getMethodName().substring(3)));
-		out.print("\"");
-
-		// open tag, end
-		if (stat.getArguments().length == 0 && subStats.isEmpty()) {
-			out.println("/>");
-			return;
-		}
-		out.println(">");
-
-		// arguments
-		for (int i = 0; i < stat.getArguments().length; i++) {
-			flushObject(stat.getArguments()[i], indent + INDENT_UNIT);
-		}
-
-		// sub statements
-		flushSubStatements(subStats, indent);
-
-		// close tag
-		flushIndent(indent);
-		out.print("</");
-		out.print(tagName);
-		out.println(">");
-	}
+            List<?> subStats, int indent) {
+        // open tag, begin
+        flushIndent(indent);
+        String tagName = stat instanceof Expression ? "object" : "void";
+        out.print("<");
+        out.print(tagName);
+
+        // id attribute
+        if (id != null) {
+            out.print(" id=\"");
+            out.print(id);
+            out.print("\"");
+        }
+
+        // special class attribute
+        if (stat.getTarget() instanceof Class<?>) {
+            out.print(" class=\"");
+            out.print(((Class<?>) stat.getTarget()).getName());
+            out.print("\"");
+        }
+
+        // property attribute
+        out.print(" property=\"");
+        out.print(decapitalize(stat.getMethodName().substring(3)));
+        out.print("\"");
+
+        // open tag, end
+        if (stat.getArguments().length == 0 && subStats.isEmpty()) {
+            out.println("/>");
+            return;
+        }
+        out.println(">");
 
-	@SuppressWarnings("nls")
+        // arguments
+        for (int i = 0; i < stat.getArguments().length; i++) {
+            flushObject(stat.getArguments()[i], indent + INDENT_UNIT);
+        }
+
+        // sub statements
+        flushSubStatements(subStats, indent);
+
+        // close tag
+        flushIndent(indent);
+        out.print("</");
+        out.print(tagName);
+        out.println(">");
+    }
+
+    @SuppressWarnings("nls")
     private void flushStatIndexed(Statement stat, String id, List<?> subStats,
-			int indent) {
-		// open tag, begin
-		flushIndent(indent);
-		String tagName = stat instanceof Expression ? "object" : "void";
-		out.print("<");
-		out.print(tagName);
-
-		// id attribute
-		if (id != null) {
-			out.print(" id=\"");
-			out.print(id);
-			out.print("\"");
-		}
-
-		// special class attribute
-		if (stat.getTarget() instanceof Class<?>) {
-			out.print(" class=\"");
-			out.print(((Class<?>) stat.getTarget()).getName());
-			out.print("\"");
-		}
-
-		// index attribute
-		out.print(" index=\"");
-		out.print(stat.getArguments()[0]);
-		out.print("\"");
-
-		// open tag, end
-		if (stat.getArguments().length == 1 && subStats.isEmpty()) {
-			out.println("/>");
-			return;
-		}
-		out.println(">");
-
-		// arguments
-		for (int i = 1; i < stat.getArguments().length; i++) {
-			flushObject(stat.getArguments()[i], indent + INDENT_UNIT);
-		}
-
-		// sub statements
-		flushSubStatements(subStats, indent);
-
-		// close tag
-		flushIndent(indent);
-		out.print("</");
-		out.print(tagName);
-		out.println(">");
-	}
+            int indent) {
+        // open tag, begin
+        flushIndent(indent);
+        String tagName = stat instanceof Expression ? "object" : "void";
+        out.print("<");
+        out.print(tagName);
+
+        // id attribute
+        if (id != null) {
+            out.print(" id=\"");
+            out.print(id);
+            out.print("\"");
+        }
+
+        // special class attribute
+        if (stat.getTarget() instanceof Class<?>) {
+            out.print(" class=\"");
+            out.print(((Class<?>) stat.getTarget()).getName());
+            out.print("\"");
+        }
+
+        // index attribute
+        out.print(" index=\"");
+        out.print(stat.getArguments()[0]);
+        out.print("\"");
+
+        // open tag, end
+        if (stat.getArguments().length == 1 && subStats.isEmpty()) {
+            out.println("/>");
+            return;
+        }
+        out.println(">");
+
+        // arguments
+        for (int i = 1; i < stat.getArguments().length; i++) {
+            flushObject(stat.getArguments()[i], indent + INDENT_UNIT);
+        }
 
-	@SuppressWarnings("nls")
+        // sub statements
+        flushSubStatements(subStats, indent);
+
+        // close tag
+        flushIndent(indent);
+        out.print("</");
+        out.print(tagName);
+        out.println(">");
+    }
+
+    @SuppressWarnings("nls")
     private void flushString(String s) {
-		char c;
-		for (int i = 0; i < s.length(); i++) {
-			c = s.charAt(i);
-			if (c == '<') {
-				out.print("&lt;");
-			} else if (c == '>') {
-				out.print("&gt;");
-			} else if (c == '&') {
-				out.print("&amp;");
-			} else if (c == '\'') {
-				out.print("&apos;");
-			} else if (c == '"') {
-				out.print("&quot;");
-			} else {
-				out.print(c);
-			}
-		}
-	}
-
-	private void flushSubStatements(List<?> subStats, int indent) {
-		for (int i = 0; i < subStats.size(); i++) {
-			Statement subStat = (Statement) subStats.get(i);
-			try {
-				if (subStat instanceof Expression) {
-					Expression subExp = (Expression) subStat;
-					Object obj = subExp.getValue();
-					Record rec = (Record) records.get(obj);
-					flushExpression(obj, rec, indent + INDENT_UNIT, true);
-				} else {
-					flushStatement(subStat, null, Collections.EMPTY_LIST,
-							indent + INDENT_UNIT);
-				}
-			} catch (Exception e) {
-				// should not happen
-				getExceptionListener().exceptionThrown(e);
-			}
-		}
-	}
-
-	/**
-	 * Returns the owner of this encoder.
-	 * 
-	 * @return the owner of this encoder
-	 */
-	public Object getOwner() {
-		return owner;
-	}
-
-	private boolean isBasicType(Object value) {
-		return value == null || value instanceof Boolean
-				|| value instanceof Byte || value instanceof Character
-				|| value instanceof Class<?> || value instanceof Double
-				|| value instanceof Float || value instanceof Integer
-				|| value instanceof Long || value instanceof Short
-				|| value instanceof String || value instanceof Proxy;
-	}
-
-	private boolean isGetArrayStat(Object target, String method, Object[] args) {
-		return ("get".equals(method) && args.length == 1 //$NON-NLS-1$
-				&& args[0] instanceof Integer && target.getClass().isArray());
-	}
-
-	private boolean isGetPropertyStat(String method, Object[] args) {
-		return (method.startsWith("get") && method.length() > 3 && args.length
== 0); //$NON-NLS-1$
-	}
-
-	private boolean isSetArrayStat(Object target, String method, Object[] args) {
-		return ("set".equals(method) && args.length == 2 //$NON-NLS-1$
-				&& args[0] instanceof Integer && target.getClass().isArray());
-	}
-
-	private boolean isSetPropertyStat(String method, Object[] args) {
-		return (method.startsWith("set") && method.length() > 3 && args.length
== 1); //$NON-NLS-1$
-	}
-
-	private String nameForClass(Class<?> c) {
-		if (c.isArray()) {
-			return nameForClass(c.getComponentType()) + "Array"; //$NON-NLS-1$
-		}
-        String name = c.getName();
-        int i = name.lastIndexOf('.');
-        if (-1 == i) {
-        	return name;
+        char c;
+        for (int i = 0; i < s.length(); i++) {
+            c = s.charAt(i);
+            if (c == '<') {
+                out.print("&lt;");
+            } else if (c == '>') {
+                out.print("&gt;");
+            } else if (c == '&') {
+                out.print("&amp;");
+            } else if (c == '\'') {
+                out.print("&apos;");
+            } else if (c == '"') {
+                out.print("&quot;");
+            } else {
+                out.print(c);
+            }
         }
-        return name.substring(i + 1);
-	}
+    }
+
+    private void flushSubStatements(List<?> subStats, int indent) {
+        for (int i = 0; i < subStats.size(); i++) {
+            Statement subStat = (Statement) subStats.get(i);
+            try {
+                if (subStat instanceof Expression) {
+                    Expression subExp = (Expression) subStat;
+                    Object obj = subExp.getValue();
+                    Record rec = (Record) records.get(obj);
+                    flushExpression(obj, rec, indent + INDENT_UNIT, true);
+                } else {
+                    flushStatement(subStat, null, Collections.EMPTY_LIST,
+                            indent + INDENT_UNIT);
+                }
+            } catch (Exception e) {
+                // should not happen
+                getExceptionListener().exceptionThrown(e);
+            }
+        }
+    }
+
+    /**
+     * Returns the owner of this encoder.
+     * 
+     * @return the owner of this encoder
+     */
+    public Object getOwner() {
+        return owner;
+    }
+
+    private boolean isBasicType(Object value) {
+        return value == null || value instanceof Boolean
+                || value instanceof Byte || value instanceof Character
+                || value instanceof Class<?> || value instanceof Double
+                || value instanceof Float || value instanceof Integer
+                || value instanceof Long || value instanceof Short
+                || value instanceof String || value instanceof Proxy;
+    }
+
+    private boolean isGetArrayStat(Object target, String method, Object[] args) {
+        return ("get".equals(method) && args.length == 1 //$NON-NLS-1$
+                && args[0] instanceof Integer && target.getClass().isArray());
+    }
+
+    private boolean isGetPropertyStat(String method, Object[] args) {
+        return (method.startsWith("get") && method.length() > 3 && args.length
== 0); //$NON-NLS-1$
+    }
+
+    private boolean isSetArrayStat(Object target, String method, Object[] args) {
+        return ("set".equals(method) && args.length == 2 //$NON-NLS-1$
+                && args[0] instanceof Integer && target.getClass().isArray());
+    }
+
+    private boolean isSetPropertyStat(String method, Object[] args) {
+        return (method.startsWith("set") && method.length() > 3 && args.length
== 1); //$NON-NLS-1$
+    }
 
     /*
      * The preprocess removes unused statements and counts references of every
@@ -743,102 +734,103 @@ public class XMLEncoder extends Encoder 
             }
         }
 
-		for (Iterator<?> iter = rec.stats.iterator(); iter.hasNext();) {
-			Statement subStat = (Statement) iter.next();
-			if (subStat instanceof Expression) {
-				try {
-					Expression subExp = (Expression) subStat;
-					Record subRec = (Record) records.get(subExp.getValue());
-					if (subRec == null || subRec.exp == null
-							|| subRec.exp != subExp) {
-						iter.remove();
-						continue;
-					}
-					preprocess(subExp.getValue(), subRec);
-					if (subRec.stats.isEmpty()) {
-						if (isGetArrayStat(subExp.getTarget(), subExp
-								.getMethodName(), subExp.getArguments())
-								|| isGetPropertyStat(subExp.getMethodName(),
-										subExp.getArguments())) {
-							iter.remove();
-							continue;
-						}
-					}
-				} catch (Exception e) {
-					getExceptionListener().exceptionThrown(e);
-					iter.remove();
-				}
-				continue;
-			}
-
-			Object subStatArgs[] = subStat.getArguments();
-			for (int i = 0; i < subStatArgs.length; i++) {
-				Record argRec = (Record) records.get(subStatArgs[i]);
-				if (argRec != null) {
-					preprocess(subStatArgs[i], argRec);
-				}
-			}
-		}
-	}
-
-	private void recordExpression(Object value, Expression exp) {
-		// record how a new object is created or obtained
-		Record rec = (Record) records.get(value);
-		if (rec == null) {
-			rec = new Record();
-			records.put(value, rec);
-		}
-
-		if (rec.exp == null) {
-			// it is generated by its sub stats
-			for (Iterator<?> iter = rec.stats.iterator(); iter.hasNext();) {
-				Statement stat = (Statement) iter.next();
-				try {
-					if (stat instanceof Expression) {
-						flushPrePending.add(value);
-					}
-				} catch (Exception e) {
-					e.printStackTrace();
-				}
-
-			}
-		}
-
-		rec.exp = exp;
-
-		// deal with 'owner' property
-		if (value == owner && owner != null) {
-			needOwner = true;
-		}
-
-		// also record as a statement
-		recordStatement(exp);
-	}
-
-	private void recordStatement(Statement stat) {
-        if (null == stat) return;
-		// deal with 'owner' property
-		if (stat.getTarget() == owner && owner != null) {
-			needOwner = true;
-		}
-
-		// record how a statement affects the target object
-		Record rec = (Record) records.get(stat.getTarget());
-		if (rec == null) {
-			rec = new Record();
-			records.put(stat.getTarget(), rec);
-		}
-		rec.stats.add(stat);
-	}
+        for (Iterator<?> iter = rec.stats.iterator(); iter.hasNext();) {
+            Statement subStat = (Statement) iter.next();
+            if (subStat instanceof Expression) {
+                try {
+                    Expression subExp = (Expression) subStat;
+                    Record subRec = (Record) records.get(subExp.getValue());
+                    if (subRec == null || subRec.exp == null
+                            || subRec.exp != subExp) {
+                        iter.remove();
+                        continue;
+                    }
+                    preprocess(subExp.getValue(), subRec);
+                    if (subRec.stats.isEmpty()) {
+                        if (isGetArrayStat(subExp.getTarget(),
+                                subExp.getMethodName(), subExp.getArguments())
+                                || isGetPropertyStat(subExp.getMethodName(),
+                                        subExp.getArguments())) {
+                            iter.remove();
+                            continue;
+                        }
+                    }
+                } catch (Exception e) {
+                    getExceptionListener().exceptionThrown(e);
+                    iter.remove();
+                }
+                continue;
+            }
+
+            Object subStatArgs[] = subStat.getArguments();
+            for (int i = 0; i < subStatArgs.length; i++) {
+                Record argRec = (Record) records.get(subStatArgs[i]);
+                if (argRec != null) {
+                    preprocess(subStatArgs[i], argRec);
+                }
+            }
+        }
+    }
+
+    private void recordExpression(Object value, Expression exp) {
+        // record how a new object is created or obtained
+        Record rec = (Record) records.get(value);
+        if (rec == null) {
+            rec = new Record();
+            records.put(value, rec);
+        }
+
+        if (rec.exp == null) {
+            // it is generated by its sub stats
+            for (Iterator<?> iter = rec.stats.iterator(); iter.hasNext();) {
+                Statement stat = (Statement) iter.next();
+                try {
+                    if (stat instanceof Expression) {
+                        flushPrePending.add(value);
+                    }
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+
+            }
+        }
+
+        rec.exp = exp;
+
+        // deal with 'owner' property
+        if (value == owner && owner != null) {
+            needOwner = true;
+        }
+
+        // also record as a statement
+        recordStatement(exp);
+    }
+
+    private void recordStatement(Statement stat) {
+        if (null == stat)
+            return;
+        // deal with 'owner' property
+        if (stat.getTarget() == owner && owner != null) {
+            needOwner = true;
+        }
+
+        // record how a statement affects the target object
+        Record rec = (Record) records.get(stat.getTarget());
+        if (rec == null) {
+            rec = new Record();
+            records.put(stat.getTarget(), rec);
+        }
+        rec.stats.add(stat);
+    }
 
     /**
      * Imperfect attempt to detect a dead loop. This works with specific
-     * patterns that can be found in our AWT implementation.
-     * See HARMONY-5707 for details.
-     *
-     * @param value the object to check dupes for
-     * @return true if a dead loop detected; false otherwise
-     * FIXME
+     * patterns that can be found in our AWT implementation. See HARMONY-5707
+     * for details.
+     * 
+     * @param value
+     *            the object to check dupes for
+     * @return true if a dead loop detected; false otherwise FIXME
      */
     private boolean checkDeadLoop(Object value) {
         int n = 0;
@@ -852,14 +844,14 @@ public class XMLEncoder extends Encoder 
             } else {
                 break;
             }
-            
+
             if (obj != null
                     && (obj.getClass().isAssignableFrom(value.getClass()))
                     && obj.equals(value)) {
                 n++;
 
                 if (n >= DEADLOCK_THRESHOLD) {
-                    //System.out.println("Dead loop hit!");
+                    // System.out.println("Dead loop hit!");
                     return true;
                 }
             }
@@ -868,48 +860,49 @@ public class XMLEncoder extends Encoder 
     }
 
     /**
-	 * Sets the owner of this encoder.
-	 * 
-	 * @param owner
-	 *            the owner to set
-	 */
-	public void setOwner(Object owner) {
-		this.owner = owner;
-	}
-
-	/**
-	 * Records the expression so that it can be written out later, then calls
-	 * super implementation.
-	 */
-	@Override
+     * Sets the owner of this encoder.
+     * 
+     * @param owner
+     *            the owner to set
+     */
+    public void setOwner(Object owner) {
+        this.owner = owner;
+    }
+
+    /**
+     * Records the expression so that it can be written out later, then calls
+     * super implementation.
+     */
+    @Override
     public void writeExpression(Expression oldExp) {
         if (null == oldExp) {
             throw new NullPointerException();
         }
-	    boolean oldWritingObject = writingObject;
-	    writingObject = true;
-		// get expression value
-		Object oldValue = null;
+        boolean oldWritingObject = writingObject;
+        writingObject = true;
+        // get expression value
+        Object oldValue = null;
 
         try {
-			oldValue = oldExp.getValue();
-		} catch (Exception e) {
-			getExceptionListener()
-					.exceptionThrown(
-							new Exception("failed to execute expression: " //$NON-NLS-1$
-									+ oldExp, e));
-			return;
-		}
-
-		// check existence
-		if (get(oldValue) != null && (!(oldValue instanceof String) || oldWritingObject))
{
-			return;
-		}
-
-		// record how the object is obtained
-		if (!isBasicType(oldValue) || (oldValue instanceof String && !oldWritingObject))
{
-			recordExpression(oldValue, oldExp);
-		}
+            oldValue = oldExp.getValue();
+        } catch (Exception e) {
+            getExceptionListener().exceptionThrown(
+                    new Exception("failed to execute expression: " //$NON-NLS-1$
+                            + oldExp, e));
+            return;
+        }
+
+        // check existence
+        if (get(oldValue) != null
+                && (!(oldValue instanceof String) || oldWritingObject)) {
+            return;
+        }
+
+        // record how the object is obtained
+        if (!isBasicType(oldValue)
+                || (oldValue instanceof String && !oldWritingObject)) {
+            recordExpression(oldValue, oldExp);
+        }
 
         // try to detect if we run into a dead loop
         if (checkDeadLoop(oldValue)) {
@@ -917,13 +910,13 @@ public class XMLEncoder extends Encoder 
         }
 
         super.writeExpression(oldExp);
-		writingObject = oldWritingObject;
-	}
+        writingObject = oldWritingObject;
+    }
 
-	/**
-	 * Records the object so that it can be written out later, then calls super
-	 * implementation.
-	 */
+    /**
+     * Records the object so that it can be written out later, then calls super
+     * implementation.
+     */
     @SuppressWarnings("unchecked")
     @Override
     public void writeObject(Object o) {
@@ -971,23 +964,21 @@ public class XMLEncoder extends Encoder 
         }
     }
 
-	/**
-	 * Records the statement so that it can be written out later, then calls
-	 * super implementation.
-	 */
-	@Override
+    /**
+     * Records the statement so that it can be written out later, then calls
+     * super implementation.
+     */
+    @Override
     public void writeStatement(Statement oldStat) {
-        if(null == oldStat) {
-            System.err.println("java.lang.Exception: XMLEncoder: discarding statement null");
+        if (null == oldStat) {
+            System.err
+                    .println("java.lang.Exception: XMLEncoder: discarding statement null");
             System.err.println("Continuing...");
             return;
         }
-		// record how the object is changed
-		recordStatement(oldStat);
-
-		super.writeStatement(oldStat);
-	}
-
-}
-
+        // record how the object is changed
+        recordStatement(oldStat);
 
+        super.writeStatement(oldStat);
+    }
+}
\ No newline at end of file

Modified: harmony/enhanced/java/trunk/classlib/modules/beans/src/main/java/org/apache/harmony/beans/BeansUtils.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/beans/src/main/java/org/apache/harmony/beans/BeansUtils.java?rev=1001187&r1=1001186&r2=1001187&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/beans/src/main/java/org/apache/harmony/beans/BeansUtils.java
(original)
+++ harmony/enhanced/java/trunk/classlib/modules/beans/src/main/java/org/apache/harmony/beans/BeansUtils.java
Sat Sep 25 10:13:23 2010
@@ -17,8 +17,35 @@
 
 package org.apache.harmony.beans;
 
+import java.lang.reflect.Method;
+import java.util.Arrays;
+
 public class BeansUtils {
 
+    public static final Object[] EMPTY_OBJECT_ARRAY = new Object[0];
+
+    public static final String NEW = "new"; //$NON-NLS-1$
+
+    public static final String NEWINSTANCE = "newInstance"; //$NON-NLS-1$
+
+    public static final String NEWARRAY = "newArray"; //$NON-NLS-1$
+
+    public static final String FORNAME = "forName"; //$NON-NLS-1$
+
+    public static final String GET = "get"; //$NON-NLS-1$
+
+    public static final String IS = "is"; //$NON-NLS-1$
+
+    public static final String SET = "set"; //$NON-NLS-1$
+
+    public static final String ADD = "add"; //$NON-NLS-1$
+
+    public static final String PUT = "put"; //$NON-NLS-1$
+
+    public static final String NULL = "null"; //$NON-NLS-1$
+
+    public static final String QUOTE = "\"\""; //$NON-NLS-1$
+
     public static final int getHashCode(Object obj) {
         return obj != null ? obj.hashCode() : 0;
     }
@@ -63,4 +90,33 @@ public class BeansUtils {
                 || (base == float.class) && (wrapper == Float.class)
                 || (base == double.class) && (wrapper == Double.class);
     }
+
+    private static final String EQUALS_METHOD = "equals";
+
+    private static final Class<?>[] EQUALS_PARAMETERS = new Class<?>[] { Object.class
};
+
+    public static boolean declaredEquals(Class<?> clazz) {
+        for (Method declaredMethod : clazz.getDeclaredMethods()) {
+            if (EQUALS_METHOD.equals(declaredMethod.getName())
+                    && Arrays.equals(declaredMethod.getParameterTypes(),
+                            EQUALS_PARAMETERS)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    public static String idOfClass(Class<?> clazz) {
+        Class<?> theClass = clazz;
+        StringBuilder sb = new StringBuilder();
+        if (theClass.isArray()) {
+            do {
+                sb.append("Array"); //$NON-NLS-1$
+                theClass = theClass.getComponentType();
+            } while (theClass.isArray());
+        }
+        String clazzName = theClass.getName();
+        clazzName = clazzName.substring(clazzName.lastIndexOf('.') + 1);
+        return clazzName + sb.toString();
+    }
 }



Mime
View raw message