From 46aaa81f9d37069eb9b00805a3469e052e4b377a Mon Sep 17 00:00:00 2001
From: Victor <melnikukr@mail.ru>
Date: Mon, 17 Mar 2014 10:22:32 +0200
Subject: [PATCH] Move TurretInfo into Turret class

---
 src/com/annimon/turrets/GameCanvas.java           |  5 +++--
 src/com/annimon/turrets/Turret.java               |  5 +++++
 src/com/annimon/turrets/TurretInfo.java           | 11 -----------
 src/com/annimon/turrets/network/SocketHelper.java |  2 +-
 4 files changed, 9 insertions(+), 14 deletions(-)
 delete mode 100644 src/com/annimon/turrets/TurretInfo.java

diff --git a/src/com/annimon/turrets/GameCanvas.java b/src/com/annimon/turrets/GameCanvas.java
index f77e690..fb13c52 100644
--- a/src/com/annimon/turrets/GameCanvas.java
+++ b/src/com/annimon/turrets/GameCanvas.java
@@ -1,9 +1,10 @@
 package com.annimon.turrets;
 
-import com.annimon.turrets.network.SocketHelper;
-import com.annimon.turrets.network.GameServer;
+import com.annimon.turrets.Turret.TurretInfo;
 import com.annimon.turrets.network.GameClient;
+import com.annimon.turrets.network.GameServer;
 import com.annimon.turrets.network.NetworkListener;
+import com.annimon.turrets.network.SocketHelper;
 import com.annimon.turrets.util.Util;
 import java.awt.Color;
 import java.awt.Graphics;
diff --git a/src/com/annimon/turrets/Turret.java b/src/com/annimon/turrets/Turret.java
index c50bb8a..7e72934 100644
--- a/src/com/annimon/turrets/Turret.java
+++ b/src/com/annimon/turrets/Turret.java
@@ -151,4 +151,9 @@ public class Turret implements Constants {
     public interface TurretListener {
         void shootComplete(boolean hitOpponent);
     }
+    
+    public static class TurretInfo {
+        public double barrelAngle, shotPower;
+        public int barrelX, barrelY;
+    }
 }
diff --git a/src/com/annimon/turrets/TurretInfo.java b/src/com/annimon/turrets/TurretInfo.java
deleted file mode 100644
index 8f72a97..0000000
--- a/src/com/annimon/turrets/TurretInfo.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.annimon.turrets;
-
-/**
- *
- * @author aNNiMON
- */
-public class TurretInfo {
-
-    public double barrelAngle, shotPower;
-    public int barrelX, barrelY;
-}
diff --git a/src/com/annimon/turrets/network/SocketHelper.java b/src/com/annimon/turrets/network/SocketHelper.java
index 32ab856..4649ee1 100644
--- a/src/com/annimon/turrets/network/SocketHelper.java
+++ b/src/com/annimon/turrets/network/SocketHelper.java
@@ -1,6 +1,6 @@
 package com.annimon.turrets.network;
 
-import com.annimon.turrets.TurretInfo;
+import com.annimon.turrets.Turret.TurretInfo;
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;