diff options
Diffstat (limited to 'dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard')
9 files changed, 27 insertions, 18 deletions
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/ImageCreationWizard.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/ImageCreationWizard.java index 885e40f7..11d3846a 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/ImageCreationWizard.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/ImageCreationWizard.java @@ -1,6 +1,7 @@ package org.openslx.dozmod.gui.wizard; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.apache.thrift.TException; import org.openslx.bwlp.thrift.iface.ImageBaseWrite; import org.openslx.bwlp.thrift.iface.ImageVersionWrite; @@ -34,7 +35,7 @@ public class ImageCreationWizard extends Wizard implements UiFeedback, QuitNotif */ private static final long serialVersionUID = -353405234601306343L; - private final static Logger LOGGER = Logger.getLogger(ImageCreationWizard.class); + private final static Logger LOGGER = LogManager.getLogger(ImageCreationWizard.class); private final UploadWizardState state = new UploadWizardState(); diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/ImageUpdateWizard.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/ImageUpdateWizard.java index d05b02b5..a82801ac 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/ImageUpdateWizard.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/ImageUpdateWizard.java @@ -2,7 +2,8 @@ package org.openslx.dozmod.gui.wizard; import java.awt.Window; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.apache.thrift.TException; import org.openslx.bwlp.thrift.iface.ImageDetailsRead; import org.openslx.bwlp.thrift.iface.ImageVersionWrite; @@ -29,7 +30,7 @@ public class ImageUpdateWizard extends Wizard implements UiFeedback, QuitNotific */ private static final long serialVersionUID = -584900619809829672L; - private final static Logger LOGGER = Logger.getLogger(ImageCreationWizard.class); + private final static Logger LOGGER = LogManager.getLogger(ImageCreationWizard.class); private final UploadWizardState state = new UploadWizardState(); protected ImageUploadPage imageUploadPage; diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/LectureWizard.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/LectureWizard.java index 59c79a88..bd7c0aeb 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/LectureWizard.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/LectureWizard.java @@ -1,6 +1,7 @@ package org.openslx.dozmod.gui.wizard; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.openslx.bwlp.thrift.iface.ImageSummaryRead; import org.openslx.bwlp.thrift.iface.LectureWrite; import org.openslx.dozmod.gui.Gui; @@ -26,7 +27,7 @@ public class LectureWizard extends Wizard implements UiFeedback { */ private static final long serialVersionUID = -7447355922540362345L; - private final static Logger LOGGER = Logger.getLogger(LectureWizard.class); + private final static Logger LOGGER = LogManager.getLogger(LectureWizard.class); public final LectureWizardState state = new LectureWizardState(); diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ContainerUploadPage.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ContainerUploadPage.java index 940531c6..389e4005 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ContainerUploadPage.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ContainerUploadPage.java @@ -1,7 +1,8 @@ package org.openslx.dozmod.gui.wizard.page; import org.apache.commons.io.FileUtils; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.openslx.bwlp.thrift.iface.ImageDetailsRead; import org.openslx.dozmod.Config; import org.openslx.dozmod.gui.Gui; @@ -40,7 +41,7 @@ public class ContainerUploadPage extends ContainerUploadPageLayout { */ private static final long serialVersionUID = 2564301984375080698L; - private final Logger LOGGER = Logger.getLogger(ContainerUploadPage.class); + private final Logger LOGGER = LogManager.getLogger(ContainerUploadPage.class); private final UploadWizardState state; private final ImageDetailsRead existingImage; diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageCustomPermissionPage.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageCustomPermissionPage.java index 3a40cb35..8895ebbb 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageCustomPermissionPage.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageCustomPermissionPage.java @@ -2,7 +2,8 @@ package org.openslx.dozmod.gui.wizard.page; import java.util.Map; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.openslx.bwlp.thrift.iface.ImagePermissions; import org.openslx.dozmod.gui.wizard.Wizard; import org.openslx.dozmod.gui.wizard.layout.ImageCustomPermissionPageLayout; @@ -16,7 +17,7 @@ public class ImageCustomPermissionPage extends ImageCustomPermissionPageLayout { */ private static final long serialVersionUID = -8809873730069813731L; - private final static Logger LOGGER = Logger.getLogger(ImageCustomPermissionPage.class); + private final static Logger LOGGER = LogManager.getLogger(ImageCustomPermissionPage.class); private boolean initDone = false; diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageOvfConversionPage.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageOvfConversionPage.java index 8caa4c51..ed3df849 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageOvfConversionPage.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageOvfConversionPage.java @@ -14,7 +14,8 @@ import javax.swing.JOptionPane; import org.apache.commons.io.FileUtils; import org.apache.commons.io.FilenameUtils; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.openslx.dozmod.Config; import org.openslx.dozmod.gui.Gui; import org.openslx.dozmod.gui.helper.I18n; @@ -36,7 +37,7 @@ public class ImageOvfConversionPage extends ImageOvfConversionPageLayout { */ private static final long serialVersionUID = 464428060782110490L; - private final static Logger LOGGER = Logger.getLogger(ImageOvfConversionPage.class); + private final static Logger LOGGER = LogManager.getLogger(ImageOvfConversionPage.class); private UploadWizardState state; private ImageOvfConversionPage page; diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageUploadPage.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageUploadPage.java index 1d7f5821..d0b491e3 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageUploadPage.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageUploadPage.java @@ -16,7 +16,8 @@ import javax.swing.JOptionPane; import javax.swing.filechooser.FileNameExtensionFilter; import org.apache.commons.io.FilenameUtils; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.openslx.bwlp.thrift.iface.ImageDetailsRead; import org.openslx.bwlp.thrift.iface.Virtualizer; import org.openslx.dozmod.Branding; @@ -58,7 +59,7 @@ public class ImageUploadPage extends ImageUploadPageLayout { */ private static final long serialVersionUID = -2974001512014608455L; - private final static Logger LOGGER = Logger.getLogger(ImageUploadPage.class); + private final static Logger LOGGER = LogManager.getLogger(ImageUploadPage.class); private UploadWizardState state; private String lastDetectedName = null; diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageUploadSummaryPage.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageUploadSummaryPage.java index fdd52efb..7f310f3b 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageUploadSummaryPage.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/ImageUploadSummaryPage.java @@ -3,7 +3,8 @@ package org.openslx.dozmod.gui.wizard.page; import java.awt.KeyboardFocusManager; import java.awt.Window; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.openslx.bwlp.thrift.iface.ImageSummaryRead; import org.openslx.bwlp.thrift.iface.TransferState; import org.openslx.dozmod.Branding; @@ -27,7 +28,7 @@ public class ImageUploadSummaryPage extends ImageUploadSummaryPageLayout { */ private static final long serialVersionUID = -319910198640112507L; - private static final Logger LOGGER = Logger.getLogger(ImageUploadSummaryPage.class); + private static final Logger LOGGER = LogManager.getLogger(ImageUploadSummaryPage.class); private boolean pageIsVisible = false; private boolean uploadListenerAdded = false; diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/LectureCustomPermissionPage.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/LectureCustomPermissionPage.java index bcaa773e..8e82d6bf 100644 --- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/LectureCustomPermissionPage.java +++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/wizard/page/LectureCustomPermissionPage.java @@ -2,7 +2,8 @@ package org.openslx.dozmod.gui.wizard.page; import java.util.Map; -import org.apache.log4j.Logger; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.openslx.bwlp.thrift.iface.LecturePermissions; import org.openslx.dozmod.gui.wizard.Wizard; import org.openslx.dozmod.gui.wizard.layout.LectureCustomPermissionPageLayout; @@ -19,7 +20,7 @@ public class LectureCustomPermissionPage extends LectureCustomPermissionPageLayo */ private static final long serialVersionUID = 8593836578573838805L; - private final static Logger LOGGER = Logger.getLogger(LectureCustomPermissionPage.class); + private final static Logger LOGGER = LogManager.getLogger(LectureCustomPermissionPage.class); private boolean initDone = false; |