From d22dc8d4de67ff74229558493a02aa7ae5fb2f22 Mon Sep 17 00:00:00 2001 From: Victor Date: Thu, 11 Jul 2013 13:51:48 +0300 Subject: [PATCH] =?UTF-8?q?=D0=98=D0=BD=D1=82=D0=B5=D1=80=D1=84=D0=B5?= =?UTF-8?q?=D0=B9=D1=81=20Operation=20=D0=B8=D0=B7=D0=BC=D0=B5=D0=BD=D1=91?= =?UTF-8?q?=D0=BD=20=D0=BD=D0=B0=20=D0=B0=D0=B1=D1=81=D1=82=D1=80=D0=B0?= =?UTF-8?q?=D0=BA=D1=82=D0=BD=D1=8B=D0=B9=20=D0=BA=D0=BB=D0=B0=D1=81=D1=81?= =?UTF-8?q?=20=D0=B4=D0=BB=D1=8F=20=D1=81=D0=BE=D0=BA=D1=80=D1=8B=D1=82?= =?UTF-8?q?=D0=B8=D1=8F=20=D0=BD=D0=B5=D0=BA=D0=BE=D1=82=D0=BE=D1=80=D1=8B?= =?UTF-8?q?=D1=85=20=D0=B4=D0=B0=D0=BD=D0=BD=D1=8B=D1=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../operations/CursorOperation.java | 5 +---- .../socketfiletransfer/operations/FileOperation.java | 5 +---- .../operations/MessageOperation.java | 5 +---- .../socketfiletransfer/operations/Operation.java | 12 +++++++++--- 4 files changed, 12 insertions(+), 15 deletions(-) diff --git a/src/com/annimon/socketfiletransfer/operations/CursorOperation.java b/src/com/annimon/socketfiletransfer/operations/CursorOperation.java index dc8830c..f2d5fba 100644 --- a/src/com/annimon/socketfiletransfer/operations/CursorOperation.java +++ b/src/com/annimon/socketfiletransfer/operations/CursorOperation.java @@ -22,7 +22,7 @@ import javax.swing.JPanel; * Управление курсором. * @author aNNiMON */ -public class CursorOperation implements Operation { +public class CursorOperation extends Operation { private static final int NONE = -1, @@ -33,9 +33,6 @@ public class CursorOperation implements Operation { TYPE_KEY_RELEASED = 5, STOP = 10; - private DataInputStream dis; - private DataOutputStream dos; - private RobotUtils robot; private boolean running; diff --git a/src/com/annimon/socketfiletransfer/operations/FileOperation.java b/src/com/annimon/socketfiletransfer/operations/FileOperation.java index 8276178..19661c1 100644 --- a/src/com/annimon/socketfiletransfer/operations/FileOperation.java +++ b/src/com/annimon/socketfiletransfer/operations/FileOperation.java @@ -14,13 +14,10 @@ import java.io.IOException; * * @author aNNiMON */ -public class FileOperation implements Operation { +public class FileOperation extends Operation { private static final int BUFFER_SIZE = 1024; - private DataInputStream dis; - private DataOutputStream dos; - public FileOperation(DataInputStream dis) { this.dis = dis; } diff --git a/src/com/annimon/socketfiletransfer/operations/MessageOperation.java b/src/com/annimon/socketfiletransfer/operations/MessageOperation.java index cedd161..ffc8b43 100644 --- a/src/com/annimon/socketfiletransfer/operations/MessageOperation.java +++ b/src/com/annimon/socketfiletransfer/operations/MessageOperation.java @@ -10,10 +10,7 @@ import java.io.IOException; * * @author aNNiMON */ -public class MessageOperation implements Operation { - - private DataInputStream dis; - private DataOutputStream dos; +public class MessageOperation extends Operation { public MessageOperation(DataInputStream dis) { this.dis = dis; diff --git a/src/com/annimon/socketfiletransfer/operations/Operation.java b/src/com/annimon/socketfiletransfer/operations/Operation.java index 09afb04..58764ed 100644 --- a/src/com/annimon/socketfiletransfer/operations/Operation.java +++ b/src/com/annimon/socketfiletransfer/operations/Operation.java @@ -1,13 +1,19 @@ package com.annimon.socketfiletransfer.operations; +import java.io.DataInputStream; +import java.io.DataOutputStream; + /** * * @author aNNiMON */ -public interface Operation { +public abstract class Operation { - void startServerSide() throws Exception; + protected DataInputStream dis; + protected DataOutputStream dos; - void startClientSide(Object... params) throws Exception; + public abstract void startServerSide() throws Exception; + + public abstract void startClientSide(Object... params) throws Exception; }