diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..74c7fa4 --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/at/fos/ermodel/gui/B3.java b/at/fos/ermodel/gui/B3.java index bcfd55b..fe9e1d2 100644 --- a/at/fos/ermodel/gui/B3.java +++ b/at/fos/ermodel/gui/B3.java @@ -17,6 +17,7 @@ import javafx.scene.control.Label; import javafx.scene.control.Menu; import javafx.scene.control.MenuBar; import javafx.scene.control.MenuItem; +import javafx.scene.control.ScrollPane; import javafx.scene.control.TextField; import javafx.scene.control.*; import javafx.scene.image.ImageView; @@ -31,7 +32,6 @@ import javafx.scene.text.Font; import javafx.scene.text.FontWeight; import javafx.stage.FileChooser; import javafx.stage.Stage; -import javafx.scene.control.ScrollPane; import javax.imageio.ImageIO; import java.awt.*; diff --git a/at/fos/ermodel/gui/C2.java b/at/fos/ermodel/gui/C2.java index 72ac99c..2232bdd 100644 --- a/at/fos/ermodel/gui/C2.java +++ b/at/fos/ermodel/gui/C2.java @@ -12,9 +12,12 @@ import javafx.scene.text.FontWeight; import javafx.scene.text.Text; import java.io.BufferedReader; +import java.io.ByteArrayInputStream; +import java.io.IOException; import java.io.InputStream; import java.util.HashMap; import java.util.Objects; +import java.util.zip.GZIPInputStream; public class C2 { public static final Color MouseSelectedColor = Color.RED; @@ -92,60 +95,87 @@ public class C2 { public static HashMap randomDataFiles = new HashMap<>(); public static HashMap randomDataFilesExtern = new HashMap<>(); - public C2() { alerterror.getStyleClass().add("alert.error.dialog-pane"); alertinformation.getStyleClass().add("alert.error.dialog-pane"); alertconfirmation.getStyleClass().add("alert.error.dialog-pane"); + randomDataFiles.put("Random Color", decompress("colors")); + randomDataFiles.put("Random Company", decompress("companies")); + randomDataFiles.put("Random Country", decompress("countries")); + randomDataFiles.put("Random Departmentname", decompress("departmentnames")); + randomDataFiles.put("Random Firstname", decompress("firstnames")); + randomDataFiles.put("Random Jobname", decompress("jobnames")); + randomDataFiles.put("Random Language", decompress("languages")); + randomDataFiles.put("Random Lastname", decompress("lastnames")); + randomDataFiles.put("Random Mediacategory", decompress("mediacategories")); + randomDataFiles.put("Random Mediapublisher", decompress("mediapublishers")); + randomDataFiles.put("Random Mediatitle", decompress("mediatitles")); + randomDataFiles.put("Random Mediatype", decompress("mediatypes")); + randomDataFiles.put("Random Place", decompress("places")); + randomDataFiles.put("Random Profession", decompress("professions")); + randomDataFiles.put("Random Rentalequipment", decompress("rentalequipment")); + randomDataFiles.put("Random Street", decompress("streets")); - String appImages = "/applicationimages/"; - String appData = "/data/"; + applicationImageIconAsICO = loadImage("erdlogo"); + attr_conn_attrImage = loadImage("attr_conn_attr"); + attr_conn_esImage = loadImage("attr_conn_es"); + attr_conn_rsImage = loadImage("attr_conn_rs"); + attr_derived_multi_valueImage = loadImage("attr_derived_multi_value"); + attr_derived_one_valueImage = loadImage("attr_derived_one_value"); + attr_key_valueImage = loadImage("attr_key_value"); + attr_multi_valueImage = loadImage("attr_multi_value"); + attr_one_valueImage = loadImage("attr_one_value"); + attr_weak_key_valueImage = loadImage("attr_weak_key_value"); + es_associativeImage = loadImage("es_associative"); + es_weakImage = loadImage("es_weak"); + esImage = loadImage("es"); + rs_conn_esImage = loadImage("rs_conn_es"); + rs_id_conn_es_weakImage = loadImage("rs_id_conn_es_weak"); + rs_id_conn_esImage = loadImage("rs_id_conn_es"); + rs_idImage = loadImage("rs_id"); + rs_isa_conn_general_esImage = loadImage("rs_isa_conn_general_es"); + rs_isa_conn_special_esImage = loadImage("rs_isa_conn_special_es"); + rs_isaImage = loadImage("rs_isa"); + rsImage = loadImage("rs"); + textImage = loadImage("text"); + textWithoutBorderImage = loadImage("text_without_border"); + treeOpenImage = loadImage("tree_open"); + treeCloseImage = loadImage("tree_close"); + } + private static InputStream decompress(String INPUT_FILE) { + INPUT_FILE = "/compressed_data/" + INPUT_FILE + ".txt.gz"; + byte[] buffer = new byte[1024]; + try { + GZIPInputStream is = + new GZIPInputStream(Objects.requireNonNull(C2.class.getResourceAsStream(INPUT_FILE))); - randomDataFiles.put("Random Color", getClass().getResourceAsStream(appData + "colors.txt")); - randomDataFiles.put("Random Company", getClass().getResourceAsStream(appData + "companies.txt")); - randomDataFiles.put("Random Country", getClass().getResourceAsStream(appData + "countries.txt")); - randomDataFiles.put("Random Departmentname", getClass().getResourceAsStream(appData + "departmentnames.txt")); - randomDataFiles.put("Random Firstname", getClass().getResourceAsStream(appData + "firstnames.txt")); - randomDataFiles.put("Random Jobname", getClass().getResourceAsStream(appData + "jobnames.txt")); - randomDataFiles.put("Random Language", getClass().getResourceAsStream(appData + "languages.txt")); - randomDataFiles.put("Random Lastname", getClass().getResourceAsStream(appData + "lastnames.txt")); - randomDataFiles.put("Random Mediacategory", getClass().getResourceAsStream(appData + "mediacategories.txt")); - randomDataFiles.put("Random Mediapublisher", getClass().getResourceAsStream(appData + "mediapublishers.txt")); - randomDataFiles.put("Random Mediatitle", getClass().getResourceAsStream(appData + "mediatitles.txt")); - randomDataFiles.put("Random Mediatype", getClass().getResourceAsStream(appData + "mediatypes.txt")); - randomDataFiles.put("Random Place", getClass().getResourceAsStream(appData + "places.txt")); - randomDataFiles.put("Random Profession", getClass().getResourceAsStream(appData + "professions.txt")); - randomDataFiles.put("Random Rentalequipment", getClass().getResourceAsStream(appData + "rentalequipment.txt")); - randomDataFiles.put("Random Street", getClass().getResourceAsStream(appData + "streets.txt")); + StringBuilder out = new StringBuilder(); - applicationImageIconAsICO = new Image(Objects.requireNonNull(getClass().getResourceAsStream(appImages + "erdlogo.png"))); - attr_conn_attrImage = new Image(Objects.requireNonNull(getClass().getResourceAsStream(appImages + "attr_conn_attr.png"))); - attr_conn_esImage = new Image(Objects.requireNonNull(getClass().getResourceAsStream(appImages + "attr_conn_es.png"))); - attr_conn_rsImage = new Image(Objects.requireNonNull(getClass().getResourceAsStream(appImages + "attr_conn_rs.png"))); - attr_derived_multi_valueImage = new Image(Objects.requireNonNull(getClass().getResourceAsStream(appImages + "attr_derived_multi_value.png"))); - attr_derived_one_valueImage = new Image(Objects.requireNonNull(getClass().getResourceAsStream(appImages + "attr_derived_one_value.png"))); - attr_key_valueImage = new Image(Objects.requireNonNull(getClass().getResourceAsStream(appImages + "attr_key_value.png"))); - attr_multi_valueImage = new Image(Objects.requireNonNull(getClass().getResourceAsStream(appImages + "attr_multi_value.png"))); - attr_one_valueImage = new Image(Objects.requireNonNull(getClass().getResourceAsStream(appImages + "attr_one_value.png"))); - attr_weak_key_valueImage = new Image(Objects.requireNonNull(getClass().getResourceAsStream(appImages + "attr_weak_key_value.png"))); - es_associativeImage = new Image(Objects.requireNonNull(getClass().getResourceAsStream(appImages + "es_associative.png"))); - es_weakImage = new Image(Objects.requireNonNull(getClass().getResourceAsStream(appImages + "es_weak.png"))); - esImage = new Image(Objects.requireNonNull(getClass().getResourceAsStream(appImages + "es.png"))); - rs_conn_esImage = new Image(Objects.requireNonNull(getClass().getResourceAsStream(appImages + "rs_conn_es.png"))); - rs_id_conn_es_weakImage = new Image(Objects.requireNonNull(getClass().getResourceAsStream(appImages + "rs_id_conn_es_weak.png"))); - rs_id_conn_esImage = new Image(Objects.requireNonNull(getClass().getResourceAsStream(appImages + "rs_id_conn_es.png"))); - rs_idImage = new Image(Objects.requireNonNull(getClass().getResourceAsStream(appImages + "rs_id.png"))); - rs_isa_conn_general_esImage = new Image(Objects.requireNonNull(getClass().getResourceAsStream(appImages + "rs_isa_conn_general_es.png"))); - rs_isa_conn_special_esImage = new Image(Objects.requireNonNull(getClass().getResourceAsStream(appImages + "rs_isa_conn_special_es.png"))); - rs_isaImage = new Image(Objects.requireNonNull(getClass().getResourceAsStream(appImages + "rs_isa.png"))); - rsImage = new Image(Objects.requireNonNull(getClass().getResourceAsStream(appImages + "rs.png"))); - textImage = new Image(Objects.requireNonNull(getClass().getResourceAsStream(appImages + "text.png"))); - textWithoutBorderImage = new Image(Objects.requireNonNull(getClass().getResourceAsStream(appImages + "text_without_border.png"))); - treeOpenImage = new Image(Objects.requireNonNull(getClass().getResourceAsStream(appImages + "tree_open.png"))); - treeCloseImage = new Image(Objects.requireNonNull(getClass().getResourceAsStream(appImages + "tree_close.png"))); + while (is.read(buffer) > 0) { + for (byte b : buffer) { + out.append((char) b); + } + } + is.close(); + + System.out.println("File Successfully decompressed"); + + System.out.println(out); + + return new ByteArrayInputStream(out.toString().getBytes()); + } catch (IOException e) { + e.printStackTrace(); + } + + return null; + + } + + private static Image loadImage(String FILE_NAME) { + return new Image(Objects.requireNonNull(C2.class.getResourceAsStream("/applicationimages/" + FILE_NAME + ".png"))); } public static double computeTextWidth(String text, double wrappingWidth) { diff --git a/at/fos/ermodel/gui/C4.java b/at/fos/ermodel/gui/C4.java index a802e9c..e85f529 100644 --- a/at/fos/ermodel/gui/C4.java +++ b/at/fos/ermodel/gui/C4.java @@ -74,8 +74,8 @@ public class C4 { public StringBuffer create_MS_SQL_Script(boolean createInsertStatements, boolean addCDToDBName, boolean singeInserts) throws ZZ20 { LocalDate today = LocalDate.now(); String currentDate = today.getYear() + ( - (today.getMonthValue() < 10) ? ("0" + today.getMonthValue()) : "" + today.getMonthValue()) + ( - (today.getDayOfMonth() < 10) ? ("0" + today.getDayOfMonth()) : "" + today.getDayOfMonth()); + (today.getMonthValue() < 10) ? ("0" + today.getMonthValue()) : String.valueOf(today.getMonthValue())) + ( + (today.getDayOfMonth() < 10) ? ("0" + today.getDayOfMonth()) : String.valueOf(today.getDayOfMonth())); if (addCDToDBName) this.databaseName = this.databaseName + currentDate; @@ -207,8 +207,8 @@ public class C4 { public StringBuffer create_MySQL_Script(boolean createInsertStatements, boolean addCDToDBName, boolean singeInserts) throws ZZ20 { LocalDate today = LocalDate.now(); String currentDate = today.getYear() + ( - (today.getMonthValue() < 10) ? ("0" + today.getMonthValue()) : "" + today.getMonthValue()) + ( - (today.getDayOfMonth() < 10) ? ("0" + today.getDayOfMonth()) : "" + today.getDayOfMonth()); + (today.getMonthValue() < 10) ? ("0" + today.getMonthValue()) : String.valueOf(today.getMonthValue())) + ( + (today.getDayOfMonth() < 10) ? ("0" + today.getDayOfMonth()) : String.valueOf(today.getDayOfMonth())); if (addCDToDBName) this.databaseName = currentDate + this.databaseName; diff --git a/compressed_data/colors.txt.gz b/compressed_data/colors.txt.gz new file mode 100644 index 0000000..5b6727a Binary files /dev/null and b/compressed_data/colors.txt.gz differ diff --git a/compressed_data/companies.txt.gz b/compressed_data/companies.txt.gz new file mode 100644 index 0000000..d6ba46c Binary files /dev/null and b/compressed_data/companies.txt.gz differ diff --git a/compressed_data/countries.txt.gz b/compressed_data/countries.txt.gz new file mode 100644 index 0000000..03784f2 Binary files /dev/null and b/compressed_data/countries.txt.gz differ diff --git a/compressed_data/departmentnames.txt.gz b/compressed_data/departmentnames.txt.gz new file mode 100644 index 0000000..9409aea Binary files /dev/null and b/compressed_data/departmentnames.txt.gz differ diff --git a/compressed_data/firstnames.txt.gz b/compressed_data/firstnames.txt.gz new file mode 100644 index 0000000..fb5b70f Binary files /dev/null and b/compressed_data/firstnames.txt.gz differ diff --git a/compressed_data/jobnames.txt.gz b/compressed_data/jobnames.txt.gz new file mode 100644 index 0000000..1bc9278 Binary files /dev/null and b/compressed_data/jobnames.txt.gz differ diff --git a/compressed_data/languages.txt.gz b/compressed_data/languages.txt.gz new file mode 100644 index 0000000..7441dfd Binary files /dev/null and b/compressed_data/languages.txt.gz differ diff --git a/compressed_data/lastnames.txt.gz b/compressed_data/lastnames.txt.gz new file mode 100644 index 0000000..057a27a Binary files /dev/null and b/compressed_data/lastnames.txt.gz differ diff --git a/compressed_data/mediacategories.txt.gz b/compressed_data/mediacategories.txt.gz new file mode 100644 index 0000000..1b7a4a9 Binary files /dev/null and b/compressed_data/mediacategories.txt.gz differ diff --git a/compressed_data/mediapublishers.txt.gz b/compressed_data/mediapublishers.txt.gz new file mode 100644 index 0000000..2c742af Binary files /dev/null and b/compressed_data/mediapublishers.txt.gz differ diff --git a/compressed_data/mediatitles.txt.gz b/compressed_data/mediatitles.txt.gz new file mode 100644 index 0000000..bc27cc8 Binary files /dev/null and b/compressed_data/mediatitles.txt.gz differ diff --git a/compressed_data/mediatypes.txt.gz b/compressed_data/mediatypes.txt.gz new file mode 100644 index 0000000..6f4ed41 Binary files /dev/null and b/compressed_data/mediatypes.txt.gz differ diff --git a/compressed_data/places.txt.gz b/compressed_data/places.txt.gz new file mode 100644 index 0000000..b7cf78e Binary files /dev/null and b/compressed_data/places.txt.gz differ diff --git a/compressed_data/professions.txt.gz b/compressed_data/professions.txt.gz new file mode 100644 index 0000000..88f0cbb Binary files /dev/null and b/compressed_data/professions.txt.gz differ diff --git a/compressed_data/rentalequipment.txt.gz b/compressed_data/rentalequipment.txt.gz new file mode 100644 index 0000000..a99c889 Binary files /dev/null and b/compressed_data/rentalequipment.txt.gz differ diff --git a/compressed_data/streets.txt.gz b/compressed_data/streets.txt.gz new file mode 100644 index 0000000..045c391 Binary files /dev/null and b/compressed_data/streets.txt.gz differ diff --git a/noEasyDB.iml b/noEasyDB.iml index a0d88a2..5f20ef2 100644 --- a/noEasyDB.iml +++ b/noEasyDB.iml @@ -6,6 +6,7 @@ +