You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by ml...@apache.org on 2006/06/08 05:40:30 UTC
svn commit: r412641 [1/32] - in
/incubator/harmony/enhanced/classlib/trunk/modules/beans/src:
main/java/java/beans/ main/java/java/beans/beancontext/
test/java-internal/java/beans/beancontext/
test/java/org/apache/harmony/beans/tests/ test/java/org/apa...
Author: mloenko
Date: Wed Jun 7 20:40:24 2006
New Revision: 412641
URL: http://svn.apache.org/viewvc?rev=412641&view=rev
Log:
fixing EOLs in beans sources and tests
Modified:
incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/java/beans/Encoder.java
incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/java/beans/PropertyEditorManager.java
incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/java/beans/beancontext/BeanContextServicesSupport.java
incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/java/beans/beancontext/BeanContextSupport.java
incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java-internal/java/beans/beancontext/BeanContextServicesSupportTest.java
incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java-internal/java/beans/beancontext/BeanContextSupportTest.java
incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/AllTests.java
incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/AllTests.java
incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/AppletInitializerTest.java
incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/BeanDescriptorTest.java
incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/BeanInfoTest.java
incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/BeansTest.java
incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/CustomizedPersistenceDelegateTest.java
incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/CustomizerTest.java
incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/DefaultPersistenceDelegateTest.java
incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/DesignModeTest.java
incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/EncoderTest.java
incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/EventHandlerTest.java
incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/EventSetDescriptorTest.java
incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/ExceptionListenerTest.java
incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/ExpressionTest.java
incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/FeatureDescriptorTest.java
incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/FozzzEditor.java
incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/IndexedPropertyDescriptorTest.java
incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/IntrospectionExceptionTest.java
incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/IntrospectorTest.java
incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/MethodDescriptorTest.java
incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/MockBean4Owner_Owner.java
incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/MockBean4Owner_Target.java
incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/MockBean4StaticField.java
incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/MockBean4StaticField_PD.java
incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/MockFakeEvent.java
incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/MockFooLabelBeanInfo.java
incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/MockJavaBean.java
incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/MockPropertyChangeEvent.java
incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/MockPropertyChangeListener.java
incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/ParameterDescriptorTest.java
incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/PersistenceDelegateTest.java
incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/PropertyChangeEventTest.java
incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/PropertyChangeListenerProxyTest.java
incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/PropertyChangeListenerTest.java
incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/PropertyChangeSupportTest.java
incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/PropertyDescriptorTest.java
incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/PropertyEditorManagerTest.java
incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/PropertyEditorSupportTest.java
incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/PropertyEditorTest.java
incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/PropertyVetoExceptionTest.java
incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/SimpleBeanInfoTest.java
incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/StatementTest.java
incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/VetoableChangeListenerProxyTest.java
incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/VetoableChangeListenerTest.java
incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/VetoableChangeSupportTest.java
incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/VisibilityTest.java
incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/XMLDecoderTest.java
incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/XMLEncoderTest.java
incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/beancontext/AllTests.java
incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/beancontext/BeanContextChildSupportTest.java
incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/beancontext/BeanContextEventTest.java
incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/beancontext/BeanContextMembershipEventTest.java
incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/beancontext/BeanContextServiceAvailableEventTest.java
incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/beancontext/BeanContextServiceRevokedEventTest.java
incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/beancontext/BeanContextServicesSupportTest.java
incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/beancontext/BeanContextSupportTest.java
incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/beancontext/InterfacesTest.java
incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/beancontext/MethodInvocationRecords.java
incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/beancontext/Utils.java
incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/beancontext/mock/MockBeanContext.java
incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/beancontext/mock/MockBeanContextChild.java
incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/beancontext/mock/MockBeanContextChildComponentProxy.java
incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/beancontext/mock/MockBeanContextChildDelegateS.java
incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/beancontext/mock/MockBeanContextChildS.java
incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/beancontext/mock/MockBeanContextContainerProxy.java
incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/beancontext/mock/MockBeanContextDelegateS.java
incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/beancontext/mock/MockBeanContextMembershipListener.java
incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/beancontext/mock/MockBeanContextMembershipListenerS.java
incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/beancontext/mock/MockBeanContextProxy.java
incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/beancontext/mock/MockBeanContextProxyS.java
incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/beancontext/mock/MockBeanContextServiceProvider.java
incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/beancontext/mock/MockBeanContextServiceProviderBeanInfo.java
incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/beancontext/mock/MockBeanContextServiceProviderS.java
incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/beancontext/mock/MockBeanContextServiceRevokedListener.java
incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/beancontext/mock/MockBeanContextServices.java
incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/beancontext/mock/MockBeanContextServicesListener.java
incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/beancontext/mock/MockBeanContextServicesListenerS.java
incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/beancontext/mock/MockPropertyChangeListener.java
incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/beancontext/mock/MockPropertyChangeListenerS.java
incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/beancontext/mock/MockVetoChangeListener.java
incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/beancontext/mock/MockVetoableChangeListener.java
incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/beancontext/mock/MockVetoableChangeListenerS.java
incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/beancontext/mock/MockVisibility.java
incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/mock/FakeFox.java
incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/mock/FakeFox01.java
incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/mock/FakeFox011.java
incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/mock/FakeFox01BeanInfo.java
incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/mock/FakeFox02.java
incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/mock/FakeFox02BeanInfo.java
incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/mock/Foz.java
incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/mock/FozDefault.java
incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/mock/Fozz.java
incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/mock/FozzEditor.java
incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/mock/Fozzz.java
incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/mock/MockAppletBean.java
incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/mock/MockAppletBean2.java
incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/mock/MockAppletInitializer.java
incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/mock/MockBean4Codec.java
incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/mock/MockBean4CodecAdv.java
incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/mock/MockBean4CodecBadGetter.java
incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/mock/MockBean4CodecBadSetter.java
incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/mock/MockBean4CodecPrimitives.java
incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/mock/MockBeanListener2.java
incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/mock/MockButton.java
incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/mock/MockExceptionListener.java
incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/mock/MockFakeListener.java
incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/mock/MockFoo.java
incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/mock/MockFoo2.java
incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/mock/MockFoo2BeanInfo.java
incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/mock/MockFoo2Parent.java
incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/mock/MockFoo2ParentBeanInfo.java
incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/mock/MockFooBeanInfo.java
incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/mock/MockFooButton.java
incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/mock/MockFooChild.java
incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/mock/MockFooChildBeanInfo.java
incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/mock/MockFooLabel.java
incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/mock/MockFooLiYang.java
incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/mock/MockFooLiYangBeanInfo.java
incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/mock/MockFooStop.java
incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/mock/MockFooSub.java
incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/mock/MockFooSubBeanInfo.java
incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/mock/MockFooSubSub.java
incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/mock/MockPropertyChangeEvent.java
incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/mock/MockPropertyChangeListener2.java
incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/mock/MockSimpleBeanInfo.java
incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/mock/NonSerializedVCListener.java
incubator/harmony/enhanced/classlib/trunk/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/mock/SerializedVCListener.java
Modified: incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/java/beans/Encoder.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/java/beans/Encoder.java?rev=412641&r1=412640&r2=412641&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/java/beans/Encoder.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/java/beans/Encoder.java Wed Jun 7 20:40:24 2006
@@ -1,309 +1,309 @@
-/*
- * Copyright 2005 The Apache Software Foundation or its licensors, as applicable.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/**
- * @author Maxim V. Berkultsev
- * @version $Revision: 1.14.6.4 $
- */
-package java.beans;
-
-import java.util.HashMap;
-import java.util.Vector;
-
-import org.apache.harmony.beans.NullPersistenceDelegate;
-import org.apache.harmony.beans.ObjectNode;
-import org.apache.harmony.beans.DefaultPersistenceDelegatesFactory;
-
-/**
- * @author Maxim V. Berkultsev
- * @version $Revision: 1.14.6.4 $
- */
-
-public class Encoder {
-
- private ExceptionListener exceptionListener = null;
- private HashMap<Class, PersistenceDelegate> persistenceDelegates =
- new HashMap<Class, PersistenceDelegate>();
-
- Vector<Object> roots = new Vector<Object>();
- HashMap<Object, ObjectNode> nodes = new HashMap<Object, ObjectNode>();
-
- /**
- * @com.intel.drl.spec_ref
- */
- public Encoder() {}
-
- /**
- * @com.intel.drl.spec_ref
- */
- public Object get(Object oldInstance) {
- if(oldInstance == null) {
- return null;
- }
-
- ObjectNode node = (ObjectNode) nodes.get(oldInstance);
- Object result = getValue(node);
- return result;
- }
-
- /**
- * @com.intel.drl.spec_ref
- */
- public Object remove(Object oldInstance) {
- //TODO - notify references on node deletion
- if(oldInstance == null) {
- return null;
- }
-
- ObjectNode node = (ObjectNode) nodes.remove(oldInstance);
- return getValue(node);
- }
-
- /**
- * @com.intel.drl.spec_ref
- */
- public PersistenceDelegate getPersistenceDelegate(Class<?> type) {
- PersistenceDelegate result =
- (PersistenceDelegate) persistenceDelegates.get(type);
-
- if(result == null) {
- result = DefaultPersistenceDelegatesFactory.getPersistenceDelegate(
- type);
- }
-
- return result;
- }
-
- /**
- * @com.intel.drl.spec_ref
- */
- public void setPersistenceDelegate(Class<?> type,
- PersistenceDelegate persistenceDelegate) {
- persistenceDelegates.put(type, persistenceDelegate);
- }
-
- /**
- * @com.intel.drl.spec_ref
- */
- protected void writeObject(Object object) {
- roots.add(object);
- doWriteObject(object);
- }
-
- void doWriteObject(Object object) {
- PersistenceDelegate pd = (object != null) ?
- getPersistenceDelegate(object.getClass()) :
- new NullPersistenceDelegate();
-
- if(pd == null) {
- pd = new DefaultPersistenceDelegate();
- }
-
- pd.writeObject(object, this);
- }
-
- /**
- * @com.intel.drl.spec_ref
- */
- public void writeStatement(Statement oldStm) {
- ObjectNode node = (ObjectNode) nodes.get(oldStm.getTarget());
- if(node != null) {
- try {
- Object[] oldArgs = oldStm.getArguments();
- Object[] newArgs = write(oldArgs);
-
- Statement statement = new Statement(node.getObjectValue(),
- oldStm.getMethodName(), oldArgs);
- node.addStatement(statement);
- } catch (Exception e) {
- getExceptionListener().exceptionThrown(e);
- }
- } else {
- System.out.println("no node is found for statement with target = "
- + oldStm.getTarget());
- }
- }
-
- /**
- * @com.intel.drl.spec_ref
- */
- public void writeExpression(Expression oldExp) {
- try {
- Object oldInstance = oldExp.getValue();
-
- ObjectNode node = null;
- Class type = null;
-
- if(oldInstance != null) {
- type = oldInstance.getClass();
- node = (ObjectNode) nodes.get(oldInstance);
- }
-
- if(node == null) {
- if(isNull(type) || isPrimitive(type) || isString(type)
- || isClass(type)) {
- node = new ObjectNode(oldExp);
- } else {
- write(oldExp.getArguments());
- node = new ObjectNode(oldExp, nodes);
- }
-
- nodes.put(oldInstance, node);
-
- // if an expression is not a constructor
- if(!(oldExp.getTarget() instanceof Class)) {
- ObjectNode parent = (ObjectNode) nodes.get(
- oldExp.getTarget());
- parent.addExpression(oldExp);
- }
- } else if(oldExp.getMethodName().equals("new")) {
- node.addReference();
- } else {
- node.addReferencedExpression(oldExp);
- }
- } catch (Exception e) {
- // TODO - remove written args
- getExceptionListener().exceptionThrown(e);
- }
- }
-
- /**
- * @com.intel.drl.spec_ref
- */
- public void setExceptionListener(ExceptionListener exceptionListener) {
- this.exceptionListener = exceptionListener;
- }
-
- /**
- * @com.intel.drl.spec_ref
- */
- public ExceptionListener getExceptionListener() {
- if(exceptionListener == null) {
- exceptionListener = new ExceptionListener() {
- public void exceptionThrown(Exception e) {
- System.out.println(e.getClass() + ": " + e.getMessage());
- }
- };
- }
-
- return exceptionListener;
- }
-
- private Object write(Object oldInstance) throws Exception {
- if(oldInstance == null) {
- return null;
- }
-
- ObjectNode node = (ObjectNode) nodes.get(oldInstance);
- if(node == null) {
- Class type = oldInstance.getClass();
-
- if(isPrimitive(type) || isString(type) || isClass(type)) {
- Expression expr = new Expression(type, "new",
- new Object[] { oldInstance });
- nodes.put(oldInstance, new ObjectNode(expr));
- } else {
- doWriteObject(oldInstance);
- }
-
- node = (ObjectNode) nodes.get(oldInstance);
- } else {
- node.addReference();
- }
-
- return node.getObjectValue();
- }
-
- private Object[] write(Object[] oldInstances) throws Exception {
- if(oldInstances != null) {
- Object[] newInstances = new Object[oldInstances.length];
-
- for(int i = 0; i < oldInstances.length; ++i) {
- newInstances[i] = write(oldInstances[i]);
- }
-
- return newInstances;
- }
-
- return null;
- }
-
- private Object getValue(ObjectNode node) {
- if(node != null) {
- try {
- Object result = node.getObjectValue();
- return result;
- } catch (Exception e) {
- getExceptionListener().exceptionThrown(e);
- }
- }
-
- return null;
- }
-
- static boolean isNull(Class type) {
- return (type == null);
- }
-
- static boolean isPrimitive(Class type) {
- return (type == Boolean.class) || (type == Byte.class) ||
- (type == Character.class) || (type == Double.class) ||
- (type == Float.class) || (type == Integer.class) ||
- (type == Long.class) || (type == Short.class);
- }
-
- static boolean isString(Class type) {
- return (type == String.class);
-
- }
-
- static boolean isClass(Class type) {
- return (type == Class.class);
- }
-
-
- static boolean isArray(Class type) {
- return type.isArray();
- }
-
- static String getPrimitiveName(Class type) {
- String result = null;
-
- if(type == Boolean.class) {
- result = "boolean";
- } else if(type == Byte.class) {
- result = "byte";
- } else if(type == Character.class) {
- result = "char";
- } else if(type == Double.class) {
- result = "double";
- } else if(type == Float.class) {
- result = "float";
- } else if(type == Integer.class) {
- result = "int";
- } else if(type == Long.class) {
- result = "long";
- } else if(type == Short.class) {
- result = "short";
- } else if(type == String.class) {
- result = "string";
- } else if(type == Class.class) {
- result = "class";
- }
-
- return result;
- }
-}
+/*
+ * Copyright 2005 The Apache Software Foundation or its licensors, as applicable.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * @author Maxim V. Berkultsev
+ * @version $Revision: 1.14.6.4 $
+ */
+package java.beans;
+
+import java.util.HashMap;
+import java.util.Vector;
+
+import org.apache.harmony.beans.NullPersistenceDelegate;
+import org.apache.harmony.beans.ObjectNode;
+import org.apache.harmony.beans.DefaultPersistenceDelegatesFactory;
+
+/**
+ * @author Maxim V. Berkultsev
+ * @version $Revision: 1.14.6.4 $
+ */
+
+public class Encoder {
+
+ private ExceptionListener exceptionListener = null;
+ private HashMap<Class, PersistenceDelegate> persistenceDelegates =
+ new HashMap<Class, PersistenceDelegate>();
+
+ Vector<Object> roots = new Vector<Object>();
+ HashMap<Object, ObjectNode> nodes = new HashMap<Object, ObjectNode>();
+
+ /**
+ * @com.intel.drl.spec_ref
+ */
+ public Encoder() {}
+
+ /**
+ * @com.intel.drl.spec_ref
+ */
+ public Object get(Object oldInstance) {
+ if(oldInstance == null) {
+ return null;
+ }
+
+ ObjectNode node = (ObjectNode) nodes.get(oldInstance);
+ Object result = getValue(node);
+ return result;
+ }
+
+ /**
+ * @com.intel.drl.spec_ref
+ */
+ public Object remove(Object oldInstance) {
+ //TODO - notify references on node deletion
+ if(oldInstance == null) {
+ return null;
+ }
+
+ ObjectNode node = (ObjectNode) nodes.remove(oldInstance);
+ return getValue(node);
+ }
+
+ /**
+ * @com.intel.drl.spec_ref
+ */
+ public PersistenceDelegate getPersistenceDelegate(Class<?> type) {
+ PersistenceDelegate result =
+ (PersistenceDelegate) persistenceDelegates.get(type);
+
+ if(result == null) {
+ result = DefaultPersistenceDelegatesFactory.getPersistenceDelegate(
+ type);
+ }
+
+ return result;
+ }
+
+ /**
+ * @com.intel.drl.spec_ref
+ */
+ public void setPersistenceDelegate(Class<?> type,
+ PersistenceDelegate persistenceDelegate) {
+ persistenceDelegates.put(type, persistenceDelegate);
+ }
+
+ /**
+ * @com.intel.drl.spec_ref
+ */
+ protected void writeObject(Object object) {
+ roots.add(object);
+ doWriteObject(object);
+ }
+
+ void doWriteObject(Object object) {
+ PersistenceDelegate pd = (object != null) ?
+ getPersistenceDelegate(object.getClass()) :
+ new NullPersistenceDelegate();
+
+ if(pd == null) {
+ pd = new DefaultPersistenceDelegate();
+ }
+
+ pd.writeObject(object, this);
+ }
+
+ /**
+ * @com.intel.drl.spec_ref
+ */
+ public void writeStatement(Statement oldStm) {
+ ObjectNode node = (ObjectNode) nodes.get(oldStm.getTarget());
+ if(node != null) {
+ try {
+ Object[] oldArgs = oldStm.getArguments();
+ Object[] newArgs = write(oldArgs);
+
+ Statement statement = new Statement(node.getObjectValue(),
+ oldStm.getMethodName(), oldArgs);
+ node.addStatement(statement);
+ } catch (Exception e) {
+ getExceptionListener().exceptionThrown(e);
+ }
+ } else {
+ System.out.println("no node is found for statement with target = "
+ + oldStm.getTarget());
+ }
+ }
+
+ /**
+ * @com.intel.drl.spec_ref
+ */
+ public void writeExpression(Expression oldExp) {
+ try {
+ Object oldInstance = oldExp.getValue();
+
+ ObjectNode node = null;
+ Class type = null;
+
+ if(oldInstance != null) {
+ type = oldInstance.getClass();
+ node = (ObjectNode) nodes.get(oldInstance);
+ }
+
+ if(node == null) {
+ if(isNull(type) || isPrimitive(type) || isString(type)
+ || isClass(type)) {
+ node = new ObjectNode(oldExp);
+ } else {
+ write(oldExp.getArguments());
+ node = new ObjectNode(oldExp, nodes);
+ }
+
+ nodes.put(oldInstance, node);
+
+ // if an expression is not a constructor
+ if(!(oldExp.getTarget() instanceof Class)) {
+ ObjectNode parent = (ObjectNode) nodes.get(
+ oldExp.getTarget());
+ parent.addExpression(oldExp);
+ }
+ } else if(oldExp.getMethodName().equals("new")) {
+ node.addReference();
+ } else {
+ node.addReferencedExpression(oldExp);
+ }
+ } catch (Exception e) {
+ // TODO - remove written args
+ getExceptionListener().exceptionThrown(e);
+ }
+ }
+
+ /**
+ * @com.intel.drl.spec_ref
+ */
+ public void setExceptionListener(ExceptionListener exceptionListener) {
+ this.exceptionListener = exceptionListener;
+ }
+
+ /**
+ * @com.intel.drl.spec_ref
+ */
+ public ExceptionListener getExceptionListener() {
+ if(exceptionListener == null) {
+ exceptionListener = new ExceptionListener() {
+ public void exceptionThrown(Exception e) {
+ System.out.println(e.getClass() + ": " + e.getMessage());
+ }
+ };
+ }
+
+ return exceptionListener;
+ }
+
+ private Object write(Object oldInstance) throws Exception {
+ if(oldInstance == null) {
+ return null;
+ }
+
+ ObjectNode node = (ObjectNode) nodes.get(oldInstance);
+ if(node == null) {
+ Class type = oldInstance.getClass();
+
+ if(isPrimitive(type) || isString(type) || isClass(type)) {
+ Expression expr = new Expression(type, "new",
+ new Object[] { oldInstance });
+ nodes.put(oldInstance, new ObjectNode(expr));
+ } else {
+ doWriteObject(oldInstance);
+ }
+
+ node = (ObjectNode) nodes.get(oldInstance);
+ } else {
+ node.addReference();
+ }
+
+ return node.getObjectValue();
+ }
+
+ private Object[] write(Object[] oldInstances) throws Exception {
+ if(oldInstances != null) {
+ Object[] newInstances = new Object[oldInstances.length];
+
+ for(int i = 0; i < oldInstances.length; ++i) {
+ newInstances[i] = write(oldInstances[i]);
+ }
+
+ return newInstances;
+ }
+
+ return null;
+ }
+
+ private Object getValue(ObjectNode node) {
+ if(node != null) {
+ try {
+ Object result = node.getObjectValue();
+ return result;
+ } catch (Exception e) {
+ getExceptionListener().exceptionThrown(e);
+ }
+ }
+
+ return null;
+ }
+
+ static boolean isNull(Class type) {
+ return (type == null);
+ }
+
+ static boolean isPrimitive(Class type) {
+ return (type == Boolean.class) || (type == Byte.class) ||
+ (type == Character.class) || (type == Double.class) ||
+ (type == Float.class) || (type == Integer.class) ||
+ (type == Long.class) || (type == Short.class);
+ }
+
+ static boolean isString(Class type) {
+ return (type == String.class);
+
+ }
+
+ static boolean isClass(Class type) {
+ return (type == Class.class);
+ }
+
+
+ static boolean isArray(Class type) {
+ return type.isArray();
+ }
+
+ static String getPrimitiveName(Class type) {
+ String result = null;
+
+ if(type == Boolean.class) {
+ result = "boolean";
+ } else if(type == Byte.class) {
+ result = "byte";
+ } else if(type == Character.class) {
+ result = "char";
+ } else if(type == Double.class) {
+ result = "double";
+ } else if(type == Float.class) {
+ result = "float";
+ } else if(type == Integer.class) {
+ result = "int";
+ } else if(type == Long.class) {
+ result = "long";
+ } else if(type == Short.class) {
+ result = "short";
+ } else if(type == String.class) {
+ result = "string";
+ } else if(type == Class.class) {
+ result = "class";
+ }
+
+ return result;
+ }
+}
Modified: incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/java/beans/PropertyEditorManager.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/java/beans/PropertyEditorManager.java?rev=412641&r1=412640&r2=412641&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/java/beans/PropertyEditorManager.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/beans/src/main/java/java/beans/PropertyEditorManager.java Wed Jun 7 20:40:24 2006
@@ -1,133 +1,133 @@
-/*
- * Copyright 2005 The Apache Software Foundation or its licensors, as applicable.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/**
- * @author Maxim V. Berkultsev
- * @version $Revision: 1.6.6.4 $
- */
-package java.beans;
-
-import java.util.HashMap;
-
-/**
- * @author Maxim V. Berkultsev
- * @version $Revision: 1.6.6.4 $
- */
-
-public class PropertyEditorManager {
-
- private static String[] path = {"org.apache.harmony.beans.editors"};
- private static HashMap<Class, Class> registeredEditors = new HashMap<Class, Class>();
-
- /**
- */
- public PropertyEditorManager() {
- }
-
- /**
- * @com.intel.drl.spec_ref
- */
- public static void registerEditor(Class<?> targetType, Class<?> editorClass) {
- if (targetType == null) {
- throw new NullPointerException();
- }
-
- SecurityManager sm = System.getSecurityManager();
- if (sm != null) {
- sm.checkPropertiesAccess();
- }
- if (editorClass != null) {
- registeredEditors.put(targetType, editorClass);
- } else {
- registeredEditors.remove(targetType);
- }
- }
-
- /**
- * @com.intel.drl.spec_ref
- */
- public static synchronized PropertyEditor findEditor(Class<?> targetType) {
- if (targetType == null) {
- throw new NullPointerException();
- }
-
- Class editorClass = null;
- PropertyEditor editor = null;
-
- editorClass = (Class) registeredEditors.get(targetType);
-
- if (editorClass == null) {
- String editorClassName = targetType.getName() + "Editor";
- ClassLoader loader = targetType.getClassLoader();
-
- if (loader == null) {
- loader = Thread.currentThread().getContextClassLoader();
- }
-
- try {
- editorClass = Class.forName(editorClassName, true, loader);
- } catch (ClassNotFoundException cnfe) {
- String shortEditorClassName = editorClassName
- .substring(editorClassName.lastIndexOf(".") + 1);
-
- if (targetType.isPrimitive()) {
- shortEditorClassName = shortEditorClassName.substring(0, 1)
- .toUpperCase()
- + shortEditorClassName.substring(1);
- }
-
- for (int i = 0; i < path.length; ++i) {
- editorClassName = path[i] + "." + shortEditorClassName;
-
- try {
- editorClass = Class.forName(editorClassName, true,
- loader);
- } catch (ClassNotFoundException cnfe2) {} catch (Exception e) {
- break;
- }
- }
- } catch (Exception e) {}
- }
-
- if (editorClass != null) {
- try {
- editor = (PropertyEditor) editorClass.newInstance();
- } catch (Exception e) {}
- }
-
- return editor;
- }
-
- /**
- * @com.intel.drl.spec_ref
- */
- public static synchronized void setEditorSearchPath(String[] apath) {
- SecurityManager sm = System.getSecurityManager();
-
- if (sm != null) {
- sm.checkPropertiesAccess();
- }
-
- path = apath;
- }
-
- /**
- * @com.intel.drl.spec_ref
- */
- public static synchronized String[] getEditorSearchPath() {
- return path;
- }
-}
+/*
+ * Copyright 2005 The Apache Software Foundation or its licensors, as applicable.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * @author Maxim V. Berkultsev
+ * @version $Revision: 1.6.6.4 $
+ */
+package java.beans;
+
+import java.util.HashMap;
+
+/**
+ * @author Maxim V. Berkultsev
+ * @version $Revision: 1.6.6.4 $
+ */
+
+public class PropertyEditorManager {
+
+ private static String[] path = {"org.apache.harmony.beans.editors"};
+ private static HashMap<Class, Class> registeredEditors = new HashMap<Class, Class>();
+
+ /**
+ */
+ public PropertyEditorManager() {
+ }
+
+ /**
+ * @com.intel.drl.spec_ref
+ */
+ public static void registerEditor(Class<?> targetType, Class<?> editorClass) {
+ if (targetType == null) {
+ throw new NullPointerException();
+ }
+
+ SecurityManager sm = System.getSecurityManager();
+ if (sm != null) {
+ sm.checkPropertiesAccess();
+ }
+ if (editorClass != null) {
+ registeredEditors.put(targetType, editorClass);
+ } else {
+ registeredEditors.remove(targetType);
+ }
+ }
+
+ /**
+ * @com.intel.drl.spec_ref
+ */
+ public static synchronized PropertyEditor findEditor(Class<?> targetType) {
+ if (targetType == null) {
+ throw new NullPointerException();
+ }
+
+ Class editorClass = null;
+ PropertyEditor editor = null;
+
+ editorClass = (Class) registeredEditors.get(targetType);
+
+ if (editorClass == null) {
+ String editorClassName = targetType.getName() + "Editor";
+ ClassLoader loader = targetType.getClassLoader();
+
+ if (loader == null) {
+ loader = Thread.currentThread().getContextClassLoader();
+ }
+
+ try {
+ editorClass = Class.forName(editorClassName, true, loader);
+ } catch (ClassNotFoundException cnfe) {
+ String shortEditorClassName = editorClassName
+ .substring(editorClassName.lastIndexOf(".") + 1);
+
+ if (targetType.isPrimitive()) {
+ shortEditorClassName = shortEditorClassName.substring(0, 1)
+ .toUpperCase()
+ + shortEditorClassName.substring(1);
+ }
+
+ for (int i = 0; i < path.length; ++i) {
+ editorClassName = path[i] + "." + shortEditorClassName;
+
+ try {
+ editorClass = Class.forName(editorClassName, true,
+ loader);
+ } catch (ClassNotFoundException cnfe2) {} catch (Exception e) {
+ break;
+ }
+ }
+ } catch (Exception e) {}
+ }
+
+ if (editorClass != null) {
+ try {
+ editor = (PropertyEditor) editorClass.newInstance();
+ } catch (Exception e) {}
+ }
+
+ return editor;
+ }
+
+ /**
+ * @com.intel.drl.spec_ref
+ */
+ public static synchronized void setEditorSearchPath(String[] apath) {
+ SecurityManager sm = System.getSecurityManager();
+
+ if (sm != null) {
+ sm.checkPropertiesAccess();
+ }
+
+ path = apath;
+ }
+
+ /**
+ * @com.intel.drl.spec_ref
+ */
+ public static synchronized String[] getEditorSearchPath() {
+ return path;
+ }
+}