1.32

- generator: added table structure in top comment and db definitions to fields - generator: added multiple new convenience methods - generator: added vaadin support
Osiris-Team · Mar 4, 2024 · 4316605 · 4316605
1 parent 0414a24
commit 4316605
Show file tree

Hide file tree

Showing 7 changed files with 609 additions and 174 deletions.
diff --git a/pom.xml b/pom.xml
@@ -6,21 +6,52 @@
 
     <groupId>com.osiris.jsqlgen</groupId>
     <artifactId>jSQL-Gen</artifactId>
-    <version>1.31</version>
+    <version>1.32</version>
     <name>jSQL-Gen</name>
 
     <properties>
+        <vaadin.version>14.10.10</vaadin.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <exec.mainClass>com.osiris.jsqlgen.Main</exec.mainClass>
     </properties>
 
     <repositories>
+        <!-- The order of definitions matters. Explicitly defining central here to make sure it has the highest priority. -->
+
+        <!-- Main Maven repository -->
+        <repository>
+            <id>central</id>
+            <url>https://repo.maven.apache.org/maven2</url>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+        </repository>
+        <!-- Repository used by many Vaadin add-ons -->
+        <repository>
+            <id>Vaadin Directory</id>
+            <url>https://maven.vaadin.com/vaadin-addons</url>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+        </repository>
         <repository>
             <id>jitpack.io</id>
             <url>https://jitpack.io</url>
         </repository>
     </repositories>
 
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>com.vaadin</groupId>
+                <artifactId>vaadin-bom</artifactId>
+                <type>pom</type>
+                <scope>import</scope>
+                <version>${vaadin.version}</version>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
     <dependencies>
         <!-- JAVAFX-->
         <dependency>
@@ -89,6 +120,44 @@
             <version>2.4.0</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>com.vaadin</groupId>
+            <artifactId>vaadin-core</artifactId>
+            <exclusions>
+                <!-- Webjars are only needed when running in Vaadin 13 compatibility mode -->
+                <exclusion>
+                    <groupId>com.vaadin.webjar</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.webjars.bowergithub.insites</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.webjars.bowergithub.polymer</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.webjars.bowergithub.polymerelements</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.webjars.bowergithub.vaadin</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.webjars.bowergithub.webcomponents</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.github.mvysny.vaadin-boot</groupId>
+            <artifactId>vaadin-boot</artifactId>
+            <version>10.5</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>

diff --git a/src/main/java/com/osiris/jsqlgen/MainApplication.java b/src/main/java/com/osiris/jsqlgen/MainApplication.java
@@ -565,6 +565,14 @@ else if (command.equals("Duplicate")) {
                 Data.save();
             });
 
+            final CheckBox isVaadinFlow = new CheckBox("Vaadin-Flow");
+            paneTable.getChildren().add(isVaadinFlow);
+            isVaadinFlow.setSelected(t.isVaadinFlowUI);
+            isVaadinFlow.setOnAction(event -> {
+                t.isVaadinFlowUI = isVaadinFlow.isSelected();
+                Data.save();
+            });
+
             VBox listColumns = new VBox();
             listTables.getItems().add(listColumns);
             listColumns.paddingProperty().setValue(new Insets(0, 0, 0, 50));