summaryrefslogtreecommitdiff
path: root/same/src/main/java/com/orbekk/net
diff options
context:
space:
mode:
authorKjetil Ørbekk <kjetil.orbekk@gmail.com>2012-02-27 16:08:54 +0100
committerKjetil Ørbekk <kjetil.orbekk@gmail.com>2012-02-27 16:08:54 +0100
commitc58c649531e4884a92f07d9b12f0ad77fbcf5d6a (patch)
tree38d2997ec6cdaed9120dba012b61afbb8b2e53ea /same/src/main/java/com/orbekk/net
parentee51a98e9b61336610d667de57a8cff70d0ac1d9 (diff)
Clean up source code.
Clean up source code with Eclipse. In particular remove tabs.
Diffstat (limited to 'same/src/main/java/com/orbekk/net')
-rw-r--r--same/src/main/java/com/orbekk/net/BroadcastListener.java10
-rw-r--r--same/src/main/java/com/orbekk/net/Broadcaster.java7
-rw-r--r--same/src/main/java/com/orbekk/net/MyJsonRpcHttpClient.java16
3 files changed, 17 insertions, 16 deletions
diff --git a/same/src/main/java/com/orbekk/net/BroadcastListener.java b/same/src/main/java/com/orbekk/net/BroadcastListener.java
index 50ad5af..df8c02e 100644
--- a/same/src/main/java/com/orbekk/net/BroadcastListener.java
+++ b/same/src/main/java/com/orbekk/net/BroadcastListener.java
@@ -13,11 +13,11 @@ public class BroadcastListener {
private int port;
private Logger logger = LoggerFactory.getLogger(getClass());
DatagramSocket socket;
-
+
public BroadcastListener(int port) {
this.port = port;
}
-
+
public synchronized DatagramPacket listen() {
logger.debug("Waiting for broadcast on port " + port);
try {
@@ -43,17 +43,17 @@ public class BroadcastListener {
logger.warn("Exception when listening for broadcast: {}", e);
return null;
}
-
+
String address = packet.getAddress().getHostAddress();
logger.debug("Received broadcast from " + address +
": " + new String(packet.getData(), 0, packet.getLength()));
return packet;
}
-
+
public void interrupt() {
socket.close();
}
-
+
public static void main(String[] args) {
int port = Integer.parseInt(args[0]);
BroadcastListener listener = new BroadcastListener(port);
diff --git a/same/src/main/java/com/orbekk/net/Broadcaster.java b/same/src/main/java/com/orbekk/net/Broadcaster.java
index b3e4860..cfec0ae 100644
--- a/same/src/main/java/com/orbekk/net/Broadcaster.java
+++ b/same/src/main/java/com/orbekk/net/Broadcaster.java
@@ -17,10 +17,10 @@ import org.slf4j.LoggerFactory;
public class Broadcaster implements BroadcasterInterface {
private Logger logger = LoggerFactory.getLogger(getClass());
-
+
public List<InetAddress> getBroadcastAddresses() {
List<InetAddress> broadcastAddresses = new LinkedList<InetAddress>();
-
+
Enumeration<NetworkInterface> interfaces;
try {
interfaces = NetworkInterface.getNetworkInterfaces();
@@ -48,6 +48,7 @@ public class Broadcaster implements BroadcasterInterface {
return broadcastAddresses;
}
+ @Override
public boolean sendBroadcast(int port, byte[] data) {
boolean successful = false;
for (InetAddress broadcastAddress : getBroadcastAddresses()) {
@@ -67,7 +68,7 @@ public class Broadcaster implements BroadcasterInterface {
}
return successful;
}
-
+
public static void main(String[] args) {
int port = Integer.parseInt(args[0]);
Broadcaster broadcaster = new Broadcaster();
diff --git a/same/src/main/java/com/orbekk/net/MyJsonRpcHttpClient.java b/same/src/main/java/com/orbekk/net/MyJsonRpcHttpClient.java
index f4973f2..f83bb41 100644
--- a/same/src/main/java/com/orbekk/net/MyJsonRpcHttpClient.java
+++ b/same/src/main/java/com/orbekk/net/MyJsonRpcHttpClient.java
@@ -31,9 +31,9 @@ public class MyJsonRpcHttpClient extends JsonRpcHttpClient {
private URL serviceUrl;
private JsonRpcClient rpcClient;
private HttpClient httpClient;
-
+
public MyJsonRpcHttpClient(URL serviceUrl, int connectionTimeout,
- int readTimeout) {
+ int readTimeout) {
super(null);
httpClient = new DefaultHttpClient();
HttpParams params = httpClient.getParams();
@@ -41,8 +41,8 @@ public class MyJsonRpcHttpClient extends JsonRpcHttpClient {
HttpConnectionParams.setSoTimeout(params, readTimeout);
rpcClient = new JsonRpcClient();
this.serviceUrl = serviceUrl;
- }
-
+ }
+
@Override
public synchronized Object invoke(
final String methodName, final Object[] arguments, Type returnType,
@@ -59,15 +59,15 @@ public class MyJsonRpcHttpClient extends JsonRpcHttpClient {
}
});
entity.setContentType("application/json-rpc");
-
+
HttpPost post = new HttpPost(serviceUrl.toString());
-
+
for (Map.Entry<String, String> entry : extraHeaders.entrySet()) {
post.addHeader(entry.getKey(), entry.getValue());
}
-
+
post.setEntity(entity);
-
+
HttpResponse response = httpClient.execute(post);
HttpEntity responseEntity = response.getEntity();