jdk 1.6, fixed some compiler warnings

.settings/org.eclipse.jdt.core.prefs

@@ -1,15 +1,15 @@
-#Sun Jul 10 22:18:34 CEST 2011
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.compliance=1.6
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.source=1.6
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
 org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0

README.txt

@@ -78,7 +78,7 @@ The source archive contains the full source, and also unit test code and a
 couple of example programs in the java/test/ directory.
 
 Pyrolite speaks Pyro4 protocol version 46 only (Pyro 4.22 and newer).
-The java library requires java 1.5 or newer.
+The java library requires java 1.6 or newer.
 The .net library requires .net runtime 3.5.
 The Java source was developed using Eclipse.
 The C#/.NET source was developed using mono, monodevelop and sharpdevelop.

build.xml

@@ -1,7 +1,7 @@
 <!-- ANT project build file for Pyrolite -->
 <project name="Pyrolite-java" default="all">
-  <property name="ant.build.javac.target" value="1.5" />
-  <property name="ant.build.javac.source" value="1.5" />
+  <property name="ant.build.javac.target" value="1.6" />
+  <property name="ant.build.javac.source" value="1.6" />
   <property name="libsrc" location="java/src" />
   <property name="testsrc" location="java/test" />
   <property name="build" location="java/bin" />

java/test/net/razorvine/pickle/test/ArrayConstructorTest.java

@@ -1,7 +1,6 @@
 package net.razorvine.pickle.test;
 
 import static org.junit.Assert.*;
-import junit.framework.Assert;
 import net.razorvine.pickle.PickleException;
 import net.razorvine.pickle.objects.ArrayConstructor;
 
@@ -15,35 +14,35 @@ public void testInvalidMachineTypes()
 		ArrayConstructor ac=new ArrayConstructor();
 		try {
 			ac.construct('b', -1, new byte[]{0});
-			Assert.fail("expected pickleexception");
+			fail("expected pickleexception");
 		} catch (PickleException x) {
 			//ok
 		}
 
 		try {
 			ac.construct('b', 0, new byte[]{0});
-			Assert.fail("expected pickleexception");
+			fail("expected pickleexception");
 		} catch (PickleException x) {
 			//ok
 		}
 
 		try {
 			ac.construct('?', 0, new byte[]{0});
-			Assert.fail("expected pickleexception");
+			fail("expected pickleexception");
 		} catch (PickleException x) {
 			//ok
 		}
 
 		try {
 			ac.construct('b', 22, new byte[]{0});
-			Assert.fail("expected pickleexception");
+			fail("expected pickleexception");
 		} catch (PickleException x) {
 			//ok
 		}
 
 		try {
 			ac.construct('d', 16, new byte[]{0});
-			Assert.fail("expected pickleexception");
+			fail("expected pickleexception");
 		} catch (PickleException x) {
 			//ok
 		}

java/test/net/razorvine/pyro/test/MessageTests.java

@@ -258,6 +258,7 @@ public void testChecksum() throws IOException
 		byte[] data = c.ReceivedData();
 		data[Message.HEADER_SIZE-2] = 0;
 		data[Message.HEADER_SIZE-1] = 0;
+		c.close();
 		c = new ConnectionMock(data);
 		try {
 			Message.recv(c, null);
@@ -266,5 +267,7 @@ public void testChecksum() throws IOException
 		catch(PyroException x) {
 			assertTrue(x.getMessage().contains("checksum"));
 		}
+		c.close();
+
 	}
 }