From 56abbf57d2e671e06c2a3160fdf8b94b50d69997 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kjetil=20=C3=98rbekk?= <kjetil.orbekk@gmail.com>
Date: Tue, 7 Feb 2012 09:46:38 +0100
Subject: Fix warnings.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

– Remove unused imports.
– Remove unused variables.
---
 same/src/main/java/com/orbekk/net/HttpUtil.java               | 1 -
 same/src/main/java/com/orbekk/net/MyJsonRpcHttpClient.java    | 2 --
 same/src/main/java/com/orbekk/same/Client.java                | 1 -
 same/src/main/java/com/orbekk/same/ConnectionManagerImpl.java | 1 -
 same/src/main/java/com/orbekk/same/SameController.java        | 3 ---
 same/src/main/java/com/orbekk/same/config/Configuration.java  | 1 -
 same/src/main/java/com/orbekk/same/http/ServerBuilder.java    | 1 -
 7 files changed, 10 deletions(-)

(limited to 'same/src/main/java/com')

diff --git a/same/src/main/java/com/orbekk/net/HttpUtil.java b/same/src/main/java/com/orbekk/net/HttpUtil.java
index b4bb887..946c377 100644
--- a/same/src/main/java/com/orbekk/net/HttpUtil.java
+++ b/same/src/main/java/com/orbekk/net/HttpUtil.java
@@ -3,7 +3,6 @@ package com.orbekk.net;
 import java.io.IOException;
 import java.net.MalformedURLException;
 import java.net.URL;
-import java.net.URLConnection;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/same/src/main/java/com/orbekk/net/MyJsonRpcHttpClient.java b/same/src/main/java/com/orbekk/net/MyJsonRpcHttpClient.java
index 237198e..f4973f2 100644
--- a/same/src/main/java/com/orbekk/net/MyJsonRpcHttpClient.java
+++ b/same/src/main/java/com/orbekk/net/MyJsonRpcHttpClient.java
@@ -4,7 +4,6 @@ import java.io.IOException;
 import java.io.OutputStream;
 import java.lang.reflect.Type;
 import java.net.URL;
-import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.http.HttpEntity;
@@ -16,7 +15,6 @@ import org.apache.http.entity.EntityTemplate;
 import org.apache.http.impl.client.DefaultHttpClient;
 import org.apache.http.params.HttpConnectionParams;
 import org.apache.http.params.HttpParams;
-import org.codehaus.jackson.map.ObjectMapper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/same/src/main/java/com/orbekk/same/Client.java b/same/src/main/java/com/orbekk/same/Client.java
index 60faf1b..7730f3e 100644
--- a/same/src/main/java/com/orbekk/same/Client.java
+++ b/same/src/main/java/com/orbekk/same/Client.java
@@ -2,7 +2,6 @@ package com.orbekk.same;
 
 import static com.orbekk.same.StackTraceUtil.throwableToString;
 
-import java.util.ArrayList;
 import java.util.List;
 
 import org.codehaus.jackson.type.TypeReference;
diff --git a/same/src/main/java/com/orbekk/same/ConnectionManagerImpl.java b/same/src/main/java/com/orbekk/same/ConnectionManagerImpl.java
index 2767003..b978ab4 100644
--- a/same/src/main/java/com/orbekk/same/ConnectionManagerImpl.java
+++ b/same/src/main/java/com/orbekk/same/ConnectionManagerImpl.java
@@ -1,6 +1,5 @@
 package com.orbekk.same;
 
-import com.googlecode.jsonrpc4j.JsonRpcHttpClient;
 import com.googlecode.jsonrpc4j.ProxyUtil;
 import com.orbekk.net.MyJsonRpcHttpClient;
 import com.orbekk.paxos.PaxosService;
diff --git a/same/src/main/java/com/orbekk/same/SameController.java b/same/src/main/java/com/orbekk/same/SameController.java
index 16c4d80..5fc319d 100644
--- a/same/src/main/java/com/orbekk/same/SameController.java
+++ b/same/src/main/java/com/orbekk/same/SameController.java
@@ -4,7 +4,6 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import com.orbekk.net.BroadcastListener;
-import com.orbekk.net.HttpUtil;
 import com.orbekk.paxos.PaxosService;
 import com.orbekk.paxos.PaxosServiceImpl;
 import com.orbekk.same.config.Configuration;
@@ -14,7 +13,6 @@ import com.orbekk.same.http.StateServlet;
 
 public class SameController {
     private Logger logger = LoggerFactory.getLogger(getClass());
-    private int port;
     private ServerContainer server;
     private Master master;
     private Client client;
@@ -72,7 +70,6 @@ public class SameController {
             Client client,
             PaxosServiceImpl paxos,
             DiscoveryService discoveryService) {
-        this.port = port;
         this.server = server;
         this.master = master;
         this.client = client;
diff --git a/same/src/main/java/com/orbekk/same/config/Configuration.java b/same/src/main/java/com/orbekk/same/config/Configuration.java
index b52b22a..f4cb0cb 100644
--- a/same/src/main/java/com/orbekk/same/config/Configuration.java
+++ b/same/src/main/java/com/orbekk/same/config/Configuration.java
@@ -3,7 +3,6 @@ package com.orbekk.same.config;
 import java.io.FileNotFoundException;
 import java.io.FileReader;
 import java.io.IOException;
-import java.util.Enumeration;
 import java.util.Properties;
 
 import org.slf4j.Logger;
diff --git a/same/src/main/java/com/orbekk/same/http/ServerBuilder.java b/same/src/main/java/com/orbekk/same/http/ServerBuilder.java
index ff29e43..dcb7b8a 100644
--- a/same/src/main/java/com/orbekk/same/http/ServerBuilder.java
+++ b/same/src/main/java/com/orbekk/same/http/ServerBuilder.java
@@ -2,7 +2,6 @@ package com.orbekk.same.http;
 
 import javax.servlet.http.HttpServlet;
 
-import org.eclipse.jetty.server.Server;
 import org.eclipse.jetty.servlet.ServletContextHandler;
 import org.eclipse.jetty.servlet.ServletHolder;
 import org.slf4j.Logger;
-- 
cgit v1.2.3