[client] added style as parameter to showMessage of GuiManager

3 files changed, 9 insertions, 23 deletions

diff --git a/dozentenmodul/src/main/java/gui/core/DisclaimerComposite.java b/dozentenmodul/src/main/java/gui/core/DisclaimerComposite.java
index 15f21754..c4d48a60 100644
--- a/dozentenmodul/src/main/java/gui/core/DisclaimerComposite.java
+++ b/dozentenmodul/src/main/java/gui/core/DisclaimerComposite.java
@@ -1,11 +1,6 @@
 package gui.core;
 
-import gui.GuiManager;
-
-import org.apache.log4j.Logger;
 import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Button;
@@ -18,8 +13,6 @@ import org.eclipse.swt.widgets.Text;
 
 public class DisclaimerComposite extends Composite {
 	
-	private final static Logger LOGGER = Logger.getLogger(DisclaimerComposite.class);
-	
 	private final String notice = "Bitte lesen und bestätigen Sie folgende rechtliche Hinweise";
 	private final String disclaimer = "Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. \n\n"
 			+ "Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi. Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. \n\n"
diff --git a/dozentenmodul/src/main/java/gui/core/LoginComposite.java b/dozentenmodul/src/main/java/gui/core/LoginComposite.java
index ad95b9f8..d4266adb 100644
--- a/dozentenmodul/src/main/java/gui/core/LoginComposite.java
+++ b/dozentenmodul/src/main/java/gui/core/LoginComposite.java
@@ -2,7 +2,6 @@ package gui.core;
 
 import gui.GuiManager;
 
-import org.apache.log4j.Logger;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.graphics.ImageData;
@@ -15,14 +14,9 @@ import org.eclipse.swt.widgets.Group;
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.swt.widgets.Text;
-import org.openslx.bwlp.thrift.iface.ImageSummaryRead;
-
-import config.Config;
 
 public class LoginComposite extends Composite {
 
-	private final static Logger LOGGER = Logger.getLogger(LoginComposite.class);
-
 	// TODO add ids to use for the authButtons group!
 	protected static enum LOGIN_TYPE {
 		BWIDM(0, "bwidm"),
@@ -66,7 +60,7 @@ public class LoginComposite extends Composite {
 	protected final Button saveUsernameCheck;
 	protected final Button[] authButtons;
 
-	private static final String title = "Dozmod - Login";
+	private static final String title = "bwSuite - Login";
 	private static final String authenticationGroupLabel = "Authentifizierungsart";
 
 	/**
@@ -174,5 +168,4 @@ public class LoginComposite extends Composite {
 			System.out.println(e.getMessage());
 		}
 	}
-
 }
diff --git a/dozentenmodul/src/main/java/gui/core/LoginGUI.java b/dozentenmodul/src/main/java/gui/core/LoginGUI.java
index 321942d5..795ccc4b 100644
--- a/dozentenmodul/src/main/java/gui/core/LoginGUI.java
+++ b/dozentenmodul/src/main/java/gui/core/LoginGUI.java
@@ -226,13 +226,13 @@ public class LoginGUI extends LoginComposite {
 		if (username == null) {
 			// tell the GUIManager to show an error to the user
 			// TODO either popup or in the bottom status bar
-			GuiManager.showMessage(NO_USERNAME);
+			GuiManager.showMessage(NO_USERNAME, SWT.ICON_ERROR);
 			return;
 		}
 		if (password == null) {
 			// tell the GUIManager to show an error to the user
 			// TODO either popup or in the bottom status bar
-			GuiManager.showMessage(NO_PASSWORD);
+			GuiManager.showMessage(NO_PASSWORD, SWT.ICON_ERROR);
 			return;
 		}
 
@@ -253,10 +253,10 @@ public class LoginGUI extends LoginComposite {
 						if (returnCode != ReturnCode.NO_ERROR && user == null) {
 							switch(returnCode) {
 							case IDP_ERROR:
-								GuiManager.showMessage("IdP Error");
+								GuiManager.showMessage("IdP Error", SWT.ICON_ERROR);
 								break;
 							default:
-								GuiManager.showMessage("Internal error!");
+								GuiManager.showMessage("Internal error!", SWT.ICON_ERROR);
 								break;
 							}
 						} else
@@ -265,7 +265,7 @@ public class LoginGUI extends LoginComposite {
 				});
 			} catch (TAuthenticationException e) {
 				//LOGGER.error("Authentication error, see trace: ", e);
-				GuiManager.showMessage(e.getMessage());
+				GuiManager.showMessage(e.getMessage(), SWT.ICON_ERROR);
 				return;
 			}
 			break;
@@ -279,18 +279,18 @@ public class LoginGUI extends LoginComposite {
 						// handle errors first
 						if (returnCode != ReturnCode.NO_ERROR && user == null) {
 							LOGGER.error("BWLP login failed.");
-							GuiManager.showMessage("Login failed!");
+							GuiManager.showMessage("Login failed!", SWT.ICON_ERROR);
 						}
 						if (returnCode == ReturnCode.NO_ERROR && user != null)
 							postSuccessfulLogin();
 					}
 				});
 			} catch (TAuthenticationException e) {
-				GuiManager.showMessage(e.getMessage());
+				GuiManager.showMessage(e.getMessage(), SWT.ICON_ERROR);
 			}
 			break;
 		case SAT:
-			LOGGER.info("sat");
+			LOGGER.warn("Direct satellite login is not yet supported.");
 			break;
 		default:
 			LOGGER.error("Unknown login type! Ignoring...");