[client] Update virtualizer download link

4 files changed, 2 insertions, 148 deletions

diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/MainWindow.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/MainWindow.java
index 70270ff0..6a9997d9 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/MainWindow.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/MainWindow.java
@@ -62,7 +62,6 @@ import org.openslx.dozmod.gui.window.LectureListWindow;
 import org.openslx.dozmod.gui.window.LoginWindow;
 import org.openslx.dozmod.gui.window.MainMenuWindow;
 import org.openslx.dozmod.gui.window.PrivacyNoticeWindow;
-import org.openslx.dozmod.gui.window.VirtualizerNoticeWindow;
 import org.openslx.dozmod.state.UploadWizardState;
 import org.openslx.dozmod.thrift.GuiErrorCallback;
 import org.openslx.dozmod.thrift.Session;
@@ -539,7 +538,7 @@ public abstract class MainWindow {
 		virtualizerNoticeItem.addActionListener(new ActionListener() {
 			@Override
 			public void actionPerformed(ActionEvent e) {
-				VirtualizerNoticeWindow.open(mainWindow);
+				DesktopEnvironment.openWebpage(Link.VMWARE);
 			}
 		});
 
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/VirtualizerNoticeWindow.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/VirtualizerNoticeWindow.java
deleted file mode 100644
index 8da88314..00000000
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/VirtualizerNoticeWindow.java
+++ /dev/null
@@ -1,66 +0,0 @@
-package org.openslx.dozmod.gui.window;
-
-import java.awt.Frame;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.awt.event.WindowAdapter;
-import java.awt.event.WindowEvent;
-
-import javax.swing.JFrame;
-
-import org.apache.log4j.Logger;
-import org.openslx.dozmod.Config;
-import org.openslx.dozmod.gui.helper.UiFeedback;
-import org.openslx.dozmod.gui.window.layout.VirtualizerNoticeWindowLayout;
-import org.openslx.dozmod.util.DesktopEnvironment;
-import org.openslx.dozmod.util.DesktopEnvironment.Link;
-
-@SuppressWarnings("serial")
-public class VirtualizerNoticeWindow extends VirtualizerNoticeWindowLayout implements UiFeedback {
-
-	private final static Logger LOGGER = Logger.getLogger(VirtualizerNoticeWindow.class);
-
-	public VirtualizerNoticeWindow(Frame modalParent) {
-		super(modalParent);
-
-		final VirtualizerNoticeWindow me = this;
-		setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);
-
-		// function for close button
-		btnClose.addActionListener(new ActionListener() {
-			@Override
-			public void actionPerformed(ActionEvent e) {
-				Config.setVirtualizerRead(true);
-				me.dispose();
-			}
-		});
-
-		this.addWindowListener(new WindowAdapter() {
-			@Override
-			public void windowClosing(WindowEvent e) {
-				Config.setVirtualizerRead(true);
-			}
-		});
-
-		btnDownload.addActionListener(new ActionListener() {
-			@Override
-			public void actionPerformed(ActionEvent e) {
-				DesktopEnvironment.openWebpage(Link.VMWARE);
-			}
-		});
-	}
-
-	public static void open(Frame modalParent) {
-		new VirtualizerNoticeWindow(modalParent).setVisible(true);
-	}
-
-	@Override
-	public boolean wantConfirmQuit() {
-		return false;
-	}
-
-	@Override
-	public void escapePressed() {
-		dispose();
-	}
-}
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/VirtualizerNoticeWindowLayout.java b/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/VirtualizerNoticeWindowLayout.java
deleted file mode 100644
index 8509eee6..00000000
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/gui/window/layout/VirtualizerNoticeWindowLayout.java
+++ /dev/null
@@ -1,79 +0,0 @@
-package org.openslx.dozmod.gui.window.layout;
-
-import java.awt.Dimension;
-import java.awt.Frame;
-
-import javax.swing.BorderFactory;
-import javax.swing.Box;
-import javax.swing.BoxLayout;
-import javax.swing.JButton;
-import javax.swing.JDialog;
-import javax.swing.JLabel;
-import javax.swing.JPanel;
-
-import org.openslx.dozmod.Branding;
-import org.openslx.dozmod.gui.Gui;
-import org.openslx.dozmod.gui.helper.GridManager;
-
-@SuppressWarnings("serial")
-public abstract class VirtualizerNoticeWindowLayout extends JDialog {
-	private static final String title = "Hinweis VMWare Player";
-	private static final String infoText = "<html><body style='width:100%'>"
-			+ "Für die Arbeit mit der " + Branding.getApplicationName() + " wird zwingend der <b>VMWare Player</b> benötigt. "
-			+ "Diesen können Sie sich unter folgendem Link kostenfrei herunterladen. "
-			+ "Wenn Sie bereits den VMWare Player oder die VMWare Workstation installiert haben, können Sie diesen Hinweis ignorieren."
-			+ "</body></html>";
-
-	//	protected JButton windowsDLButton;
-	protected final JButton btnDownload;
-	protected final JButton btnClose;
-
-	public VirtualizerNoticeWindowLayout(Frame modalParent) {
-		super(modalParent, title, modalParent != null ? ModalityType.APPLICATION_MODAL
-				: ModalityType.MODELESS);
-
-		JPanel contentPanel = new JPanel();
-		contentPanel.setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 5));
-		add(contentPanel);
-
-		GridManager grid = new GridManager(contentPanel, 1);
-
-		JPanel infoPane = new JPanel();
-		infoPane.setLayout(new BoxLayout(infoPane, BoxLayout.PAGE_AXIS));
-
-		// infotext
-		JLabel infoLabel = new JLabel(infoText);
-		infoLabel.setBorder(BorderFactory.createTitledBorder("Hinweis"));
-		infoPane.add(infoLabel);
-
-		// Spacing
-		infoPane.add(Box.createRigidArea(new Dimension(0, 10)));
-
-		// Download buttons
-		btnDownload = new JButton("VMWare Player herunterladen");
-		infoPane.add(btnDownload);
-
-		// Bottom controls
-		JPanel bottomPane = new JPanel();
-		bottomPane.setLayout(new BoxLayout(bottomPane, BoxLayout.LINE_AXIS));
-
-		bottomPane.add(Box.createHorizontalGlue());
-
-		btnClose = new JButton("Schließen");
-		bottomPane.add(btnClose);
-
-		grid.add(infoPane).fill(true, true).expand(true, true);
-		grid.nextRow();
-		grid.skip().fill(true, true).expand(true, true);
-		grid.nextRow();
-		grid.add(bottomPane).fill(true, false).expand(true, false);
-		grid.nextRow();
-		grid.finish(false);
-
-		// Scale window with font
-		setMinimumSize(Gui.getScaledDimension(600, 250));
-		setLocationRelativeTo(modalParent);
-		validate();
-	}
-
-}
diff --git a/dozentenmodul/src/main/java/org/openslx/dozmod/util/DesktopEnvironment.java b/dozentenmodul/src/main/java/org/openslx/dozmod/util/DesktopEnvironment.java
index f08ef14b..81125f62 100644
--- a/dozentenmodul/src/main/java/org/openslx/dozmod/util/DesktopEnvironment.java
+++ b/dozentenmodul/src/main/java/org/openslx/dozmod/util/DesktopEnvironment.java
@@ -21,7 +21,7 @@ public class DesktopEnvironment {
 	private static final Desktop desktop = Desktop.isDesktopSupported() ? Desktop.getDesktop() : null;
 	public static enum Link {
 		FAQ(Branding.getServiceFAQWebsite()),
-		VMWARE("https://my.vmware.com/web/vmware/free#desktop_end_user_computing/vmware_workstation_player/12_0"),
+		VMWARE("https://www.bwlehrpool.de/doku.php/allgemein/virtualisierer"),
 		//INTRO("http://www.hs-offenburg.de/fileadmin/Einrichtungen/hrz/Projekte/bwLehrpool/3_bwLehrpool_-_Image_einbinden_und_starten.pdf"),
 		DOZMOD("https://" + App.getMasterServerAddress() + "/dozmod/"),
 		REGISTER_BWIDM("https://" + App.getMasterServerAddress() + "/webif/");