GabrielTofvesson/TeamAvionLauncher
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Minor update

Browse Source 
- Fixed layout loading
This commit is contained in:
Gabriel Tofvesson 2016-12-22 16:02:53 +01:00
parent 480b268b3c
commit 35de96f275
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
libs/libRefTools.jar
View File

Binary file not shown.

2
src/Launcher/Main.java
View File

@ -191,7 +191,7 @@ public class Main extends Application {
Stage login = new Stage(); Stage login = new Stage();
login.initModality(Modality.APPLICATION_MODAL); login.initModality(Modality.APPLICATION_MODAL);
login.initStyle(StageStyle.UNDECORATED); login.initStyle(StageStyle.UNDECORATED);
Pane minecraftlogin = (Pane) Tabs.load("instance_userinfo"); Pane minecraftlogin = (Pane) Tabs.reloadTab("instance_userinfo");
login.setScene(new Scene(minecraftlogin, 300, 308)); login.setScene(new Scene(minecraftlogin, 300, 308));
login.show(); login.show();
login.setResizable(false); login.setResizable(false);

6
src/Launcher/Tabs.java
View File

@ -33,10 +33,10 @@ public class Tabs {
URL file = Main.class.getResource("/assets/layout/"+fileName); URL file = Main.class.getResource("/assets/layout/"+fileName);
try { try {
final boolean[] b = {false}; final boolean[] b = {false};
loaded.stream().filter(p -> p.getKey().equals(file)).forEach(p->b[0]=true); loaded.stream().filter(p ->p!=null && p.getKey().equals(file)).forEach(p->b[0]=true);
if(!b[0]) loaded.add(new Pair<>(file, FXMLLoader.load(file))); // Load file if it isn't already loaded if(!b[0]) loaded.add(new Pair<>(file, FXMLLoader.load(file))); // Load file if it isn't already loaded
final Node[] p1 = new Node[]{new Pane()}; final Node[] p1 = new Node[]{new Pane()};
loaded.stream().filter(p->p.getKey().equals(file)).forEach(p->p1[0]=p.getValue()); loaded.stream().filter(p->p!=null && p.getKey().equals(file)).forEach(p->p1[0]=p.getValue());
return p1[0]; return p1[0];
} catch (IOException e) { } catch (IOException e) {
e.printStackTrace(); e.printStackTrace();
@ -67,7 +67,7 @@ public class Tabs {
public static void unloadTab(String fileName){ public static void unloadTab(String fileName){
if(!fileName.endsWith(".fxml")) fileName+=".fxml"; if(!fileName.endsWith(".fxml")) fileName+=".fxml";
URL file = Main.class.getResource("/assets/layout/"+fileName); URL file = Main.class.getResource("/assets/layout/"+fileName);
loaded.stream().filter(p->p.getKey().equals(file)).forEach(loaded::remove); loaded.stream().filter(p->p!=null && p.getKey().equals(file)).forEach(loaded::remove);
} }
/** /**