diff --git a/build/built-jar.properties b/build/built-jar.properties
index 03c819e..cc2d0f4 100644
--- a/build/built-jar.properties
+++ b/build/built-jar.properties
@@ -1,4 +1,4 @@
-#Fri, 09 Aug 2019 05:16:48 +0200
+#Fri, 09 Aug 2019 06:24:54 +0200
-C\:\\Users\\mschw\\Desktop\\CODE\\java-fx-8-samples=
+D\:\\Git-Repos\\java-fx-8-samples=
diff --git a/build/classes/basenconverter/FXMLDocument.fxml b/build/classes/basenconverter/FXMLDocument.fxml
new file mode 100644
index 0000000..76e0a7c
--- /dev/null
+++ b/build/classes/basenconverter/FXMLDocument.fxml
@@ -0,0 +1,42 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/build/classes/basenconverter/FXMLDocumentController.class b/build/classes/basenconverter/FXMLDocumentController.class
new file mode 100644
index 0000000..0cb7503
Binary files /dev/null and b/build/classes/basenconverter/FXMLDocumentController.class differ
diff --git a/build/classes/basenconverter/Main.class b/build/classes/basenconverter/Main.class
new file mode 100644
index 0000000..c061f79
Binary files /dev/null and b/build/classes/basenconverter/Main.class differ
diff --git a/build/classes/utils/Runner.class b/build/classes/utils/Runner.class
index 007ac49..32471b9 100644
Binary files a/build/classes/utils/Runner.class and b/build/classes/utils/Runner.class differ
diff --git a/dist/java-fx-8-samples.html b/dist/java-fx-8-samples.html
index 0154ca2..f8be0dc 100644
--- a/dist/java-fx-8-samples.html
+++ b/dist/java-fx-8-samples.html
@@ -4,7 +4,7 @@
function launchApplication(jnlpfile) {
dtjava.launch( {
url : 'java-fx-8-samples.jnlp',
- jnlp_content : 'PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4NCjxqbmxwIHNwZWM9IjEuMCIgeG1sbnM6amZ4PSJodHRwOi8vamF2YWZ4LmNvbSIgaHJlZj0iamF2YS1meC04LXNhbXBsZXMuam5scCI+DQogIDxpbmZvcm1hdGlvbj4NCiAgICA8dGl0bGU+amF2YS1meC04LXNhbXBsZXM8L3RpdGxlPg0KICAgIDx2ZW5kb3I+bXNjaHc8L3ZlbmRvcj4NCiAgICA8ZGVzY3JpcHRpb24+bnVsbDwvZGVzY3JpcHRpb24+DQogICAgPG9mZmxpbmUtYWxsb3dlZC8+DQogIDwvaW5mb3JtYXRpb24+DQogIDxyZXNvdXJjZXM+DQogICAgPGoyc2UgdmVyc2lvbj0iMS42KyIgaHJlZj0iaHR0cDovL2phdmEuc3VuLmNvbS9wcm9kdWN0cy9hdXRvZGwvajJzZSIvPg0KICAgIDxqYXIgaHJlZj0iamF2YS1meC04LXNhbXBsZXMuamFyIiBzaXplPSIxOTk1MTUiIGRvd25sb2FkPSJlYWdlciIgLz4NCiAgPC9yZXNvdXJjZXM+DQogIDxqZng6amF2YWZ4LWRlc2MgIHdpZHRoPSI4MDAiIGhlaWdodD0iNjAwIiBtYWluLWNsYXNzPSJ1dGlscy5SdW5uZXIiICBuYW1lPSJqYXZhLWZ4LTgtc2FtcGxlcyIgLz4NCiAgPHVwZGF0ZSBjaGVjaz0iYWx3YXlzIi8+DQo8L2pubHA+DQo='
+ jnlp_content : 'PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4NCjxqbmxwIHNwZWM9IjEuMCIgeG1sbnM6amZ4PSJodHRwOi8vamF2YWZ4LmNvbSIgaHJlZj0iamF2YS1meC04LXNhbXBsZXMuam5scCI+DQogIDxpbmZvcm1hdGlvbj4NCiAgICA8dGl0bGU+amF2YS1meC04LXNhbXBsZXM8L3RpdGxlPg0KICAgIDx2ZW5kb3I+bXNjaHc8L3ZlbmRvcj4NCiAgICA8ZGVzY3JpcHRpb24+bnVsbDwvZGVzY3JpcHRpb24+DQogICAgPG9mZmxpbmUtYWxsb3dlZC8+DQogIDwvaW5mb3JtYXRpb24+DQogIDxyZXNvdXJjZXM+DQogICAgPGoyc2UgdmVyc2lvbj0iMS42KyIgaHJlZj0iaHR0cDovL2phdmEuc3VuLmNvbS9wcm9kdWN0cy9hdXRvZGwvajJzZSIvPg0KICAgIDxqYXIgaHJlZj0iamF2YS1meC04LXNhbXBsZXMuamFyIiBzaXplPSIyMDMzMzgiIGRvd25sb2FkPSJlYWdlciIgLz4NCiAgPC9yZXNvdXJjZXM+DQogIDxqZng6amF2YWZ4LWRlc2MgIHdpZHRoPSI4MDAiIGhlaWdodD0iNjAwIiBtYWluLWNsYXNzPSJ1dGlscy5SdW5uZXIiICBuYW1lPSJqYXZhLWZ4LTgtc2FtcGxlcyIgLz4NCiAgPHVwZGF0ZSBjaGVjaz0iYWx3YXlzIi8+DQo8L2pubHA+DQo='
},
{
javafx : '8.0+'
@@ -24,7 +24,7 @@
placeholder : 'javafx-app-placeholder',
width : '800',
height : '600',
- jnlp_content : 'PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4NCjxqbmxwIHNwZWM9IjEuMCIgeG1sbnM6amZ4PSJodHRwOi8vamF2YWZ4LmNvbSIgaHJlZj0iamF2YS1meC04LXNhbXBsZXMuam5scCI+DQogIDxpbmZvcm1hdGlvbj4NCiAgICA8dGl0bGU+amF2YS1meC04LXNhbXBsZXM8L3RpdGxlPg0KICAgIDx2ZW5kb3I+bXNjaHc8L3ZlbmRvcj4NCiAgICA8ZGVzY3JpcHRpb24+bnVsbDwvZGVzY3JpcHRpb24+DQogICAgPG9mZmxpbmUtYWxsb3dlZC8+DQogIDwvaW5mb3JtYXRpb24+DQogIDxyZXNvdXJjZXM+DQogICAgPGoyc2UgdmVyc2lvbj0iMS42KyIgaHJlZj0iaHR0cDovL2phdmEuc3VuLmNvbS9wcm9kdWN0cy9hdXRvZGwvajJzZSIvPg0KICAgIDxqYXIgaHJlZj0iamF2YS1meC04LXNhbXBsZXMuamFyIiBzaXplPSIxOTk1MTUiIGRvd25sb2FkPSJlYWdlciIgLz4NCiAgPC9yZXNvdXJjZXM+DQogIDxqZng6amF2YWZ4LWRlc2MgIHdpZHRoPSI4MDAiIGhlaWdodD0iNjAwIiBtYWluLWNsYXNzPSJ1dGlscy5SdW5uZXIiICBuYW1lPSJqYXZhLWZ4LTgtc2FtcGxlcyIgLz4NCiAgPHVwZGF0ZSBjaGVjaz0iYWx3YXlzIi8+DQo8L2pubHA+DQo='
+ jnlp_content : 'PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4NCjxqbmxwIHNwZWM9IjEuMCIgeG1sbnM6amZ4PSJodHRwOi8vamF2YWZ4LmNvbSIgaHJlZj0iamF2YS1meC04LXNhbXBsZXMuam5scCI+DQogIDxpbmZvcm1hdGlvbj4NCiAgICA8dGl0bGU+amF2YS1meC04LXNhbXBsZXM8L3RpdGxlPg0KICAgIDx2ZW5kb3I+bXNjaHc8L3ZlbmRvcj4NCiAgICA8ZGVzY3JpcHRpb24+bnVsbDwvZGVzY3JpcHRpb24+DQogICAgPG9mZmxpbmUtYWxsb3dlZC8+DQogIDwvaW5mb3JtYXRpb24+DQogIDxyZXNvdXJjZXM+DQogICAgPGoyc2UgdmVyc2lvbj0iMS42KyIgaHJlZj0iaHR0cDovL2phdmEuc3VuLmNvbS9wcm9kdWN0cy9hdXRvZGwvajJzZSIvPg0KICAgIDxqYXIgaHJlZj0iamF2YS1meC04LXNhbXBsZXMuamFyIiBzaXplPSIyMDMzMzgiIGRvd25sb2FkPSJlYWdlciIgLz4NCiAgPC9yZXNvdXJjZXM+DQogIDxqZng6amF2YWZ4LWRlc2MgIHdpZHRoPSI4MDAiIGhlaWdodD0iNjAwIiBtYWluLWNsYXNzPSJ1dGlscy5SdW5uZXIiICBuYW1lPSJqYXZhLWZ4LTgtc2FtcGxlcyIgLz4NCiAgPHVwZGF0ZSBjaGVjaz0iYWx3YXlzIi8+DQo8L2pubHA+DQo='
},
{
javafx : '8.0+'
diff --git a/dist/java-fx-8-samples.jar b/dist/java-fx-8-samples.jar
index d78d8fc..1ae018f 100644
Binary files a/dist/java-fx-8-samples.jar and b/dist/java-fx-8-samples.jar differ
diff --git a/dist/java-fx-8-samples.jnlp b/dist/java-fx-8-samples.jnlp
index e465afb..cb1a78a 100644
--- a/dist/java-fx-8-samples.jnlp
+++ b/dist/java-fx-8-samples.jnlp
@@ -8,7 +8,7 @@
-
+
diff --git a/src/basenconverter/FXMLDocument.fxml b/src/basenconverter/FXMLDocument.fxml
new file mode 100644
index 0000000..76e0a7c
--- /dev/null
+++ b/src/basenconverter/FXMLDocument.fxml
@@ -0,0 +1,42 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/basenconverter/FXMLDocumentController.java b/src/basenconverter/FXMLDocumentController.java
new file mode 100644
index 0000000..5de1275
--- /dev/null
+++ b/src/basenconverter/FXMLDocumentController.java
@@ -0,0 +1,114 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package basenconverter;
+
+import java.math.BigInteger;
+import java.net.URL;
+import java.util.ResourceBundle;
+import javafx.event.ActionEvent;
+import javafx.fxml.FXML;
+import javafx.fxml.Initializable;
+import javafx.scene.control.Button;
+import javafx.scene.control.Label;
+import javafx.scene.control.RadioButton;
+import javafx.scene.control.TextField;
+import javafx.scene.control.ToggleGroup;
+
+/**
+ *
+ * @author Marcel
+ */
+public class FXMLDocumentController implements Initializable {
+
+ @FXML
+ private TextField txtDez;
+ @FXML
+ private TextField txtHex;
+ @FXML
+ private TextField txtBin;
+ @FXML
+ private Button btnConvert;
+ @FXML
+ private Label lblFehler;
+ @FXML
+ private RadioButton rbtnDez;
+ @FXML
+ private ToggleGroup fromTo;
+ @FXML
+ private RadioButton rbtnHex;
+ @FXML
+ private RadioButton rbtnBin;
+
+ @Override
+ public void initialize(URL url, ResourceBundle rb) {
+ // TODO
+ }
+
+ @FXML
+ private void handleConvert(ActionEvent event) {
+ try {
+ if (fromTo.getSelectedToggle().equals(rbtnDez)) {
+ Long l = Long.parseLong(txtDez.getText());
+ txtHex.setText(Long.toHexString(l));
+ txtBin.setText(Long.toBinaryString(l));
+
+ } else if (fromTo.getSelectedToggle().equals(rbtnHex)) {
+ String hex = txtHex.getText();
+ BigInteger bi = new BigInteger(hex, 16);
+ txtDez.setText(bi.toString());
+ Long l = Long.parseLong(txtDez.getText());
+ txtBin.setText(Long.toBinaryString(l));
+
+ } else if (fromTo.getSelectedToggle().equals(rbtnBin)) {
+ String bin = txtBin.getText();
+ BigInteger bi = new BigInteger(bin, 2);
+ txtDez.setText(bi.toString());
+ Long l = Long.parseLong(txtDez.getText());
+ txtHex.setText(Long.toHexString(l));
+
+ } else {
+ lblFehler.setText("Select Radiobutton");
+ }
+ } catch (Exception e) {
+ lblFehler.setText("Eingabefehler");
+ }
+
+ }
+
+ @FXML
+ private void handlerbtnDez(ActionEvent event) {
+ txtBin.setText(null);
+ txtDez.setText(null);
+ txtHex.setText(null);
+
+ txtDez.setEditable(true);
+ txtBin.setEditable(false);
+ txtHex.setEditable(false);
+ }
+
+ @FXML
+ private void handlerbtnHex(ActionEvent event) {
+ txtBin.setText(null);
+ txtDez.setText(null);
+ txtHex.setText(null);
+
+ txtHex.setEditable(true);
+ txtBin.setEditable(false);
+ txtDez.setEditable(false);
+ }
+
+ @FXML
+ private void handlerbtnBin(ActionEvent event) {
+ txtBin.setText(null);
+ txtDez.setText(null);
+ txtHex.setText(null);
+
+ txtBin.setEditable(true);
+ txtHex.setEditable(false);
+ txtDez.setEditable(false);
+ }
+
+}
diff --git a/src/basenconverter/Main.java b/src/basenconverter/Main.java
new file mode 100644
index 0000000..75bef19
--- /dev/null
+++ b/src/basenconverter/Main.java
@@ -0,0 +1,45 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package basenconverter;
+
+import java.io.IOException;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import javafx.application.Application;
+import javafx.fxml.FXMLLoader;
+import javafx.scene.Parent;
+import javafx.scene.Scene;
+import javafx.stage.Stage;
+
+/**
+ *
+ * @author Marcel
+ */
+public class Main extends Application {
+
+ @Override
+ public void start(Stage stage) {
+ Parent root = null;
+ try {
+ root = FXMLLoader.load(getClass().getResource("FXMLDocument.fxml"));
+ } catch (IOException ex) {
+ Logger.getLogger(Main.class.getName()).log(Level.SEVERE, null, ex);
+ }
+
+ Scene scene = new Scene(root);
+
+ stage.setScene(scene);
+ stage.show();
+ }
+
+ /**
+ * @param args the command line arguments
+ */
+ public static void main(String[] args) {
+ launch(args);
+ }
+
+}
diff --git a/src/utils/Runner.java b/src/utils/Runner.java
index e93f695..e6cb75a 100644
--- a/src/utils/Runner.java
+++ b/src/utils/Runner.java
@@ -13,9 +13,11 @@ import javafx.event.EventHandler;
import javafx.geometry.Insets;
import javafx.scene.Scene;
import javafx.scene.control.Button;
+import javafx.scene.control.Label;
import javafx.scene.control.ScrollPane;
import javafx.scene.layout.GridPane;
import javafx.scene.layout.StackPane;
+import javafx.scene.text.Font;
import javafx.stage.Stage;
/**
@@ -38,97 +40,109 @@ public class Runner extends Application{
GridPane gridpane = new GridPane();
gridpane.paddingProperty().set(new Insets(5));
+ Label lblTechdemo = new Label("Techdemos:");
+ lblTechdemo.setFont(Font.font(20));
+ gridpane.add(lblTechdemo, 0, 0);
+
Button btn1 = new Button("Start Animated Ball 1");
btn1.setOnAction(event -> new animatedball1.Main().start(new Stage()));
- gridpane.add(btn1, 0, 0);
+ gridpane.add(btn1, 0, 1);
Button btn2 = new Button("Start Animated Ball 2");
btn2.setOnAction(event -> new animatedBall2.Main().start(new Stage()));
- gridpane.add(btn2, 1, 0);
-
- Button btn3 = new Button("Start Buegelperlen");
- btn3.setOnAction(event -> new buegelperlen.Main().start(new Stage()));
- gridpane.add(btn3, 2, 0);
+ gridpane.add(btn2, 1, 1);
Button btn4 = new Button("Start Change Scene 1");
btn4.setOnAction(event -> new changescene1.Main().start(new Stage()));
- gridpane.add(btn4, 0, 1);
+ gridpane.add(btn4, 2, 1);
Button btn5 = new Button("Start Change Scene 2");
btn5.setOnAction(event -> new changescene2.Main().start(new Stage()));
- gridpane.add(btn5, 1, 1);
+ gridpane.add(btn5, 0, 2);
Button btn6 = new Button("Start Circlegenerator");
btn6.setOnAction(event -> new circlegenerator.Main().start(new Stage()));
- gridpane.add(btn6, 2, 1);
+ gridpane.add(btn6, 1, 2);
Button btn7 = new Button("Start Collision Test");
btn7.setOnAction(event -> new collisiontest.Main().start(new Stage()));
- gridpane.add(btn7, 0, 2);
+ gridpane.add(btn7, 2, 2);
Button btn8 = new Button("Start Color Shooter");
btn8.setOnAction(event -> new colorshooter.Main().start(new Stage()));
- gridpane.add(btn8, 1, 2);
+ gridpane.add(btn8, 0, 3);
Button btn9 = new Button("Start Cube Demo");
btn9.setOnAction(event -> new cubedemo.Main().start(new Stage()));
- gridpane.add(btn9, 2, 2);
-
- Button btn10 = new Button("Start Easy Screenshotter");
- btn10.setOnAction(event -> new easyscreenshotter.Main().start(new Stage()));
- gridpane.add(btn10, 0, 3);
+ gridpane.add(btn9, 1, 3);
Button btn11 = new Button("Start Grafischer Wuerfel");
btn11.setOnAction(event -> new grafischerwuerfel.Main().start(new Stage()));
- gridpane.add(btn11, 1, 3);
-
+ gridpane.add(btn11, 2, 3);
+
Button btn12 = new Button("Start IPv4 Generator");
btn12.setOnAction(event -> new ipv4generator.Main().start(new Stage()));
- gridpane.add(btn12, 2, 3);
+ gridpane.add(btn12, 0, 4);
Button btn13 = new Button("Start ListView Test 1");
btn13.setOnAction(event -> new listviewtest1.Main().start(new Stage()));
- gridpane.add(btn13, 0, 4);
+ gridpane.add(btn13, 1, 4);
Button btn14 = new Button("Start ListView Test 2");
btn14.setOnAction(event -> new listviewtest2.Main().start(new Stage()));
- gridpane.add(btn14, 1, 4);
+ gridpane.add(btn14, 2, 4);
Button btn15 = new Button("Start Movie Database");
btn15.setOnAction(event -> new moviedatabase.Main().start(new Stage()));
- gridpane.add(btn15, 2, 4);
+ gridpane.add(btn15, 0, 5);
Button btn16 = new Button("Start Multiple Windows");
btn16.setOnAction(event -> new multiplewindows.Main().start(new Stage()));
- gridpane.add(btn16, 0, 5);
+ gridpane.add(btn16, 1, 5);
Button btn17 = new Button("Start My Cookie Clicker");
btn17.setOnAction(event -> new mycookieclicker.Main().start(new Stage()));
- gridpane.add(btn17, 1, 5);
+ gridpane.add(btn17, 2, 5);
Button btn18 = new Button("Start Progressbars");
btn18.setOnAction(event -> new progressbars.Main().start(new Stage()));
- gridpane.add(btn18, 2, 5);
-
- Button btn19 = new Button("Start Random Word Gen Finder");
- btn19.setOnAction(event -> new randomwordgenfinder.Main().start(new Stage()));
- gridpane.add(btn19, 0, 6);
-
- Button btn20 = new Button("Start Taschenrechner Komma");
- btn20.setOnAction(event -> new taschenrechnerkomma.Main().start(new Stage()));
- gridpane.add(btn20, 1, 6);
+ gridpane.add(btn18, 0, 6);
Button btn21 = new Button("Start Track Cursor");
btn21.setOnAction(event -> new trackcoursor.Main().start(new Stage()));
- gridpane.add(btn21, 2, 6);
+ gridpane.add(btn21, 1, 6);
Button btn22 = new Button("Start Unicode Emoji Test");
btn22.setOnAction(event -> new unicodeemojitest.Main().start(new Stage()));
- gridpane.add(btn22, 0, 7);
+ gridpane.add(btn22, 2, 6);
+
+ Label lblFertig = new Label("Echte Projekte:");
+ lblFertig.setFont(Font.font(20));
+ gridpane.add(lblFertig, 0, 7);
+
+ Button btn3 = new Button("Start Buegelperlen");
+ btn3.setOnAction(event -> new buegelperlen.Main().start(new Stage()));
+ gridpane.add(btn3, 0, 8);
+
+ Button btn23 = new Button("Start Base N Converter");
+ btn23.setOnAction(event -> new basenconverter.Main().start(new Stage()));
+ gridpane.add(btn23, 1, 8);
+
+ Button btn10 = new Button("Start Easy Screenshotter");
+ btn10.setOnAction(event -> new easyscreenshotter.Main().start(new Stage()));
+ gridpane.add(btn10, 2, 8);
+
+ Button btn19 = new Button("Start Random Word Gen Finder");
+ btn19.setOnAction(event -> new randomwordgenfinder.Main().start(new Stage()));
+ gridpane.add(btn19, 0, 9);
+
+ Button btn20 = new Button("Start Taschenrechner Komma");
+ btn20.setOnAction(event -> new taschenrechnerkomma.Main().start(new Stage()));
+ gridpane.add(btn20, 1, 9);
ScrollPane root = new ScrollPane(gridpane);
- Scene scene = new Scene(root, 500, 250);
+ Scene scene = new Scene(root, 600, 400);
primaryStage.setTitle("Project Chooser");
primaryStage.setScene(scene);