Mercurial > hg > FederatedLinda

changeset 66:82a292aa41ad

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix
author one
date Sat, 06 Jun 2009 14:23:02 +0900
parents cc860e8beb8f
children 264123227f0d
files src/fdl/FDLindaServ.java src/fdl/PSXLindaImpl.java src/fdl/URLKicker.java src/fdl/test/TestEtc.java src/fdl/test/TestMetaLinda.java src/fdl/test/TestPSXLinda.java src/fdl/test/metaTransfer/FDLServWithSend.java src/fdl/test/metaTransfer/MetaProtocolEngine.java src/fdl/test/metaTransfer/MetaProtocolEngine_not.java src/fdl/test/metaTransfer/Ring/FDLServWithSend.java src/fdl/test/metaTransfer/Ring/MetaProtocolEngine.java src/fdl/test/metaTransfer/Ring/TestTransfer.java src/fdl/test/metaTransfer/Ring/TestTransferRing.java src/fdl/test/metaTransfer/Ring/TestTransferThree.java src/fdl/test/metaTransfer/TestTransfer.java src/fdl/test/transfer/TestTransfer.java src/fdl/test/transfer/cluster/FDLServWithSendMeta.java src/fdl/test/transfer/cluster/HostCheck.java src/fdl/test/transfer/cluster/MetaProtocolEngine.java src/fdl/test/transfer/cluster/ProtocolEngineMain.java src/fdl/test/transfer/three/TestTransfer.java src/fdl/test/transfer/two/TestTransfer.java src/fdl/test2/Server.java src/fdl/test2/TestRead.java src/fdl/test2/TestRing.java src/fdl/test2/client.java
diffstat 26 files changed, 42 insertions(+), 49 deletions(-) [+]
line wrap: on
line diff
--- a/src/fdl/FDLindaServ.java	Thu Feb 26 08:46:29 2009 +0900
+++ b/src/fdl/FDLindaServ.java	Sat Jun 06 14:23:02 2009 +0900
@@ -12,12 +12,7 @@
 import java.util.Iterator;
 import java.util.logging.Level;
 
-import fdl.test.transfer.cluster.MetaProtocolEngine;
 
-/**
- * @author kono
- *
- */
 public class FDLindaServ  {
 	static final int MAX_REQ = 1;
 	static final int FAIL = (-1);
--- a/src/fdl/PSXLindaImpl.java	Thu Feb 26 08:46:29 2009 +0900
+++ b/src/fdl/PSXLindaImpl.java	Sat Jun 06 14:23:02 2009 +0900
@@ -13,7 +13,6 @@
 package fdl;
 
 import java.io.IOException;
-//import java.net.InetAddress;
 import java.net.InetSocketAddress;
 import java.net.Socket;
 import java.nio.ByteBuffer;
--- a/src/fdl/URLKicker.java	Thu Feb 26 08:46:29 2009 +0900
+++ b/src/fdl/URLKicker.java	Sat Jun 06 14:23:02 2009 +0900
@@ -11,8 +11,10 @@
 
 package fdl;
 
-import java.net.*;
-import java.io.*;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.net.URL;
+import java.net.URLConnection;
 
 
 /**
--- a/src/fdl/test/TestEtc.java	Thu Feb 26 08:46:29 2009 +0900
+++ b/src/fdl/test/TestEtc.java	Sat Jun 06 14:23:02 2009 +0900
@@ -2,7 +2,6 @@
 package fdl.test;
 
 import java.io.IOException;
-//import java.nio.ByteBuffer;
 
 import fdl.PSXQueue;
 
--- a/src/fdl/test/TestMetaLinda.java	Thu Feb 26 08:46:29 2009 +0900
+++ b/src/fdl/test/TestMetaLinda.java	Sat Jun 06 14:23:02 2009 +0900
@@ -17,9 +17,9 @@
 import java.nio.ByteBuffer;
 
 import fdl.FederatedLinda;
+import fdl.PSX;
 import fdl.PSXLinda;
 import fdl.PSXReply;
-import fdl.PSX;
 
 
 /**
--- a/src/fdl/test/TestPSXLinda.java	Thu Feb 26 08:46:29 2009 +0900
+++ b/src/fdl/test/TestPSXLinda.java	Sat Jun 06 14:23:02 2009 +0900
@@ -18,9 +18,9 @@
 import java.nio.ByteBuffer;
 
 import fdl.FederatedLinda;
+import fdl.PSX;
 import fdl.PSXLinda;
 import fdl.PSXReply;
-import fdl.PSX;
 
 
 /**
--- a/src/fdl/test/metaTransfer/FDLServWithSend.java	Thu Feb 26 08:46:29 2009 +0900
+++ b/src/fdl/test/metaTransfer/FDLServWithSend.java	Sat Jun 06 14:23:02 2009 +0900
@@ -3,7 +3,7 @@
 import java.io.IOException;
 
 import fdl.FDLindaServ;
-//import fdl.MetaLinda;
+import fdl.MetaLinda;
 
 
 public class FDLServWithSend extends FDLindaServ {
@@ -12,16 +12,11 @@
 		super(port);
 		this.port1 = port1;
 	}
-	
+
 	@Override public void mainLoop() {
 		System.out.println("change mainloop");
-<<<<<<< local
 		MetaLinda ml = new MetaLinda(tupleSpace, this);
 		MetaProtocolEngine mpe = new MetaProtocolEngine(ml,"MetaEngine", port1);
-=======
-//		MetaLinda ml = new MetaLinda(tupleSpace, this);
-//		mpe = new MetaProtocolEngine(ml,"MetaEngine", port1);
->>>>>>> other
 		mpe.mainLoop();
 	}
 
--- a/src/fdl/test/metaTransfer/MetaProtocolEngine.java	Thu Feb 26 08:46:29 2009 +0900
+++ b/src/fdl/test/metaTransfer/MetaProtocolEngine.java	Sat Jun 06 14:23:02 2009 +0900
@@ -5,9 +5,7 @@
 import java.io.IOException;
 import java.nio.ByteBuffer;
 
-
 import fdl.MetaEngine;
-
 import fdl.MetaLinda;
 import fdl.PSXLinda;
 import fdl.PSXReply;
--- a/src/fdl/test/metaTransfer/MetaProtocolEngine_not.java	Thu Feb 26 08:46:29 2009 +0900
+++ b/src/fdl/test/metaTransfer/MetaProtocolEngine_not.java	Sat Jun 06 14:23:02 2009 +0900
@@ -5,7 +5,6 @@
 
 import fdl.FederatedLinda;
 import fdl.MetaEngine;
-//import fdl.MetaReply;
 import fdl.MetaLinda;
 import fdl.PSXLinda;
 import fdl.PSXReply;
--- a/src/fdl/test/metaTransfer/Ring/FDLServWithSend.java	Thu Feb 26 08:46:29 2009 +0900
+++ b/src/fdl/test/metaTransfer/Ring/FDLServWithSend.java	Sat Jun 06 14:23:02 2009 +0900
@@ -15,11 +15,7 @@
 	@Override public void mainLoop() {
 		System.out.println("change mainloop");
 		MetaLinda ml = new MetaLinda(tupleSpace, this);
-<<<<<<< local
-		MetaProtocolEngine mpe = new MetaProtocolEngine(ml,"MetaEngine", port1);
-=======
-		mpe = new MetaProtocolEngine(ml,"MetaEngine", port1, port);
->>>>>>> other
+		MetaProtocolEngine mpe = new MetaProtocolEngine(ml,"MetaEngine", port1, port1);
 		mpe.mainLoop();
 	}
 
--- a/src/fdl/test/metaTransfer/Ring/MetaProtocolEngine.java	Thu Feb 26 08:46:29 2009 +0900
+++ b/src/fdl/test/metaTransfer/Ring/MetaProtocolEngine.java	Sat Jun 06 14:23:02 2009 +0900
@@ -5,9 +5,7 @@
 import java.io.IOException;
 import java.nio.ByteBuffer;
 
-
 import fdl.MetaEngine;
-
 import fdl.MetaLinda;
 import fdl.PSXLinda;
 import fdl.PSXReply;
--- a/src/fdl/test/metaTransfer/Ring/TestTransfer.java	Thu Feb 26 08:46:29 2009 +0900
+++ b/src/fdl/test/metaTransfer/Ring/TestTransfer.java	Sat Jun 06 14:23:02 2009 +0900
@@ -1,6 +1,6 @@
 package fdl.test.metaTransfer.Ring;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
 
 import java.io.IOException;
 
--- a/src/fdl/test/metaTransfer/Ring/TestTransferRing.java	Thu Feb 26 08:46:29 2009 +0900
+++ b/src/fdl/test/metaTransfer/Ring/TestTransferRing.java	Sat Jun 06 14:23:02 2009 +0900
@@ -1,6 +1,6 @@
 package fdl.test.metaTransfer.Ring;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
 
 import org.junit.Test;
 
--- a/src/fdl/test/metaTransfer/Ring/TestTransferThree.java	Thu Feb 26 08:46:29 2009 +0900
+++ b/src/fdl/test/metaTransfer/Ring/TestTransferThree.java	Sat Jun 06 14:23:02 2009 +0900
@@ -1,6 +1,6 @@
 package fdl.test.metaTransfer.Ring;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
 
 import org.junit.Test;
 
--- a/src/fdl/test/metaTransfer/TestTransfer.java	Thu Feb 26 08:46:29 2009 +0900
+++ b/src/fdl/test/metaTransfer/TestTransfer.java	Sat Jun 06 14:23:02 2009 +0900
@@ -1,6 +1,6 @@
 package fdl.test.metaTransfer;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
 
 import java.io.IOException;
 
--- a/src/fdl/test/transfer/TestTransfer.java	Thu Feb 26 08:46:29 2009 +0900
+++ b/src/fdl/test/transfer/TestTransfer.java	Sat Jun 06 14:23:02 2009 +0900
@@ -1,6 +1,7 @@
 package fdl.test.transfer;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+
 import org.junit.Test;
 
 public class TestTransfer {
--- a/src/fdl/test/transfer/cluster/FDLServWithSendMeta.java	Thu Feb 26 08:46:29 2009 +0900
+++ b/src/fdl/test/transfer/cluster/FDLServWithSendMeta.java	Sat Jun 06 14:23:02 2009 +0900
@@ -4,7 +4,8 @@
 import java.io.FileNotFoundException;
 import java.io.FileReader;
 import java.io.IOException;
-import java.net.*;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
 
 import fdl.FDLindaServ;
 import fdl.MetaLinda;
@@ -26,7 +27,7 @@
 	
 	@Override public void mainLoop() {
 		MetaLinda ml = new MetaLinda(tupleSpace, this);
-		mpe = new MetaProtocolEngine(ml, nextHost, chknum, bufsize, txt);
+		MetaProtocolEngine mpe = new MetaProtocolEngine(ml, nextHost, chknum, bufsize, txt);
 		mpe.mainLoop();
 	}
 	
--- a/src/fdl/test/transfer/cluster/HostCheck.java	Thu Feb 26 08:46:29 2009 +0900
+++ b/src/fdl/test/transfer/cluster/HostCheck.java	Sat Jun 06 14:23:02 2009 +0900
@@ -4,7 +4,7 @@
 import java.io.FileNotFoundException;
 import java.io.FileReader;
 import java.io.IOException;
-import java.net.*;
+import java.net.InetAddress;
 
 public class HostCheck {
 	private static String bufstring;
--- a/src/fdl/test/transfer/cluster/MetaProtocolEngine.java	Thu Feb 26 08:46:29 2009 +0900
+++ b/src/fdl/test/transfer/cluster/MetaProtocolEngine.java	Sat Jun 06 14:23:02 2009 +0900
@@ -1,12 +1,12 @@
 package fdl.test.transfer.cluster;
 
-import java.io.*;
-//import java.net.InetAddress;
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
 import java.nio.ByteBuffer;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 
-
 import fdl.MetaEngine;
 import fdl.MetaLinda;
 import fdl.PSXLinda;
--- a/src/fdl/test/transfer/cluster/ProtocolEngineMain.java	Thu Feb 26 08:46:29 2009 +0900
+++ b/src/fdl/test/transfer/cluster/ProtocolEngineMain.java	Sat Jun 06 14:23:02 2009 +0900
@@ -3,7 +3,7 @@
 import java.io.IOException;
 import java.nio.ByteBuffer;
 import java.text.SimpleDateFormat;
-import java.util.*;
+import java.util.Date;
 
 import fdl.FederatedLinda;
 import fdl.PSXLinda;
--- a/src/fdl/test/transfer/three/TestTransfer.java	Thu Feb 26 08:46:29 2009 +0900
+++ b/src/fdl/test/transfer/three/TestTransfer.java	Sat Jun 06 14:23:02 2009 +0900
@@ -1,6 +1,7 @@
 package fdl.test.transfer.three;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+
 import org.junit.Test;
 
 
--- a/src/fdl/test/transfer/two/TestTransfer.java	Thu Feb 26 08:46:29 2009 +0900
+++ b/src/fdl/test/transfer/two/TestTransfer.java	Sat Jun 06 14:23:02 2009 +0900
@@ -1,6 +1,7 @@
 package fdl.test.transfer.two;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+
 import org.junit.Test;
 
 public class TestTransfer {
--- a/src/fdl/test2/Server.java	Thu Feb 26 08:46:29 2009 +0900
+++ b/src/fdl/test2/Server.java	Sat Jun 06 14:23:02 2009 +0900
@@ -1,8 +1,10 @@
 package fdl.test2;
 
-import java.net.*;
-import java.io.*;
-import java.util.*;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.net.ServerSocket;
+import java.net.Socket;
+import java.util.Date;
 
 public class Server extends Thread{
 	static int Port = 10007;
--- a/src/fdl/test2/TestRead.java	Thu Feb 26 08:46:29 2009 +0900
+++ b/src/fdl/test2/TestRead.java	Sat Jun 06 14:23:02 2009 +0900
@@ -1,6 +1,9 @@
 package fdl.test2;
 
-import java.io.*;
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileReader;
+import java.io.IOException;
 
 public class TestRead {
 
--- a/src/fdl/test2/TestRing.java	Thu Feb 26 08:46:29 2009 +0900
+++ b/src/fdl/test2/TestRing.java	Sat Jun 06 14:23:02 2009 +0900
@@ -1,6 +1,7 @@
 package fdl.test2;
 
-import java.io.*;
+import java.io.BufferedReader;
+import java.io.FileReader;
 import java.io.IOException;
 import java.nio.ByteBuffer;
 
--- a/src/fdl/test2/client.java	Thu Feb 26 08:46:29 2009 +0900
+++ b/src/fdl/test2/client.java	Sat Jun 06 14:23:02 2009 +0900
@@ -1,7 +1,9 @@
 package fdl.test2;
 
-import java.io.*;
-import java.net.*;
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.net.Socket;
 
 public class client {
 	public static void main(String arg[]) throws IOException{