diff --git a/src/main/java/Enigma/model/DataFunk.java b/src/main/java/Enigma/model/DataFunk.java deleted file mode 100644 index 7af31510a4d8d53c0904afc9443c1a06001bf862..0000000000000000000000000000000000000000 --- a/src/main/java/Enigma/model/DataFunk.java +++ /dev/null @@ -1,47 +0,0 @@ -package Enigma.model; - -import java.io.IOException; -import java.net.DatagramPacket; -import java.net.DatagramSocket; -import java.net.InetAddress; -import java.net.MulticastSocket; - -public class DataFunk { - public int port = 12345; - public String mcIPStr = "224.0.0.1"; - - public void receive() throws IOException { - MulticastSocket mcSocket = null; - InetAddress mcIPAddress = null; - mcIPAddress = InetAddress.getByName(mcIPStr); - mcSocket = new MulticastSocket(port); - System.out.println("Multicast Receiver running at:" + mcSocket.getLocalSocketAddress()); - mcSocket.joinGroup(mcIPAddress); - - DatagramPacket packet = new DatagramPacket(new byte[1024], 1024); - - System.out.println("Waiting for a multicast message..."); - mcSocket.receive(packet); - String msg = new String(packet.getData(), packet.getOffset(), - packet.getLength()); - System.out.println("[Multicast Receiver] Received:" + msg); - - mcSocket.leaveGroup(mcIPAddress); - mcSocket.close(); - } - - public void send(String strSend) throws IOException { - DatagramSocket udpSocket = new DatagramSocket(); - - InetAddress mcIPAddress = InetAddress.getByName(mcIPStr); - byte[] msg = strSend.getBytes(); - DatagramPacket packet = new DatagramPacket(msg, msg.length); - packet.setAddress(mcIPAddress); - packet.setPort(port); - udpSocket.send(packet); - - System.out.println("Sent a multicast message."); - System.out.println("Exiting application"); - udpSocket.close(); - } -} diff --git a/src/main/java/Enigma/model/Morsecode.java b/src/main/java/Enigma/model/Morsecode.java index 533b7104135360476707f1ae12688462a092e4e7..abb6a774452ea7e3a848da04aca1e62ef23d3aaa 100644 --- a/src/main/java/Enigma/model/Morsecode.java +++ b/src/main/java/Enigma/model/Morsecode.java @@ -35,19 +35,13 @@ public class Morsecode { codeMap.put("X", "1101010110"); codeMap.put("Y", "11010110110"); codeMap.put("Z", "1101101010"); - codeMap.put("1", "10110110110110"); - codeMap.put("2", "1010110110110"); - codeMap.put("3", "101010110110"); - codeMap.put("4", "10101010110"); - codeMap.put("5", "1010101010"); - codeMap.put("6", "11010101010"); - codeMap.put("7", "110110101010"); - codeMap.put("8", "1101101101010"); - codeMap.put("9", "11011011011010"); - codeMap.put("0", "110110110110110"); + // KA - Spruchanfang codeMap.put("KA", "1101011010110"); + // AR - Spruchende codeMap.put("AR", "101101011010"); + // VE - Verstanden codeMap.put("VE", "10101011010"); + // SK - Verkehrsende codeMap.put("SK", "10101011010110"); }