From a1a397d06d16f8514823eb2308b61b3c33795e8f Mon Sep 17 00:00:00 2001
From: Mystikfluu <Mystikfluu@gmail.com>
Date: Sun, 2 Apr 2023 22:30:52 +0200
Subject: [PATCH] better naming

---
 at/fos/ermodel/gui/B3.java |  5 ++++-
 at/fos/ermodel/gui/T3.java | 39 ++++++++++----------------------------
 2 files changed, 14 insertions(+), 30 deletions(-)

diff --git a/at/fos/ermodel/gui/B3.java b/at/fos/ermodel/gui/B3.java
index fe9e1d2..2c21a9f 100644
--- a/at/fos/ermodel/gui/B3.java
+++ b/at/fos/ermodel/gui/B3.java
@@ -159,6 +159,7 @@ public class B3
         this.showAttributeCB.setTooltip(new Tooltip("Check data generation"));
         this.showAttributeCB.setPrefWidth(40.0D);
         this.showAttributeCB.setMinWidth(40.0D);
+
         this.showAttributeCB.setOnAction(new EventHandler<>() {
             public void handle(ActionEvent event) {
                 if (B3.this.showAttributeCB.isSelected()) {
@@ -707,6 +708,8 @@ public class B3
         this.generateRelationalModelCB = new CheckBox("Generate Relational Model");
         this.generateRelationalModelCB.setTooltip(new Tooltip("To check the relational model open the area right to the working area"));
         this.generateRelationalModelCB.setSelected(false);
+        generateRelationalModelCB.setStyle("-fx-text-fill: #ffffff;");
+
         setMouseHandler(this.generateRelationalModelCB);
         this.generateRelationalModelCB.setOnAction(arg0 -> {
             if (B3.this.generateRelationalModelCB.isSelected()) {
@@ -746,7 +749,7 @@ public class B3
         setMouseHandler(this.generateInsertsCB);
         this.generateInsertsCB.setFont(Font.font(null, FontWeight.NORMAL, 11.0D));
         this.generateInsertsCB.setSelected(false);
-        this.singleInsertStatementCB = new CheckBox("-> as single insert statement");
+        this.singleInsertStatementCB = new CheckBox("-> as multiple insert statements");
         this.singleInsertStatementCB.setTooltip(new Tooltip("If selected, all inserts are seperated statements"));
         setMouseHandler(this.singleInsertStatementCB);
         this.singleInsertStatementCB.setFont(Font.font(null, FontWeight.NORMAL, 11.0D));
diff --git a/at/fos/ermodel/gui/T3.java b/at/fos/ermodel/gui/T3.java
index c234317..36b563c 100644
--- a/at/fos/ermodel/gui/T3.java
+++ b/at/fos/ermodel/gui/T3.java
@@ -1,5 +1,4 @@
 package at.fos.ermodel.gui;
-/*     */
 
 import javafx.scene.Node;
 import javafx.scene.effect.ColorAdjust;
@@ -44,7 +43,7 @@ public class T3 {
             "Random Street"};
 
 
-    public static Object copyObject(Object objSource) {
+    public static Object copyObject(Graphic_Main_Elem objSource) {
         Object objDest = null;
         try {
             ByteArrayOutputStream bos = new ByteArrayOutputStream();
@@ -110,50 +109,32 @@ public class T3 {
         return text;
     }
 
+    public static String getRandomDouble(double valuesVon, double valuesBis) {
+        return String.valueOf(valuesVon + (new Random()).nextDouble(valuesBis - valuesVon) + 1);
+    }
 
     public static String getRandomInteger(int valuesVon, int valuesBis) {
-        int randomValue = valuesVon + (new Random()).nextInt(valuesBis - valuesVon) + 1;
-        return String.valueOf(randomValue);
+        return getRandomDouble(valuesVon, valuesBis);
     }
 
 
+
+
     public static String getRandomBoolean() {
-        boolean randomValue = (new Random()).nextBoolean();
-        String booleanAsString;
-        booleanAsString = "0";
-        if (randomValue) booleanAsString = "1";
-        return booleanAsString;
+        return getRandomInteger(0,1);
     }
 
 
     public static String getRandomDecimal(int digitsBeforeComma, int digitsAfterComma) {
-        StringBuilder digitsAfterCommaAsString = new StringBuilder();
-
-        StringBuilder digitsBeforeCommaAsString = new StringBuilder();
-        int i;
-        for (i = 0; i < digitsAfterComma; i++) {
-            digitsAfterCommaAsString.append("9");
-        }
-        int digitsAfterCommaRange = Integer.parseInt((digitsAfterCommaAsString.length() == 0) ? "0" : digitsAfterCommaAsString.toString());
-        for (i = 0; i < digitsBeforeComma; i++) {
-            digitsBeforeCommaAsString.append("9");
-        }
-        int digitsBeforeCommaRange = Integer.parseInt(digitsBeforeCommaAsString.toString());
-
-        return (new Random()).nextInt(digitsBeforeCommaRange + 1) + "." + (new Random()).nextInt(digitsAfterCommaRange + 1);
+        return getRandomDouble(0,Math.pow(10,digitsBeforeComma)-1) + "." + getRandomDouble(0,Math.pow(10,digitsAfterComma)-1);
     }
 
 
     public static String getRandomTextGivenLength(int textLength) {
         String str = "abcdefghijklmnopqrstuvwxyz";
         StringBuilder randomText = new StringBuilder();
-        ArrayList<Character> charactersAsList = new ArrayList<>();
         for (int j = 0; j < textLength; j++) {
-            charactersAsList.add(str.charAt((new Random()).nextInt(26)));
-        }
-        for (int k = 0; k < charactersAsList.size(); ) {
-            randomText.append(charactersAsList.get(k));
-            k++;
+            randomText.append(str.charAt((new Random()).nextInt(26)));
         }
         return randomText.toString();
     }