You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by qi...@apache.org on 2008/11/27 06:10:42 UTC
svn commit: r721077 [2/12] - in /harmony/enhanced/classlib/branches/java6:
./ depends/files/ depends/jars/ depends/manifests/asm-3.1/
depends/manifests/asm-3.1/META-INF/ depends/manifests/bcel-5.2/ make/
modules/accessibility/ modules/accessibility/src...
Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/test/impl/boot/java/awt/Tools.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/test/impl/boot/java/awt/Tools.java?rev=721077&r1=721076&r2=721077&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/test/impl/boot/java/awt/Tools.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/test/impl/boot/java/awt/Tools.java Wed Nov 26 21:10:32 2008
@@ -459,14 +459,14 @@
public static class File {
public static String changeExt(String file, String newExt) {
- int k = file.lastIndexOf(".");
+ int k = file.lastIndexOf('.');
return file.substring(0, k) + newExt;
}
public static String extractFileName(String file) {
int k;
- if ((k = file.lastIndexOf("/")) == -1) {
- if ((k = file.lastIndexOf("\\")) == -1) {
+ if ((k = file.lastIndexOf('/')) == -1) {
+ if ((k = file.lastIndexOf('\\')) == -1) {
k = 1;
}
}
@@ -474,7 +474,7 @@
}
public static String extractFileExt(String file) {
- int k = file.lastIndexOf(".");
+ int k = file.lastIndexOf('.');
return file.substring(k + 1);
}
Modified: harmony/enhanced/classlib/branches/java6/modules/awt/src/test/impl/boot/java/awt/datatransfer/DataFlavorRTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/awt/src/test/impl/boot/java/awt/datatransfer/DataFlavorRTest.java?rev=721077&r1=721076&r2=721077&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/awt/src/test/impl/boot/java/awt/datatransfer/DataFlavorRTest.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/awt/src/test/impl/boot/java/awt/datatransfer/DataFlavorRTest.java Wed Nov 26 21:10:32 2008
@@ -32,35 +32,29 @@
public class DataFlavorRTest extends TestCase {
- public void testSerializeDefaultDataFlavor() {
+ public void testSerializeDefaultDataFlavor() throws IOException,
+ ClassNotFoundException {
DataFlavor flavor = new DataFlavor();
- DataFlavor restored = (DataFlavor)writeAndRead(flavor);
+ DataFlavor restored = (DataFlavor) writeAndRead(flavor);
assertEquals(restored, flavor);
}
-
- private Serializable writeAndRead(Serializable original) {
-
- try {
- File tempFile = File.createTempFile("save", ".object");
-
- FileOutputStream fos = new FileOutputStream(tempFile);
-
- ObjectOutputStream oos = new ObjectOutputStream(fos);
- oos.writeObject(original);
- oos.close();
-
- FileInputStream fis = new FileInputStream(tempFile);
- ObjectInputStream ois = new ObjectInputStream(fis);
-
- Serializable restored = (Serializable) ois.readObject();
- tempFile.delete();
- return restored;
- } catch (IOException e) {
- throw new RuntimeException(e);
- } catch (ClassNotFoundException e) {
- throw new RuntimeException(e);
- }
+ private Serializable writeAndRead(Serializable original)
+ throws IOException, ClassNotFoundException {
+ File tempFile = File.createTempFile("save", ".object");
+ tempFile.deleteOnExit();
+
+ FileOutputStream fos = new FileOutputStream(tempFile);
+
+ ObjectOutputStream oos = new ObjectOutputStream(fos);
+ oos.writeObject(original);
+ oos.close();
+
+ FileInputStream fis = new FileInputStream(tempFile);
+ ObjectInputStream ois = new ObjectInputStream(fis);
+
+ Serializable restored = (Serializable) ois.readObject();
+ ois.close();
+ return restored;
}
-
}
\ No newline at end of file
Modified: harmony/enhanced/classlib/branches/java6/modules/beans/.classpath
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/beans/.classpath?rev=721077&r1=721076&r2=721077&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/beans/.classpath (original)
+++ harmony/enhanced/classlib/branches/java6/modules/beans/.classpath Wed Nov 26 21:10:32 2008
@@ -6,6 +6,6 @@
<classpathentry kind="src" output="bin/test-internal" path="src/test/java-internal"/>
<classpathentry kind="src" path="src/test/resources"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="var" path="JUNIT_HOME/junit.jar" sourcepath="JUNIT_SRC_HOME/junitsrc.zip"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
<classpathentry kind="output" path="bin/main"/>
</classpath>
Modified: harmony/enhanced/classlib/branches/java6/modules/beans/src/main/java/java/beans/BeanDescriptor.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/beans/src/main/java/java/beans/BeanDescriptor.java?rev=721077&r1=721076&r2=721077&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/beans/src/main/java/java/beans/BeanDescriptor.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/beans/src/main/java/java/beans/BeanDescriptor.java Wed Nov 26 21:10:32 2008
@@ -104,7 +104,7 @@
if (leguminaClass != null) {
String beanClassName = leguminaClass.getName();
- int idx = beanClassName.lastIndexOf("."); //$NON-NLS-1$
+ int idx = beanClassName.lastIndexOf('.');
result = (idx == -1) ? beanClassName : beanClassName
.substring(idx + 1);
Modified: harmony/enhanced/classlib/branches/java6/modules/beans/src/main/java/java/beans/EventSetDescriptor.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/beans/src/main/java/java/beans/EventSetDescriptor.java?rev=721077&r1=721076&r2=721077&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/beans/src/main/java/java/beans/EventSetDescriptor.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/beans/src/main/java/java/beans/EventSetDescriptor.java Wed Nov 26 21:10:32 2008
@@ -342,7 +342,7 @@
throws IntrospectionException {
String expectedListenerTypeName = listenerType.getName();
expectedListenerTypeName = expectedListenerTypeName
- .substring(expectedListenerTypeName.lastIndexOf(".") + 1); //$NON-NLS-1$
+ .substring(expectedListenerTypeName.lastIndexOf('.') + 1);
Method method = null;
Method[] methods = sourceClass.getMethods();
for (Method m : methods) {
Modified: harmony/enhanced/classlib/branches/java6/modules/beans/src/main/java/java/beans/IntrospectionException.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/beans/src/main/java/java/beans/IntrospectionException.java?rev=721077&r1=721076&r2=721077&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/beans/src/main/java/java/beans/IntrospectionException.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/beans/src/main/java/java/beans/IntrospectionException.java Wed Nov 26 21:10:32 2008
@@ -19,7 +19,7 @@
public class IntrospectionException extends Exception {
- static final long serialVersionUID = -3728150539969542619L;
+ private static final long serialVersionUID = -3728150539969542619L;
public IntrospectionException(String message) {
super(message);
Modified: harmony/enhanced/classlib/branches/java6/modules/beans/src/main/java/java/beans/StandardBeanInfo.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/beans/src/main/java/java/beans/StandardBeanInfo.java?rev=721077&r1=721076&r2=721077&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/beans/src/main/java/java/beans/StandardBeanInfo.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/beans/src/main/java/java/beans/StandardBeanInfo.java Wed Nov 26 21:10:32 2008
@@ -968,16 +968,11 @@
// Both normal getter and setter of the same type were defined;
// no indexed getter/setter *PAIR* of the other type defined
if (normalGetter != null && normalSetter != null &&
- (indexedGetter == null || indexedSetter == null) &&
- normalPropType != indexedPropType) {
-// String tag = normalPropType.isArray() ?
-// STR_INDEXED : STR_NORMAL;
- String tag = STR_NORMAL;
-
- table.put(tag, STR_VALID);
- table.put(tag + PREFIX_GET, normalGetter);
- table.put(tag + PREFIX_SET, normalSetter);
- table.put(tag + STR_PROPERTY_TYPE, normalPropType);
+ (indexedGetter == null || indexedSetter == null)) {
+ table.put(STR_NORMAL, STR_VALID);
+ table.put(STR_NORMAL + PREFIX_GET, normalGetter);
+ table.put(STR_NORMAL + PREFIX_SET, normalSetter);
+ table.put(STR_NORMAL + STR_PROPERTY_TYPE, normalPropType);
continue;
}
@@ -986,14 +981,10 @@
// getters & setters defined
if ((normalGetter != null || normalSetter != null) &&
indexedGetter == null && indexedSetter == null) {
-// String tag = normalPropType.isArray() ?
-// STR_INDEXED : STR_NORMAL;
- String tag = STR_NORMAL;
-
- table.put(tag, STR_VALID);
- table.put(tag + PREFIX_GET, normalGetter);
- table.put(tag + PREFIX_SET, normalSetter);
- table.put(tag + STR_PROPERTY_TYPE, normalPropType);
+ table.put(STR_NORMAL, STR_VALID);
+ table.put(STR_NORMAL + PREFIX_GET, normalGetter);
+ table.put(STR_NORMAL + PREFIX_SET, normalSetter);
+ table.put(STR_NORMAL + STR_PROPERTY_TYPE, normalPropType);
continue;
}
@@ -1030,6 +1021,18 @@
indexedPropType);
continue;
}
+
+ // RULE5
+ // Both indexed getter and setter methods are defined
+ // no normal getter/setter *PAIR* of the other type defined
+ if ((normalSetter != null || normalGetter != null)
+ && indexedGetter != null && indexedSetter != null) {
+ table.put(STR_INDEXED, STR_VALID);
+ table.put(STR_INDEXED + PREFIX_GET, indexedGetter);
+ table.put(STR_INDEXED + PREFIX_SET, indexedSetter);
+ table.put(STR_INDEXED + STR_PROPERTY_TYPE, indexedPropType);
+ continue;
+ }
// default rule - invalid property
table.put(STR_NORMAL, STR_INVALID);
Modified: harmony/enhanced/classlib/branches/java6/modules/beans/src/main/java/java/beans/XMLEncoder.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/beans/src/main/java/java/beans/XMLEncoder.java?rev=721077&r1=721076&r2=721077&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/beans/src/main/java/java/beans/XMLEncoder.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/beans/src/main/java/java/beans/XMLEncoder.java Wed Nov 26 21:10:32 2008
@@ -32,7 +32,7 @@
import java.util.List;
/**
- * <code>XMLEncoder</code> exnteds <code>Encoder</code> to write out the
+ * <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>
@@ -102,7 +102,7 @@
* Construct a <code>XMLEncoder</code>.
*
* @param out
- * the output stream where xml is writtern to
+ * the output stream where xml is written to
*/
public XMLEncoder(OutputStream out) {
if (null != out) {
@@ -136,7 +136,7 @@
* Writes out all objects since last flush to the output stream.
* <p>
* The implementation write the xml header first if it has not been
- * writtern. Then all pending objects since last flush are writtern.
+ * written. Then all pending objects since last flush are written.
* </p>
*/
@SuppressWarnings("nls")
@@ -801,6 +801,7 @@
}
private void recordStatement(Statement stat) {
+ if (null == stat) return;
// deal with 'owner' property
if (stat.getTarget() == owner && owner != null) {
needOwner = true;
@@ -817,7 +818,7 @@
/**
* Imperfect attempt to detect a dead loop. This works with specific
- * patterns that can be found in our AWT implementaiton.
+ * patterns that can be found in our AWT implementation.
* See HARMONY-5707 for details.
*
* @param value the object to check dupes for
@@ -860,7 +861,7 @@
}
/**
- * Records the expression so that it can be writtern out later, then calls
+ * Records the expression so that it can be written out later, then calls
* super implementation.
*/
@Override
@@ -900,7 +901,7 @@
}
/**
- * Records the object so that it can be writtern out later, then calls super
+ * Records the object so that it can be written out later, then calls super
* implementation.
*/
@Override
@@ -935,11 +936,16 @@
}
/**
- * Records the statement so that it can be writtern out later, then calls
+ * 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");
+ System.err.println("Continuing...");
+ return;
+ }
// record how the object is changed
recordStatement(oldStat);
Modified: harmony/enhanced/classlib/branches/java6/modules/beans/src/main/java/java/beans/beancontext/BeanContextEvent.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/beans/src/main/java/java/beans/beancontext/BeanContextEvent.java?rev=721077&r1=721076&r2=721077&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/beans/src/main/java/java/beans/beancontext/BeanContextEvent.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/beans/src/main/java/java/beans/beancontext/BeanContextEvent.java Wed Nov 26 21:10:32 2008
@@ -21,7 +21,7 @@
public abstract class BeanContextEvent extends EventObject {
- static final long serialVersionUID = 7267998073569045052L;
+ private static final long serialVersionUID = 7267998073569045052L;
/**
* @serial
Modified: harmony/enhanced/classlib/branches/java6/modules/beans/src/main/java/java/beans/beancontext/BeanContextServiceAvailableEvent.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/beans/src/main/java/java/beans/beancontext/BeanContextServiceAvailableEvent.java?rev=721077&r1=721076&r2=721077&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/beans/src/main/java/java/beans/beancontext/BeanContextServiceAvailableEvent.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/beans/src/main/java/java/beans/beancontext/BeanContextServiceAvailableEvent.java Wed Nov 26 21:10:32 2008
@@ -21,7 +21,7 @@
@SuppressWarnings("unchecked")
public class BeanContextServiceAvailableEvent extends BeanContextEvent {
- static final long serialVersionUID = -5333985775656400778L;
+ private static final long serialVersionUID = -5333985775656400778L;
/**
* @serial
Modified: harmony/enhanced/classlib/branches/java6/modules/beans/src/main/java/java/beans/beancontext/BeanContextServiceRevokedEvent.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/beans/src/main/java/java/beans/beancontext/BeanContextServiceRevokedEvent.java?rev=721077&r1=721076&r2=721077&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/beans/src/main/java/java/beans/beancontext/BeanContextServiceRevokedEvent.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/beans/src/main/java/java/beans/beancontext/BeanContextServiceRevokedEvent.java Wed Nov 26 21:10:32 2008
@@ -19,7 +19,7 @@
@SuppressWarnings("unchecked")
public class BeanContextServiceRevokedEvent extends BeanContextEvent {
- static final long serialVersionUID = -1295543154724961754L;
+ private static final long serialVersionUID = -1295543154724961754L;
/**
* @serial
Modified: harmony/enhanced/classlib/branches/java6/modules/beans/src/main/java/java/beans/beancontext/BeanContextServicesSupport.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/beans/src/main/java/java/beans/beancontext/BeanContextServicesSupport.java?rev=721077&r1=721076&r2=721077&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/beans/src/main/java/java/beans/beancontext/BeanContextServicesSupport.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/beans/src/main/java/java/beans/beancontext/BeanContextServicesSupport.java Wed Nov 26 21:10:32 2008
@@ -190,7 +190,7 @@
*/
protected static class BCSSServiceProvider implements Serializable {
- static final long serialVersionUID = 861278251667444782L;
+ private static final long serialVersionUID = 861278251667444782L;
/**
* The service provider of the related service.
@@ -212,7 +212,7 @@
}
- static final long serialVersionUID = -8494482757288719206L;
+ private static final long serialVersionUID = -8494482757288719206L;
/**
* A map of all registered services - key is service class, value is
Modified: harmony/enhanced/classlib/branches/java6/modules/beans/src/main/java/java/beans/beancontext/BeanContextSupport.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/beans/src/main/java/java/beans/beancontext/BeanContextSupport.java?rev=721077&r1=721076&r2=721077&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/beans/src/main/java/java/beans/beancontext/BeanContextSupport.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/beans/src/main/java/java/beans/beancontext/BeanContextSupport.java Wed Nov 26 21:10:32 2008
@@ -59,7 +59,7 @@
*/
protected class BCSChild implements Serializable {
- static final long serialVersionUID = -5815286101609939109L;
+ private static final long serialVersionUID = -5815286101609939109L;
Object child;
@@ -97,7 +97,7 @@
}
}
- static final long serialVersionUID = -4879613978649577204L; //J2SE 1.4.2
+ private static final long serialVersionUID = -4879613978649577204L; //J2SE 1.4.2
/**
* A list of registered membership listeners.
Modified: harmony/enhanced/classlib/branches/java6/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/BeansTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/BeansTest.java?rev=721077&r1=721076&r2=721077&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/BeansTest.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/BeansTest.java Wed Nov 26 21:10:32 2008
@@ -523,7 +523,7 @@
private class ObjectBean implements Externalizable {
- static final long serialVersionUID = 637071583755213744L;
+ private static final long serialVersionUID = 637071583755213744L;
public void writeExternal(ObjectOutput out) {
};
Modified: harmony/enhanced/classlib/branches/java6/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/IntrospectorTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/IntrospectorTest.java?rev=721077&r1=721076&r2=721077&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/IntrospectorTest.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/IntrospectorTest.java Wed Nov 26 21:10:32 2008
@@ -471,6 +471,138 @@
assertTrue(contains("getStaticName", methodDescriptors));
assertTrue(contains("setStaticName", methodDescriptors));
}
+
+ public void testMockIncompatibleGetterAndIndexedGetterBean() throws Exception {
+ Class beanClass = MockIncompatibleGetterAndIndexedGetterBean.class;
+ BeanInfo beanInfo = Introspector.getBeanInfo(beanClass);
+ PropertyDescriptor pd = null;
+ PropertyDescriptor[] pds = beanInfo.getPropertyDescriptors();
+ for (int i = 0; i < pds.length; i++) {
+ pd = pds[i];
+ if (pd.getName().equals("data")) {
+ break;
+ }
+ }
+ assertNotNull(pd);
+ assertTrue(pd instanceof IndexedPropertyDescriptor);
+ IndexedPropertyDescriptor ipd = (IndexedPropertyDescriptor) pd;
+ assertNull(ipd.getReadMethod());
+ assertNull(ipd.getWriteMethod());
+ Method indexedReadMethod = beanClass.getMethod("getData",
+ new Class[] { int.class });
+ Method indexedWriteMethod = beanClass.getMethod("setData", new Class[] {
+ int.class, int.class });
+ assertEquals(indexedReadMethod, ipd.getIndexedReadMethod());
+ assertEquals(indexedWriteMethod, ipd.getIndexedWriteMethod());
+ }
+
+ public void testMockIncompatibleSetterAndIndexedSetterBean() throws Exception {
+ Class beanClass = MockIncompatibleSetterAndIndexedSetterBean.class;
+ BeanInfo beanInfo = Introspector.getBeanInfo(beanClass);
+ PropertyDescriptor pd = null;
+ PropertyDescriptor[] pds = beanInfo.getPropertyDescriptors();
+ for (int i = 0; i < pds.length; i++) {
+ pd = pds[i];
+ if (pd.getName().equals("data")) {
+ break;
+ }
+ }
+ assertNotNull(pd);
+ assertTrue(pd instanceof IndexedPropertyDescriptor);
+ IndexedPropertyDescriptor ipd = (IndexedPropertyDescriptor) pd;
+ assertNull(ipd.getReadMethod());
+ assertNull(ipd.getWriteMethod());
+ Method indexedReadMethod = beanClass.getMethod("getData",
+ new Class[] { int.class });
+ Method indexedWriteMethod = beanClass.getMethod("setData", new Class[] {
+ int.class, int.class });
+ assertEquals(indexedReadMethod, ipd.getIndexedReadMethod());
+ assertEquals(indexedWriteMethod, ipd.getIndexedWriteMethod());
+ }
+
+ public void testMockIncompatibleAllSetterAndGetterBean() throws Exception {
+ Class beanClass = MockIncompatibleAllSetterAndGetterBean.class;
+ BeanInfo beanInfo = Introspector.getBeanInfo(beanClass);
+ PropertyDescriptor pd = null;
+ PropertyDescriptor[] pds = beanInfo.getPropertyDescriptors();
+ for (int i = 0; i < pds.length; i++) {
+ pd = pds[i];
+ if (pd.getName().equals("data")) {
+ break;
+ }
+ }
+ assertNotNull(pd);
+ assertTrue(pd instanceof IndexedPropertyDescriptor);
+ IndexedPropertyDescriptor ipd = (IndexedPropertyDescriptor) pd;
+ assertNull(ipd.getReadMethod());
+ assertNull(ipd.getWriteMethod());
+ Method indexedReadMethod = beanClass.getMethod("getData",
+ new Class[] { int.class });
+ Method indexedWriteMethod = beanClass.getMethod("setData", new Class[] {
+ int.class, int.class });
+ assertEquals(indexedReadMethod, ipd.getIndexedReadMethod());
+ assertEquals(indexedWriteMethod, ipd.getIndexedWriteMethod());
+ }
+
+ public class MockIncompatibleGetterAndIndexedGetterBean {
+ private int[] datas;
+
+ public int getData() {
+ return datas[0];
+ }
+
+ public int getData(int index) {
+ return datas[index];
+ }
+
+ public void setData(int index, int data) {
+ this.datas[index] = data;
+ }
+ }
+
+ public class MockIncompatibleSetterAndIndexedSetterBean {
+
+ private int[] datas;
+
+ public int getData(int index){
+ return datas[index];
+ }
+
+ public void setData(int index, int data) {
+ this.datas[index] = data;
+ }
+
+ public void setData(int data){
+ this.datas[0] = data;
+ }
+
+ }
+
+ public class MockIncompatibleAllSetterAndGetterBean {
+
+ private int[] datas;
+
+ public int getData(){
+ return datas[0];
+ }
+
+ public int getData(int index){
+ return datas[index];
+ }
+
+ public void setData(int index, int data) {
+ this.datas[index] = data;
+ }
+
+ public void setData(int data){
+ this.datas[0] = data;
+ }
+
+ public void setData(){
+ this.datas[0] = 0;
+ }
+
+ }
public static class StaticClazz {
Modified: harmony/enhanced/classlib/branches/java6/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/XMLEncoderTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/XMLEncoderTest.java?rev=721077&r1=721076&r2=721077&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/XMLEncoderTest.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/XMLEncoderTest.java Wed Nov 26 21:10:32 2008
@@ -24,12 +24,14 @@
import java.beans.PersistenceDelegate;
import java.beans.Statement;
import java.beans.XMLEncoder;
+import java.io.BufferedReader;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.PrintWriter;
+import java.io.StringReader;
import junit.framework.TestCase;
@@ -372,13 +374,13 @@
InputStream refIn;
InputStreamReader xml;
- InputStreamReader refXml;
XMLReader xmlReader;
XMLReader refXmlReader;
TestEventHandler handler = new TestEventHandler();
TestEventHandler refHandler = new TestEventHandler();
String saxParserClassName = System.getProperty("org.xml.sax.driver");
+ String version = System.getProperty("java.version");
if (enc == null || temp == null) {
temp = new ByteArrayOutputStream();
@@ -387,15 +389,24 @@
enc.writeObject(obj);
enc.close();
byte bytes[] = temp.toByteArray();
-
+ xml = new InputStreamReader(new ByteArrayInputStream(bytes), "UTF-8");
refIn = XMLEncoderTest.class.getResourceAsStream(xmlFile);
if (refIn == null) {
throw new Error("resource " + xmlFile + " not exist in "
+ XMLEncoderTest.class.getPackage());
}
- xml = new InputStreamReader(new ByteArrayInputStream(bytes), "UTF-8");
- refXml = new InputStreamReader(refIn, "UTF-8");
-
+ BufferedReader br = new BufferedReader(new InputStreamReader(refIn, "UTF-8"));
+ StringBuilder sb = new StringBuilder();
+ String line = null;
+ while((line = br.readLine()) != null){
+ sb.append(line + "\n");
+ }
+ refIn.close();
+ String refString = sb.toString();
+ refString = refString.replace("${version}", version);
+ if(obj != null){
+ refString = refString.replace("${classname}", obj.getClass().getName());
+ }
if (saxParserClassName == null) {
saxParserClassName = "org.apache.xerces.parsers.SAXParser";
}
@@ -408,7 +419,7 @@
refXmlReader = XMLReaderFactory.createXMLReader(saxParserClassName);
refXmlReader.setContentHandler(refHandler);
refXmlReader.setErrorHandler(refHandler);
- refXmlReader.parse(new InputSource(refXml));
+ refXmlReader.parse(new InputSource(new StringReader(refString)));
assertEquals("Generated XML differs from the sample,", refHandler.root,
handler.root);
Modified: harmony/enhanced/classlib/branches/java6/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/beancontext/BeanContextChildSupportTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/beancontext/BeanContextChildSupportTest.java?rev=721077&r1=721076&r2=721077&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/beancontext/BeanContextChildSupportTest.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/beancontext/BeanContextChildSupportTest.java Wed Nov 26 21:10:32 2008
@@ -57,7 +57,7 @@
private static class MockBeanContextChildSupport extends
BeanContextChildSupport {
- static final long serialVersionUID = -8602521752077435319L;
+ private static final long serialVersionUID = -8602521752077435319L;
public BeanContext lastInitBeanContext = null;
Modified: harmony/enhanced/classlib/branches/java6/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/beancontext/BeanContextEventTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/beancontext/BeanContextEventTest.java?rev=721077&r1=721076&r2=721077&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/beancontext/BeanContextEventTest.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/beancontext/BeanContextEventTest.java Wed Nov 26 21:10:32 2008
@@ -42,7 +42,7 @@
private static class MockBeanContextEvent extends BeanContextEvent {
- static final long serialVersionUID = -5990761357871915928L;
+ private static final long serialVersionUID = -5990761357871915928L;
/**
* @param bc
Modified: harmony/enhanced/classlib/branches/java6/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/beancontext/BeanContextMembershipEventTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/beancontext/BeanContextMembershipEventTest.java?rev=721077&r1=721076&r2=721077&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/beancontext/BeanContextMembershipEventTest.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/beancontext/BeanContextMembershipEventTest.java Wed Nov 26 21:10:32 2008
@@ -45,7 +45,7 @@
private static class MockBeanContextMembershipEvent extends
BeanContextMembershipEvent {
- static final long serialVersionUID = -4761911723636245515L;
+ private static final long serialVersionUID = -4761911723636245515L;
/**
* @param bc
Modified: harmony/enhanced/classlib/branches/java6/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/beancontext/BeanContextServiceAvailableEventTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/beancontext/BeanContextServiceAvailableEventTest.java?rev=721077&r1=721076&r2=721077&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/beancontext/BeanContextServiceAvailableEventTest.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/beancontext/BeanContextServiceAvailableEventTest.java Wed Nov 26 21:10:32 2008
@@ -44,7 +44,7 @@
private static class MockBeanContextServiceAvailableEvent extends
BeanContextServiceAvailableEvent {
- static final long serialVersionUID = 796722290390289532L;
+ private static final long serialVersionUID = 796722290390289532L;
/**
* @param bcs
Modified: harmony/enhanced/classlib/branches/java6/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/beancontext/BeanContextServiceRevokedEventTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/beancontext/BeanContextServiceRevokedEventTest.java?rev=721077&r1=721076&r2=721077&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/beancontext/BeanContextServiceRevokedEventTest.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/beancontext/BeanContextServiceRevokedEventTest.java Wed Nov 26 21:10:32 2008
@@ -56,7 +56,7 @@
private static class MockBeanContextServiceRevokedEvent extends
BeanContextServiceRevokedEvent {
- static final long serialVersionUID = -705194281645674622L;
+ private static final long serialVersionUID = -705194281645674622L;
/**
* @param bcs
Modified: harmony/enhanced/classlib/branches/java6/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/beancontext/BeanContextServicesSupportTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/beancontext/BeanContextServicesSupportTest.java?rev=721077&r1=721076&r2=721077&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/beancontext/BeanContextServicesSupportTest.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/beans/src/test/java/org/apache/harmony/beans/tests/java/beans/beancontext/BeanContextServicesSupportTest.java Wed Nov 26 21:10:32 2008
@@ -62,7 +62,7 @@
public static class MockBeanContextServicesSupport extends
BeanContextServicesSupport {
- static final long serialVersionUID = -5521269152428572350L;
+ private static final long serialVersionUID = -5521269152428572350L;
public MethodInvocationRecords records;
Modified: harmony/enhanced/classlib/branches/java6/modules/beans/src/test/resources/xml/MockBean4Codec_BornFriendChange.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/beans/src/test/resources/xml/MockBean4Codec_BornFriendChange.xml?rev=721077&r1=721076&r2=721077&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/beans/src/test/resources/xml/MockBean4Codec_BornFriendChange.xml (original)
+++ harmony/enhanced/classlib/branches/java6/modules/beans/src/test/resources/xml/MockBean4Codec_BornFriendChange.xml Wed Nov 26 21:10:32 2008
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<java version="1.4.2_07" class="java.beans.XMLDecoder">
- <object class="org.apache.harmony.beans.tests.java.beans.mock.MockBean4Codec">
+<java version="${version}" class="java.beans.XMLDecoder">
+ <object class="${classname}">
<void id="MockBean4CodecPrimitives0" property="bornFriend">
<void property="zarr">
<void index="0">
Modified: harmony/enhanced/classlib/branches/java6/modules/beans/src/test/resources/xml/MockBean4Codec_ManyChanges.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/beans/src/test/resources/xml/MockBean4Codec_ManyChanges.xml?rev=721077&r1=721076&r2=721077&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/beans/src/test/resources/xml/MockBean4Codec_ManyChanges.xml (original)
+++ harmony/enhanced/classlib/branches/java6/modules/beans/src/test/resources/xml/MockBean4Codec_ManyChanges.xml Wed Nov 26 21:10:32 2008
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<java version="1.4.2_07" class="java.beans.XMLDecoder">
- <object id="MockBean4Codec0" class="org.apache.harmony.beans.tests.java.beans.mock.MockBean4Codec">
+<java version="${version}" class="java.beans.XMLDecoder">
+ <object id="MockBean4Codec0" class="${classname}">
<void property="b">
<byte>127</byte>
</void>
@@ -48,9 +48,9 @@
<float>12.34</float>
</void>
<void property="friend">
- <object class="tests.api.java.beans.mock.MockBean4Codec">
+ <object class="${classname}">
<void property="clazz">
- <class>tests.api.java.beans.mock.MockBean4Codec</class>
+ <class>${classname}</class>
</void>
</object>
</void>
Modified: harmony/enhanced/classlib/branches/java6/modules/beans/src/test/resources/xml/MockBean4Codec_ManyChanges_2.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/beans/src/test/resources/xml/MockBean4Codec_ManyChanges_2.xml?rev=721077&r1=721076&r2=721077&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/beans/src/test/resources/xml/MockBean4Codec_ManyChanges_2.xml (original)
+++ harmony/enhanced/classlib/branches/java6/modules/beans/src/test/resources/xml/MockBean4Codec_ManyChanges_2.xml Wed Nov 26 21:10:32 2008
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<java version="1.4.2 subset" class="java.beans.XMLDecoder">
+<java version="${version}" class="java.beans.XMLDecoder">
<object class="org.apache.harmony.beans.tests.java.beans.mock.MockBean4Codec">
<void property="bornFriend">
<void property="clazz">
Modified: harmony/enhanced/classlib/branches/java6/modules/beans/src/test/resources/xml/MockBean4Codec_NoChange.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/beans/src/test/resources/xml/MockBean4Codec_NoChange.xml?rev=721077&r1=721076&r2=721077&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/beans/src/test/resources/xml/MockBean4Codec_NoChange.xml (original)
+++ harmony/enhanced/classlib/branches/java6/modules/beans/src/test/resources/xml/MockBean4Codec_NoChange.xml Wed Nov 26 21:10:32 2008
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<java version="1.4.2_07" class="java.beans.XMLDecoder">
- <object class="org.apache.harmony.beans.tests.java.beans.mock.MockBean4Codec"/>
+<java version="${version}" class="java.beans.XMLDecoder">
+ <object class="${classname}"/>
</java>
Modified: harmony/enhanced/classlib/branches/java6/modules/beans/src/test/resources/xml/MockBean4Owner_SetOwner.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/beans/src/test/resources/xml/MockBean4Owner_SetOwner.xml?rev=721077&r1=721076&r2=721077&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/beans/src/test/resources/xml/MockBean4Owner_SetOwner.xml (original)
+++ harmony/enhanced/classlib/branches/java6/modules/beans/src/test/resources/xml/MockBean4Owner_SetOwner.xml Wed Nov 26 21:10:32 2008
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<java version="1.4.2 subset" class="java.beans.XMLDecoder">
+<java version="${version}" class="java.beans.XMLDecoder">
<void id="MockBean4Owner_Owner0" property="owner"/>
- <object class="org.apache.harmony.beans.tests.java.beans.MockBean4Owner_Target">
+ <object class="${classname}">
<void property="v">
<object idref="MockBean4Owner_Owner0"/>
</void>
Modified: harmony/enhanced/classlib/branches/java6/modules/beans/src/test/resources/xml/MockBean4Owner_SetOwnerWithWriteStatement.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/beans/src/test/resources/xml/MockBean4Owner_SetOwnerWithWriteStatement.xml?rev=721077&r1=721076&r2=721077&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/beans/src/test/resources/xml/MockBean4Owner_SetOwnerWithWriteStatement.xml (original)
+++ harmony/enhanced/classlib/branches/java6/modules/beans/src/test/resources/xml/MockBean4Owner_SetOwnerWithWriteStatement.xml Wed Nov 26 21:10:32 2008
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
-<java version="1.4.2 subset" class="java.beans.XMLDecoder">
+<java version="${version}" class="java.beans.XMLDecoder">
<void id="MockBean4Owner_Owner0" property="owner">
<void method="loading"/>
</void>
- <object class="org.apache.harmony.beans.tests.java.beans.MockBean4Owner_Target">
+ <object class="${classname}">
<void property="v">
<object idref="MockBean4Owner_Owner0"/>
</void>
Modified: harmony/enhanced/classlib/branches/java6/modules/beans/src/test/resources/xml/MockBean4StaticField.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/beans/src/test/resources/xml/MockBean4StaticField.xml?rev=721077&r1=721076&r2=721077&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/beans/src/test/resources/xml/MockBean4StaticField.xml (original)
+++ harmony/enhanced/classlib/branches/java6/modules/beans/src/test/resources/xml/MockBean4StaticField.xml Wed Nov 26 21:10:32 2008
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<java version="1.4.2 subset" class="java.beans.XMLDecoder">
- <object class="org.apache.harmony.beans.tests.java.beans.MockBean4StaticField" field="inst"/>
+<java version="${version}" class="java.beans.XMLDecoder">
+ <object class="${classname}" field="inst"/>
</java>
Modified: harmony/enhanced/classlib/branches/java6/modules/beans/src/test/resources/xml/MockBean4StaticField_Original.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/beans/src/test/resources/xml/MockBean4StaticField_Original.xml?rev=721077&r1=721076&r2=721077&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/beans/src/test/resources/xml/MockBean4StaticField_Original.xml (original)
+++ harmony/enhanced/classlib/branches/java6/modules/beans/src/test/resources/xml/MockBean4StaticField_Original.xml Wed Nov 26 21:10:32 2008
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
-<java version="1.4.2 subset" class="java.beans.XMLDecoder">
- <void class="org.apache.harmony.beans.tests.java.beans.MockBean4StaticField" method="getField">
+<java version="${version}" class="java.beans.XMLDecoder">
+ <void class="${classname}">
<string>inst</string>
<void id="A0" method="get">
<null/>
Modified: harmony/enhanced/classlib/branches/java6/modules/beans/src/test/resources/xml/Test6.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/beans/src/test/resources/xml/Test6.xml?rev=721077&r1=721076&r2=721077&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/beans/src/test/resources/xml/Test6.xml (original)
+++ harmony/enhanced/classlib/branches/java6/modules/beans/src/test/resources/xml/Test6.xml Wed Nov 26 21:10:32 2008
@@ -20,12 +20,12 @@
Author: Maxim V. Berkultsev
Version: $Revision: 1.1.6.3 $
-->
-<java version="1.4.2_04" class="java.beans.XMLDecoder">
- <object id="SampleBean0" class="org.apache.harmony.tests.java.beans.auxiliary.SampleBean">
+<java version="${version}" class="java.beans.XMLDecoder">
+ <object id="SampleBean0" class="${classname}">
<void property="object">
- <object id="SampleBean1" class="org.apache.harmony.tests.java.beans.auxiliary.SampleBean">
+ <object id="SampleBean1" class="${classname}">
<void property="object">
- <object id="SampleBean2" class="org.apache.harmony.tests.java.beans.auxiliary.SampleBean">
+ <object id="SampleBean2" class="${classname}">
<void property="object">
<object idref="SampleBean0"/>
</void>
Modified: harmony/enhanced/classlib/branches/java6/modules/beans/src/test/resources/xml/Test7.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/beans/src/test/resources/xml/Test7.xml?rev=721077&r1=721076&r2=721077&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/beans/src/test/resources/xml/Test7.xml (original)
+++ harmony/enhanced/classlib/branches/java6/modules/beans/src/test/resources/xml/Test7.xml Wed Nov 26 21:10:32 2008
@@ -20,7 +20,7 @@
Author: Maxim V. Berkultsev
Version: $Revision: 1.1.6.3 $
-->
-<java version="1.4.2_04" class="java.beans.XMLDecoder">
+<java version="${version}" class="java.beans.XMLDecoder">
<array class="java.lang.String" length="2">
<void index="0">
Modified: harmony/enhanced/classlib/branches/java6/modules/beans/src/test/resources/xml/bad_int.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/beans/src/test/resources/xml/bad_int.xml?rev=721077&r1=721076&r2=721077&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/beans/src/test/resources/xml/bad_int.xml (original)
+++ harmony/enhanced/classlib/branches/java6/modules/beans/src/test/resources/xml/bad_int.xml Wed Nov 26 21:10:32 2008
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<java version="1.4.2_07" class="java.beans.XMLDecoder">
+<java version="${version}" class="java.beans.XMLDecoder">
<int>3</inta>
</java>
Modified: harmony/enhanced/classlib/branches/java6/modules/beans/src/test/resources/xml/int.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/beans/src/test/resources/xml/int.xml?rev=721077&r1=721076&r2=721077&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/beans/src/test/resources/xml/int.xml (original)
+++ harmony/enhanced/classlib/branches/java6/modules/beans/src/test/resources/xml/int.xml Wed Nov 26 21:10:32 2008
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<java version="1.4.2_07" class="java.beans.XMLDecoder">
+<java version="${version}" class="java.beans.XMLDecoder">
<int>3</int>
</java>
Modified: harmony/enhanced/classlib/branches/java6/modules/beans/src/test/resources/xml/null.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/beans/src/test/resources/xml/null.xml?rev=721077&r1=721076&r2=721077&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/beans/src/test/resources/xml/null.xml (original)
+++ harmony/enhanced/classlib/branches/java6/modules/beans/src/test/resources/xml/null.xml Wed Nov 26 21:10:32 2008
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<java version="1.4.2_07" class="java.beans.XMLDecoder">
+<java version="${version}" class="java.beans.XMLDecoder">
<null/>
</java>
Modified: harmony/enhanced/classlib/branches/java6/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/mock/MockAppletBean2.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/mock/MockAppletBean2.java?rev=721077&r1=721076&r2=721077&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/mock/MockAppletBean2.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/beans/src/test/support/java/org/apache/harmony/beans/tests/support/mock/MockAppletBean2.java Wed Nov 26 21:10:32 2008
@@ -24,7 +24,7 @@
* test java.beans.Beans
*/
public class MockAppletBean2 extends Applet implements Serializable {
- static final long serialVersionUID = 1L;
+ private static final long serialVersionUID = 1L;
private String propertyOne;
Modified: harmony/enhanced/classlib/branches/java6/modules/concurrent/.classpath
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/concurrent/.classpath?rev=721077&r1=721076&r2=721077&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/concurrent/.classpath (original)
+++ harmony/enhanced/classlib/branches/java6/modules/concurrent/.classpath Wed Nov 26 21:10:32 2008
@@ -9,6 +9,6 @@
<classpathentry output="bin/test" kind="src" path="src/test/java"/>
<classpathentry output="bin/test" kind="src" path="src/test/resources"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry sourcepath="JUNIT_SRC_HOME/junitsrc.zip" kind="var" path="JUNIT_HOME/junit.jar"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
<classpathentry kind="output" path="bin/main"/>
</classpath>
Modified: harmony/enhanced/classlib/branches/java6/modules/crypto/.classpath
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/crypto/.classpath?rev=721077&r1=721076&r2=721077&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/crypto/.classpath (original)
+++ harmony/enhanced/classlib/branches/java6/modules/crypto/.classpath Wed Nov 26 21:10:32 2008
@@ -8,6 +8,6 @@
<classpathentry path="src/test/api/java.injected" kind="src" output="bin/test/api.injected"/>
<classpathentry path="src/test/api/java" kind="src" output="bin/test/api"/>
<classpathentry path="org.eclipse.pde.core.requiredPlugins" kind="con"/>
- <classpathentry path="JUNIT_HOME/junit.jar" kind="var" sourcepath="JUNIT_SRC_HOME/junitsrc.zip"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
<classpathentry path="bin/main" kind="output"/>
</classpath>
Modified: harmony/enhanced/classlib/branches/java6/modules/imageio/.classpath
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/imageio/.classpath?rev=721077&r1=721076&r2=721077&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/imageio/.classpath (original)
+++ harmony/enhanced/classlib/branches/java6/modules/imageio/.classpath Wed Nov 26 21:10:32 2008
@@ -3,6 +3,6 @@
<classpathentry path="src/main/java" kind="src" output="bin/main"/>
<classpathentry path="src/test/java" kind="src" output="bin/test/"/>
<classpathentry path="org.eclipse.pde.core.requiredPlugins" kind="con"/>
- <classpathentry path="JUNIT_HOME/junit.jar" kind="var" sourcepath="JUNIT_SRC_HOME/junitsrc.zip"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
<classpathentry path="bin/main" kind="output"/>
</classpath>
Modified: harmony/enhanced/classlib/branches/java6/modules/instrument/.classpath
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/instrument/.classpath?rev=721077&r1=721076&r2=721077&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/instrument/.classpath (original)
+++ harmony/enhanced/classlib/branches/java6/modules/instrument/.classpath Wed Nov 26 21:10:32 2008
@@ -3,7 +3,7 @@
<classpathentry kind="src" path="src/main/java"/>
<classpathentry kind="src" path="src/test/resources"/>
<classpathentry kind="src" path="src/test/java"/>
- <classpathentry kind="var" path="JUNIT_HOME/junit.jar"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="output" path="bin"/>
</classpath>
Modified: harmony/enhanced/classlib/branches/java6/modules/jndi/.classpath
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/jndi/.classpath?rev=721077&r1=721076&r2=721077&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/jndi/.classpath (original)
+++ harmony/enhanced/classlib/branches/java6/modules/jndi/.classpath Wed Nov 26 21:10:32 2008
@@ -3,6 +3,6 @@
<classpathentry output="bin/main" kind="src" path="src/main/java"/>
<classpathentry output="bin/test" kind="src" path="src/test/java"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="var" path="JUNIT_HOME/junit.jar"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
<classpathentry kind="output" path="bin/main"/>
</classpath>
Modified: harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/javax/naming/AuthenticationException.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/javax/naming/AuthenticationException.java?rev=721077&r1=721076&r2=721077&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/javax/naming/AuthenticationException.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/javax/naming/AuthenticationException.java Wed Nov 26 21:10:32 2008
@@ -27,7 +27,7 @@
*/
public class AuthenticationException extends NamingSecurityException {
- static final long serialVersionUID = 3678497619904568096L;
+ private static final long serialVersionUID = 3678497619904568096L;
/**
* Constructs an <code>AuthenticationException</code> instance with all
Modified: harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/javax/naming/AuthenticationNotSupportedException.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/javax/naming/AuthenticationNotSupportedException.java?rev=721077&r1=721076&r2=721077&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/javax/naming/AuthenticationNotSupportedException.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/javax/naming/AuthenticationNotSupportedException.java Wed Nov 26 21:10:32 2008
@@ -29,7 +29,7 @@
public class AuthenticationNotSupportedException extends
NamingSecurityException {
- static final long serialVersionUID = -7149033933259492300L;
+ private static final long serialVersionUID = -7149033933259492300L;
/**
* Constructs an <code>AuthenticationNotSupportedException</code> instance
Modified: harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/javax/naming/CommunicationException.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/javax/naming/CommunicationException.java?rev=721077&r1=721076&r2=721077&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/javax/naming/CommunicationException.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/javax/naming/CommunicationException.java Wed Nov 26 21:10:32 2008
@@ -31,7 +31,7 @@
* This constant is used during deserialization to check the version which
* created the serialized object.
*/
- static final long serialVersionUID = 3618507780299986611L;
+ private static final long serialVersionUID = 3618507780299986611L;
/**
* Constructs a <code>CommunicationException</code> instance with all data
Modified: harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/javax/naming/ConfigurationException.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/javax/naming/ConfigurationException.java?rev=721077&r1=721076&r2=721077&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/javax/naming/ConfigurationException.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/javax/naming/ConfigurationException.java Wed Nov 26 21:10:32 2008
@@ -31,7 +31,7 @@
* This constant is used during deserialization to check the version which
* created the serialized object.
*/
- static final long serialVersionUID = -2535156726228855704L;
+ private static final long serialVersionUID = -2535156726228855704L;
/**
* Constructs a <code>ConfigurationException</code> instance with all data
Modified: harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/javax/naming/ContextNotEmptyException.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/javax/naming/ContextNotEmptyException.java?rev=721077&r1=721076&r2=721077&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/javax/naming/ContextNotEmptyException.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/javax/naming/ContextNotEmptyException.java Wed Nov 26 21:10:32 2008
@@ -31,7 +31,7 @@
* This constant is used during deserialization to check the version which
* created the serialized object.
*/
- static final long serialVersionUID = 1090963683348219877L;
+ private static final long serialVersionUID = 1090963683348219877L;
/**
* Constructs a <code>ContextNotEmptyException</code> instance with all
Modified: harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/javax/naming/InsufficientResourcesException.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/javax/naming/InsufficientResourcesException.java?rev=721077&r1=721076&r2=721077&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/javax/naming/InsufficientResourcesException.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/javax/naming/InsufficientResourcesException.java Wed Nov 26 21:10:32 2008
@@ -31,7 +31,7 @@
* This constant is used during deserialization to check the version which
* created the serialized object.
*/
- static final long serialVersionUID = 6227672693037844532L;
+ private static final long serialVersionUID = 6227672693037844532L;
/**
* Constructs an <code>InsufficientResourcesException</code> instance with
Modified: harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/javax/naming/InterruptedNamingException.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/javax/naming/InterruptedNamingException.java?rev=721077&r1=721076&r2=721077&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/javax/naming/InterruptedNamingException.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/javax/naming/InterruptedNamingException.java Wed Nov 26 21:10:32 2008
@@ -31,7 +31,7 @@
* This constant is used during deserialization to check the version which
* created the serialized object.
*/
- static final long serialVersionUID = 6404516648893194728L;
+ private static final long serialVersionUID = 6404516648893194728L;
/**
* Constructs an <code>InterruptedNamingException</code> instance with all
Modified: harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/javax/naming/InvalidNameException.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/javax/naming/InvalidNameException.java?rev=721077&r1=721076&r2=721077&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/javax/naming/InvalidNameException.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/javax/naming/InvalidNameException.java Wed Nov 26 21:10:32 2008
@@ -31,7 +31,7 @@
* This constant is used during deserialization to check the version which
* created the serialized object.
*/
- static final long serialVersionUID = -8370672380823801105L;
+ private static final long serialVersionUID = -8370672380823801105L;
/**
* Constructs an <code>InvalidNameException</code> instance with all data
Modified: harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/javax/naming/LimitExceededException.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/javax/naming/LimitExceededException.java?rev=721077&r1=721076&r2=721077&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/javax/naming/LimitExceededException.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/javax/naming/LimitExceededException.java Wed Nov 26 21:10:32 2008
@@ -31,7 +31,7 @@
* This constant is used during deserialization to check the version which
* created the serialized object.
*/
- static final long serialVersionUID = -776898738660207856L;
+ private static final long serialVersionUID = -776898738660207856L;
/**
* Constructs a <code>LimitExceededException</code> instance with all data
Modified: harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/javax/naming/LinkLoopException.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/javax/naming/LinkLoopException.java?rev=721077&r1=721076&r2=721077&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/javax/naming/LinkLoopException.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/javax/naming/LinkLoopException.java Wed Nov 26 21:10:32 2008
@@ -31,7 +31,7 @@
* This constant is used during deserialization to check the version which
* created the serialized object.
*/
- static final long serialVersionUID = -3119189944325198009L;
+ private static final long serialVersionUID = -3119189944325198009L;
/**
* Constructs a <code>LinkLoopException</code> instance with all data
Modified: harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/javax/naming/LinkRef.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/javax/naming/LinkRef.java?rev=721077&r1=721076&r2=721077&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/javax/naming/LinkRef.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/javax/naming/LinkRef.java Wed Nov 26 21:10:32 2008
@@ -32,7 +32,7 @@
* This constant is used during deserialization to check the version which
* created the serialized object.
*/
- static final long serialVersionUID = -5386290613498931298L;
+ private static final long serialVersionUID = -5386290613498931298L;
/*
* The type name of the address this LinkRef points to.
Modified: harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/javax/naming/MalformedLinkException.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/javax/naming/MalformedLinkException.java?rev=721077&r1=721076&r2=721077&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/javax/naming/MalformedLinkException.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/javax/naming/MalformedLinkException.java Wed Nov 26 21:10:32 2008
@@ -31,7 +31,7 @@
* This constant is used during deserialization to check the version which
* created the serialized object.
*/
- static final long serialVersionUID = -3066740437737830242L;
+ private static final long serialVersionUID = -3066740437737830242L;
/**
* Constructs a <code>MalformedLinkException</code> instance with all data
Modified: harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/javax/naming/NameAlreadyBoundException.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/javax/naming/NameAlreadyBoundException.java?rev=721077&r1=721076&r2=721077&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/javax/naming/NameAlreadyBoundException.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/javax/naming/NameAlreadyBoundException.java Wed Nov 26 21:10:32 2008
@@ -31,7 +31,7 @@
* This constant is used during deserialization to check the version which
* created the serialized object.
*/
- static final long serialVersionUID = -8491441000356780586L;
+ private static final long serialVersionUID = -8491441000356780586L;
/**
* Constructor a <code>NameAlreadyBoundException</code> instance with all
Modified: harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/javax/naming/NameNotFoundException.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/javax/naming/NameNotFoundException.java?rev=721077&r1=721076&r2=721077&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/javax/naming/NameNotFoundException.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/javax/naming/NameNotFoundException.java Wed Nov 26 21:10:32 2008
@@ -31,7 +31,7 @@
* This constant is used during deserialization to check the version which
* created the serialized object.
*/
- static final long serialVersionUID = -8007156725367842053L;
+ private static final long serialVersionUID = -8007156725367842053L;
/**
* Constructs a <code>NameNotFoundException</code> instance with all data
Modified: harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/javax/naming/NoInitialContextException.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/javax/naming/NoInitialContextException.java?rev=721077&r1=721076&r2=721077&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/javax/naming/NoInitialContextException.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/javax/naming/NoInitialContextException.java Wed Nov 26 21:10:32 2008
@@ -40,7 +40,7 @@
* This constant is used during deserialization to check the version which
* created the serialized object.
*/
- static final long serialVersionUID = -3413733186901258623L;
+ private static final long serialVersionUID = -3413733186901258623L;
/**
* Constructs an <code>NoInitialContextException</code> instance with all
Modified: harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/javax/naming/NoPermissionException.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/javax/naming/NoPermissionException.java?rev=721077&r1=721076&r2=721077&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/javax/naming/NoPermissionException.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/javax/naming/NoPermissionException.java Wed Nov 26 21:10:32 2008
@@ -28,7 +28,7 @@
*/
public class NoPermissionException extends NamingSecurityException {
- static final long serialVersionUID = 8395332708699751775L;
+ private static final long serialVersionUID = 8395332708699751775L;
/**
* Constructs a <code>NoPermissionException</code> instance with all data
Modified: harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/javax/naming/NotContextException.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/javax/naming/NotContextException.java?rev=721077&r1=721076&r2=721077&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/javax/naming/NotContextException.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/javax/naming/NotContextException.java Wed Nov 26 21:10:32 2008
@@ -35,7 +35,7 @@
* This constant is used during deserialization to check the version which
* created the serialized object.
*/
- static final long serialVersionUID = 849752551644540417L;
+ private static final long serialVersionUID = 849752551644540417L;
/**
* Constructs a <code>NotContextException</code> instance with all data
Modified: harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/javax/naming/OperationNotSupportedException.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/javax/naming/OperationNotSupportedException.java?rev=721077&r1=721076&r2=721077&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/javax/naming/OperationNotSupportedException.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/javax/naming/OperationNotSupportedException.java Wed Nov 26 21:10:32 2008
@@ -31,7 +31,7 @@
* This constant is used during deserialization to check the version which
* created the serialized object.
*/
- static final long serialVersionUID = 5493232822427682064L;
+ private static final long serialVersionUID = 5493232822427682064L;
/**
* Constructs a <code>OperationNotSupportedException</code> instance with
Modified: harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/javax/naming/PartialResultException.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/javax/naming/PartialResultException.java?rev=721077&r1=721076&r2=721077&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/javax/naming/PartialResultException.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/javax/naming/PartialResultException.java Wed Nov 26 21:10:32 2008
@@ -27,7 +27,7 @@
*/
public class PartialResultException extends NamingException {
- static final long serialVersionUID = 2572144970049426786L;
+ private static final long serialVersionUID = 2572144970049426786L;
/**
* Constructs a <code>PartialResultException</code> instance with all data
Modified: harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/javax/naming/RefAddr.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/javax/naming/RefAddr.java?rev=721077&r1=721076&r2=721077&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/javax/naming/RefAddr.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/javax/naming/RefAddr.java Wed Nov 26 21:10:32 2008
@@ -35,7 +35,7 @@
* This constant is used during deserialization to check the version which
* created the serialized object.
*/
- static final long serialVersionUID = -1468165120479154358L;
+ private static final long serialVersionUID = -1468165120479154358L;
/**
* The type of the address.
@@ -114,11 +114,7 @@
@SuppressWarnings("nls")
@Override
public String toString() {
- return "The type of the address is: "
- + this.addrType
- + "\nThe content of the address is: "
- + (null == this.getContent() ? "null" : this.getContent()
- .toString()) + "\n";
+ return "Type: " + addrType + "\nContent: " + getContent() + "\n";
}
}
Modified: harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/javax/naming/Reference.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/javax/naming/Reference.java?rev=721077&r1=721076&r2=721077&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/javax/naming/Reference.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/javax/naming/Reference.java Wed Nov 26 21:10:32 2008
@@ -337,16 +337,18 @@
*
* @return the string representation of this object
*/
+ @SuppressWarnings("nls")
@Override
public String toString() {
- String s = "Reference class name: " + this.className; //$NON-NLS-1$
- Enumeration<RefAddr> e = this.addrs.elements();
+ StringBuilder s = new StringBuilder("Reference Class Name: ");
+ s.append(className);
+ s.append("\n");
- s += "\nReference addresses:"; //$NON-NLS-1$
+ Enumeration<RefAddr> e = this.addrs.elements();
while (e.hasMoreElements()) {
- s += "\n\t" + e.nextElement(); //$NON-NLS-1$
+ s.append(e.nextElement());
}
- return s + "\n"; //$NON-NLS-1$
+ return s.toString();
}
}
Modified: harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/javax/naming/ServiceUnavailableException.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/javax/naming/ServiceUnavailableException.java?rev=721077&r1=721076&r2=721077&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/javax/naming/ServiceUnavailableException.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/javax/naming/ServiceUnavailableException.java Wed Nov 26 21:10:32 2008
@@ -31,7 +31,7 @@
* This constant is used during deserialization to check the version which
* created the serialized object.
*/
- static final long serialVersionUID = -4996964726566773444L;
+ private static final long serialVersionUID = -4996964726566773444L;
/**
* Constructs a <code>ServiceUnavailableException</code> instance with all
Modified: harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/javax/naming/SizeLimitExceededException.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/javax/naming/SizeLimitExceededException.java?rev=721077&r1=721076&r2=721077&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/javax/naming/SizeLimitExceededException.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/javax/naming/SizeLimitExceededException.java Wed Nov 26 21:10:32 2008
@@ -27,7 +27,7 @@
*/
public class SizeLimitExceededException extends LimitExceededException {
- static final long serialVersionUID = 7129289564879168579L;
+ private static final long serialVersionUID = 7129289564879168579L;
/**
* Constructs a <code>SizeLimitExceededException</code> instance with all
Modified: harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/javax/naming/StringRefAddr.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/javax/naming/StringRefAddr.java?rev=721077&r1=721076&r2=721077&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/javax/naming/StringRefAddr.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/javax/naming/StringRefAddr.java Wed Nov 26 21:10:32 2008
@@ -27,7 +27,7 @@
* This constant is used during deserialization to check the version which
* created the serialized object.
*/
- static final long serialVersionUID = -8913762495138505527L;
+ private static final long serialVersionUID = -8913762495138505527L;
/**
* The address itself. For StringRefAddr the address is a string such as a
Modified: harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/javax/naming/TimeLimitExceededException.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/javax/naming/TimeLimitExceededException.java?rev=721077&r1=721076&r2=721077&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/javax/naming/TimeLimitExceededException.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/javax/naming/TimeLimitExceededException.java Wed Nov 26 21:10:32 2008
@@ -31,7 +31,7 @@
* This constant is used during deserialization to check the version which
* created the serialized object.
*/
- static final long serialVersionUID = -3597009011385034696L;
+ private static final long serialVersionUID = -3597009011385034696L;
/**
* Constructs a <code>TimeLimitExceededException</code> instance with all
Modified: harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/javax/naming/directory/Attribute.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/javax/naming/directory/Attribute.java?rev=721077&r1=721076&r2=721077&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/javax/naming/directory/Attribute.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/javax/naming/directory/Attribute.java Wed Nov 26 21:10:32 2008
@@ -78,7 +78,7 @@
* This constant is used during deserialization to check the version which
* created the serialized object.
*/
- static final long serialVersionUID = 0x78d7ee3675a55244L;
+ public static final long serialVersionUID = 0x78d7ee3675a55244L;
/**
* Adds a value at the specified index. The index is only meaningful if the
Modified: harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/javax/naming/directory/BasicAttribute.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/javax/naming/directory/BasicAttribute.java?rev=721077&r1=721076&r2=721077&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/javax/naming/directory/BasicAttribute.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/javax/naming/directory/BasicAttribute.java Wed Nov 26 21:10:32 2008
@@ -63,7 +63,7 @@
* This constant is used during deserialization to check the version which
* created the serialized object.
*/
- static final long serialVersionUID = 0x5d95d32a668565beL;
+ private static final long serialVersionUID = 0x5d95d32a668565beL;
/**
* The attribute identifier. It is initialized by the public constructors
Modified: harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/javax/naming/directory/BasicAttributes.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/javax/naming/directory/BasicAttributes.java?rev=721077&r1=721076&r2=721077&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/javax/naming/directory/BasicAttributes.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/javax/naming/directory/BasicAttributes.java Wed Nov 26 21:10:32 2008
@@ -57,7 +57,7 @@
* This constant is used during deserialization to check the version which
* created the serialized object.
*/
- static final long serialVersionUID = 0x451d18d6a95539d8L;
+ private static final long serialVersionUID = 0x451d18d6a95539d8L;
/**
* Flag indicating whether the case of attribute identifier is ignored.
Modified: harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/javax/naming/ldap/LdapReferralException.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/javax/naming/ldap/LdapReferralException.java?rev=721077&r1=721076&r2=721077&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/javax/naming/ldap/LdapReferralException.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/javax/naming/ldap/LdapReferralException.java Wed Nov 26 21:10:32 2008
@@ -33,7 +33,7 @@
* This constant is used during deserialization to check the version which
* created the serialized object.
*/
- static final long serialVersionUID = -1668992791764950804L;
+ private static final long serialVersionUID = -1668992791764950804L;
/**
* Default constructor.
Modified: harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/javax/naming/ldap/UnsolicitedNotificationEvent.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/javax/naming/ldap/UnsolicitedNotificationEvent.java?rev=721077&r1=721076&r2=721077&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/javax/naming/ldap/UnsolicitedNotificationEvent.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/javax/naming/ldap/UnsolicitedNotificationEvent.java Wed Nov 26 21:10:32 2008
@@ -29,7 +29,7 @@
* This constant is used during deserialization to check the version which
* created the serialized object.
*/
- static final long serialVersionUID = -2382603380799883705L;
+ private static final long serialVersionUID = -2382603380799883705L;
/**
* The specific notification.
Modified: harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/javax/naming/spi/ResolveResult.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/javax/naming/spi/ResolveResult.java?rev=721077&r1=721076&r2=721077&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/javax/naming/spi/ResolveResult.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/javax/naming/spi/ResolveResult.java Wed Nov 26 21:10:32 2008
@@ -34,7 +34,7 @@
*/
public class ResolveResult implements java.io.Serializable {
- static final long serialVersionUID = -4552108072002407559L;
+ private static final long serialVersionUID = -4552108072002407559L;
/**
* This field holds the object associated with the resolved name. It may be
Modified: harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/org/apache/harmony/jndi/internal/parser/LdapRdnParser.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/org/apache/harmony/jndi/internal/parser/LdapRdnParser.java?rev=721077&r1=721076&r2=721077&view=diff
==============================================================================
--- harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/org/apache/harmony/jndi/internal/parser/LdapRdnParser.java (original)
+++ harmony/enhanced/classlib/branches/java6/modules/jndi/src/main/java/org/apache/harmony/jndi/internal/parser/LdapRdnParser.java Wed Nov 26 21:10:32 2008
@@ -30,7 +30,7 @@
*/
public class LdapRdnParser implements LdapParser {
- private static String name = null;
+ private String name = null;
LdapTypeAndValueList list = new LdapTypeAndValueList();
@@ -45,9 +45,9 @@
*/
public LdapRdnParser(String name) {
if (name.endsWith("+")) {
- LdapRdnParser.name = name.substring(0, name.lastIndexOf('+'));
+ this.name = name.substring(0, name.lastIndexOf('+'));
} else {
- LdapRdnParser.name = name;
+ this.name = name;
}
}