From 331a02ae367422f6b68a89480de532e20e0cab15 Mon Sep 17 00:00:00 2001
From: Dennis Eisold <de@itstall.de>
Date: Thu, 14 Nov 2019 11:46:13 +0100
Subject: [PATCH] =?UTF-8?q?DataFunk=20hinzugef=C3=BCgt=20und=20Package=20u?=
=?UTF-8?q?mbenannt?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pom.xml | 2 +-
.../java/{Projektarbeit => Enigma}/App.java | 2 +-
.../PrimaryController.java | 2 +-
.../SecondaryController.java | 2 +-
src/main/java/Enigma/model/DataFunk.java | 47 +++++++++++++++++++
.../model/Morsecode.java | 2 +-
src/main/java/module-info.java | 4 +-
.../{Projektarbeit => Enigma}/primary.fxml | 2 +-
.../{Projektarbeit => Enigma}/secondary.fxml | 2 +-
9 files changed, 56 insertions(+), 9 deletions(-)
rename src/main/java/{Projektarbeit => Enigma}/App.java (97%)
rename src/main/java/{Projektarbeit => Enigma}/PrimaryController.java (89%)
rename src/main/java/{Projektarbeit => Enigma}/SecondaryController.java (89%)
create mode 100644 src/main/java/Enigma/model/DataFunk.java
rename src/main/java/{Projektarbeit => Enigma}/model/Morsecode.java (98%)
rename src/main/resources/{Projektarbeit => Enigma}/primary.fxml (93%)
rename src/main/resources/{Projektarbeit => Enigma}/secondary.fxml (93%)
diff --git a/pom.xml b/pom.xml
index a7add4c..02b261f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -36,7 +36,7 @@
<artifactId>javafx-maven-plugin</artifactId>
<version>0.0.1</version>
<configuration>
- <mainClass>Projektarbeit.App</mainClass>
+ <mainClass>Enigma.App</mainClass>
</configuration>
</plugin>
</plugins>
diff --git a/src/main/java/Projektarbeit/App.java b/src/main/java/Enigma/App.java
similarity index 97%
rename from src/main/java/Projektarbeit/App.java
rename to src/main/java/Enigma/App.java
index 920abb7..29d6c4f 100644
--- a/src/main/java/Projektarbeit/App.java
+++ b/src/main/java/Enigma/App.java
@@ -1,4 +1,4 @@
-package Projektarbeit;
+package Enigma;
import javafx.application.Application;
import javafx.fxml.FXMLLoader;
diff --git a/src/main/java/Projektarbeit/PrimaryController.java b/src/main/java/Enigma/PrimaryController.java
similarity index 89%
rename from src/main/java/Projektarbeit/PrimaryController.java
rename to src/main/java/Enigma/PrimaryController.java
index 7a9f16e..ebc6366 100644
--- a/src/main/java/Projektarbeit/PrimaryController.java
+++ b/src/main/java/Enigma/PrimaryController.java
@@ -1,4 +1,4 @@
-package Projektarbeit;
+package Enigma;
import java.io.IOException;
import javafx.fxml.FXML;
diff --git a/src/main/java/Projektarbeit/SecondaryController.java b/src/main/java/Enigma/SecondaryController.java
similarity index 89%
rename from src/main/java/Projektarbeit/SecondaryController.java
rename to src/main/java/Enigma/SecondaryController.java
index ab6d1ec..360bb06 100644
--- a/src/main/java/Projektarbeit/SecondaryController.java
+++ b/src/main/java/Enigma/SecondaryController.java
@@ -1,4 +1,4 @@
-package Projektarbeit;
+package Enigma;
import java.io.IOException;
import javafx.fxml.FXML;
diff --git a/src/main/java/Enigma/model/DataFunk.java b/src/main/java/Enigma/model/DataFunk.java
new file mode 100644
index 0000000..7af3151
--- /dev/null
+++ b/src/main/java/Enigma/model/DataFunk.java
@@ -0,0 +1,47 @@
+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/Projektarbeit/model/Morsecode.java b/src/main/java/Enigma/model/Morsecode.java
similarity index 98%
rename from src/main/java/Projektarbeit/model/Morsecode.java
rename to src/main/java/Enigma/model/Morsecode.java
index e3032c9..533b710 100644
--- a/src/main/java/Projektarbeit/model/Morsecode.java
+++ b/src/main/java/Enigma/model/Morsecode.java
@@ -1,4 +1,4 @@
-package Projektarbeit.model;
+package Enigma.model;
import java.util.TreeMap;
diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java
index ef48572..c9e95ca 100644
--- a/src/main/java/module-info.java
+++ b/src/main/java/module-info.java
@@ -2,6 +2,6 @@ module Projektarbeit {
requires javafx.controls;
requires javafx.fxml;
- opens Projektarbeit to javafx.fxml;
- exports Projektarbeit;
+ opens Enigma to javafx.fxml;
+ exports Enigma;
}
\ No newline at end of file
diff --git a/src/main/resources/Projektarbeit/primary.fxml b/src/main/resources/Enigma/primary.fxml
similarity index 93%
rename from src/main/resources/Projektarbeit/primary.fxml
rename to src/main/resources/Enigma/primary.fxml
index 9dfabf8..498e016 100644
--- a/src/main/resources/Projektarbeit/primary.fxml
+++ b/src/main/resources/Enigma/primary.fxml
@@ -5,7 +5,7 @@
<?import javafx.scene.control.Button?>
<?import javafx.geometry.Insets?>
-<VBox alignment="CENTER" spacing="20.0" xmlns="http://javafx.com/javafx/8.0.171" xmlns:fx="http://javafx.com/fxml/1" fx:controller="Projektarbeit.PrimaryController">
+<VBox alignment="CENTER" spacing="20.0" xmlns="http://javafx.com/javafx/8.0.171" xmlns:fx="http://javafx.com/fxml/1" fx:controller="Enigma.PrimaryController">
<children>
<Label text="Primary View" />
<Button fx:id="primaryButton" text="Switch to Secondary View" onAction="#switchToSecondary"/>
diff --git a/src/main/resources/Projektarbeit/secondary.fxml b/src/main/resources/Enigma/secondary.fxml
similarity index 93%
rename from src/main/resources/Projektarbeit/secondary.fxml
rename to src/main/resources/Enigma/secondary.fxml
index f603410..6f0d942 100644
--- a/src/main/resources/Projektarbeit/secondary.fxml
+++ b/src/main/resources/Enigma/secondary.fxml
@@ -5,7 +5,7 @@
<?import javafx.scene.control.Button?>
<?import javafx.geometry.Insets?>
-<VBox alignment="CENTER" spacing="20.0" xmlns="http://javafx.com/javafx/8.0.171" xmlns:fx="http://javafx.com/fxml/1" fx:controller="Projektarbeit.SecondaryController">
+<VBox alignment="CENTER" spacing="20.0" xmlns="http://javafx.com/javafx/8.0.171" xmlns:fx="http://javafx.com/fxml/1" fx:controller="Enigma.SecondaryController">
<children>
<Label text="Secondary View" />
<Button fx:id="secondaryButton" text="Switch to Primary View" onAction="#switchToPrimary" />
--
GitLab