diff options
Diffstat (limited to 'dozentenmodul/src/main/java/org/openslx/dozmod/gui/window')
7 files changed, 21 insertions, 7 deletions
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/VirtConfigEditorWindow.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/VirtConfigEditorWindow.java index 542b278e..a1a28d96 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/VirtConfigEditorWindow.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/VirtConfigEditorWindow.java @@ -96,6 +96,7 @@ public class VirtConfigEditorWindow extends VirtConfigEditorWindowLayout impleme } if (metaCandidate == null) { dispose(); + return; } byte[] uiBytesFiltered = metaCandidate.getDefinitionArray(); diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/VirtDropDownConfigEditorWindow.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/VirtDropDownConfigEditorWindow.java index 5266e157..6dba2a08 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/VirtDropDownConfigEditorWindow.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/VirtDropDownConfigEditorWindow.java @@ -56,12 +56,15 @@ public class VirtDropDownConfigEditorWindow extends VirtDropDownConfigEditorWind } catch (IOException e) { LOGGER.error("Could not get VmMetaData instance from given machine description: ", e); } + + meta = metaCandidate; + if (metaCandidate == null) { + this.originalMachineDescription = null; dispose(); + return; } - meta = metaCandidate; - initializeSoundBox(meta.getSupportedSoundCards()); initializeDDABox(meta.getSupportedDDAccs()); initializeHWVersBox(meta.getSupportedHWVersions()); diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/CheckUpdateWindowLayout.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/CheckUpdateWindowLayout.java index 9c20e88c..8667c944 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/CheckUpdateWindowLayout.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/CheckUpdateWindowLayout.java @@ -84,6 +84,8 @@ public abstract class CheckUpdateWindowLayout extends JDialog { add(buttonPanel, BorderLayout.PAGE_END); pack(); - Gui.centerShellOverShell(modalParent, this); + if (modalParent != null) { + Gui.centerShellOverShell(modalParent, this); + } } } diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/GenericNoticeWindowLayout.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/GenericNoticeWindowLayout.java index 56713dd5..022950d1 100755 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/GenericNoticeWindowLayout.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/GenericNoticeWindowLayout.java @@ -82,7 +82,9 @@ public abstract class GenericNoticeWindowLayout extends JDialog { grid.finish(false); pack(); - Gui.centerShellOverShell(modalParent, this); + if (modalParent != null) { + Gui.centerShellOverShell(modalParent, this); + } } public void setNoticeText(String text) { diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/LocationSelectionWindowLayout.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/LocationSelectionWindowLayout.java index 4ddf25e8..f8640c19 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/LocationSelectionWindowLayout.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/LocationSelectionWindowLayout.java @@ -59,6 +59,8 @@ public class LocationSelectionWindowLayout extends JDialog { grid.finish(false); setPreferredSize(Gui.getScaledDimension(550, 500)); pack(); - Gui.centerShellOverShell(modalParent, this); + if (modalParent != null) { + Gui.centerShellOverShell(modalParent, this); + } } } diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/VirtConfigEditorWindowLayout.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/VirtConfigEditorWindowLayout.java index af06b5fe..c8cc7f62 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/VirtConfigEditorWindowLayout.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/VirtConfigEditorWindowLayout.java @@ -58,6 +58,8 @@ public class VirtConfigEditorWindowLayout extends JDialog { setPreferredSize(Gui.getScaledDimension(650, 750)); setMinimumSize(Gui.getScaledDimension(550, 650)); - Gui.centerShellOverShell(modalParent, this); + if (modalParent != null) { + Gui.centerShellOverShell(modalParent, this); + } } } diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/VirtDropDownConfigEditorWindowLayout.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/VirtDropDownConfigEditorWindowLayout.java index 28dd5e4e..a73bb60e 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/VirtDropDownConfigEditorWindowLayout.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/VirtDropDownConfigEditorWindowLayout.java @@ -135,7 +135,9 @@ public class VirtDropDownConfigEditorWindowLayout extends JDialog { setPreferredSize(Gui.getScaledDimension(600, 400)); setMinimumSize(Gui.getScaledDimension(450, 350)); - Gui.centerShellOverShell(modalParent, this); + if (modalParent != null) { + Gui.centerShellOverShell(modalParent, this); + } } // SoundBox |