clean up

19 files changed, 23 insertions, 104 deletions

diff --git a/src/jake2/client/CL_parse.java b/src/jake2/client/CL_parse.java
index d783875..f17813f 100644
--- a/src/jake2/client/CL_parse.java
+++ b/src/jake2/client/CL_parse.java
@@ -1,8 +1,6 @@
 /*
  * CL_parse.java
  * Copyright (C) 2004
- * 
- * $Id: CL_parse.java,v 1.21 2005-02-19 21:16:03 salomo Exp $
  */
 /*
  Copyright (C) 1997-2001 Id Software, Inc.
@@ -34,7 +32,6 @@ import jake2.render.model_t;
 import jake2.sound.S;
 import jake2.sys.Sys;
 import jake2.util.Lib;
-import jake2.util.Math3D;
 
 import java.io.IOException;
 import java.io.RandomAccessFile;
diff --git a/src/jake2/game/Monster.java b/src/jake2/game/Monster.java
index 491caff..c3c23b9 100644
--- a/src/jake2/game/Monster.java
+++ b/src/jake2/game/Monster.java
@@ -19,16 +19,14 @@
  */
 
 // Created on 17.12.2003 by RST.
-// $Id: Monster.java,v 1.7 2005-11-20 22:18:33 salomo Exp $
+
 package jake2.game;
 
 import jake2.Defines;
 import jake2.client.M;
-import jake2.qcommon.CM;
 import jake2.qcommon.Com;
-import jake2.util.*;
-
-import java.util.*;
+import jake2.util.Lib;
+import jake2.util.Math3D;
 
 public class Monster {
 
diff --git a/src/jake2/game/PlayerWeapon.java b/src/jake2/game/PlayerWeapon.java
index 1b9cca3..04f9da5 100644
--- a/src/jake2/game/PlayerWeapon.java
+++ b/src/jake2/game/PlayerWeapon.java
@@ -20,14 +20,11 @@
 
 // Created on 16.11.2003 by RST.
 
-// $Id: PlayerWeapon.java,v 1.2 2005-11-20 22:18:33 salomo Exp $
-
 package jake2.game;
 
 import jake2.Defines;
 import jake2.Globals;
 import jake2.game.monsters.M_Player;
-import jake2.qcommon.Com;
 import jake2.util.Lib;
 import jake2.util.Math3D;
 
diff --git a/src/jake2/game/SuperAdapter.java b/src/jake2/game/SuperAdapter.java
index d8491da..dccdc27 100644
--- a/src/jake2/game/SuperAdapter.java
+++ b/src/jake2/game/SuperAdapter.java
@@ -19,14 +19,12 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 
 // Created on 09.01.2004 by RST.
-// $Id: SuperAdapter.java,v 1.9 2005-11-20 22:25:28 salomo Exp $
 
 package jake2.game;
 
 import jake2.qcommon.Com;
 
 import java.util.Hashtable;
-import java.util.Vector;
 
 public abstract class SuperAdapter {
 
diff --git a/src/jake2/game/client_respawn_t.java b/src/jake2/game/client_respawn_t.java
index e9c11de..0b8d4be 100644
--- a/src/jake2/game/client_respawn_t.java
+++ b/src/jake2/game/client_respawn_t.java
@@ -18,18 +18,13 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
 // Created on 31.10.2003 by RST.
-// $Id: client_respawn_t.java,v 1.6 2004-09-10 19:02:54 salomo Exp $
 
 package jake2.game;
 
-import jake2.qcommon.Com;
-import jake2.util.Lib;
 import jake2.util.Math3D;
 import jake2.util.QuakeFile;
 
 import java.io.IOException;
-import java.io.RandomAccessFile;
-import java.nio.ByteBuffer;
 
 /** Client data that stays across deathmatch respawns.*/
 public class client_respawn_t
diff --git a/src/jake2/game/cplane_t.java b/src/jake2/game/cplane_t.java
index 976465e..f69f83e 100644
--- a/src/jake2/game/cplane_t.java
+++ b/src/jake2/game/cplane_t.java
@@ -19,11 +19,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 
 // Created on 31.10.2003 by RST.
-// $Id: cplane_t.java,v 1.5 2005-12-03 19:44:05 salomo Exp $
 
 package jake2.game;
 
-import jake2.util.Lib;
 import jake2.util.Math3D;
 
 public class cplane_t
diff --git a/src/jake2/game/level_locals_t.java b/src/jake2/game/level_locals_t.java
index dc12cab..ad88666 100644
--- a/src/jake2/game/level_locals_t.java
+++ b/src/jake2/game/level_locals_t.java
@@ -19,15 +19,12 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 
 // Created on 20.11.2003 by RST
-// $Id: level_locals_t.java,v 1.2 2004-08-20 21:29:57 salomo Exp $
 
 package jake2.game;
 
-import jake2.util.Lib;
 import jake2.util.QuakeFile;
 
 import java.io.IOException;
-import java.io.RandomAccessFile;
 
 public class level_locals_t
 {
diff --git a/src/jake2/game/monsterinfo_t.java b/src/jake2/game/monsterinfo_t.java
index 4a98213..3889f06 100644
--- a/src/jake2/game/monsterinfo_t.java
+++ b/src/jake2/game/monsterinfo_t.java
@@ -19,14 +19,12 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 
 // Created on 31.10.2003 by RST.
-// $Id: monsterinfo_t.java,v 1.2 2004-08-20 21:29:58 salomo Exp $
 
 package jake2.game;
 
 import jake2.util.QuakeFile;
 
 import java.io.IOException;
-import java.io.RandomAccessFile;
 
 public class monsterinfo_t {
 
diff --git a/src/jake2/game/pmove_state_t.java b/src/jake2/game/pmove_state_t.java
index 2e83f3e..7ac0d26 100644
--- a/src/jake2/game/pmove_state_t.java
+++ b/src/jake2/game/pmove_state_t.java
@@ -19,7 +19,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 
 // Created on 31.10.2003 by RST.
-// $Id: pmove_state_t.java,v 1.3 2005-01-21 01:08:48 cawe Exp $
+
 package jake2.game;
 
 import jake2.qcommon.Com;
@@ -27,7 +27,6 @@ import jake2.util.Math3D;
 
 import java.io.IOException;
 import java.io.RandomAccessFile;
-import java.nio.ByteBuffer;
 
 public class pmove_state_t {
 	//	this structure needs to be communicated bit-accurate
diff --git a/src/jake2/qcommon/CRC.java b/src/jake2/qcommon/CRC.java
index 1a315cf..769792b 100644
--- a/src/jake2/qcommon/CRC.java
+++ b/src/jake2/qcommon/CRC.java
@@ -19,10 +19,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 
 // Created on 25.01.2004 by RST.
-// $Id: CRC.java,v 1.2 2005-01-23 01:19:06 cawe Exp $
-package jake2.qcommon;
 
-import jake2.util.Vargs;
+package jake2.qcommon;
 
 public class CRC
 {
diff --git a/src/jake2/render/msurface_t.java b/src/jake2/render/msurface_t.java
index 51fe1cc..cfb1656 100644
--- a/src/jake2/render/msurface_t.java
+++ b/src/jake2/render/msurface_t.java
@@ -19,16 +19,13 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 
 // Created on 20.11.2003 by RST.
-// $Id: msurface_t.java,v 1.4 2005-01-14 16:13:07 cawe Exp $
 
 package jake2.render;
 
-import java.nio.ByteBuffer;
-import java.util.Arrays;
+import jake2.Defines;
+import jake2.game.cplane_t;
 
-import jake2.game.*;
-import jake2.qcommon.texinfo_t;
-import jake2.*;
+import java.nio.ByteBuffer;
 
 public class msurface_t
 {
diff --git a/src/jake2/server/challenge_t.java b/src/jake2/server/challenge_t.java
index ba1dd36..9c9eaa8 100644
--- a/src/jake2/server/challenge_t.java
+++ b/src/jake2/server/challenge_t.java
@@ -19,17 +19,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 
 // Created on 14.01.2004 by RST.
-// $Id: challenge_t.java,v 1.1 2004-07-07 19:59:50 hzi Exp $
 
 package jake2.server;
 
-
-import jake2.*;
-import jake2.client.*;
-import jake2.game.*;
-import jake2.qcommon.*;
-import jake2.render.*;
-import jake2.server.*;
+import jake2.qcommon.netadr_t;
 
 public class challenge_t {
 	//mem
diff --git a/src/jake2/server/client_frame_t.java b/src/jake2/server/client_frame_t.java
index 3f841da..fa86a7d 100644
--- a/src/jake2/server/client_frame_t.java
+++ b/src/jake2/server/client_frame_t.java
@@ -19,17 +19,11 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 
 // Created on 13.01.2004 by RST.
-// $Id: client_frame_t.java,v 1.1 2004-07-07 19:59:50 hzi Exp $
 
 package jake2.server;
 
-
-import jake2.*;
-import jake2.client.*;
-import jake2.game.*;
-import jake2.qcommon.*;
-import jake2.render.*;
-import jake2.server.*;
+import jake2.Defines;
+import jake2.game.player_state_t;
 
 public class client_frame_t {
 
diff --git a/src/jake2/server/client_t.java b/src/jake2/server/client_t.java
index b8ccf0e..241bd65 100644
--- a/src/jake2/server/client_t.java
+++ b/src/jake2/server/client_t.java
@@ -19,16 +19,14 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 
 // Created on 13.01.2004 by RST.
-// $Id: client_t.java,v 1.2 2004-08-22 14:25:13 salomo Exp $
 
 package jake2.server;
 
-import jake2.*;
-import jake2.client.*;
-import jake2.game.*;
-import jake2.qcommon.*;
-import jake2.render.*;
-import jake2.server.*;
+import jake2.Defines;
+import jake2.game.edict_t;
+import jake2.game.usercmd_t;
+import jake2.qcommon.netchan_t;
+import jake2.qcommon.sizebuf_t;
 
 public class client_t {
 
diff --git a/src/jake2/server/moveclip_t.java b/src/jake2/server/moveclip_t.java
index 3a336af..cb51fdd 100644
--- a/src/jake2/server/moveclip_t.java
+++ b/src/jake2/server/moveclip_t.java
@@ -19,17 +19,11 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 
 // Created on 09.12.2003 by RST.
-// $Id: moveclip_t.java,v 1.2 2005-01-14 16:14:02 cawe Exp $
 
 package jake2.server;
 
-
-import jake2.*;
-import jake2.client.*;
-import jake2.game.*;
-import jake2.qcommon.*;
-import jake2.render.*;
-import jake2.server.*;
+import jake2.game.edict_t;
+import jake2.game.trace_t;
 import jake2.util.Math3D;
 
 public class moveclip_t 
diff --git a/src/jake2/sound/WaveLoader.java b/src/jake2/sound/WaveLoader.java
index a52f376..c0d95cd 100644
--- a/src/jake2/sound/WaveLoader.java
+++ b/src/jake2/sound/WaveLoader.java
@@ -1,8 +1,6 @@
 /*
  * SND_MEM.java
  * Copyright (C) 2004
- * 
- * $Id: WaveLoader.java,v 1.7 2006-01-01 15:07:30 cawe Exp $
  */
 /*
 Copyright (C) 1997-2001 Id Software, Inc.
@@ -29,12 +27,6 @@ import jake2.Defines;
 import jake2.qcommon.Com;
 import jake2.qcommon.FS;
 
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.nio.ByteOrder;
-
-import javax.sound.sampled.*;
-
 /**
  * SND_MEM
  */
diff --git a/test/jake2/client/CircleListener.java b/test/jake2/client/CircleListener.java
index 35762e8..d06bc94 100644
--- a/test/jake2/client/CircleListener.java
+++ b/test/jake2/client/CircleListener.java
@@ -19,23 +19,12 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 
 // Created on 07.01.2000 by RST.
-// $Id: CircleListener.java,v 1.1 2004-07-07 19:59:56 hzi Exp $
 
 package jake2.client;
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
 import java.awt.Robot;
-
-
-
-// import jake2.*;
-// import jake2.client.*;
-// import jake2.game.*;
-// import jake2.qcommon.*;
-// import jake2.render.*;
-// import jake2.server.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
 
 class CircleListener implements ActionListener {
     Robot robot;
diff --git a/test/jake2/qcommon/TestCMD.java b/test/jake2/qcommon/TestCMD.java
index 3316fd7..a2e3e5b 100644
--- a/test/jake2/qcommon/TestCMD.java
+++ b/test/jake2/qcommon/TestCMD.java
@@ -19,18 +19,13 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 
 // Created on 29.12.2003 by RST.
-// $Id: TestCMD.java,v 1.2 2004-07-09 06:50:51 hzi Exp $
 
 package jake2.qcommon;
 
-import java.io.*;
+import jake2.game.Cmd;
 
-import jake2.*;
-import jake2.client.*;
-import jake2.game.*;
-import jake2.qcommon.*;
-import jake2.render.*;
-import jake2.server.*;
+import java.io.BufferedReader;
+import java.io.InputStreamReader;
 
 public class TestCMD {
 
diff --git a/test/jake2/qcommon/TestCOM.java b/test/jake2/qcommon/TestCOM.java
index 6432fbe..b1ca560 100644
--- a/test/jake2/qcommon/TestCOM.java
+++ b/test/jake2/qcommon/TestCOM.java
@@ -19,17 +19,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 
 // Created on 29.12.2003 by RST.
-// $Id: TestCOM.java,v 1.1 2004-07-07 19:59:56 hzi Exp $
 
 package jake2.qcommon;
 
-import jake2.*;
-import jake2.client.*;
-import jake2.game.*;
-import jake2.qcommon.*;
-import jake2.render.*;
-import jake2.server.*;
-
 public class TestCOM {
 
 	public static void main(String args[]) {