From 9d782ef4f91b10644e3504f50280bb9d6d5c37f6 Mon Sep 17 00:00:00 2001
From: Robert Goldmann <deadlocker@gmx.de>
Date: Sat, 17 Dec 2016 22:56:30 +0100
Subject: [PATCH] updated Tools.jar, cleanup
---
bin/de/bricked/main/_de.properties | 2 +-
lib/Tools.jar | Bin 555385 -> 557157 bytes
src/de/bricked/game/board/Board.java | 5 +--
.../bricked/game/levels/LevelPackHandler.java | 2 +-
src/de/bricked/game/paddle/Paddle.java | 3 +-
src/de/bricked/game/powerups/PowerUpType.java | 1 -
.../paddle/DecreasePaddleSizePowerUp.java | 2 +-
.../paddle/IncreasePaddleSizePowerUp.java | 2 +-
src/de/bricked/game/settings/GameSize.java | 3 +-
src/de/bricked/main/_de.properties | 2 +-
src/de/bricked/ui/Controller.java | 13 +-----
src/de/bricked/ui/LevelController.java | 33 ++++------------
.../bricked/ui/LevelPackSelectController.java | 3 --
src/de/bricked/ui/cells/LevelCell.java | 2 +-
src/de/bricked/ui/cells/LevelPackCell.java | 2 +-
src/de/bricked/utils/Downloader.java | 5 +--
src/de/bricked/utils/FileUtils.java | 2 +-
src/de/bricked/utils/MathUtils.java | 19 ---------
.../controller/LevelPackDialogController.java | 2 +-
.../utils/AlertGenerator.java | 37 ------------------
20 files changed, 24 insertions(+), 116 deletions(-)
delete mode 100644 src/de/bricked/utils/MathUtils.java
delete mode 100644 src/de/brickedleveleditor/utils/AlertGenerator.java
diff --git a/bin/de/bricked/main/_de.properties b/bin/de/bricked/main/_de.properties
index f34e0b8..ebc59d4 100644
--- a/bin/de/bricked/main/_de.properties
+++ b/bin/de/bricked/main/_de.properties
@@ -1,7 +1,7 @@
app.name=Bricked
version.code=0
version.name=0.0.0
-version.date=19.10.16
+version.date=17.12.16
author=Max Wittig, Robert Goldmann (Vielen Dank an Tobias)
shortcut.debug.console=F12
diff --git a/lib/Tools.jar b/lib/Tools.jar
index 1ad855e76a4327dbfc19066d639b190f24c02ab9..5a145f32bcf870288793acaf2dfabedb41cd3c1f 100644
GIT binary patch
delta 4222
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
E0Q)96KmY&$
delta 2495
zcmaFbp!D;TB5!~<Gm8iV2L}hkmd@-(-d0}5R$iv9yv)n|n7x+9Zr|p|{30C8TDXik
zXBn6!;LCEA6~vk@;L9T0&Kk_p&Kk_Roi&)vFb5>O-Eu!$ASamBdxC8b6PV?5nr#~+
zn8kXQEs+Jx%Dl+7n;FbfzslwfW=*@zroDZ^4YpXYu5Gv3+QE$WuDfj8yY8~T6$LA=
z`ph1|#Js69d;8U|>=qngF@b;VDPXl*%Q=>?fraGQIc9+!y1i3~qY^B+omG@$FT@>3
z#W)s0+>s^C;Q+RM`&v1ULWnv=MUHleDXY~v+8{biG&zp3gH8Txz_A3PZiz8R5tudo
zuK|bnbOSRE!TRiA;c$sMF(<Q5K?A0yt!1G(ja(a}mNs>{Ea~FRXx<XCR_~-!*f*g~
z(jwW>)x}l$vdgF2KlHiHf8a`Hy+gg{a`|7vR<-BeP4e(Lp85IVobvOP`saV|J8!AJ
z|Nr09`3!N#z8guYY}v6b*W%>mZClq&y^|U3=Hc|3w=~jMYSq^I33F!cUidVI^Wo!N
zOLwcQntc0m&Vys_w$D*Ky&cCcwix_fQtCZhXLfN^X4G6`6VA>pbAx*&w=U^^pJ4bz
zti=7$wi4ePiJZ5a`+M>vb{XgTzgFYDRjpQaIn*L@`;utx!@eKtdh1!3`q&T6zh3+B
zMSOW`iRX>L>{(i`-Qu*5eyHb}H+5rn@Vb3&GP^G-ImU(cZZb2KcUBjf_(YEJnWx5H
zW5GAcNnVbDE${wW%sbAlGb2hTD=f~b-gdG2G^Uuthg{beTvSgC-+RYgMA_niLf6XZ
zE}?@B4i7TA5B*7y(SJChr6c>dn$WGPS0WRiEep@)yu>2yUEEjV5zo3iW>IAQg-L6s
zZC+b*Ve*1YXV*$^ec$8op^3HQ!ITy?eqrtxKf;8j%sQ7=vieQdxfN6SW!w$ic$@`$
zjKBPAZvSLB=V(h$vCyp58!m6VKj-t4Q_oIy%uT#_$wy}LjHIN`WhX;CZzq>_)mz4T
zzqk6EP+E5FfLw5F?+jPols(%R*S>k>7L-$ev_SB3lg9KJEFaIFsF>?#qZ+>ZsoLgU
zktQY!t==u{PMF4W_Bp%J%tq0FQ#Pl!`xKujWZQHzhsRi9{<;UclHoTySIu6<Jn@Yw
z=UvA>QI)TkIiK!y-FIEfyW`i@BGYYqlw<XUrdpYw)4E(9b5*Cy?$?`@)jDcP5e<5a
z56nJryR?2<Ps-7VFCW`l=GEIv&%V;$YOKsBtg?L1f}Q`K9@w3s)TQKQG|g=O6Vc;W
z&sfMzVD63T?A-c0uhhD-F)@bia>(T68Igyk7G5nVVm%vpPN2bR`OmKbNp?y{b*%f0
z@};?L&d)k@^wXkfJx$iEDCe$>*!`K`o`3dQ_`v+brWXtT*YB1(tb1qLMyE^H7zK{s
zev~w^JL%+xls(Fc`KJBFZ3}f*9LvaDn3FZF`dOHt_O4yJek)#wDg>^-99X_MPsML<
z)~5{@w^{%F;t+CoR_WC{Np8Aq;T7QyEmyeC8~C?QyX<@Q#H;PivlptCYBl*Et)1fe
z(d|c!$MfJl0<)gAu<|djS3Q+oP#b8T<EQ2v&MEf8_vN&xsFk~1Ird%P^5{sdbbPv{
zFjgUJosBZHlJc8{PK%dIFFf+RbMcw=D(RiY!S|(<>;p3#dXjHM-|5nodAyJ5`Pw;)
zGu*rr{xCDTSoFWmb6$P3?Z_pKrDpz8Jb`Zv*bnz#u)Hl8cl?~G&GZ|)yXxQdUC^o$
z(hmx1x!|8DdQx6{qwp85l7M@SW%usx-f;Qw#pi4L9~#JK6_j(hYnTS8cP^gdbmh%K
zg{208`+~%m_8SDcR`fjj5X5^*SagcAzvIob5x+O~=1=bUYjG-&KUG4VdCKjM-=0%e
za-HJ0Y_ptyBgEU^h}~IkPXNPvlZ`6%=UVDqALlII)EB<_wa4{C+23~6c6>?{d(pw}
z`|+Az2v^09pab(5qC~{C8rFS`UUKOxhj@DVdd1n5Ei-Q(k<P9t-t_-~mfm$X>4iTv
zwiz$a+OSR`Vv5LKzNx=%&wMIV^eA8G(}ku4^PQIu?A)6#`#G~H`D5a*^c$U@wDR2K
zt61uLjIPMeI%-qIanHYKPE$qlHU;nF)8)AD^p$^{=YCu5&e7jrHnghzXh@y*VWNM5
z-Lmo*UmtrN<7Zmb({U*L)cse&PvwqQZ*}>(#A(WTrbSmCo-k$GeeU1tH#P4J`+6R9
zHz*(fka}PuV~uD*iu^u4i%-6>4c~1WzWXXxGROzid@$V4FpDSIaL3sV-v1>RwB*~?
z-~Y=T;LXnA{Z8g_H!A~!8#e<3qTT~lBYSN)GQp+&bVWrD@$C-I9FdTMevTK%CT`{}
zo!Q$1!#K3$K!yMGx)KggFymAShd-DhQ_A5AW~7vIJO?xU$~f%6jQ%nX2QcGO8HW>?
zAzsem3udI3b3}j{hsrtJ!3>@X4j(Wh8p_zds)9oUT=`7DTFK!Es`92wR&m%v6jedB
zEv@1>4HhY`=I8@6d}=tPnbz@4&#d841q)0B325<8UsuDSrr@<S*0W;WjNoJz28L!X
z1_luZWbjI0`j;9GC9pQhS`KNZe$nY>wHyjyfyi18Y35539Mkv8ameTdcr!AIFhH6Q
zAVXtK!g_qz7#L)D85jhR&17(sp1!}90}_4@K!#pWoc_0#Lmq6Xd>w~0Q>5~An>r3P
zU647O&iqnJVPaq~Wno|tMKMQ7n}eYwKR>5f-#=KzKY04a5)QE#kQV7BKSeE>7#M1q
z85sCbw4BsMXwgf~Nh~f#cQ$gmK()@!U^-(xhce%$&TP*;7uZWQ*%%nQxu?Ic<B*!}
zQ_mp{c79ephcr`#&Ghzq4jYHlPB7b2i;D7#obyvsG3-m)6tlFJi-Cbf6g});J5OhB
p;BZh{<;TIGS5TCnm6}`<;LXYg^3Vi^2@FRy85rjIb1*P4006fG^g#ds
diff --git a/src/de/bricked/game/board/Board.java b/src/de/bricked/game/board/Board.java
index e684131..05d27d5 100644
--- a/src/de/bricked/game/board/Board.java
+++ b/src/de/bricked/game/board/Board.java
@@ -27,8 +27,7 @@ public class Board
this.game = game;
init();
- String boardString = game.getLevel().getBoard();
- // parse board -> create bricks
+ String boardString = game.getLevel().getBoard();
String[] bricksAndPowerArray = boardString.split(" ");
ArrayList<Brick> loadedBricks = new ArrayList<>();
for(String bricksAndPower : bricksAndPowerArray)
@@ -37,7 +36,7 @@ public class Board
int powerUp = Integer.parseInt(bricksAndPower.substring(1));
Brick currentBrick = null;
PowerUp currentPowerUp = null;
- // TODO IMPLEMENT POWERUP
+ // TODO IMPLEMENT POWERUPS
switch(powerUp)
{
case 0:
diff --git a/src/de/bricked/game/levels/LevelPackHandler.java b/src/de/bricked/game/levels/LevelPackHandler.java
index dc27b33..2a0723e 100644
--- a/src/de/bricked/game/levels/LevelPackHandler.java
+++ b/src/de/bricked/game/levels/LevelPackHandler.java
@@ -117,4 +117,4 @@ public class LevelPackHandler
}
return fileArrayList;
}
-}
+}
\ No newline at end of file
diff --git a/src/de/bricked/game/paddle/Paddle.java b/src/de/bricked/game/paddle/Paddle.java
index 96b2b68..491d649 100644
--- a/src/de/bricked/game/paddle/Paddle.java
+++ b/src/de/bricked/game/paddle/Paddle.java
@@ -12,8 +12,7 @@ public class Paddle
{
this.gameWidth = gameWidth;
this.paddleSize = size;
- this.height = initialHeight;
- //this.MAX_WIDTH = MAX_WIDTH_PERCENTAGE * gameWidth;
+ this.height = initialHeight;
this.speed = SPEED_FACTOR * gameWidth;
}
diff --git a/src/de/bricked/game/powerups/PowerUpType.java b/src/de/bricked/game/powerups/PowerUpType.java
index e360e30..93d3ec9 100644
--- a/src/de/bricked/game/powerups/PowerUpType.java
+++ b/src/de/bricked/game/powerups/PowerUpType.java
@@ -1,6 +1,5 @@
package de.bricked.game.powerups;
-
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
diff --git a/src/de/bricked/game/powerups/paddle/DecreasePaddleSizePowerUp.java b/src/de/bricked/game/powerups/paddle/DecreasePaddleSizePowerUp.java
index 214145d..fb5fca7 100644
--- a/src/de/bricked/game/powerups/paddle/DecreasePaddleSizePowerUp.java
+++ b/src/de/bricked/game/powerups/paddle/DecreasePaddleSizePowerUp.java
@@ -27,4 +27,4 @@ public class DecreasePaddleSizePowerUp extends PowerUp
public void deactivate(LevelController levelController, Game game)
{
}
-}
+}
\ No newline at end of file
diff --git a/src/de/bricked/game/powerups/paddle/IncreasePaddleSizePowerUp.java b/src/de/bricked/game/powerups/paddle/IncreasePaddleSizePowerUp.java
index 00a6cb3..c211128 100644
--- a/src/de/bricked/game/powerups/paddle/IncreasePaddleSizePowerUp.java
+++ b/src/de/bricked/game/powerups/paddle/IncreasePaddleSizePowerUp.java
@@ -27,4 +27,4 @@ public class IncreasePaddleSizePowerUp extends PowerUp
public void deactivate(LevelController levelController, Game game)
{
}
-}
+}
\ No newline at end of file
diff --git a/src/de/bricked/game/settings/GameSize.java b/src/de/bricked/game/settings/GameSize.java
index 7e84650..92c0598 100644
--- a/src/de/bricked/game/settings/GameSize.java
+++ b/src/de/bricked/game/settings/GameSize.java
@@ -10,7 +10,6 @@ public enum GameSize
BIG(1920, 1080),
FULL_SCREEN();
-
private int width;
private int height;
@@ -36,4 +35,4 @@ public enum GameSize
{
return height;
}
-}
+}
\ No newline at end of file
diff --git a/src/de/bricked/main/_de.properties b/src/de/bricked/main/_de.properties
index f34e0b8..ebc59d4 100644
--- a/src/de/bricked/main/_de.properties
+++ b/src/de/bricked/main/_de.properties
@@ -1,7 +1,7 @@
app.name=Bricked
version.code=0
version.name=0.0.0
-version.date=19.10.16
+version.date=17.12.16
author=Max Wittig, Robert Goldmann (Vielen Dank an Tobias)
shortcut.debug.console=F12
diff --git a/src/de/bricked/ui/Controller.java b/src/de/bricked/ui/Controller.java
index 71e276a..eee193f 100644
--- a/src/de/bricked/ui/Controller.java
+++ b/src/de/bricked/ui/Controller.java
@@ -13,8 +13,6 @@ import javafx.fxml.FXML;
import javafx.fxml.FXMLLoader;
import javafx.scene.Parent;
import javafx.scene.Scene;
-import javafx.scene.control.Alert;
-import javafx.scene.control.Alert.AlertType;
import javafx.scene.control.Button;
import javafx.scene.image.Image;
import javafx.scene.input.KeyEvent;
@@ -25,6 +23,7 @@ import javafx.stage.WindowEvent;
import kuusisto.tinysound.TinySound;
import logger.LogLevel;
import logger.Logger;
+import tools.AlertGenerator;
public class Controller
{
@@ -139,14 +138,6 @@ public class Controller
public void about()
{
- Alert alert = new Alert(AlertType.INFORMATION);
- alert.setTitle("About " + bundle.getString("app.name"));
- alert.setHeaderText(bundle.getString("app.name"));
- alert.setContentText("Version: " + bundle.getString("version.name") + "\r\nDate: " + bundle.getString("version.date") + "\r\nAuthors: "+ bundle.getString("author") +"\r\n");
- Stage dialogStage = (Stage)alert.getDialogPane().getScene().getWindow();
- alert.getDialogPane().setStyle("-fx-base: " + bundle.getString("color.background"));
- dialogStage.getIcons().add(icon);
- dialogStage.centerOnScreen();
- alert.showAndWait();
+ AlertGenerator.showAboutAlert(bundle.getString("app.name"), bundle.getString("version.name"), bundle.getString("version.code"), bundle.getString("version.date"), bundle.getString("author"), icon, stage, null, false);
}
}
\ No newline at end of file
diff --git a/src/de/bricked/ui/LevelController.java b/src/de/bricked/ui/LevelController.java
index 22b9295..5a08cb2 100644
--- a/src/de/bricked/ui/LevelController.java
+++ b/src/de/bricked/ui/LevelController.java
@@ -40,7 +40,6 @@ import javafx.scene.Cursor;
import javafx.scene.Group;
import javafx.scene.Scene;
import javafx.scene.control.Alert;
-import javafx.scene.control.Alert.AlertType;
import javafx.scene.control.Button;
import javafx.scene.control.Label;
import javafx.scene.effect.Lighting;
@@ -66,6 +65,7 @@ import javafx.util.Duration;
import kuusisto.tinysound.TinySound;
import logger.LogLevel;
import logger.Logger;
+import tools.AlertGenerator;
import tools.Worker;
public class LevelController
@@ -445,18 +445,10 @@ public class LevelController
gameState = GameState.STOPPED;
timer.stop();
- game.getSoundHandler().play(SoundType.GAME_OVER);
-
- Platform.runLater(() -> {
- Alert alert = new Alert(AlertType.INFORMATION);
- alert.setTitle("Game Over");
- alert.setHeaderText("");
- alert.setContentText("You have no lives left");
- Stage dialogStage = (Stage)alert.getDialogPane().getScene().getWindow();
- alert.getDialogPane().setStyle("-fx-base: " + bundle.getString("color.background"));
- dialogStage.getIcons().add(icon);
- dialogStage.centerOnScreen();
- alert.showAndWait();
+ game.getSoundHandler().play(SoundType.GAME_OVER);
+
+ Platform.runLater(() -> {
+ AlertGenerator.showAlert(Alert.AlertType.INFORMATION, "Game Over", "", "Youe have no lives left", icon, stage, bundle.getString("color.background"), false);
});
}
else
@@ -713,8 +705,7 @@ public class LevelController
anchorPaneGame.getChildren().remove(stackPaneBall);
game.setBall(new Ball(ballType));
-
- // create circle for ball
+
final Circle circle = new Circle(game.getBall().getBallRadius(), Color.web(game.getBall().getType().getColor()));
circle.setEffect(new Lighting());
stackPaneBall = new StackPane();
@@ -810,16 +801,8 @@ public class LevelController
game.getSoundHandler().play(SoundType.FINISHED_LEVEL);
- Platform.runLater(() -> {
- Alert alert = new Alert(AlertType.INFORMATION);
- alert.setTitle("Congratulations!");
- alert.setHeaderText("");
- alert.setContentText("You finished Level \"" + game.getLevel().getName() + "\" with " + game.getTotalPoints() + " Points");
- Stage dialogStage = (Stage)alert.getDialogPane().getScene().getWindow();
- alert.getDialogPane().setStyle("-fx-base: " + bundle.getString("color.background"));
- dialogStage.getIcons().add(icon);
- dialogStage.centerOnScreen();
- alert.showAndWait();
+ Platform.runLater(() -> {
+ AlertGenerator.showAlert(Alert.AlertType.INFORMATION, "Congratulations!", "", "You finished Level \"" + game.getLevel().getName() + "\" with " + game.getTotalPoints() + " Points", icon, stage, bundle.getString("color.background"), false);
});
}
}
diff --git a/src/de/bricked/ui/LevelPackSelectController.java b/src/de/bricked/ui/LevelPackSelectController.java
index 75dc799..7f822b4 100644
--- a/src/de/bricked/ui/LevelPackSelectController.java
+++ b/src/de/bricked/ui/LevelPackSelectController.java
@@ -111,9 +111,6 @@ public class LevelPackSelectController
});
mainPane.setStyle("-fx-base: " + bundle.getString("color.background") + ";");
-
-// buttonBack.setStyle("-fx-base: " + bundle.getString("color.button"));
-// downloadLevelpackButton.setStyle("-fx-base: " + bundle.getString("color.button"));
}
public void reload()
diff --git a/src/de/bricked/ui/cells/LevelCell.java b/src/de/bricked/ui/cells/LevelCell.java
index d1a3fa5..dcf087d 100644
--- a/src/de/bricked/ui/cells/LevelCell.java
+++ b/src/de/bricked/ui/cells/LevelCell.java
@@ -126,4 +126,4 @@ public class LevelCell extends ListCell<Level>
setStyle("-fx-background-color: transparent");
}
-}
+}
\ No newline at end of file
diff --git a/src/de/bricked/ui/cells/LevelPackCell.java b/src/de/bricked/ui/cells/LevelPackCell.java
index 09bb92b..d255ccf 100644
--- a/src/de/bricked/ui/cells/LevelPackCell.java
+++ b/src/de/bricked/ui/cells/LevelPackCell.java
@@ -73,4 +73,4 @@ public class LevelPackCell extends ListCell<LevelPack>
setStyle("-fx-background-color: transparent");
}
-}
+}
\ No newline at end of file
diff --git a/src/de/bricked/utils/Downloader.java b/src/de/bricked/utils/Downloader.java
index 2c414fd..dd2ab21 100644
--- a/src/de/bricked/utils/Downloader.java
+++ b/src/de/bricked/utils/Downloader.java
@@ -1,6 +1,5 @@
package de.bricked.utils;
-
import de.bricked.game.Config;
import de.bricked.game.levels.LevelPack;
import de.bricked.game.levels.LevelPackParser;
@@ -31,7 +30,6 @@ public class Downloader
Logger.log(LogLevel.ERROR, Logger.exceptionToString(e));
}
}
-
}
private void save()
@@ -47,11 +45,10 @@ public class Downloader
{
e.printStackTrace();
}
-
}
private String getPackName()
{
return levelPack.getPackageName();
}
-}
+}
\ No newline at end of file
diff --git a/src/de/bricked/utils/FileUtils.java b/src/de/bricked/utils/FileUtils.java
index 3727a55..6fe9aac 100644
--- a/src/de/bricked/utils/FileUtils.java
+++ b/src/de/bricked/utils/FileUtils.java
@@ -55,4 +55,4 @@ public class FileUtils
}
return null;
}
-}
+}
\ No newline at end of file
diff --git a/src/de/bricked/utils/MathUtils.java b/src/de/bricked/utils/MathUtils.java
deleted file mode 100644
index 735a1b2..0000000
--- a/src/de/bricked/utils/MathUtils.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package de.bricked.utils;
-
-import javafx.geometry.Point2D;
-
-public class MathUtils
-{
- public static double getAngle(Point2D a, Point2D b)
- {
-// double angle = Math.toDegrees(Math.atan2(b.getY(), b.getX()) - Math.atan2(a.getY(), a.getX()));
- return Math.toDegrees(Math.acos(a.dotProduct(b) / (a.magnitude() * b.magnitude())));
- }
- public static Point2D normalize(Point2D direction)
- {
- double length = Math.sqrt(direction.getX() * direction.getX() + direction.getY() * direction.getY());
- double newX = direction.getX() / length;
- double newY = direction.getY() / length;
- return new Point2D(newX, newY);
- }
-}
\ No newline at end of file
diff --git a/src/de/brickedleveleditor/ui/controller/LevelPackDialogController.java b/src/de/brickedleveleditor/ui/controller/LevelPackDialogController.java
index 1ced35c..9f32ef6 100644
--- a/src/de/brickedleveleditor/ui/controller/LevelPackDialogController.java
+++ b/src/de/brickedleveleditor/ui/controller/LevelPackDialogController.java
@@ -2,12 +2,12 @@ package de.brickedleveleditor.ui.controller;
import de.bricked.game.paddle.PaddleSize;
-import de.brickedleveleditor.utils.AlertGenerator;
import javafx.fxml.FXML;
import javafx.scene.control.Alert;
import javafx.scene.control.ComboBox;
import javafx.scene.control.Spinner;
import javafx.scene.control.TextField;
+import tools.AlertGenerator;
public class LevelPackDialogController extends AbstractController
{
diff --git a/src/de/brickedleveleditor/utils/AlertGenerator.java b/src/de/brickedleveleditor/utils/AlertGenerator.java
deleted file mode 100644
index fa58b2a..0000000
--- a/src/de/brickedleveleditor/utils/AlertGenerator.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package de.brickedleveleditor.utils;
-
-import javafx.scene.control.Alert;
-import javafx.scene.control.Alert.AlertType;
-import javafx.scene.image.Image;
-import javafx.stage.Stage;
-
-public class AlertGenerator
-{
- public static void showAlert(AlertType type, String contentText, Image icon)
- {
- show(type, type.name(), "", contentText, icon, true);
- }
-
- public static void showAlert(AlertType type, String title, String headerText, String contentText, Image icon, boolean centerOnScreen)
- {
- show(type, title, headerText, contentText, icon, centerOnScreen);
- }
-
- private static void show(AlertType type, String title, String headerText, String contentText, Image icon, boolean centerOnScreen)
- {
- Alert alert = new Alert(type);
- alert.setTitle(title);
- alert.setHeaderText(headerText);
- alert.setContentText(contentText);
- Stage dialogStage = (Stage) alert.getDialogPane().getScene().getWindow();
- if(icon != null)
- {
- dialogStage.getIcons().add(icon);
- }
- if (centerOnScreen)
- {
- dialogStage.centerOnScreen();
- }
- alert.showAndWait();
- }
-}
\ No newline at end of file
--
GitLab