From 4b23560a46ee0011b8c55e8883e44d4fa261fdab Mon Sep 17 00:00:00 2001
From: Code002Lover Arch Laptop <security@ipost.rocks>
Date: Sat, 1 Apr 2023 12:11:02 +0200
Subject: [PATCH] optimize some stuff

---
 at/fos/ermodel/gui/Graphic_LINE_Elem.java |   1 -
 at/fos/ermodel/gui/ZZ30.java              | 116 ++++++++--------------
 2 files changed, 43 insertions(+), 74 deletions(-)

diff --git a/at/fos/ermodel/gui/Graphic_LINE_Elem.java b/at/fos/ermodel/gui/Graphic_LINE_Elem.java
index 8a123c3..99be661 100644
--- a/at/fos/ermodel/gui/Graphic_LINE_Elem.java
+++ b/at/fos/ermodel/gui/Graphic_LINE_Elem.java
@@ -183,7 +183,6 @@ public abstract class Graphic_LINE_Elem
         if (this instanceof Graphic_LINE_Attr_RS_Elem) {
             return;
         }
-
         double helpXStart = this.xPos;
         double helpXEnd = this.xEnd;
         double helpYStart = this.yPos;
diff --git a/at/fos/ermodel/gui/ZZ30.java b/at/fos/ermodel/gui/ZZ30.java
index c84cd60..e2b4024 100644
--- a/at/fos/ermodel/gui/ZZ30.java
+++ b/at/fos/ermodel/gui/ZZ30.java
@@ -316,43 +316,7 @@ public class ZZ30 {
                     }
 
 
-                    doneWeakElements.add(gw_es);
-
-
-                    boolean partPrimary = true;
-
-                    ArrayList<Graphic_Main_Elem> keys = getKeyAttributes(gw_es);
-                    if (keys.size() > 0) partPrimary = false;
-                    keys = getWeakKeyAttributes(gw_es);
-                    if (!partPrimary && keys.size() > 0) {
-
-
-                        this.view.verticalBox.getChildren().clear();
-                        this.view.generateRelationalModelCB.setSelected(false);
-                        return false;
-                    }
-
-
-                    assert ges != null;
-                    T1 tableForges = this.relationalModel.getTableGivenNumber(ges.sdfsdfsdfd());
-                    ArrayList<C3> keyColumns = this.relationalModel.getKeyColumnsGivenRelation(ges.sdfsdfsdfd());
-                    T1 tableForgwes = this.relationalModel.getTableGivenNumber(gw_es.sdfsdfsdfd());
-                    for (C3 refcolumn : keyColumns) {
-                        C3 column = new C3(tableForgwes.getTablenamePraefix() + refcolumn.getColumnName(),
-                                refcolumn.getDatatype(),
-                                partPrimary,
-                                !partPrimary,
-                                false,
-                                false,
-                                refcolumn.getAutoincrementStartAt(),
-                                new T2(tableForges.getTablename(), refcolumn.getColumnName()),
-                                tableForgwes.getReferstoGraphicalElement(),
-
-                                null,
-                                null,
-                                null);
-                        tableForgwes.addColumn(column);
-                    }
+                    if (handleWeakElements(doneWeakElements, gw_es, ges)) return false;
                 }
             }
         }
@@ -417,42 +381,7 @@ public class ZZ30 {
 
                             countNotTransformedWeakES--;
 
-                            doneWeakElements.add(gw_es);
-
-                            boolean partPrimary = true;
-
-                            ArrayList<Graphic_Main_Elem> keys = getKeyAttributes(gw_es);
-                            if (keys.size() > 0) partPrimary = false;
-                            keys = getWeakKeyAttributes(gw_es);
-                            if (!partPrimary && keys.size() > 0) {
-
-
-                                this.view.verticalBox.getChildren().clear();
-                                this.view.generateRelationalModelCB.setSelected(false);
-                                return false;
-                            }
-
-
-                            assert ges != null;
-                            T1 tableForges = this.relationalModel.getTableGivenNumber(ges.sdfsdfsdfd());
-                            ArrayList<C3> keyColumns = this.relationalModel.getKeyColumnsGivenRelation(ges.sdfsdfsdfd());
-                            T1 tableForgwes = this.relationalModel.getTableGivenNumber(gw_es.sdfsdfsdfd());
-                            for (C3 refcolumn : keyColumns) {
-                                C3 column = new C3(tableForgwes.getTablenamePraefix() + refcolumn.getColumnName(),
-                                        refcolumn.getDatatype(),
-                                        partPrimary,
-                                        !partPrimary,
-                                        false,
-                                        false,
-                                        refcolumn.getAutoincrementStartAt(),
-                                        new T2(tableForges.getTablename(), refcolumn.getColumnName()),
-                                        tableForgwes.getReferstoGraphicalElement(),
-
-                                        null,
-                                        null,
-                                        null);
-                                tableForgwes.addColumn(column);
-                            }
+                            if (handleWeakElements(doneWeakElements, gw_es, ges)) return false;
                         }
                     }
                 }
@@ -713,6 +642,47 @@ public class ZZ30 {
         return true;
     }
 
+    private boolean handleWeakElements(ArrayList<Graphic_Main_Elem> doneWeakElements, Graphic_ES_Main_Elem gw_es, Graphic_ES_Main_Elem ges) {
+        doneWeakElements.add(gw_es);
+
+
+        boolean partPrimary = true;
+
+        ArrayList<Graphic_Main_Elem> keys = getKeyAttributes(gw_es);
+        if (keys.size() > 0) partPrimary = false;
+        keys = getWeakKeyAttributes(gw_es);
+        if (!partPrimary && keys.size() > 0) {
+
+
+            this.view.verticalBox.getChildren().clear();
+            this.view.generateRelationalModelCB.setSelected(false);
+            return true;
+        }
+
+
+        assert ges != null;
+        T1 tableForges = this.relationalModel.getTableGivenNumber(ges.sdfsdfsdfd());
+        ArrayList<C3> keyColumns = this.relationalModel.getKeyColumnsGivenRelation(ges.sdfsdfsdfd());
+        T1 tableForgwes = this.relationalModel.getTableGivenNumber(gw_es.sdfsdfsdfd());
+        for (C3 refcolumn : keyColumns) {
+            C3 column = new C3(tableForgwes.getTablenamePraefix() + refcolumn.getColumnName(),
+                    refcolumn.getDatatype(),
+                    partPrimary,
+                    !partPrimary,
+                    false,
+                    false,
+                    refcolumn.getAutoincrementStartAt(),
+                    new T2(tableForges.getTablename(), refcolumn.getColumnName()),
+                    tableForgwes.getReferstoGraphicalElement(),
+
+                    null,
+                    null,
+                    null);
+            tableForgwes.addColumn(column);
+        }
+        return false;
+    }
+
     private boolean handleKey(Graphic_RS_Main_Elem grsem) {
         boolean keyCorrect = true;
         ArrayList<Graphic_Main_Elem> keys = getKeyAttributes(grsem);