diff options
Diffstat (limited to 'dozentenmodul/src/main/java')
| -rw-r--r-- | dozentenmodul/src/main/java/gui/intro/Login_GUI.java | 2 | ||||
| -rw-r--r-- | dozentenmodul/src/main/java/util/GuiManager.java | 4 |
2 files changed, 1 insertions, 5 deletions
diff --git a/dozentenmodul/src/main/java/gui/intro/Login_GUI.java b/dozentenmodul/src/main/java/gui/intro/Login_GUI.java index fb46335a..8cb8b3ca 100644 --- a/dozentenmodul/src/main/java/gui/intro/Login_GUI.java +++ b/dozentenmodul/src/main/java/gui/intro/Login_GUI.java @@ -605,8 +605,6 @@ public class Login_GUI extends JInternalFrame { // if not then request it from the masterserver List<OrganizationData> tempOrgs = null; try { - if (ThriftManager.getMasterClient() == null) LOGGER.error("DERP"); - tempOrgs = ThriftManager.getMasterClient().getOrganizations(); } catch (TException e) { LOGGER.error("Could not fetch list of identity providers from the masterserver, see trace: ", e); diff --git a/dozentenmodul/src/main/java/util/GuiManager.java b/dozentenmodul/src/main/java/util/GuiManager.java index a2c4cd1f..32a52cea 100644 --- a/dozentenmodul/src/main/java/util/GuiManager.java +++ b/dozentenmodul/src/main/java/util/GuiManager.java @@ -175,15 +175,13 @@ public abstract class GuiManager { } catch (NoSuchFieldException e) { // only this case if interesting for us, // since we now we don't have a help message to show - LOGGER.debug("No 'HELP_MESSAGE' defined in class: " + currentFrame.getClass().getName()); - return true; + return false; } catch (IllegalArgumentException|IllegalAccessException|SecurityException e) { LOGGER.error("Failed to check for 'HELP_MESSAGE' variable in '" + currentFrame.getClass() + "' class, see trace: " + e); // just do nothing } // print it for debugging purposes - LOGGER.debug("HELP_MESSAGE of '" + currentFrame.getClass().getName() + "': " + test); // still here? means we have a HELP_MESSAGE to display JMenu mnNewMenu_Info = new JMenu("Info"); mnNewMenu_Info.addMouseListener(new MouseAdapter() { |