diff options
| author | Simon Rettberg | 2015-07-09 12:36:37 +0200 |
|---|---|---|
| committer | Simon Rettberg | 2015-07-09 12:36:37 +0200 |
| commit | 06b5236c58dde31bbc910a644aa2c676197ca2a8 (patch) | |
| tree | 9b94b474cf34e25b73a5d092b945dd37e0973977 /dozentenmodul/src/main/java/org/openslx/dozmod/gui/helper/MessageType.java | |
| parent | [client] Clean up login, implement showMessageBox, fix formatting (diff) | |
| parent | [client] GuiManager.openPopup first steps (diff) | |
| download | tutor-module-06b5236c58dde31bbc910a644aa2c676197ca2a8.tar.gz tutor-module-06b5236c58dde31bbc910a644aa2c676197ca2a8.tar.xz tutor-module-06b5236c58dde31bbc910a644aa2c676197ca2a8.zip | |
Merge branch 'v1.1' of git.openslx.org:openslx-ng/tutor-module into v1.1
Conflicts:
dozentenmodul/src/main/java/org/openslx/dozmod/authentication/EcpAuthenticator.java
dozentenmodul/src/main/java/org/openslx/dozmod/gui/helper/GuiManager.java
dozentenmodul/src/main/java/org/openslx/dozmod/gui/helper/MessageType.java
dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/LoginWindow.java
(Hopefully resolved)
Diffstat (limited to 'dozentenmodul/src/main/java/org/openslx/dozmod/gui/helper/MessageType.java')
| -rw-r--r-- | dozentenmodul/src/main/java/org/openslx/dozmod/gui/helper/MessageType.java | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/helper/MessageType.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/helper/MessageType.java index a5dc8b7b..9c2ae0b7 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/helper/MessageType.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/helper/MessageType.java @@ -1,20 +1,19 @@ package org.openslx.dozmod.gui.helper; -import org.apache.log4j.Priority; +import org.apache.log4j.Level; import org.eclipse.swt.SWT; -@SuppressWarnings("deprecation") public enum MessageType { - DEBUG(SWT.ICON_INFORMATION, "Debug", Priority.DEBUG), - INFO(SWT.ICON_INFORMATION, "Hinweis", Priority.INFO), - WARNING(SWT.ICON_WARNING, "Warnung", Priority.WARN), - ERROR(SWT.ICON_ERROR, "Fehler", Priority.ERROR); + DEBUG(SWT.ICON_INFORMATION, "Debug", Level.DEBUG), + INFO(SWT.ICON_INFORMATION, "Hinweis", Level.INFO), + WARNING(SWT.ICON_WARNING, "Warnung", Level.WARN), + ERROR(SWT.ICON_ERROR, "Fehler", Level.ERROR); public final String title; public final int style; - public final Priority logPriority; + public final Level logPriority; - private MessageType(int style, String title, Priority prio) { + private MessageType(int style, String title, Level prio) { this.title = title; this.style = style; this.logPriority = prio; |