Release/0.1.8 (#8)

* Add sql support

* Add better styling

* Bug fixes

* Refactoring

LICENSE

@@ -18,4 +18,4 @@ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+SOFTWARE.

README.md

@@ -38,4 +38,4 @@ Click OK and the application updates the view of the table
 
 ## Licence
 
-See [licence file](LICENSE).
+See [licence file](LICENSE).

pom.xml

@@ -5,7 +5,7 @@
 
     <groupId>com.erikmafo</groupId>
     <artifactId>bigtableviewer</artifactId>
-    <version>0.1.7</version>
+    <version>0.1.8</version>
     <packaging>jar</packaging>
     <name>bigtableviewer</name>
 
@@ -173,6 +173,21 @@
     </build>
 
     <dependencies>
+        <dependency>
+            <groupId>org.mapdb</groupId>
+            <artifactId>mapdb</artifactId>
+            <version>3.0.8</version>
+        </dependency>
+        <dependency>
+            <groupId>org.kordamp.bootstrapfx</groupId>
+            <artifactId>bootstrapfx-core</artifactId>
+            <version>0.2.4</version>
+        </dependency>
+        <dependency>
+            <groupId>org.fxmisc.richtext</groupId>
+            <artifactId>richtextfx</artifactId>
+            <version>0.10.5</version>
+        </dependency>
         <dependency>
             <groupId>com.google.cloud</groupId>
             <artifactId>google-cloud-bigtable</artifactId>
@@ -244,7 +259,7 @@
         <dependency>
             <groupId>com.google.inject</groupId>
             <artifactId>guice</artifactId>
-            <version>4.2.2</version>
+            <version>4.2.3</version>
         </dependency>
     </dependencies>
 </project>

src/main/java/com/erikmafo/btviewer/FXMLLoaderUtil.java

@@ -0,0 +1,21 @@
+package com.erikmafo.btviewer;
+
+import com.erikmafo.btviewer.services.ServicesModule;
+import com.google.inject.Guice;
+import com.google.inject.Injector;
+import javafx.fxml.FXMLLoader;
+
+import java.io.IOException;
+
+public class FXMLLoaderUtil {
+    public static void loadFxml(String fxmlFile, Object controller) {
+        var loader = new FXMLLoader(controller.getClass().getResource(fxmlFile));
+        loader.setRoot(controller);
+        loader.setController(controller);
+        try {
+            loader.load();
+        } catch (IOException e) {
+            throw new RuntimeException("Could not load fxml file: " + fxmlFile, e);
+        }
+    }
+}

src/main/java/com/erikmafo/btviewer/MainApp.java

@@ -19,10 +19,12 @@ public static void main(String[] args) {
     @Override
     public void start(Stage primaryStage) throws Exception{
         FXMLLoader loader = new FXMLLoader(getClass().getResource("/fxml/main.fxml"));
-        loader.setControllerFactory(Guice.createInjector(new ServicesModule())::getInstance);
+        var injector = Guice.createInjector(new ServicesModule());
+        loader.setControllerFactory(injector::getInstance);
         Parent root = loader.load();
-        primaryStage.setTitle("Bigtable viewer");
+        primaryStage.setTitle("Bigtable Viewer");
         primaryStage.setScene(new Scene(root, 800, 700));
+        primaryStage.getScene().getStylesheets().add("org/kordamp/bootstrapfx/bootstrapfx.css");
         primaryStage.show();
     }
 

src/main/java/com/erikmafo/btviewer/components/BigtableInstanceDialog.java → src/main/java/com/erikmafo/btviewer/components/AddInstanceDialog.java

@@ -1,4 +1,6 @@
 package com.erikmafo.btviewer.components;
+
+import com.erikmafo.btviewer.FXMLLoaderUtil;
 import com.erikmafo.btviewer.model.BigtableInstance;
 import javafx.fxml.FXML;
 import javafx.fxml.FXMLLoader;
@@ -7,28 +9,18 @@
 import javafx.scene.control.DialogPane;
 import javafx.scene.control.TextField;
 
-import java.io.IOException;
 import java.util.concurrent.CompletableFuture;
 
-public class BigtableInstanceDialog extends DialogPane {
+public class AddInstanceDialog extends DialogPane {
 
     @FXML
     private TextField projectIdTextField;
 
     @FXML
     private TextField instanceIdTextField;
 
-    private BigtableInstanceDialog() {
-
-        FXMLLoader loader = new FXMLLoader(getClass().getResource("/fxml/bigtable_instance_dialog.fxml"));
-        loader.setRoot(this);
-        loader.setController(this);
-
-        try {
-            loader.load();
-        } catch (IOException e) {
-            throw new RuntimeException(e);
-        }
+    private AddInstanceDialog() {
+        FXMLLoaderUtil.loadFxml("/fxml/add_instance_dialog.fxml", this);
     }
 
     private BigtableInstance getBigtableInstance() {
@@ -37,12 +29,27 @@ private BigtableInstance getBigtableInstance() {
                 instanceIdTextField.getText());
     }
 
+    public void preFillProjectId(String projectId) {
+        projectIdTextField.setText(projectId);
+        projectIdTextField.setEditable(false);
+        instanceIdTextField.requestFocus();
+    }
+
     public static CompletableFuture<BigtableInstance> displayAndAwaitResult() {
+        return displayAndAwaitResult(null);
+    }
+
+    public static CompletableFuture<BigtableInstance> displayAndAwaitResult(String projectId) {
         CompletableFuture<BigtableInstance> future = new CompletableFuture<>();
 
         try {
             Dialog<BigtableInstance> dialog = new Dialog<>();
-            BigtableInstanceDialog pane = new BigtableInstanceDialog();
+            AddInstanceDialog pane = new AddInstanceDialog();
+
+            if (projectId != null) {
+                pane.preFillProjectId(projectId);
+            }
+
             dialog.setDialogPane(pane);
             dialog.setResultConverter(buttonType -> {