v1.1.0 commit

Oshan96 · Oshan96 · commit 1cd5507c016e · 2018-03-30T13:40:16.000+05:30
diff --git a/CustomStage.iml b/CustomStage.iml
@@ -4,7 +4,6 @@
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-      <excludeFolder url="file://$MODULE_DIR$/src/lk/vivoxalabs/customstage/test" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
diff --git a/src/lk/vivoxalabs/customstage/CustomStage.java b/src/lk/vivoxalabs/customstage/CustomStage.java
@@ -3,20 +3,18 @@
 import javafx.application.Platform;
 import javafx.scene.layout.Pane;
 import javafx.stage.Stage;
+import lk.vivoxalabs.customstage.tools.NavigationType;
 import lk.vivoxalabs.customstage.view.controller.CustomStageController;
 
 import java.net.URL;
 
 /**
  * A fully user customizable JavaFX Stage
  * All of the customizing methods and methods which changing the appearance of the scene executed on
- * FX-threads so user does not have to call these methods inside a,
- * @code Platform.runLater(()->{//code})
- *
- * Created by oshan on 08-Mar-18.
+ * FX-threads so user does not have to call these methods inside a Platform.runlater
  *
  * @author oshan
- * @version 1.0
+ * @version 1.1.0
  */
 public class CustomStage extends Stage {
     private final CustomStageController _STAGE_CONTROLLER_;
@@ -73,10 +71,20 @@ public void setStyleSheet(URL path) {
     /**
      * Sets a static navigation pane (right side of the window) attaching the pane given
      *
+     * @param type where the navigationPane should be placed on the window (LEFT/RIGHT/TOP/BOTTOM)
      * @param navigationPane root pane of the navigation (fxml file)
      */
-    public void setNavigationPane(Pane navigationPane){
-        Platform.runLater(()-> _STAGE_CONTROLLER_.setNavigationPane(navigationPane));
+    public void setNavigationPane(NavigationType type, Pane navigationPane){
+        Platform.runLater(()-> _STAGE_CONTROLLER_.setNavigationPane(type,navigationPane));
+    }
+
+    /**
+     * Removes the pointed navigationPane from the window
+     *
+     * @param type which navigationPane should be removed from the window (LEFT/RIGHT/TOP/BOTTOM)
+     */
+    public void removeNavigationPane(NavigationType type){
+        Platform.runLater(()->_STAGE_CONTROLLER_.removeNavigationPane(type));
     }
 
 }
diff --git a/src/lk/vivoxalabs/customstage/CustomStageBuilder.java b/src/lk/vivoxalabs/customstage/CustomStageBuilder.java
@@ -8,6 +8,7 @@
 import javafx.scene.paint.Color;
 import javafx.stage.StageStyle;
 import lk.vivoxalabs.customstage.tools.ActionAdapter;
+import lk.vivoxalabs.customstage.tools.NavigationType;
 import lk.vivoxalabs.customstage.tools.ResizeHelper;
 import lk.vivoxalabs.customstage.view.controller.CustomStageController;
 
@@ -18,10 +19,8 @@
 /**
  * This is used to create a CustomStage object as per user given definitions (using the methods of this class)
  *
- * Created by oshan on 08-Mar-18.
- *
  * @author oshan
- * @version 1.0
+ * @version 1.1.0
  */
 public class CustomStageBuilder {
 
@@ -160,23 +159,28 @@ public CustomStageBuilder setStyleSheet(URL path) {
     }
 
     /**
-     * Removes the navigation pane of the window
+     * @deprecated this method does not need to be called from this builder class after v1.1.0
+     *
+     * Removes the left navigation pane of the window
      *
      * @return the current CustomStageBuilder object
+     *
      */
     public CustomStageBuilder removeNavigationPane(){
         _STAGE_CONTROLLER_.removeNavigationPane();
         return this;
     }
 
+
     /**
-     * Sets a static navigation pane (right side of the window) attaching the pane given
+     * Sets a static navigation pane (to the pointed location) attaching the pane given
      *
+     * @param type where the navigationPane should be placed on the window (LEFT/RIGHT/TOP/BOTTOM)
      * @param navigationPane root pane of the navigation (fxml file)
      * @return the current CustomStageBuilder object
      */
-    public CustomStageBuilder setNavigationPane(Pane navigationPane){
-        _STAGE_CONTROLLER_.setNavigationPane(navigationPane);
+    public CustomStageBuilder setNavigationPane(NavigationType type, Pane navigationPane){
+        _STAGE_CONTROLLER_.setNavigationPane(type,navigationPane);
         return this;
     }
 
diff --git a/src/lk/vivoxalabs/customstage/tools/ActionAdapter.java b/src/lk/vivoxalabs/customstage/tools/ActionAdapter.java
@@ -10,8 +10,6 @@
 /**
  * Controls all the action events of the window (close,maximize/restore,minimize)
  *
- * Created by oshan on 08-Mar-18.
- *
  * @author oshan
  * @version 1.0
  */
diff --git a/src/lk/vivoxalabs/customstage/tools/NavigationType.java b/src/lk/vivoxalabs/customstage/tools/NavigationType.java
@@ -4,4 +4,5 @@
  * @author oshan
  */
 public enum NavigationType {
+    RIGHT,LEFT,TOP,BOTTOM
 }
diff --git a/src/lk/vivoxalabs/customstage/view/controller/CustomStageController.java b/src/lk/vivoxalabs/customstage/view/controller/CustomStageController.java
@@ -19,6 +19,7 @@
 import javafx.stage.Stage;
 import javafx.stage.StageStyle;
 import lk.vivoxalabs.customstage.tools.ActionAdapter;
+import lk.vivoxalabs.customstage.tools.NavigationType;
 
 import java.awt.*;
 import java.net.URL;
@@ -27,10 +28,8 @@
 /**
  * Controller class of the CustomStage (fxml file) and is responsible for the behaviour of the CustomStage
  *
- * Created by oshan on 08-Mar-18.
- *
  * @author oshan
- * @version 1.0
+ * @version 1.1.0
  */
 public class CustomStageController implements Initializable {
 
@@ -49,7 +48,7 @@ public class CustomStageController implements Initializable {
     @FXML
     private Button btnMax,btnClose,btnMin;
     @FXML
-    private StackPane dynamicPane,navigationPane;
+    private StackPane dynamicPane, left_navigationPane,right_navigationPane,top_navigationPane,bottom_navigationPane;
     @FXML
     private BorderPane containerPane;
     @FXML
@@ -134,12 +133,35 @@ public void setStyleSheet(URL path) {
     }
 
     /**
-     * Removes the navigation pane of the window
+     * @deprecated use removeNavigationPane(NavigationType type) method instead
+     *
+     * Removes the left navigation pane of the window
      */
     public void removeNavigationPane(){
         containerPane.getChildren().remove(containerPane.leftProperty().get());
     }
 
+    /**
+     * Removes the pointed navigationPane from the window
+     *
+     * @param type which navigationPane should be removed from the window (LEFT/RIGHT/TOP/BOTTOM)
+     */
+    public void removeNavigationPane(NavigationType type){
+        switch (type){
+            case LEFT:{
+                containerPane.getChildren().remove(left_navigationPane);
+            }break;
+            case RIGHT:{
+                containerPane.getChildren().remove(right_navigationPane);
+            }case TOP:{
+                containerPane.getChildren().remove(containerPane.topProperty().get());
+            }break;
+            case BOTTOM:{
+                containerPane.getChildren().remove(containerPane.bottomProperty().get());
+            }
+        }
+    }
+
     /**
      * Changes the default icons for the action buttons on Title-bar
      *
@@ -167,11 +189,33 @@ public void setActionIcons(@Nullable Image close,@Nullable Image minimize,@Nulla
     /**
      * Sets a static navigation pane (right side of the window) attaching the pane given
      *
+     * @param type where the navigationPane should be placed on the window (LEFT/RIGHT/TOP/BOTTOM)
      * @param navigationPane root pane of the navigation (fxml file)
      */
-    public void setNavigationPane(Pane navigationPane){
-            this.navigationPane.getChildren().clear();
-            this.navigationPane.getChildren().add(navigationPane);
+    public void setNavigationPane(NavigationType type, Pane navigationPane){
+            switch (type){
+                case LEFT:{
+                    this.left_navigationPane.getChildren().clear();
+                    this.left_navigationPane.getChildren().add(navigationPane);
+                    containerPane.setLeft(left_navigationPane);
+                }break;
+                case RIGHT:{
+                    this.right_navigationPane.getChildren().clear();
+                    this.right_navigationPane.getChildren().add(navigationPane);
+                    containerPane.setRight(right_navigationPane);
+                }break;
+                case TOP:{
+                    this.top_navigationPane.getChildren().clear();
+                    this.top_navigationPane.getChildren().add(navigationPane);
+                    containerPane.setTop(top_navigationPane);
+                }break;
+                case BOTTOM:{
+                    this.bottom_navigationPane.getChildren().clear();
+                    this.bottom_navigationPane.getChildren().add(navigationPane);
+                    containerPane.setBottom(bottom_navigationPane);
+                }
+            }
+
     }
 
     @Override
@@ -216,6 +260,11 @@ public void initialize(URL location, ResourceBundle resources) {
                 maximizeRestore(event);
             }
         });
+
+        containerPane.getChildren().remove(containerPane.leftProperty().get());
+        containerPane.getChildren().remove(containerPane.rightProperty().get());
+        containerPane.getChildren().remove(containerPane.topProperty().get());
+        containerPane.getChildren().remove(containerPane.bottomProperty().get());
     }
 
 
diff --git a/src/lk/vivoxalabs/customstage/view/css/customstage.css b/src/lk/vivoxalabs/customstage/view/css/customstage.css
@@ -20,7 +20,7 @@
 #dynamicPane{}
 
 /*The StackPane provided to place the navigation view*/
-#navigationPane{}
+.navigationPane{}
 
 /*Title-bar of the window*/
 #titleBar{
diff --git a/src/lk/vivoxalabs/customstage/view/fxml/CustomStage.fxml b/src/lk/vivoxalabs/customstage/view/fxml/CustomStage.fxml
@@ -32,11 +32,20 @@
       </AnchorPane>
       <BorderPane fx:id="containerPane" layoutY="31.0" prefHeight="497.0" prefWidth="764.0" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="30.5">
          <left>
-            <StackPane fx:id="navigationPane" prefHeight="498.0" prefWidth="280.0" BorderPane.alignment="CENTER" />
+            <StackPane fx:id="left_navigationPane" prefHeight="498.0" prefWidth="280.0" styleClass="navigationPane" BorderPane.alignment="CENTER" />
          </left>
          <center>
             <StackPane fx:id="dynamicPane" prefHeight="498.0" prefWidth="563.0" BorderPane.alignment="CENTER" />
          </center>
+         <right>
+            <StackPane fx:id="right_navigationPane" prefHeight="498.0" prefWidth="280.0" styleClass="navigationPane" BorderPane.alignment="CENTER" />
+         </right>
+         <top>
+            <StackPane fx:id="top_navigationPane" prefHeight="250.0" prefWidth="200.0" BorderPane.alignment="CENTER" />
+         </top>
+         <bottom>
+            <StackPane fx:id="bottom_navigationPane" prefHeight="250.0" prefWidth="200.0" BorderPane.alignment="CENTER" />
+         </bottom>
       </BorderPane>
 
    </children>

Original file line number	Diff line number	Diff line change
`@@ -10,8 +10,6 @@`
`10`	`10`	`/**`
`11`	`11`	`* Controls all the action events of the window (close,maximize/restore,minimize)`
`12`	`12`	`*`
`13`		`- * Created by oshan on 08-Mar-18.`
`14`		`- *`
`15`	`13`	`* @author oshan`
`16`	`14`	`* @version 1.0`
`17`	`15`	`*/`
Original file line number	Diff line number	Diff line change
`@@ -4,4 +4,5 @@`
`4`	`4`	`* @author oshan`
`5`	`5`	`*/`
`6`	`6`	`public enum NavigationType {`
	`7`	`+ RIGHT,LEFT,TOP,BOTTOM`
`7`	`8`	`}`