You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by zh...@apache.org on 2010/09/30 03:58:38 UTC
svn commit: r1002929 -
/harmony/enhanced/java/branches/java6/classlib/modules/beans/src/main/java/java/beans/Encoder.java
Author: zhoukevin
Date: Thu Sep 30 01:58:37 2010
New Revision: 1002929
URL: http://svn.apache.org/viewvc?rev=1002929&view=rev
Log:
Refine java.beans.Encoder class based on the merge from trunk 1002511 at java6 r1002734, no functional changes.
Modified:
harmony/enhanced/java/branches/java6/classlib/modules/beans/src/main/java/java/beans/Encoder.java
Modified: harmony/enhanced/java/branches/java6/classlib/modules/beans/src/main/java/java/beans/Encoder.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/java6/classlib/modules/beans/src/main/java/java/beans/Encoder.java?rev=1002929&r1=1002928&r2=1002929&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/beans/src/main/java/java/beans/Encoder.java (original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/beans/src/main/java/java/beans/Encoder.java Thu Sep 30 01:58:37 2010
@@ -37,11 +37,9 @@ import java.awt.font.TextAttribute;
import java.lang.reflect.Field;
import java.lang.reflect.Method;
import java.lang.reflect.Proxy;
-import java.util.Collection;
import java.util.Date;
import java.util.Hashtable;
import java.util.IdentityHashMap;
-import java.util.Map;
import javax.swing.Box;
import javax.swing.DefaultComboBoxModel;
@@ -113,9 +111,9 @@ public class Encoder {
private IdentityHashMap<Object, Object> oldNewMap = new IdentityHashMap<Object, Object>();
- private static volatile boolean isInitilizedAWT;
+ private static volatile boolean isInitilizedAWT;
- private static volatile boolean isInitilizedSwing;
+ private static volatile boolean isInitilizedSwing;
/**
* Construct a new encoder.
@@ -189,17 +187,16 @@ public class Encoder {
if (type == null) {
return nullPD; // may be return a special PD?
}
-
- // checks for awt and swing classes
- if (!isInitilizedAWT
- && type.getName().startsWith("java.awt")) { //$NON-NLS-1$
- registerAwtPDs();
- isInitilizedAWT = true;
- } else if (!isInitilizedSwing
- && type.getName().startsWith("javax.swing")) { //$NON-NLS-1$
- registerSwingPDs();
- isInitilizedSwing = true;
- }
+
+ // checks for awt and swing classes
+ if (!isInitilizedAWT && type.getName().startsWith("java.awt")) { //$NON-NLS-1$
+ registerAwtPDs();
+ isInitilizedAWT = true;
+ } else if (!isInitilizedSwing
+ && type.getName().startsWith("javax.swing")) { //$NON-NLS-1$
+ registerSwingPDs();
+ isInitilizedSwing = true;
+ }
// registered delegate
PersistenceDelegate registeredPD = delegates.get(type);
@@ -249,48 +246,39 @@ public class Encoder {
return defaultPD;
}
- private static void registerSwingPDs() {
- delegates.put(Box.class, new SwingBoxPersistenceDelegate());
- delegates.put(JFrame.class, new SwingJFramePersistenceDelegate());
- delegates.put(JTabbedPane.class,
- new SwingJTabbedPanePersistenceDelegate());
- delegates.put(DefaultComboBoxModel.class,
- new SwingDefaultComboBoxModelPersistenceDelegate());
- delegates.put(ToolTipManager.class,
- new SwingToolTipManagerPersistenceDelegate());
-
- }
-
- private static void registerAwtPDs() {
- delegates.put(Choice.class, new AwtChoicePersistenceDelegate());
- delegates.put(Color.class, new AwtColorPersistenceDelegate());
- delegates.put(Container.class,
- new AwtContainerPersistenceDelegate());
- delegates.put(Component.class,
- new AwtComponentPersistenceDelegate());
- delegates.put(Cursor.class, new AwtCursorPersistenceDelegate());
- delegates.put(Dimension.class,
- new AwtDimensionPersistenceDelegate());
- delegates.put(Font.class, new AwtFontPersistenceDelegate());
- delegates.put(Insets.class, new AwtInsetsPersistenceDelegate());
- delegates.put(List.class, new AwtListPersistenceDelegate());
- delegates.put(Menu.class, new AwtMenuPersistenceDelegate());
- delegates.put(MenuBar.class, new AwtMenuBarPersistenceDelegate());
- delegates.put(MenuShortcut.class,
- new AwtMenuShortcutPersistenceDelegate());
- delegates.put(Point.class, new AwtPointPersistenceDelegate());
- delegates.put(Rectangle.class,
- new AwtRectanglePersistenceDelegate());
- delegates.put(SystemColor.class,
- new AwtSystemColorPersistenceDelegate());
- delegates.put(TextAttribute.class,
- new AwtFontTextAttributePersistenceDelegate());
- delegates.put(ScrollPane.class,
- new AwtScrollPanePersistenceDelegate());
- }
+ private static void registerSwingPDs() {
+ delegates.put(Box.class, new SwingBoxPersistenceDelegate());
+ delegates.put(JFrame.class, new SwingJFramePersistenceDelegate());
+ delegates.put(JTabbedPane.class,
+ new SwingJTabbedPanePersistenceDelegate());
+ delegates.put(DefaultComboBoxModel.class,
+ new SwingDefaultComboBoxModelPersistenceDelegate());
+ delegates.put(ToolTipManager.class,
+ new SwingToolTipManagerPersistenceDelegate());
+
+ }
- private void put(Object old, Object nu) {
- oldNewMap.put(old, nu);
+ private static void registerAwtPDs() {
+ delegates.put(Choice.class, new AwtChoicePersistenceDelegate());
+ delegates.put(Color.class, new AwtColorPersistenceDelegate());
+ delegates.put(Container.class, new AwtContainerPersistenceDelegate());
+ delegates.put(Component.class, new AwtComponentPersistenceDelegate());
+ delegates.put(Cursor.class, new AwtCursorPersistenceDelegate());
+ delegates.put(Dimension.class, new AwtDimensionPersistenceDelegate());
+ delegates.put(Font.class, new AwtFontPersistenceDelegate());
+ delegates.put(Insets.class, new AwtInsetsPersistenceDelegate());
+ delegates.put(List.class, new AwtListPersistenceDelegate());
+ delegates.put(Menu.class, new AwtMenuPersistenceDelegate());
+ delegates.put(MenuBar.class, new AwtMenuBarPersistenceDelegate());
+ delegates.put(MenuShortcut.class,
+ new AwtMenuShortcutPersistenceDelegate());
+ delegates.put(Point.class, new AwtPointPersistenceDelegate());
+ delegates.put(Rectangle.class, new AwtRectanglePersistenceDelegate());
+ delegates.put(SystemColor.class,
+ new AwtSystemColorPersistenceDelegate());
+ delegates.put(TextAttribute.class,
+ new AwtFontTextAttributePersistenceDelegate());
+ delegates.put(ScrollPane.class, new AwtScrollPanePersistenceDelegate());
}
/**
@@ -432,8 +420,7 @@ public class Encoder {
if (o == null) {
return;
}
- Class<?> type = o.getClass();
- getPersistenceDelegate(type).writeObject(o, this);
+ getPersistenceDelegate(o.getClass()).writeObject(o, this);
}
/**