fix java deprecation notices

4 files changed, 24 insertions, 127 deletions

diff --git a/sources/events/internal/VSAbstractInternalEvent.java b/sources/events/internal/VSAbstractInternalEvent.java
index 3d2d6b3..e8e2d13 100644
--- a/sources/events/internal/VSAbstractInternalEvent.java
+++ b/sources/events/internal/VSAbstractInternalEvent.java
@@ -1,30 +1,8 @@
-/*
- * 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 events.internal;
 
-import java.io.*;
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
 
 import events.VSAbstractEvent;
 import serialize.VSSerialize;
@@ -36,14 +14,11 @@ import serialize.VSSerialize;
  * @author Paul C. Buetow
  */
 abstract public class VSAbstractInternalEvent extends VSAbstractEvent {
-    /** The serial version uid */
-    private static final long serialVersionUID = 1L;
-
     /* (non-Javadoc)
      * @see events.VSAbstractEvent#createShortname()()
      */
     protected String createShortname(String savedShortname) {
-	return savedShortname;
+	    return savedShortname;
     }
 
     /* (non-Javadoc)
@@ -56,17 +31,16 @@ abstract public class VSAbstractInternalEvent extends VSAbstractEvent {
         super.serialize(serialize, objectOutputStream);
 
         /** For later backwards compatibility, to add more stuff */
-        objectOutputStream.writeObject(new Boolean(false));
+        objectOutputStream.writeObject(Boolean.valueOf(false));
 
         /** 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 {
diff --git a/sources/events/internal/VSMessageReceiveEvent.java b/sources/events/internal/VSMessageReceiveEvent.java
index c7f9113..323a6d8 100644
--- a/sources/events/internal/VSMessageReceiveEvent.java
+++ b/sources/events/internal/VSMessageReceiveEvent.java
@@ -1,30 +1,5 @@
-/*
- * 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 events.internal;
 
-//import java.io.*;
-
 import core.VSMessage;
 import protocols.VSAbstractProtocol;
 import serialize.VSNotSerializable;
@@ -37,8 +12,6 @@ import serialize.VSNotSerializable;
  */
 public class VSMessageReceiveEvent extends VSAbstractInternalEvent
             implements VSNotSerializable {
-    /** The serioal version uid */
-    private static final long serialVersionUID = 1L;
 
     /** The message. */
     private VSMessage message;
@@ -63,8 +36,7 @@ public class VSMessageReceiveEvent extends VSAbstractInternalEvent
      * @see events.VSAbstractEvent#onStart()
      */
     public void onStart() {
-        boolean onlyRelevantMessages = process.getPrefs().getBoolean(
-                                           "sim.messages.relevant");
+        boolean onlyRelevantMessages = process.getPrefs().getBoolean("sim.messages.relevant");
 
         //String eventName = message.getName();
         String protocolClassname = message.getProtocolClassname();
diff --git a/sources/events/internal/VSProtocolEvent.java b/sources/events/internal/VSProtocolEvent.java
index f9a531c..c39b639 100644
--- a/sources/events/internal/VSProtocolEvent.java
+++ b/sources/events/internal/VSProtocolEvent.java
@@ -1,33 +1,13 @@
-/*
- * 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 events.internal;
 
-import java.io.*;
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
 
 import core.VSInternalProcess;
-import events.*;
+import events.VSAbstractEvent;
+import events.VSCopyableEvent;
+import events.VSRegisteredEvents;
 import protocols.VSAbstractProtocol;
 import serialize.VSSerialize;
 
@@ -42,9 +22,6 @@ import serialize.VSSerialize;
  */
 public class VSProtocolEvent extends VSAbstractInternalEvent
             implements VSCopyableEvent {
-    /** The serial version uid */
-    private static final long serialVersionUID = 1L;
-
     /** The protocol classname. */
     private String protocolClassname;
 
@@ -160,21 +137,20 @@ public class VSProtocolEvent extends VSAbstractInternalEvent
         super.serialize(serialize, objectOutputStream);
 
         /** For later backwards compatibility, to add more stuff */
-        objectOutputStream.writeObject(new Boolean(false));
+        objectOutputStream.writeObject(Boolean.valueOf(false));
 
         objectOutputStream.writeObject(protocolClassname);
-        objectOutputStream.writeObject(new Boolean(isClientProtocol));
-        objectOutputStream.writeObject(new Boolean(isProtocolActivation));
+        objectOutputStream.writeObject(Boolean.valueOf(isClientProtocol));
+        objectOutputStream.writeObject(Boolean.valueOf(isProtocolActivation));
 
         /** 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 {
diff --git a/sources/events/internal/VSProtocolScheduleEvent.java b/sources/events/internal/VSProtocolScheduleEvent.java
index 6a0eed5..9c708ad 100644
--- a/sources/events/internal/VSProtocolScheduleEvent.java
+++ b/sources/events/internal/VSProtocolScheduleEvent.java
@@ -1,33 +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 events.internal;
 
-import java.io.*;
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
 
-//import events.*;
 import protocols.VSAbstractProtocol;
-import serialize.*;
+import serialize.VSNotSerializable;
+import serialize.VSSerialize;
 
 /**
  * The class VSProtocolScheduleEvent, this event is used if a protocol (which
@@ -38,9 +17,6 @@ import serialize.*;
  */
 public class VSProtocolScheduleEvent extends VSAbstractInternalEvent
             implements VSNotSerializable {
-    /** The serial version uid */
-    private static final long serialVersionUID = 1L;
-
     /** The event is a server protocol schedule. */
     private boolean isServerSchedule; /* true = server, false = client */
 
@@ -125,17 +101,16 @@ public class VSProtocolScheduleEvent extends VSAbstractInternalEvent
         super.serialize(serialize, objectOutputStream);
 
         /** For later backwards compatibility, to add more stuff */
-        objectOutputStream.writeObject(new Boolean(false));
+        objectOutputStream.writeObject(Boolean.valueOf(false));
 
         /** 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 {