From 56d6a6a7a30b0821e0ac65ce442d2d5acf83bb60 Mon Sep 17 00:00:00 2001 From: Victor Date: Thu, 11 Jul 2013 19:35:57 +0300 Subject: [PATCH] Fix imports --- .../com/annimon/socketfiletransfer/BrightnessActivity.java | 2 +- .../java/com/annimon/socketfiletransfer/MainActivity.java | 2 +- .../com/annimon/socketfiletransfer/MessagesActivity.java | 2 +- .../com/annimon/socketfiletransfer/OperationListener.java | 3 ++- .../src/main/java/com/annimon/socketfiletransfer/Server.java | 2 -- .../com/annimon/socketfiletransfer/SocketTransferTask.java | 1 - .../java/com/annimon/socketfiletransfer/TransferServer.java | 3 +-- .../socketfiletransfer/operations/MessageOperation.java | 5 +---- 8 files changed, 7 insertions(+), 13 deletions(-) diff --git a/SocketFileTransfer/src/main/java/com/annimon/socketfiletransfer/BrightnessActivity.java b/SocketFileTransfer/src/main/java/com/annimon/socketfiletransfer/BrightnessActivity.java index 42cf9a8..6ccdf98 100644 --- a/SocketFileTransfer/src/main/java/com/annimon/socketfiletransfer/BrightnessActivity.java +++ b/SocketFileTransfer/src/main/java/com/annimon/socketfiletransfer/BrightnessActivity.java @@ -1,7 +1,7 @@ package com.annimon.socketfiletransfer; -import android.os.Bundle; import android.app.Activity; +import android.os.Bundle; import android.widget.SeekBar; public class BrightnessActivity extends Activity { diff --git a/SocketFileTransfer/src/main/java/com/annimon/socketfiletransfer/MainActivity.java b/SocketFileTransfer/src/main/java/com/annimon/socketfiletransfer/MainActivity.java index 78e6e9f..0d9d407 100644 --- a/SocketFileTransfer/src/main/java/com/annimon/socketfiletransfer/MainActivity.java +++ b/SocketFileTransfer/src/main/java/com/annimon/socketfiletransfer/MainActivity.java @@ -1,11 +1,11 @@ package com.annimon.socketfiletransfer; +import android.app.Activity; import android.content.ActivityNotFoundException; import android.content.Intent; import android.database.Cursor; import android.net.Uri; import android.os.Bundle; -import android.app.Activity; import android.provider.MediaStore; import android.view.Menu; import android.view.MenuItem; diff --git a/SocketFileTransfer/src/main/java/com/annimon/socketfiletransfer/MessagesActivity.java b/SocketFileTransfer/src/main/java/com/annimon/socketfiletransfer/MessagesActivity.java index 44a9005..b94e1de 100644 --- a/SocketFileTransfer/src/main/java/com/annimon/socketfiletransfer/MessagesActivity.java +++ b/SocketFileTransfer/src/main/java/com/annimon/socketfiletransfer/MessagesActivity.java @@ -1,7 +1,7 @@ package com.annimon.socketfiletransfer; -import android.os.Bundle; import android.app.Activity; +import android.os.Bundle; import android.view.View; import android.widget.EditText; import android.widget.TextView; diff --git a/SocketFileTransfer/src/main/java/com/annimon/socketfiletransfer/OperationListener.java b/SocketFileTransfer/src/main/java/com/annimon/socketfiletransfer/OperationListener.java index 29b4c82..6231698 100644 --- a/SocketFileTransfer/src/main/java/com/annimon/socketfiletransfer/OperationListener.java +++ b/SocketFileTransfer/src/main/java/com/annimon/socketfiletransfer/OperationListener.java @@ -2,10 +2,11 @@ package com.annimon.socketfiletransfer; import com.annimon.socketfiletransfer.operations.BrightnessOperation; import com.annimon.socketfiletransfer.operations.CursorOperation; -import com.annimon.socketfiletransfer.operations.MessageOperation; import com.annimon.socketfiletransfer.operations.FileOperation; +import com.annimon.socketfiletransfer.operations.MessageOperation; import com.annimon.socketfiletransfer.operations.Operation; import com.annimon.socketfiletransfer.util.ExceptionHandler; + import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.IOException; diff --git a/SocketFileTransfer/src/main/java/com/annimon/socketfiletransfer/Server.java b/SocketFileTransfer/src/main/java/com/annimon/socketfiletransfer/Server.java index a24428a..156b67f 100644 --- a/SocketFileTransfer/src/main/java/com/annimon/socketfiletransfer/Server.java +++ b/SocketFileTransfer/src/main/java/com/annimon/socketfiletransfer/Server.java @@ -1,11 +1,9 @@ package com.annimon.socketfiletransfer; import com.annimon.socketfiletransfer.util.Config; -import com.annimon.socketfiletransfer.util.Console; import com.annimon.socketfiletransfer.util.ExceptionHandler; import java.io.IOException; -import java.net.InetAddress; import java.net.ServerSocket; import java.net.Socket; diff --git a/SocketFileTransfer/src/main/java/com/annimon/socketfiletransfer/SocketTransferTask.java b/SocketFileTransfer/src/main/java/com/annimon/socketfiletransfer/SocketTransferTask.java index bc560a1..d9f354d 100644 --- a/SocketFileTransfer/src/main/java/com/annimon/socketfiletransfer/SocketTransferTask.java +++ b/SocketFileTransfer/src/main/java/com/annimon/socketfiletransfer/SocketTransferTask.java @@ -1,7 +1,6 @@ package com.annimon.socketfiletransfer; import android.os.AsyncTask; -import android.util.Log; import com.annimon.socketfiletransfer.util.Config; import com.annimon.socketfiletransfer.util.ExceptionHandler; diff --git a/SocketFileTransfer/src/main/java/com/annimon/socketfiletransfer/TransferServer.java b/SocketFileTransfer/src/main/java/com/annimon/socketfiletransfer/TransferServer.java index b8a9c83..54edbfd 100644 --- a/SocketFileTransfer/src/main/java/com/annimon/socketfiletransfer/TransferServer.java +++ b/SocketFileTransfer/src/main/java/com/annimon/socketfiletransfer/TransferServer.java @@ -4,7 +4,6 @@ import android.os.Handler; import com.annimon.socketfiletransfer.util.Console; import com.annimon.socketfiletransfer.util.ExceptionHandler; -import com.annimon.socketfiletransfer.util.MessageHistory; import java.net.Socket; @@ -38,7 +37,7 @@ public class TransferServer implements Runnable { } private void printClientInfo(Socket client) { - Console.println( client.getRemoteSocketAddress().toString() ); + Console.println(client.getRemoteSocketAddress().toString()); } } diff --git a/SocketFileTransfer/src/main/java/com/annimon/socketfiletransfer/operations/MessageOperation.java b/SocketFileTransfer/src/main/java/com/annimon/socketfiletransfer/operations/MessageOperation.java index 707fd7a..5b1358e 100644 --- a/SocketFileTransfer/src/main/java/com/annimon/socketfiletransfer/operations/MessageOperation.java +++ b/SocketFileTransfer/src/main/java/com/annimon/socketfiletransfer/operations/MessageOperation.java @@ -1,12 +1,9 @@ package com.annimon.socketfiletransfer.operations; -import android.util.Log; - import com.annimon.socketfiletransfer.OperationListener; import com.annimon.socketfiletransfer.util.Console; import com.annimon.socketfiletransfer.util.MessageHistory; -import java.io.DataInputStream; -import java.io.DataOutputStream; + import java.io.IOException; /**