util

Contains the following changes:

1. Update SpaceFiller to contain static methods to easily create Regions 2. Remove unnecessary whitespace 3. Add a simple Github Action workflow to verify the project 4. Update .gitignore Also contains the following updates to pom.xml: 1. Update groupId to com.stream-pi 2. Remove unnecessary transitive dependency 3. Update version from 1.0.0 to 1.0.0-SNAPSHOT 4. Use maven.compiler.release instead of source and target

+107 −125

Author

Abhinay Agarwal 2021-02-07 13:27

Committer

Abhinay Agarwal 2021-02-07 13:52

Hash a5dbd858e8a1d629cccfb40808c427912d1b4b84

Parent fa016038629f4639f388a74327f3eb8addcce0c8

Reference git #util/a5dbd858e8a1d629cccfb40808c427912d1b4b84

Modified Files

List

Side by side diff

Inline diff

A .github/workflows/build.yml

+27 −0

name: Build

on:

push:

branches:

- master

pull_request:

branches:

- master

jobs:

build:

name: Build

runs-on: ubuntu-latest

steps:

- name: Checkout

uses: actions/checkout@v2

- name: Setup Java 11

uses: actions/setup-java@v1

with:

java-version: 11

- name: Verify project

run: mvn clean verify

# TODO: Deploy Snapshots

M .gitignore

+5 −2

.idea/

# Maven

target/

Util.iml

# IntelliJ IDEA

.idea/

*.iml

# Eclipse

.settings/

.project

.factorypath

.classpath

M pom.xml

+29 −44

<?xml version="1.0" encoding="UTF-8"?>

<project xmlns="http://maven.apache.org/POM/4.0.0"

xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">

<groupId>com.stream_pi</groupId>

<groupId>com.stream-pi</groupId>

<version>1.0.0-SNAPSHOT</version>

<url>https://stream-pi.com/</url>

<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

<maven.compiler.release>11</maven.compiler.release>

<javafx.version>16-ea+6</javafx.version>

<ikonli.version>11.5.0</ikonli.version>

</properties>

<groupId>org.openjfx</groupId>

<artifactId>javafx-controls</artifactId>

<version>${javafx.version}</version>

</dependency>

<groupId>org.kordamp.ikonli</groupId>

<artifactId>ikonli-javafx</artifactId>

<version>${ikonli.version}</version>

</dependency>

<groupId>org.kordamp.ikonli</groupId>

<artifactId>ikonli-fontawesome5-pack</artifactId>

<version>${ikonli.version}</version>

</dependency>

</dependencies>

<build>

<groupId>org.apache.maven.plugins</groupId>

<artifactId>maven-jar-plugin</artifactId>

<phase>package</phase>

<goals>

</goals>

</execution>

</executions>

</plugin>

<groupId>org.apache.maven.plugins</groupId>

<artifactId>maven-compiler-plugin</artifactId>

</configuration>

</plugin>

</plugins>

</build>

<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

<maven.compiler.source>11</maven.compiler.source>

<maven.compiler.target>11</maven.compiler.target>

</properties>

<groupId>org.kordamp.ikonli</groupId>

<artifactId>ikonli-fontawesome5-pack</artifactId>

<version>${IkonliFA5PackVersion}</version>

</dependency>

<groupId>org.openjfx</groupId>

<artifactId>javafx-controls</artifactId>

<version>${JavaFXVersion}</version>

</dependency>

<groupId>org.openjfx</groupId>

<artifactId>javafx-base</artifactId>

<version>${JavaFXVersion}</version>

</dependency>

<groupId>org.kordamp.ikonli</groupId>

<artifactId>ikonli-javafx</artifactId>

<version>${IkonliVersion}</version>

</dependency>

</dependencies>

</project>

M src/main/java/com/stream_pi/util/alert/StreamPiAlert.java

+6 −14

Stream-Pi - Free & Open-Source Modular Cross-Platform Programmable Macro Pad

This program is free software: you can redistribute it and/or modify

it under the terms of the GNU General Public License as published by

the Free Software Foundation, either version 3 of the License, or

(at your option) any later version.

This program is distributed in the hope that it will be useful,

but WITHOUT ANY WARRANTY; without even the implied warranty of

MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

GNU General Public License for more details.

Originally Written by : Debayan Sutradhar (rnayabed)

package com.stream_pi.util.alert;

import com.stream_pi.util.uihelper.SpaceFiller;

import org.kordamp.ikonli.javafx.FontIcon;

import javafx.application.Platform;

import javafx.collections.ListChangeListener;

import javafx.geometry.Insets;

import javafx.scene.Node;

import javafx.scene.control.Button;

import javafx.scene.control.Label;

import javafx.scene.control.ScrollPane;

import javafx.scene.control.ScrollPane.ScrollBarPolicy;

import javafx.scene.layout.StackPane;

import javafx.scene.layout.HBox;

import javafx.scene.layout.Pane;

import javafx.scene.layout.Priority;

import javafx.scene.layout.VBox;

/**

* Custom Alert Dialog for Server and Client

public class StreamPiAlert

{

private String title;

private String[] buttons;

private StreamPiAlertType streamPiAlertType;

private Pane contentPane;

private static StackPane stackPaneParent = null;

/**

* Sets the parent where the alert will be shown

* @param parent StackPane where the alert dialog will be shown

public static void setParent(StackPane parent)

{

stackPaneParent = parent;

stackPaneParent.getStyleClass().add("alert_pane_parent");

stackPaneParent.getChildren().addListener((ListChangeListener<Node>) c ->

{

if(stackPaneParent.getChildren().size() > 0)

{

stackPaneParent.setVisible(true);

stackPaneParent.toFront();

}

else

{

stackPaneParent.setVisible(false);

stackPaneParent.toBack();

}

});

}

/**

* Returns the parent node

* @return StackPane parent where the alert boxes will be shown

public static StackPane getParent()

{

return stackPaneParent;

}

private StreamPiAlertListener streamPiAlertListener = null;

/**

* Public constructor to make an alert with just title, pre-made content pane (mainly for forms, complex dialogs)

* @param title Heading of the Alert

* @param streamPiAlertType Alert Type

* @param contentPane The main body of the alert

public StreamPiAlert(String title, StreamPiAlertType streamPiAlertType,

Pane contentPane)

{

set(title, streamPiAlertType, contentPane, "OK");

}

/**

* Sets the Alert type

* @param streamPiAlertType Alert Type

public void setStreamPiAlertType(StreamPiAlertType streamPiAlertType)

{

this.streamPiAlertType = streamPiAlertType;

}

/**

* Constructor for very simple alert, with just title and body text

* Default AlertType will be INFORMATION

* @param title Heading

* @param contentText Body Text

public StreamPiAlert(String title, String contentText)

{

this(title, contentText, StreamPiAlertType.INFORMATION);

}

/**

* Constructor for alert with just "Alert" heading,

* content text and alert type

* @param contentText Body Text

* @param alertType Alert Type

public StreamPiAlert(String contentText, StreamPiAlertType alertType)

{

this("Alert", contentText, alertType);

}

/**

* Constructor to create Alert box with title, Alert Type and button choices

* @param title Heading

* @param streamPiAlertType Alert Type

* @param buttons Button choices

public StreamPiAlert(String title, StreamPiAlertType streamPiAlertType, String... buttons)

{

set(title, streamPiAlertType, null, buttons);

}

/**

* Constructor to create Alert Box with title, Alert Type, Body and button choices

* @param title Heading of the alert box

* @param streamPiAlertType Alert Type

* @param contentPane Alert Body

* @param buttons Button choices

public StreamPiAlert(String title, StreamPiAlertType streamPiAlertType, Pane contentPane, String... buttons)

{

set(title, streamPiAlertType, contentPane, buttons);

}

/**

* Constructor to create Alert Box with Heading, content text, Alert Type

* @param title Heading

* @param contentText Body Text

* @param streamPiAlertType Alert Type

public StreamPiAlert(String title, String contentText, StreamPiAlertType streamPiAlertType)

{

Label label = new Label(contentText);

label.setWrapText(true);

VBox vBox = new VBox(label);

set(title, streamPiAlertType, vBox, "OK");

}

/**

* Sets the alert properties

* @param title Heading

* @param streamPiAlertType Alert Type

* @param contentPane Body

* @param buttons Button choices

private void set(String title, StreamPiAlertType streamPiAlertType,

Pane contentPane, String... buttons)

{

this.title = title;

this.buttons = buttons;

this.contentPane = contentPane;

this.streamPiAlertType = streamPiAlertType;

}

/**

* Set on click Listener

* @param streamPiAlertListener Alert Listener, triggered when a button is clicked

public void setOnClicked(StreamPiAlertListener streamPiAlertListener)

{

this.streamPiAlertListener = streamPiAlertListener;

}

/**

* @return Heading of the Alert Box

public String getTitle()

{

return title;

}

/**

* @return Button Choices

public String[] getButtons()

{

return buttons;

}

/**

* @param contentPane Alert Body Node

public void setAlertContent(Pane contentPane)

{

this.contentPane = contentPane;

}

/**

* Set all the button choices

* @param buttons Array of button choices

public void setButtons(String... buttons)

{

this.buttons = buttons;

}

/**

* Create and return the final AlertBox Pane, which will be added to the parent node

* @param title Heading

* @param contentPane The Alert Body Pane

* @return Final VBox to be shown in the parent Stack Pane

private VBox getAlertPane(String title, Pane contentPane)

{

if(title.isEmpty())

title = "Alert";

Label label = new Label(title);

label.getStyleClass().add("alert_pane_header_text");

FontIcon fontIcon = new FontIcon(streamPiAlertType.getIconCode());

fontIcon.getStyleClass().addAll("alert_header_icon", streamPiAlertType.getIconStyleClassName());

HBox header = new HBox(label, new SpaceFiller(SpaceFiller.FillerType.HBox), fontIcon);

HBox header = new HBox(label, SpaceFiller.horizontal(), fontIcon);

header.getStyleClass().add("alert_header");

header.setPadding(new Insets(10));

HBox buttonBar = new HBox();

buttonBar.getStyleClass().add("alert_button_bar");

for (String eachButtonString : buttons)

{

Button button = new Button(eachButtonString);

button.setOnAction(event -> {

if(this.streamPiAlertListener != null)

{

this.streamPiAlertListener.onClick(eachButtonString);

}

destroy();

});

button.getStyleClass().add("alert_button");

buttonBar.getChildren().add(button);

}

contentPane.getStyleClass().add("alert_content_pane");

ScrollPane scrollPane = new ScrollPane(contentPane);

scrollPane.prefHeightProperty().bind(contentPane.heightProperty().add(20));

scrollPane.getStyleClass().add("alert_scroll_pane");

contentPane.prefWidthProperty().bind(scrollPane.widthProperty().subtract(10));

scrollPane.setHbarPolicy(ScrollBarPolicy.NEVER);

scrollPane.setVbarPolicy(ScrollBarPolicy.AS_NEEDED);

VBox.setVgrow(scrollPane, Priority.ALWAYS);

contentPane.getStyleClass().add("alert_content_pane");

contentPane.prefWidthProperty().bind(scrollPane.widthProperty().subtract(10));

VBox alertVBox = new VBox( header, scrollPane, buttonBar);

alertVBox.getStyleClass().add("alert_pane");

alertVBox.setMaxHeight(Double.NEGATIVE_INFINITY);

return alertVBox;

}

/**

* @return The body node of the Alert Box

public Pane getContentPane()

{

return contentPane;

}

/**

* Adds the Alert Box to the parent node

private Node popupNode;

public void show()

{

Platform.runLater(()->

{

popupNode = getAlertPane(getTitle(), getContentPane());

stackPaneParent.getChildren().add(popupNode);

});

}

/**

* Removes the alert from the parent pane

public void destroy()

{

Platform.runLater(()-> stackPaneParent.getChildren().remove(popupNode));

}

M src/main/java/com/stream_pi/util/combobox/StreamPiComboBox.java

+2 −7

Stream-Pi - Free & Open-Source Modular Cross-Platform Programmable Macro Pad

This program is free software: you can redistribute it and/or modify

it under the terms of the GNU General Public License as published by

the Free Software Foundation, either version 3 of the License, or

(at your option) any later version.

This program is distributed in the hope that it will be useful,

but WITHOUT ANY WARRANTY; without even the implied warranty of

MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

GNU General Public License for more details.

Originally Written by : Debayan Sutradhar (rnayabed)

package com.stream_pi.util.combobox;

import java.util.ArrayList;

import java.util.List;

import com.stream_pi.util.uihelper.SpaceFiller;

import org.kordamp.ikonli.javafx.FontIcon;

import javafx.application.Platform;

import javafx.collections.ListChangeListener;

import javafx.scene.Node;

import javafx.scene.control.Label;

import javafx.scene.control.ScrollPane;

import javafx.scene.control.ToggleButton;

import javafx.scene.control.ScrollPane.ScrollBarPolicy;

import javafx.scene.layout.HBox;

import javafx.scene.layout.StackPane;

import javafx.scene.layout.VBox;

/**

* Custom Combo Box for Server and Client

* @param <T> Combo Box List Type

public class StreamPiComboBox<T> extends HBox

{

private List<T> options;

private static StackPane stackPaneParent;

/**

* Sets the parent where the Combo Box will be shown

* @param parent StackPane where the Combo Box dialog will be shown

public static void setParent(StackPane parent) {

stackPaneParent = parent;

stackPaneParent.getStyleClass().add("combo_box_pane_parent");

stackPaneParent.getChildren().addListener((ListChangeListener<Node>) c ->

{

if(stackPaneParent.getChildren().size() > 0)

{

stackPaneParent.setVisible(true);

stackPaneParent.toFront();

}

else

{

stackPaneParent.setVisible(false);

stackPaneParent.toBack();

}

});

}

/**

* Constructor to create Combo Box with all the options

* @param options List of Options

public StreamPiComboBox(List<T> options)

{

setup();

setOptions(options);

}

/**

* @return List of Combo Box Options

public List<T> getOptions()

{

return options;

}

/**

* Constructor to create Combo Box with empty list

public StreamPiComboBox()

{

setup();

}

private Label currentSelectedLabel;

/**

* init of Combo Box

private void setup()

{

buttons = new ArrayList<>();

getStyleClass().add("combo_box");

setOnMouseClicked(event->show());

setOnMouseClicked(event -> show());

currentSelectedLabel = new Label();

currentSelectedLabel.getStyleClass().add("combo_box_current_selected_label");

FontIcon fontIcon = new FontIcon();

fontIcon.getStyleClass().add("combo_box_drop_down_icon");

getChildren().addAll(

currentSelectedLabel,

new SpaceFiller(SpaceFiller.FillerType.HBox),

SpaceFiller.horizontal(),

fontIcon

);

}

/**

* Set Combo Box options

* @param options Combo Box Options

public void setOptions(List<T> options)

{

this.options = options;

setCurrentSelectedItemIndex(0);

}

private int currentIndex = 0;

private List<ToggleButton> buttons;

/**

* @return Final Scroll Pane

public ScrollPane getPopupScrollPane()

{

buttons.clear();

ScrollPane scrollPane = new ScrollPane();

scrollPane.setHbarPolicy(ScrollBarPolicy.NEVER);

scrollPane.setVbarPolicy(ScrollBarPolicy.AS_NEEDED);

scrollPane.getStyleClass().add("combo_box_popup");

VBox vBox = new VBox();

vBox.getStyleClass().add("combo_box_popup_vbox");

vBox.prefWidthProperty().bind(scrollPane.widthProperty().subtract(10));

scrollPane.maxHeightProperty().bind(vBox.heightProperty().add(20));

scrollPane.setContent(vBox);

//scrollPane.setMaxHeight(Double.NEGATIVE_INFINITY);

for(int i = 0;i<options.size();i++)

{

T eachOptionObj = options.get(i);

String displayText = streamPiComboBoxFactory.getOptionDisplayText(eachOptionObj);

ToggleButton optionButton = new ToggleButton(displayText);

optionButton.getStyleClass().add("combo_box_list_option_button");

optionButton.setSelected(i == currentIndex);

optionButton.setUserData(i);

optionButton.setOnAction(event->

{

setCurrentSelectedItemIndex((int) optionButton.getUserData());

if(streamPiComboBoxListener != null)

streamPiComboBoxListener.onNewItemSelected(options.get(currentIndex));

destroy();

});

vBox.getChildren().addAll(optionButton);

buttons.add(optionButton);

}

return scrollPane;

}

/**

* @return Current Selected Option Index

public int getCurrentIndex()

{

return currentIndex;

}

/**

* @return Current Selected Item

public T getCurrentSelectedItem()

{

return options.get(currentIndex);

}

/**

* @param index Current item index to be selected

public void setCurrentSelectedItemIndex(int index)

{

this.currentIndex = index;

setCurrentSelectedLabelText(streamPiComboBoxFactory.getOptionDisplayText(options.get(index)));

}

/**

* @param text Name of the option

private void setCurrentSelectedLabelText(String text)

{

currentSelectedLabel.setText(text);

}

private StreamPiComboBoxListener<T> streamPiComboBoxListener = null;

/**

* Set on click Listener

* @param streamPiComboBoxListener Combo Box Listener, triggered when an option is clicked

public void setStreamPiComboBoxListener(StreamPiComboBoxListener<T> streamPiComboBoxListener)

{

this.streamPiComboBoxListener = streamPiComboBoxListener;

}

private Node popupNode;

/**

* Adds the Combo Box to the parent node

public void show()

{

Platform.runLater(()->{

popupNode = getPopupScrollPane();

stackPaneParent.getChildren().add(popupNode);

});

}

/**

* Removes the combo box from the parent pane

public void destroy()

{

Platform.runLater(()->{

stackPaneParent.getChildren().remove(popupNode);

});

}

private StreamPiComboBoxFactory<T> streamPiComboBoxFactory;

/**

* @param streamPiComboBoxFactory Factory for the Combo Box

public void setStreamPiComboBoxFactory(StreamPiComboBoxFactory<T> streamPiComboBoxFactory)

{

this.streamPiComboBoxFactory = streamPiComboBoxFactory;

}

M src/main/java/com/stream_pi/util/exception/SevereException.java

+2 −1

Stream-Pi - Free & Open-Source Modular Cross-Platform Programmable Macro Pad

This program is free software: you can redistribute it and/or modify

it under the terms of the GNU General Public License as published by

the Free Software Foundation, either version 3 of the License, or

(at your option) any later version.

This program is distributed in the hope that it will be useful,

but WITHOUT ANY WARRANTY; without even the implied warranty of

MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

GNU General Public License for more details.

Originally Written by : Debayan Sutradhar (rnayabed)

package com.stream_pi.util.exception;

public class SevereException extends StreamPiException{

public class SevereException extends StreamPiException {

public SevereException(String message)

{

super(message);

}

public SevereException(String title, String message)

{

super(title, message);

}

M src/main/java/com/stream_pi/util/exception/StreamPiException.java

+1 −1

Stream-Pi - Free & Open-Source Modular Cross-Platform Programmable Macro Pad

This program is free software: you can redistribute it and/or modify

it under the terms of the GNU General Public License as published by

the Free Software Foundation, either version 3 of the License, or

(at your option) any later version.

This program is distributed in the hope that it will be useful,

but WITHOUT ANY WARRANTY; without even the implied warranty of

MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

GNU General Public License for more details.

Originally Written by : Debayan Sutradhar (rnayabed)

package com.stream_pi.util.exception;

public class StreamPiException extends Exception {

private String title;

private String message;

public StreamPiException(String message)

{

super(message);

this.title = "";

this.message = message;

}

public StreamPiException(String title, String message)

{

super(message);

this.title = title;

this.message = message;

}

public String getShortMessage()

{

return message;

}

public String getTitle()

{

return title;

}

public void setTitle(String title)

{

this.title = title;

}

public void setShortMessage(String message)

{

this.message = message;

}

M src/main/java/com/stream_pi/util/iohelper/IOHelper.java

+5 −5

Stream-Pi - Free & Open-Source Modular Cross-Platform Programmable Macro Pad

This program is free software: you can redistribute it and/or modify

it under the terms of the GNU General Public License as published by

the Free Software Foundation, either version 3 of the License, or

(at your option) any later version.

This program is distributed in the hope that it will be useful,

but WITHOUT ANY WARRANTY; without even the implied warranty of

MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

GNU General Public License for more details.

Originally Written by : Debayan Sutradhar (rnayabed)

package com.stream_pi.util.iohelper;

import java.io.File;

import java.io.FileOutputStream;

import java.io.InputStream;

import java.util.zip.ZipEntry;

import java.util.zip.ZipInputStream;

public class IOHelper {

public static void unzip(InputStream inputStream, String destDir) throws Exception{

public static void unzip(InputStream inputStream, String destDir) throws Exception {

File dir = new File(destDir);

// create output directory if it doesn't exist

if(!dir.exists()) dir.mkdirs();

InputStream fis;

//buffer for read and write data to file

byte[] buffer = new byte[1024];

fis = inputStream;

ZipInputStream zis = new ZipInputStream(fis);

ZipEntry ze = zis.getNextEntry();

while(ze != null){

String fileName = ze.getName();

File newFile = new File(destDir + File.separator + fileName);

if(ze.isDirectory())

{

newFile.mkdirs();

}

else

{

FileOutputStream fos = new FileOutputStream(newFile);

int len;

while ((len = zis.read(buffer)) > 0) {

while ((len = zis.read(buffer)) > 0)

fos.write(buffer, 0, len);

{

fos.write(buffer, 0, len);

}

fos.close();

}

//close this ZipEntry

zis.closeEntry();

ze = zis.getNextEntry();

}

//close last ZipEntry

zis.closeEntry();

zis.close();

fis.close();

}

M src/main/java/com/stream_pi/util/loggerhelper/StreamPiLogFallbackHandler.java

+1 −0

Stream-Pi - Free & Open-Source Modular Cross-Platform Programmable Macro Pad

This program is free software: you can redistribute it and/or modify

it under the terms of the GNU General Public License as published by

the Free Software Foundation, either version 3 of the License, or

(at your option) any later version.

This program is distributed in the hope that it will be useful,

but WITHOUT ANY WARRANTY; without even the implied warranty of

MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

GNU General Public License for more details.

Originally Written by : Debayan Sutradhar (rnayabed)

package com.stream_pi.util.loggerhelper;

import java.util.logging.ConsoleHandler;

public class StreamPiLogFallbackHandler extends ConsoleHandler{

public StreamPiLogFallbackHandler() throws Exception

{

super();

setFormatter(new StreamPiLogFormatter());

}

public void closeHandler()

{

close();

}

M src/main/java/com/stream_pi/util/platform/ReleaseStatus.java

+3 −1

Stream-Pi - Free & Open-Source Modular Cross-Platform Programmable Macro Pad

This program is free software: you can redistribute it and/or modify

it under the terms of the GNU General Public License as published by

the Free Software Foundation, either version 3 of the License, or

(at your option) any later version.

This program is distributed in the hope that it will be useful,

but WITHOUT ANY WARRANTY; without even the implied warranty of

MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

GNU General Public License for more details.

Originally Written by : Debayan Sutradhar (rnayabed)

package com.stream_pi.util.platform;

public enum ReleaseStatus {

EA("Early Access"), GA("General Availability");

EA("Early Access"),

GA("General Availability");

private final String UIName;

ReleaseStatus(String UIName)

{

this.UIName = UIName;

}

public String getUIName()

{

return UIName;

}

M src/main/java/com/stream_pi/util/uihelper/HBoxInputBox.java

+3 −6

Stream-Pi - Free & Open-Source Modular Cross-Platform Programmable Macro Pad

This program is free software: you can redistribute it and/or modify

it under the terms of the GNU General Public License as published by

the Free Software Foundation, either version 3 of the License, or

(at your option) any later version.

This program is distributed in the hope that it will be useful,

but WITHOUT ANY WARRANTY; without even the implied warranty of

MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

GNU General Public License for more details.

Originally Written by : Debayan Sutradhar (rnayabed)

package com.stream_pi.util.uihelper;

import javafx.geometry.Insets;

import javafx.scene.control.CheckBox;

import javafx.scene.control.Label;

import javafx.scene.control.TextField;

import javafx.scene.layout.HBox;

public class HBoxInputBox extends HBox {

private TextField textField;

public HBoxInputBox(String labelText, TextField textField, int prefWidth, CheckBox enablerCheckBox)

{

textField.setPrefWidth(prefWidth);

Label label = new Label(labelText);

getChildren().addAll(label, SpaceFiller.horizontal(), textField);

getChildren().addAll(label, new SpaceFiller(SpaceFiller.FillerType.HBox), textField);

if(enablerCheckBox != null)

{

textField.disableProperty().bind(enablerCheckBox.selectedProperty());

HBox.setMargin(enablerCheckBox, new Insets(0, 0, 0, 45));

getChildren().add(enablerCheckBox);

}

this.textField = textField;

}

public HBoxInputBox(String labelText, TextField textField, CheckBox enablerCheckBox)

{

this(labelText, textField, 100, enablerCheckBox);

}

public HBoxInputBox(String labelText, TextField textField)

{

this(labelText, textField, 100, null);

}

public HBoxInputBox(String labelText, TextField textField, int prefWidth)

{

this(labelText, textField, prefWidth, null);

}

public TextField getTextField()

{

return textField;

}

M src/main/java/com/stream_pi/util/uihelper/HBoxInputBoxWithFileChooser.java

+1 −2

Stream-Pi - Free & Open-Source Modular Cross-Platform Programmable Macro Pad

This program is free software: you can redistribute it and/or modify

it under the terms of the GNU General Public License as published by

the Free Software Foundation, either version 3 of the License, or

(at your option) any later version.

This program is distributed in the hope that it will be useful,

but WITHOUT ANY WARRANTY; without even the implied warranty of

MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

GNU General Public License for more details.

Originally Written by : Debayan Sutradhar (rnayabed)

package com.stream_pi.util.uihelper;

import javafx.geometry.Insets;

import javafx.scene.control.Button;

import javafx.scene.control.CheckBox;

import javafx.scene.control.TextField;

import javafx.scene.layout.HBox;

import javafx.scene.layout.Priority;

import javafx.stage.FileChooser;

import org.kordamp.ikonli.javafx.FontIcon;

import java.io.File;

public class HBoxInputBoxWithFileChooser extends HBox {

public HBoxInputBoxWithFileChooser(String labelText, TextField textField, CheckBox enablerCheckBox, FileChooser.ExtensionFilter extensionFilter)

{

textField.setDisable(true);

HBoxInputBox hBoxInputBox = new HBoxInputBox(labelText, textField, 300);

setHgrow(hBoxInputBox, Priority.ALWAYS);

getChildren().addAll(hBoxInputBox);

setSpacing(5.0);

Button button = new Button();

FontIcon fontIcon = new FontIcon("far-folder");

//fontIcon.setIconColor(Paint.valueOf(iconColorHex));

//fontIcon.setIconSize(iconSize);

button.setGraphic(fontIcon);

button.setOnAction(event -> {

FileChooser fileChooser = new FileChooser();

fileChooser.getExtensionFilters().addAll(

extensionFilter

);

try {

File selectedDirectory = fileChooser.showOpenDialog(button.getScene().getWindow());

textField.setText(selectedDirectory.getAbsolutePath());

}

catch (NullPointerException e)

{

// No folder selected

}

});

getChildren().add(button);

if(enablerCheckBox!=null)

{

button.disableProperty().bind(enablerCheckBox.selectedProperty());

HBox.setMargin(enablerCheckBox, new Insets(0, 0, 0, 45));

getChildren().add(enablerCheckBox);

}

M src/main/java/com/stream_pi/util/uihelper/SpaceFiller.java

+9 −12

Stream-Pi - Free & Open-Source Modular Cross-Platform Programmable Macro Pad

This program is free software: you can redistribute it and/or modify

it under the terms of the GNU General Public License as published by

the Free Software Foundation, either version 3 of the License, or

(at your option) any later version.

This program is distributed in the hope that it will be useful,

but WITHOUT ANY WARRANTY; without even the implied warranty of

MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

GNU General Public License for more details.

Originally Written by : Debayan Sutradhar (rnayabed)

package com.stream_pi.util.uihelper;

import javafx.scene.layout.HBox;

import javafx.scene.layout.Priority;

import javafx.scene.layout.Region;

import javafx.scene.layout.VBox;

public class SpaceFiller extends Region {

public class SpaceFiller {

public SpaceFiller(FillerType fillerType)

public static Region horizontal()

{

if(fillerType == FillerType.HBox)

final Region region = new Region();

{

HBox.setHgrow(region, Priority.ALWAYS);

HBox.setHgrow(this, Priority.ALWAYS);

return region;

}

else if(fillerType == FillerType.VBox)

{

VBox.setVgrow(this, Priority.ALWAYS);

}

public enum FillerType

public static Region vertical()

{

HBox, VBox

final Region region = new Region();

VBox.setVgrow(region, Priority.ALWAYS);

return region;

}

M src/main/java/com/stream_pi/util/version/Version.java

+10 −13

Stream-Pi - Free & Open-Source Modular Cross-Platform Programmable Macro Pad

This program is free software: you can redistribute it and/or modify

it under the terms of the GNU General Public License as published by

the Free Software Foundation, either version 3 of the License, or

(at your option) any later version.

This program is distributed in the hope that it will be useful,

but WITHOUT ANY WARRANTY; without even the implied warranty of

MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

GNU General Public License for more details.

Originally Written by : Debayan Sutradhar (rnayabed)

package com.stream_pi.util.version;

import com.stream_pi.util.exception.MinorException;

import java.io.Serializable;

public class Version implements Serializable {

private int major, minor, revision;

public Version()

{

major = 0;

minor = 0;

revision = 0;

}

public Version(int major, int minor, int revision)

{

this.major = major;

this.minor = minor;

this.revision = revision;

}

public Version(String version) throws MinorException

{

String[] v = version.trim().split("\\.");

if(v.length == 3)

{

try

{

major = Integer.parseInt(v[0]);

minor = Integer.parseInt(v[1]);

revision = Integer.parseInt(v[2]);

}

catch (NumberFormatException e)

{

throw new MinorException("Invalid versioning!");

}

else

{

throw new MinorException("Invalid versioning!");

}

public int getMajor()

{

return major;

}

public int getMinor()

{

return minor;

}

public int getRevision()

{

return minor;

}

public String getText()

{

return this.major+"."+this.minor+"."+this.revision;

}

public void setMajor(int major)

{

this.major = major;

}

public void setMinor(int minor)

{

this.minor = minor;

}

public void setRevision(int revision)

{

this.revision = revision;

}

public boolean isBiggerThan(Version version)

{

if(major>version.major)

if (major == version.major)

return true;

else if(major < version.major)

return false;

else

{

if (minor > version.minor)

if (minor == version.minor)

return true;

{

else if(minor < version.minor)

return revision > version.revision;

return false;

}

else

{

if(revision > version.revision)

return minor > version.minor;

return true;

else

return false;

}

else

{

return major > version.major;

}

public boolean isEqual(Version version)

{

return version.major == this.major && version.minor == this.minor && version.revision == this.revision;

}

M src/main/java/com/stream_pi/util/xmlconfighelper/XMLConfigHelper.java

+3 −17

Stream-Pi - Free & Open-Source Modular Cross-Platform Programmable Macro Pad

This program is free software: you can redistribute it and/or modify

it under the terms of the GNU General Public License as published by

the Free Software Foundation, either version 3 of the License, or

(at your option) any later version.

This program is distributed in the hope that it will be useful,

but WITHOUT ANY WARRANTY; without even the implied warranty of

MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

GNU General Public License for more details.

Originally Written by : Debayan Sutradhar (rnayabed)

package com.stream_pi.util.xmlconfighelper;

import java.io.File;

import java.util.logging.Logger;

import javax.xml.transform.Result;

import javax.xml.transform.Source;

import javax.xml.transform.Transformer;

import javax.xml.transform.TransformerFactory;

import javax.xml.transform.dom.DOMSource;

import javax.xml.transform.stream.StreamResult;

import org.w3c.dom.Document;

import org.w3c.dom.Element;

import org.w3c.dom.Node;

public class XMLConfigHelper {

private static Logger logger = Logger.getLogger(XMLConfigHelper.class.getName());

private static final Logger logger = Logger.getLogger(XMLConfigHelper.class.getName());

public static String getStringProperty(Element parentElement, String propertyName) throws Exception

{

return getProperty(parentElement, propertyName, false, null, null);

}

public static int getIntProperty(Element parentElement, String propertyName) throws Exception

{

return Integer.parseInt(getProperty(parentElement, propertyName, false, null, null));

}

public static double getDoubleProperty(Element parentElement, String propertyName) throws Exception

{

return Double.parseDouble(getProperty(parentElement, propertyName, false, null, null));

}

public static boolean getBooleanProperty(Element parentElement, String propertyName) throws Exception

{

return getProperty(parentElement, propertyName, false, null, null).equals("true");

}

public static String getProperty(Element parentElement, String propertyName, boolean createNewIfDoesntExist, Document document, File file) throws Exception

{

try {

return parentElement.getElementsByTagName(propertyName).item(0).getTextContent();

}

catch (Exception e)

{

logger.warning("CANNOT get property "+parentElement.getNodeName()+"."+propertyName+"!");

if(createNewIfDoesntExist)

if (createNewIfDoesntExist)

{

logger.warning("Creating new property by that name ...");

Element newProp = document.createElement(propertyName);

parentElement.appendChild(newProp);

save(document, file);

}

throw e;

}

public static void save(Document document, File file) throws Exception

{

Transformer transformer = TransformerFactory.newInstance().newTransformer();

Result output = new StreamResult(file);

Source input = new DOMSource(document);

transformer.transform(input, output);

}

public static String getStringProperty(Element parentElement, String propertyName, String ifNotPresent, boolean printStackTrace)

{

return getStringProperty(parentElement, propertyName, ifNotPresent, printStackTrace, false, null, null);

}

public static String getStringProperty(Element parentElement, String propertyName, String ifNotPresent, boolean printStackTrace, boolean createNewIfDoesntExist,

Document document, File file)

{

String tbr = ifNotPresent;

try

{

tbr = getProperty(parentElement, propertyName, createNewIfDoesntExist, document, file);

}

catch(Exception e)

{

if(printStackTrace)

e.printStackTrace();

}

return tbr;

}

public static void removeChilds(Node node) {

while (node.hasChildNodes())

node.removeChild(node.getFirstChild());

}

public static int getIntProperty(Element parentElement, String propertyName, int ifNotPresent, boolean printStackTrace)

{

return getIntProperty(parentElement, propertyName, ifNotPresent, printStackTrace, false, null, null);

}

public static int getIntProperty(Element parentElement, String propertyName, int ifNotPresent, boolean printStackTrace, boolean createNewIfDoesntExist,

Document document, File file)

{

int tbr = ifNotPresent;

try

{

tbr = Integer.parseInt(getProperty(parentElement, propertyName, createNewIfDoesntExist, document, file));

}

catch(Exception e)

{

if(printStackTrace)

e.printStackTrace();

}

return tbr;

}

public static double getDoubleProperty(Element parentElement, String propertyName, double ifNotPresent)

{

return getDoubleProperty(parentElement, propertyName, ifNotPresent, true, false, null, null);

}

public static double getDoubleProperty(Element parentElement, String propertyName, double ifNotPresent, boolean printStackTrace)

{

return getDoubleProperty(parentElement, propertyName, ifNotPresent, printStackTrace, false, null, null);

}

public static double getDoubleProperty(Element parentElement, String propertyName, double ifNotPresent, boolean printStackTrace, boolean createNewIfDoesntExist,

Document document, File file)

{

double tbr = ifNotPresent;

try

{

tbr = Double.parseDouble(getProperty(parentElement, propertyName, createNewIfDoesntExist, document, file));

}

catch(Exception e)

{

if(printStackTrace)

e.printStackTrace();

}

return tbr;

}

public static String getStringProperty(Element parentElement, String propertyName, String ifNotPresent)

{

return getStringProperty(parentElement, propertyName, ifNotPresent, true, false, null, null);

}

public static boolean getBooleanProperty(Element parentElement, String propertyName, boolean ifNotPresent, boolean printStackTrace)

{

return getBooleanProperty(parentElement, propertyName, ifNotPresent, printStackTrace, false, null, null);

}

public static boolean getBooleanProperty(Element parentElement, String propertyName, boolean ifNotPresent, boolean printStackTrace, boolean createNewIfDoesntExist,

Document document, File file)

{

boolean tbr = ifNotPresent;

try

{

tbr = getProperty(parentElement, propertyName, createNewIfDoesntExist, document, file).equals("true");

}

catch(Exception e)

{

if(printStackTrace)

e.printStackTrace();

}

return tbr;

}

public static boolean getBooleanProperty(Element parentElement, String propertyName, boolean ifNotPresent)

{

return getBooleanProperty(parentElement, propertyName, ifNotPresent, true, false, null, null);

}

public static boolean doesElementExist(Element parent, String nameOfElement)

{

return parent.getElementsByTagName(nameOfElement).getLength() > 0;

}

public static boolean doesElementExist(Document document, String nameOfElement)

{

return document.getElementsByTagName(nameOfElement).getLength() > 0;

}

Public

util

Clone or download

Contains the following changes:

Modified Files