From dc9500c513173a0f527e5edc7a8e9c26f1acd99a Mon Sep 17 00:00:00 2001 From: Paul Buetow Date: Sun, 3 Apr 2022 19:15:16 +0100 Subject: fix java deprecation notices --- .../implementations/VSBasicMulticastProtocol.java | 28 +--------------- .../implementations/VSBerkelyTimeProtocol.java | 37 ++++------------------ .../implementations/VSBroadcastProtocol.java | 26 --------------- .../protocols/implementations/VSDummyProtocol.java | 30 ++---------------- .../VSExternalTimeSyncProtocol.java | 26 --------------- .../VSInternalTimeSyncProtocol.java | 26 --------------- .../implementations/VSOnePhaseCommitProtocol.java | 28 +--------------- .../implementations/VSPingPongProtocol.java | 28 +--------------- .../VSReliableMulticastProtocol.java | 28 +--------------- .../implementations/VSTwoPhaseCommitProtocol.java | 28 +--------------- 10 files changed, 14 insertions(+), 271 deletions(-) (limited to 'sources/protocols/implementations') 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 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. */ -- cgit v1.2.3