fix java deprecation notices

11 files changed, 28 insertions, 310 deletions

diff --git a/sources/protocols/VSAbstractProtocol.java b/sources/protocols/VSAbstractProtocol.java
index c837490..0317d07 100644
--- a/sources/protocols/VSAbstractProtocol.java
+++ b/sources/protocols/VSAbstractProtocol.java
@@ -1,36 +1,17 @@
-/*
- * VS-Simulator (http://buetow.org)
- * Copyright (c) 2008 - 2009 by Dipl.-Inform. (FH) Paul C. Buetow
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- *
- * All icons of the icons/ folder are 	under a Creative Commons
- * Attribution-Noncommercial-Share Alike License a CC-by-nc-sa.
- *
- * The icon's homepage is http://code.google.com/p/ultimate-gnome/
- */
-
 package protocols;
 
-import java.io.*;
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
 import java.util.ArrayList;
 
-import core.*;
-import events.*;
-import events.internal.*;
-import serialize.*;
+import core.VSInternalProcess;
+import core.VSMessage;
+import core.VSMessageStub;
+import core.VSTask;
+import events.VSAbstractEvent;
+import events.internal.VSProtocolScheduleEvent;
+import serialize.VSSerialize;
 import simulator.VSSimulatorVisualization;
 
 /**
@@ -40,9 +21,6 @@ import simulator.VSSimulatorVisualization;
  * @author Paul C. Buetow
  */
 abstract public class VSAbstractProtocol extends VSAbstractEvent {
-    /** The serial version uid */
-    private static final long serialVersionUID = 1L;
-
     /** The protocol has an onServerStart method */
     protected static final boolean HAS_ON_SERVER_START = true;
 
@@ -442,19 +420,18 @@ abstract public class VSAbstractProtocol extends VSAbstractEvent {
         super.serialize(serialize, objectOutputStream);
 
         /** For later backwards compatibility, to add more stuff */
-        objectOutputStream.writeObject(new Boolean(false));
+        objectOutputStream.writeObject(Boolean.valueOf(false));
 
-        objectOutputStream.writeObject(new Boolean(hasOnServerStart));
+        objectOutputStream.writeObject(Boolean.valueOf(hasOnServerStart));
 
         /** For later backwards compatibility, to add more stuff */
-        objectOutputStream.writeObject(new Boolean(false));
+        objectOutputStream.writeObject(Boolean.valueOf(false));
     }
 
     /* (non-Javadoc)
      * @see serialize.VSSerializable#deserialize(serialize.VSSerialize,
      *	java.io.ObjectInputStream)
      */
-    @SuppressWarnings("unchecked")
     public synchronized void deserialize(VSSerialize serialize,
                                          ObjectInputStream objectInputStream)
     throws IOException, ClassNotFoundException {
@@ -466,9 +443,7 @@ abstract public class VSAbstractProtocol extends VSAbstractEvent {
         /** For later backwards compatibility, to add more stuff */
         objectInputStream.readObject();
 
-        this.hasOnServerStart = ((Boolean)
-                                 objectInputStream.readObject()).booleanValue();
-
+        this.hasOnServerStart = ((Boolean) objectInputStream.readObject()).booleanValue();
         /** For later backwards compatibility, to add more stuff */
         objectInputStream.readObject();
     }
diff --git a/sources/protocols/implementations/VSBasicMulticastProtocol.java b/sources/protocols/implementations/VSBasicMulticastProtocol.java
index 9be8b32..3172b8f 100644
--- a/sources/protocols/implementations/VSBasicMulticastProtocol.java
+++ b/sources/protocols/implementations/VSBasicMulticastProtocol.java
@@ -1,30 +1,7 @@
-/*
- * Copyright (c) 2008 Paul C. Buetow, vs-sim@dev.buetow.org
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- *
- * All icons of the icons/ folder are 	under a Creative Commons
- * Attribution-Noncommercial-Share Alike License a CC-by-nc-sa.
- *
- * The icon's homepage is http://code.google.com/p/ultimate-gnome/
- */
-
 package protocols.implementations;
 
-import protocols.VSAbstractProtocol;
 import core.VSMessage;
+import protocols.VSAbstractProtocol;
 
 /**
  * The class VSBasicMulticastProtocol, an implementation of the basic multicast
@@ -33,9 +10,6 @@ import core.VSMessage;
  * @author Paul C. Buetow
  */
 public class VSBasicMulticastProtocol extends VSAbstractProtocol {
-    /** The serial version uid */
-    private static final long serialVersionUID = 1L;
-
     /**
      * Instantiates a new VSBasicMulticast object.
      */
diff --git a/sources/protocols/implementations/VSBerkelyTimeProtocol.java b/sources/protocols/implementations/VSBerkelyTimeProtocol.java
index c41924f..b348e2d 100644
--- a/sources/protocols/implementations/VSBerkelyTimeProtocol.java
+++ b/sources/protocols/implementations/VSBerkelyTimeProtocol.java
@@ -1,35 +1,12 @@
-/*
- * Copyright (c) 2008 Paul C. Buetow, vs-sim@dev.buetow.org
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- *
- * All icons of the icons/ folder are 	under a Creative Commons
- * Attribution-Noncommercial-Share Alike License a CC-by-nc-sa.
- *
- * The icon's homepage is http://code.google.com/p/ultimate-gnome/
- */
-
 package protocols.implementations;
 
-import protocols.VSAbstractProtocol;
-import core.VSMessage;
-
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Vector;
 
+import core.VSMessage;
+import protocols.VSAbstractProtocol;
+
 /**
  * The class VSBerkelyTimeProtocol, an implementation of the berkely time
  * protocol.
@@ -37,8 +14,6 @@ import java.util.Vector;
  * @author Paul C. Buetow
  */
 public class VSBerkelyTimeProtocol extends VSAbstractProtocol {
-    private static final long serialVersionUID = 1L;
-
     /**
      * Instantiates a new berkely time protocol.
      */
@@ -115,10 +90,10 @@ public class VSBerkelyTimeProtocol extends VSAbstractProtocol {
         else
             return; /* Process has been handled already or is not listed */
 
-        Long time = new Long(recvMessage.getLong("time"));
+        Long time = Long.valueOf(recvMessage.getLong("time"));
 
         processTimes.put(processID, time);
-        recvTimes.put(processID, new Long(process.getTime()));
+        recvTimes.put(processID, Long.valueOf(process.getTime()));
 
         /* All peers have told their times */
         if (peers.size() == 0) {
@@ -151,7 +126,7 @@ public class VSBerkelyTimeProtocol extends VSAbstractProtocol {
             Long recvTime = recvTimes.get(processID);
             long rtt = recvTime.longValue() - requestTime;
             long realProcessTime = localTime + (long) (rtt / 2);
-            realTimesRTT.put(processID, new Long(realProcessTime));
+            realTimesRTT.put(processID, Long.valueOf(realProcessTime));
             sum += realProcessTime;
         }
         /* Include the time of the local process */
diff --git a/sources/protocols/implementations/VSBroadcastProtocol.java b/sources/protocols/implementations/VSBroadcastProtocol.java
index 7d264cf..54fd3b5 100644
--- a/sources/protocols/implementations/VSBroadcastProtocol.java
+++ b/sources/protocols/implementations/VSBroadcastProtocol.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2008 Paul C. Buetow, vs-sim@dev.buetow.org
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- *
- * All icons of the icons/ folder are 	under a Creative Commons
- * Attribution-Noncommercial-Share Alike License a CC-by-nc-sa.
- *
- * The icon's homepage is http://code.google.com/p/ultimate-gnome/
- */
-
 package protocols.implementations;
 
 import java.util.ArrayList;
@@ -35,9 +12,6 @@ import protocols.VSAbstractProtocol;
  * @author Paul C. Buetow
  */
 public class VSBroadcastProtocol extends VSAbstractProtocol {
-    /** The serial version uid */
-    private static final long serialVersionUID = 1L;
-
     /** The sent messages. */
     private ArrayList<Integer> sentMessages;
 
diff --git a/sources/protocols/implementations/VSDummyProtocol.java b/sources/protocols/implementations/VSDummyProtocol.java
index 92b2131..e9e6837 100644
--- a/sources/protocols/implementations/VSDummyProtocol.java
+++ b/sources/protocols/implementations/VSDummyProtocol.java
@@ -1,30 +1,7 @@
-/*
- * Copyright (c) 2008 Paul C. Buetow, vs-sim@dev.buetow.org
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- *
- * All icons of the icons/ folder are 	under a Creative Commons
- * Attribution-Noncommercial-Share Alike License a CC-by-nc-sa.
- *
- * The icon's homepage is http://code.google.com/p/ultimate-gnome/
- */
-
 package protocols.implementations;
 
-import protocols.VSAbstractProtocol;
 import core.VSMessage;
+import protocols.VSAbstractProtocol;
 
 /**
  * The class VSDummyProtocol, can be used as a template in order to create
@@ -33,9 +10,6 @@ import core.VSMessage;
  * @author Paul C. Buetow
  */
 public class VSDummyProtocol extends VSAbstractProtocol {
-    /** The serial version uid */
-    private static final long serialVersionUID = 1L;
-
     /**
      * Instantiates a new dummy protocol object.
      */
@@ -77,10 +51,12 @@ public class VSDummyProtocol extends VSAbstractProtocol {
     public void onClientRecv(VSMessage recvMessage) {
         log("onClientRecv("+recvMessage+")");
 
+        /*
         String s = recvMessage.getString("Greeting");
         int n = recvMessage.getInteger("A number");
         boolean b = recvMessage.getBoolean("A boolean");
         float f = recvMessage.getFloat("A float");
+        */
     }
 
     /* (non-Javadoc)
diff --git a/sources/protocols/implementations/VSExternalTimeSyncProtocol.java b/sources/protocols/implementations/VSExternalTimeSyncProtocol.java
index c008a11..24128f6 100644
--- a/sources/protocols/implementations/VSExternalTimeSyncProtocol.java
+++ b/sources/protocols/implementations/VSExternalTimeSyncProtocol.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2008 Paul C. Buetow, vs-sim@dev.buetow.org
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- *
- * All icons of the icons/ folder are 	under a Creative Commons
- * Attribution-Noncommercial-Share Alike License a CC-by-nc-sa.
- *
- * The icon's homepage is http://code.google.com/p/ultimate-gnome/
- */
-
 package protocols.implementations;
 
 import core.VSMessage;
@@ -33,9 +10,6 @@ import protocols.VSAbstractProtocol;
  * @author Paul C. Buetow
  */
 public class VSExternalTimeSyncProtocol extends VSAbstractProtocol {
-    /** The serial version uid */
-    private static final long serialVersionUID = 1L;
-
     /** The request time. */
     private long requestTime;
 
diff --git a/sources/protocols/implementations/VSInternalTimeSyncProtocol.java b/sources/protocols/implementations/VSInternalTimeSyncProtocol.java
index 1e00742..e72c563 100644
--- a/sources/protocols/implementations/VSInternalTimeSyncProtocol.java
+++ b/sources/protocols/implementations/VSInternalTimeSyncProtocol.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2008 Paul C. Buetow, vs-sim@dev.buetow.org
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- *
- * All icons of the icons/ folder are 	under a Creative Commons
- * Attribution-Noncommercial-Share Alike License a CC-by-nc-sa.
- *
- * The icon's homepage is http://code.google.com/p/ultimate-gnome/
- */
-
 package protocols.implementations;
 
 import core.VSMessage;
@@ -33,9 +10,6 @@ import protocols.VSAbstractProtocol;
  * @author Paul C. Buetow
  */
 public class VSInternalTimeSyncProtocol extends VSAbstractProtocol {
-    /** The serial version uid */
-    private static final long serialVersionUID = 1L;
-
     /** The waiting for response. */
     private boolean waitingForResponse;
 
diff --git a/sources/protocols/implementations/VSOnePhaseCommitProtocol.java b/sources/protocols/implementations/VSOnePhaseCommitProtocol.java
index 3130cdf..bd3d843 100644
--- a/sources/protocols/implementations/VSOnePhaseCommitProtocol.java
+++ b/sources/protocols/implementations/VSOnePhaseCommitProtocol.java
@@ -1,33 +1,10 @@
-/*
- * Copyright (c) 2008 Paul C. Buetow, vs-sim@dev.buetow.org
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- *
- * All icons of the icons/ folder are 	under a Creative Commons
- * Attribution-Noncommercial-Share Alike License a CC-by-nc-sa.
- *
- * The icon's homepage is http://code.google.com/p/ultimate-gnome/
- */
-
 package protocols.implementations;
 
 import java.util.ArrayList;
 import java.util.Vector;
 
-import protocols.VSAbstractProtocol;
 import core.VSMessage;
+import protocols.VSAbstractProtocol;
 
 /**
  * The class VSOnePhaseCommitProtocol, an implementation of the one phase
@@ -36,9 +13,6 @@ import core.VSMessage;
  * @author Paul C. Buetow
  */
 public class VSOnePhaseCommitProtocol extends VSAbstractProtocol {
-    /** The serial version uid */
-    private static final long serialVersionUID = 1L;
-
     /* Server variables */
     private boolean ackSent;
 
diff --git a/sources/protocols/implementations/VSPingPongProtocol.java b/sources/protocols/implementations/VSPingPongProtocol.java
index 02178e1..b1f3d20 100644
--- a/sources/protocols/implementations/VSPingPongProtocol.java
+++ b/sources/protocols/implementations/VSPingPongProtocol.java
@@ -1,26 +1,3 @@
-/*
- * Copyright (c) 2008 Paul C. Buetow, vs-sim@dev.buetow.org
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- *
- * All icons of the icons/ folder are 	under a Creative Commons
- * Attribution-Noncommercial-Share Alike License a CC-by-nc-sa.
- *
- * The icon's homepage is http://code.google.com/p/ultimate-gnome/
- */
-
 package protocols.implementations;
 
 import core.VSMessage;
@@ -32,9 +9,6 @@ import protocols.VSAbstractProtocol;
  * @author Paul C. Buetow
  */
 public class VSPingPongProtocol extends VSAbstractProtocol {
-    /** The serial version uid */
-    private static final long serialVersionUID = 1L;
-
     /** The client counter. */
     private int clientCounter;
 
@@ -131,6 +105,6 @@ public class VSPingPongProtocol extends VSAbstractProtocol {
      * @see protocols.VSAbstractProtocol#toString()
      */
     public String toString() {
-        return super.toString() + "; Neue Nachricht da hinter";
+        return super.toString() + "; New message afterwards";
     }
 }
diff --git a/sources/protocols/implementations/VSReliableMulticastProtocol.java b/sources/protocols/implementations/VSReliableMulticastProtocol.java
index 7bdf1e3..e4601ab 100644
--- a/sources/protocols/implementations/VSReliableMulticastProtocol.java
+++ b/sources/protocols/implementations/VSReliableMulticastProtocol.java
@@ -1,33 +1,10 @@
-/*
- * Copyright (c) 2008 Paul C. Buetow, vs-sim@dev.buetow.org
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- *
- * All icons of the icons/ folder are 	under a Creative Commons
- * Attribution-Noncommercial-Share Alike License a CC-by-nc-sa.
- *
- * The icon's homepage is http://code.google.com/p/ultimate-gnome/
- */
-
 package protocols.implementations;
 
 import java.util.ArrayList;
 import java.util.Vector;
 
-import protocols.VSAbstractProtocol;
 import core.VSMessage;
+import protocols.VSAbstractProtocol;
 
 /**
  * The class VSReliableMulticastProtocol, an implementation of the reliable
@@ -36,9 +13,6 @@ import core.VSMessage;
  * @author Paul C. Buetow
  */
 public class VSReliableMulticastProtocol extends VSAbstractProtocol {
-    /** The serial version uid */
-    private static final long serialVersionUID = 2L;
-
     /**
      * Instantiates a two phase commit protocol object.
      */
diff --git a/sources/protocols/implementations/VSTwoPhaseCommitProtocol.java b/sources/protocols/implementations/VSTwoPhaseCommitProtocol.java
index 122351d..a98fcf6 100644
--- a/sources/protocols/implementations/VSTwoPhaseCommitProtocol.java
+++ b/sources/protocols/implementations/VSTwoPhaseCommitProtocol.java
@@ -1,33 +1,10 @@
-/*
- * Copyright (c) 2008 Paul C. Buetow, vs-sim@dev.buetow.org
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
- *
- * All icons of the icons/ folder are 	under a Creative Commons
- * Attribution-Noncommercial-Share Alike License a CC-by-nc-sa.
- *
- * The icon's homepage is http://code.google.com/p/ultimate-gnome/
- */
-
 package protocols.implementations;
 
 import java.util.ArrayList;
 import java.util.Vector;
 
-import protocols.VSAbstractProtocol;
 import core.VSMessage;
+import protocols.VSAbstractProtocol;
 
 /**
  * The class VSTwoPhaseCommitProtocol, an implementation of the two phase
@@ -36,9 +13,6 @@ import core.VSMessage;
  * @author Paul C. Buetow
  */
 public class VSTwoPhaseCommitProtocol extends VSAbstractProtocol {
-    /** The serial version uid */
-    private static final long serialVersionUID = 1L;
-
     /**
      * Instantiates a two phase commit protocol object.
      */