Alle GUIs für das bauen einer VL auf Basis einer Rohling sind fertig.

Nun muss noch die DB Anbindung implementiert werden

27 files changed, 186 insertions, 347 deletions

diff --git a/Dozentenmodul/.classpath b/Dozentenmodul/.classpath
index 541f3b73..d4f76ea8 100644
--- a/Dozentenmodul/.classpath
+++ b/Dozentenmodul/.classpath
@@ -8,5 +8,8 @@
 	<classpathentry kind="lib" path="C:/Users/tspitzer/Downloads/org.eclipse.equinox.common_3.3.0.v20070426.jar"/>

 	<classpathentry kind="lib" path="C:/Users/tspitzer/Downloads/swt-3.6.1-win32-win32-x86_64/swt.jar"/>

 	<classpathentry kind="lib" path="C:/Users/tspitzer/Downloads/org.eclipse.core.commands.jar/org.eclipse.core.commands.jar"/>

+	<classpathentry kind="lib" path="C:/Users/tspitzer/Downloads/wizard-0.998.1.jar/wizard-0.998.1.jar"/>

+	<classpathentry kind="lib" path="C:/Users/tspitzer/Downloads/jcalendar-1.4/lib/jcalendar-1.4.jar"/>

+	<classpathentry kind="lib" path="C:/Users/tspitzer/Downloads/mysql-connector-java-5.1.25/mysql-connector-java-5.1.25/mysql-connector-java-5.1.25-bin.jar"/>

 	<classpathentry kind="output" path="bin"/>

 </classpath>

diff --git a/Dozentenmodul/bin/GUI/ActionChooser$1.class b/Dozentenmodul/bin/GUI/ActionChooser$1.class
index 1cd29f88..0b78be44 100644
--- a/Dozentenmodul/bin/GUI/ActionChooser$1.class
+++ b/Dozentenmodul/bin/GUI/ActionChooser$1.class
diff --git a/Dozentenmodul/bin/GUI/ActionChooser$2.class b/Dozentenmodul/bin/GUI/ActionChooser$2.class
deleted file mode 100644
index d3a41875..00000000
--- a/Dozentenmodul/bin/GUI/ActionChooser$2.class
+++ /dev/null
diff --git a/Dozentenmodul/bin/GUI/ActionChooser$3.class b/Dozentenmodul/bin/GUI/ActionChooser$3.class
deleted file mode 100644
index 7fc9492d..00000000
--- a/Dozentenmodul/bin/GUI/ActionChooser$3.class
+++ /dev/null
diff --git a/Dozentenmodul/bin/GUI/ActionChooser$4.class b/Dozentenmodul/bin/GUI/ActionChooser$4.class
deleted file mode 100644
index e5b185f3..00000000
--- a/Dozentenmodul/bin/GUI/ActionChooser$4.class
+++ /dev/null
diff --git a/Dozentenmodul/bin/GUI/ActionChooser$5.class b/Dozentenmodul/bin/GUI/ActionChooser$5.class
deleted file mode 100644
index b6bc1233..00000000
--- a/Dozentenmodul/bin/GUI/ActionChooser$5.class
+++ /dev/null
diff --git a/Dozentenmodul/bin/GUI/ActionChooser$6.class b/Dozentenmodul/bin/GUI/ActionChooser$6.class
deleted file mode 100644
index ac3c008e..00000000
--- a/Dozentenmodul/bin/GUI/ActionChooser$6.class
+++ /dev/null
diff --git a/Dozentenmodul/bin/GUI/ActionChooser.class b/Dozentenmodul/bin/GUI/ActionChooser.class
index aa822d81..81f01294 100644
--- a/Dozentenmodul/bin/GUI/ActionChooser.class
+++ b/Dozentenmodul/bin/GUI/ActionChooser.class
diff --git a/Dozentenmodul/bin/GUI/Downloader$1.class b/Dozentenmodul/bin/GUI/Downloader$1.class
deleted file mode 100644
index 34be7f9e..00000000
--- a/Dozentenmodul/bin/GUI/Downloader$1.class
+++ /dev/null
diff --git a/Dozentenmodul/bin/GUI/Downloader$2.class b/Dozentenmodul/bin/GUI/Downloader$2.class
deleted file mode 100644
index a98dcef1..00000000
--- a/Dozentenmodul/bin/GUI/Downloader$2.class
+++ /dev/null
diff --git a/Dozentenmodul/bin/GUI/Downloader.class b/Dozentenmodul/bin/GUI/Downloader.class
deleted file mode 100644
index 6978c32f..00000000
--- a/Dozentenmodul/bin/GUI/Downloader.class
+++ /dev/null
diff --git a/Dozentenmodul/bin/GUI/LoginWindow$1.class b/Dozentenmodul/bin/GUI/LoginWindow$1.class
index a6974007..0221e712 100644
--- a/Dozentenmodul/bin/GUI/LoginWindow$1.class
+++ b/Dozentenmodul/bin/GUI/LoginWindow$1.class
diff --git a/Dozentenmodul/bin/GUI/LoginWindow$2.class b/Dozentenmodul/bin/GUI/LoginWindow$2.class
index cd7a76bf..1e61e1a8 100644
--- a/Dozentenmodul/bin/GUI/LoginWindow$2.class
+++ b/Dozentenmodul/bin/GUI/LoginWindow$2.class
diff --git a/Dozentenmodul/bin/GUI/LoginWindow.class b/Dozentenmodul/bin/GUI/LoginWindow.class
index 299d7f9b..7fcf5883 100644
--- a/Dozentenmodul/bin/GUI/LoginWindow.class
+++ b/Dozentenmodul/bin/GUI/LoginWindow.class
diff --git a/Dozentenmodul/bin/Wizard/newVLRohlingWizard.class b/Dozentenmodul/bin/Wizard/newVLRohlingWizard.class
index 23e79afd..065b7347 100644
--- a/Dozentenmodul/bin/Wizard/newVLRohlingWizard.class
+++ b/Dozentenmodul/bin/Wizard/newVLRohlingWizard.class
diff --git a/Dozentenmodul/bin/Wizard/searchRohlingPage$1.class b/Dozentenmodul/bin/Wizard/searchRohlingPage$1.class
index d9efce5f..f9bc440c 100644
--- a/Dozentenmodul/bin/Wizard/searchRohlingPage$1.class
+++ b/Dozentenmodul/bin/Wizard/searchRohlingPage$1.class
diff --git a/Dozentenmodul/bin/Wizard/searchRohlingPage$2.class b/Dozentenmodul/bin/Wizard/searchRohlingPage$2.class
index 914962cb..72510512 100644
--- a/Dozentenmodul/bin/Wizard/searchRohlingPage$2.class
+++ b/Dozentenmodul/bin/Wizard/searchRohlingPage$2.class
diff --git a/Dozentenmodul/bin/Wizard/searchRohlingPage.class b/Dozentenmodul/bin/Wizard/searchRohlingPage.class
index 978c4620..e37ca2d9 100644
--- a/Dozentenmodul/bin/Wizard/searchRohlingPage.class
+++ b/Dozentenmodul/bin/Wizard/searchRohlingPage.class
diff --git a/Dozentenmodul/bin/auth/Ldap.class b/Dozentenmodul/bin/auth/Ldap.class
index fead9855..7e0c8587 100644
--- a/Dozentenmodul/bin/auth/Ldap.class
+++ b/Dozentenmodul/bin/auth/Ldap.class
diff --git a/Dozentenmodul/bin/ftp/ftp.class b/Dozentenmodul/bin/ftp/ftp.class
index 25a8280a..aa926232 100644
--- a/Dozentenmodul/bin/ftp/ftp.class
+++ b/Dozentenmodul/bin/ftp/ftp.class
diff --git a/Dozentenmodul/src/GUI/ActionChooser.java b/Dozentenmodul/src/GUI/ActionChooser.java
index 75fa232b..3b26438b 100644
--- a/Dozentenmodul/src/GUI/ActionChooser.java
+++ b/Dozentenmodul/src/GUI/ActionChooser.java
@@ -1,231 +1,150 @@
 package GUI;

 

-

-import java.awt.EventQueue;

-

-import javax.swing.JFrame;

+import java.awt.FlowLayout;

+import javax.swing.JButton;

+import javax.swing.JDialog;

 import javax.swing.JPanel;

-import javax.swing.border.EmptyBorder;

-import javax.swing.JMenuBar;

-import javax.swing.JMenu;

-import javax.swing.JMenuItem;

 import javax.swing.UIManager;

 import javax.swing.UnsupportedLookAndFeelException;

+import javax.swing.border.EmptyBorder;

 import java.awt.Color;

 import javax.swing.JLabel;

-import javax.swing.SwingConstants;

 import java.awt.Font;

-import javax.swing.JRadioButton;

-import javax.swing.GroupLayout;

-import javax.swing.GroupLayout.Alignment;

-import javax.swing.LayoutStyle.ComponentPlacement;

-import javax.swing.ButtonGroup;

-import javax.swing.JButton;

-

-

-import org.eclipse.jface.wizard.WizardDialog;

-import org.eclipse.swt.widgets.Display;

-

-import Wizard.newVLRohlingWizard;

-

+import javax.swing.JTextPane;

+import java.awt.SystemColor;

+import ftp.ftp;

 import java.awt.event.ActionListener;

 import java.awt.event.ActionEvent;

-import java.awt.Desktop;

-import java.io.IOException;

-import java.net.URI;

-import java.net.URISyntaxException;

+import javax.swing.JSeparator;

+import javax.swing.JRadioButton;

+import javax.swing.SwingConstants;

+import javax.swing.ButtonGroup;

 

 @SuppressWarnings("serial")

-public class ActionChooser extends JFrame {

+public class ActionChooser extends JDialog {

 

-	private JPanel contentPane;

+	private final JPanel contentPanel = new JPanel();

+	String[] result;

+	ftp f=new ftp();

+	JRadioButton radioButton_1;

 	private final ButtonGroup buttonGroup = new ButtonGroup();

-

 	/**

 	 * Launch the application.

 	 */

 	public static void main(String[] args) {

-		EventQueue.invokeLater(new Runnable() {

-			public void run() {

-				try {

-					ActionChooser frame = new ActionChooser();

-					frame.setVisible(true);

-				} catch (Exception e) {

-					e.printStackTrace();

-				}

-			}

-		});

+		try {

+			ActionChooser dialog = new ActionChooser();

+			dialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);

+			dialog.setVisible(true);

+		} catch (Exception e) {

+			e.printStackTrace();

+		}

 	}

 

 	/**

-	 * Create the frame.

+	 * Create the dialog.

 	 */

 	public ActionChooser() {

-		

-			//Setzt das Look and Feel auf System

-			try {

-				UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());

-			} catch (ClassNotFoundException | InstantiationException

-					| IllegalAccessException | UnsupportedLookAndFeelException e) {

-				// TODO Auto-generated catch block

-				e.printStackTrace();

-			}

-

+		try {

+			UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());

+		} catch (ClassNotFoundException | InstantiationException

+				| IllegalAccessException | UnsupportedLookAndFeelException e) {

+			// TODO Auto-generated catch block

+			e.printStackTrace();

+		}

 		setTitle("Dozentenmodul");

-		setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);

-		setBounds(100, 100, 450, 300);

-		

-		JMenuBar menuBar = new JMenuBar();

-		setJMenuBar(menuBar);

-		

-		JMenu mnSuche = new JMenu("Suche");

-		menuBar.add(mnSuche);

-		

-		JMenuItem mntmVlSuchen = new JMenuItem("VL suchen");

-		mntmVlSuchen.addActionListener(new ActionListener() {

-			public void actionPerformed(ActionEvent e) {

-				//tod

-			}

-		});

-

-		mnSuche.add(mntmVlSuchen);

-		

-		JMenu mnHilfe = new JMenu("Hilfe");

-		menuBar.add(mnHilfe);

-		

-		JMenuItem mntmNeuigkeiten = new JMenuItem("Neuigkeiten");

-		mntmNeuigkeiten.addActionListener(new ActionListener() {

-			public void actionPerformed(ActionEvent e) {

-				//todo

-			}

-		});

-		mnHilfe.add(mntmNeuigkeiten);

-		

-		JMenuItem mntmFaq = new JMenuItem("FAQ");

-		mntmFaq.addActionListener(new ActionListener() {

-			public void actionPerformed(ActionEvent e) {

-				//todo

+		setBounds(100, 100, 545, 341);

+		getContentPane().setLayout(null);

+		{

+			JPanel panel = new JPanel();

+			panel.setBounds(0, 0, 529, 80);

+			getContentPane().add(panel);

+			panel.setLayout(null);

+			{

+				JLabel lblNewLabel = new JLabel("Aktionswahl");

+				lblNewLabel.setBounds(10, 11, 509, 22);

+				panel.add(lblNewLabel);

+				lblNewLabel.setFont(new Font("Tahoma", Font.PLAIN, 18));

 			}

-		});

-		mnHilfe.add(mntmFaq);

-		

-		JMenuItem mntmTicketErstellen = new JMenuItem("Ticket erstellen");

-		mntmTicketErstellen.addActionListener(new ActionListener() {

-			public void actionPerformed(ActionEvent e) {

-				if(Desktop.isDesktopSupported()){

-					Desktop desk=Desktop.getDesktop();

-					if(desk.isSupported(Desktop.Action.BROWSE)){

-						try {

-							URI uri=new URI("https://otrs.rz.hs-offenburg.de/otrs/customer.pl");

-							try {

-								desk.browse(uri);

-							} catch (IOException e1) {

-								// TODO Auto-generated catch block

-								e1.printStackTrace();

-							}

-						} catch (URISyntaxException e1) {

-							// TODO Auto-generated catch block

-							e1.printStackTrace();

+			

+			JTextPane txtpnBitteWhlenSie = new JTextPane();

+			txtpnBitteWhlenSie.setEditable(false);

+			txtpnBitteWhlenSie.setBackground(SystemColor.menu);

+			txtpnBitteWhlenSie.setText("Bitte w\u00E4hlen Sie ihre gew\u00FCnschte Aktion");

+			txtpnBitteWhlenSie.setBounds(10, 36, 509, 42);

+			panel.add(txtpnBitteWhlenSie);

+		}

+		contentPanel.setBounds(10, 113, 509, 135);

+		contentPanel.setBackground(Color.WHITE);

+		contentPanel.setBorder(new EmptyBorder(5, 5, 5, 5));

+		getContentPane().add(contentPanel);

+		contentPanel.setLayout(null);

+		

+		JRadioButton radioButton = new JRadioButton("Erstellen einer neuen VL");

+		buttonGroup.add(radioButton);

+		radioButton.setHorizontalAlignment(SwingConstants.CENTER);

+		radioButton.setBackground(Color.WHITE);

+		radioButton.setBounds(6, 7, 141, 23);

+		contentPanel.add(radioButton);

+		

+		radioButton_1 = new JRadioButton("Erstellen einer neuen VL auf Basis einer VL Rohling");

+		buttonGroup.add(radioButton_1);

+		radioButton_1.setBackground(Color.WHITE);

+		radioButton_1.setBounds(6, 30, 265, 23);

+		contentPanel.add(radioButton_1);

+		

+		JRadioButton radioButton_2 = new JRadioButton("Bearbeiten einer bestehenden VL");

+		buttonGroup.add(radioButton_2);

+		radioButton_2.setBackground(Color.WHITE);

+		radioButton_2.setBounds(6, 53, 185, 23);

+		contentPanel.add(radioButton_2);

+		

+		JRadioButton radioButton_3 = new JRadioButton("Kopieren einer bestehenden VL");

+		buttonGroup.add(radioButton_3);

+		radioButton_3.setBackground(Color.WHITE);

+		radioButton_3.setBounds(6, 76, 175, 23);

+		contentPanel.add(radioButton_3);

+		

+		JRadioButton radioButton_4 = new JRadioButton("Verlinken einer bestehenden VL");

+		buttonGroup.add(radioButton_4);

+		radioButton_4.setBackground(Color.WHITE);

+		radioButton_4.setBounds(6, 102, 175, 23);

+		contentPanel.add(radioButton_4);

+		{

+			JPanel buttonPane = new JPanel();

+			buttonPane.setBounds(0, 272, 529, 33);

+			buttonPane.setBackground(SystemColor.menu);

+			buttonPane.setLayout(new FlowLayout(FlowLayout.RIGHT));

+			getContentPane().add(buttonPane);

+			{

+				JButton cancelButton = new JButton("Weiter");

+				cancelButton.addActionListener(new ActionListener() {

+					public void actionPerformed(ActionEvent e) {

+						

+						if(radioButton_1.isSelected()==true)

+						{

+						searchRohling sr=new searchRohling();

+						sr.setVisible(true);

+						dispose();

 						}

 					}

-				}

+				});

+				cancelButton.setActionCommand("Cancel");

+				buttonPane.add(cancelButton);

 			}

-		});

-		mnHilfe.add(mntmTicketErstellen);

-		contentPane = new JPanel();

-		contentPane.setBackground(Color.WHITE);

-		contentPane.setBorder(new EmptyBorder(5, 5, 5, 5));

-		setContentPane(contentPane);

-		

-		JLabel labelChoose = new JLabel("Bitte w\u00E4hlen Sie Ihre durchzuf\u00FChrende Aktion aus");

-		labelChoose.setFont(new Font("Tahoma", Font.PLAIN, 14));

-		labelChoose.setHorizontalAlignment(SwingConstants.CENTER);

-		

-		JRadioButton rdbtnNew = new JRadioButton("Erstellen einer neuen VL");

-		rdbtnNew.setHorizontalAlignment(SwingConstants.CENTER);

-		rdbtnNew.setBackground(Color.WHITE);

-		buttonGroup.add(rdbtnNew);

-		

-		JRadioButton rdbtnNewRohling = new JRadioButton("Erstellen einer neuen VL auf Basis einer VL Rohling");

-		rdbtnNewRohling.setBackground(Color.WHITE);

-		buttonGroup.add(rdbtnNewRohling);

-		

-		JRadioButton rdbtnCopyExisiting = new JRadioButton("Kopieren einer bestehenden VL");

-		rdbtnCopyExisiting.setBackground(Color.WHITE);

-		buttonGroup.add(rdbtnCopyExisiting);

+		}

+		{

+			JSeparator separator = new JSeparator();

+			separator.setBounds(10, 259, 519, 2);

+			getContentPane().add(separator);

+		}

+		{

+			JSeparator separator = new JSeparator();

+			separator.setBounds(0, 91, 519, 2);

+			getContentPane().add(separator);

+		}

 		

-		JRadioButton rdbtnLinkExisting = new JRadioButton("Verlinken einer bestehenden VL");

-		rdbtnLinkExisting.setBackground(Color.WHITE);

-		buttonGroup.add(rdbtnLinkExisting);

-		

-		JButton btnWeiter = new JButton("Weiter");

-		btnWeiter.addActionListener(new ActionListener() {

-			public void actionPerformed(ActionEvent arg0) {

-				

-				WizardDialog wizardDialog = new WizardDialog(Display.getDefault().getActiveShell(),new newVLRohlingWizard());

-				wizardDialog.create();

-				dispose();

-				wizardDialog.open();

-				

-				

-			}

-		});

-		

-		JRadioButton rdbtnEditVL = new JRadioButton("Bearbeiten einer bestehenden VL");

-		buttonGroup.add(rdbtnEditVL);

-		rdbtnEditVL.setBackground(Color.WHITE);

-		GroupLayout gl_contentPane = new GroupLayout(contentPane);

-		gl_contentPane.setHorizontalGroup(

-			gl_contentPane.createParallelGroup(Alignment.LEADING)

-				.addGroup(Alignment.TRAILING, gl_contentPane.createSequentialGroup()

-					.addContainerGap(GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)

-					.addComponent(labelChoose, GroupLayout.PREFERRED_SIZE, 424, GroupLayout.PREFERRED_SIZE)

-					.addContainerGap())

-				.addGroup(gl_contentPane.createSequentialGroup()

-					.addContainerGap()

-					.addComponent(btnWeiter)

-					.addContainerGap(359, Short.MAX_VALUE))

-				.addGroup(gl_contentPane.createSequentialGroup()

-					.addContainerGap()

-					.addComponent(rdbtnLinkExisting)

-					.addContainerGap(253, Short.MAX_VALUE))

-				.addGroup(gl_contentPane.createSequentialGroup()

-					.addContainerGap()

-					.addComponent(rdbtnCopyExisiting)

-					.addContainerGap(253, Short.MAX_VALUE))

-				.addGroup(gl_contentPane.createSequentialGroup()

-					.addContainerGap()

-					.addComponent(rdbtnEditVL)

-					.addContainerGap(319, Short.MAX_VALUE))

-				.addGroup(gl_contentPane.createSequentialGroup()

-					.addContainerGap()

-					.addComponent(rdbtnNewRohling)

-					.addContainerGap(163, Short.MAX_VALUE))

-				.addGroup(gl_contentPane.createSequentialGroup()

-					.addContainerGap()

-					.addComponent(rdbtnNew)

-					.addContainerGap(287, Short.MAX_VALUE))

-		);

-		gl_contentPane.setVerticalGroup(

-			gl_contentPane.createParallelGroup(Alignment.LEADING)

-				.addGroup(gl_contentPane.createSequentialGroup()

-					.addContainerGap()

-					.addComponent(labelChoose)

-					.addGap(33)

-					.addComponent(rdbtnNew)

-					.addPreferredGap(ComponentPlacement.RELATED)

-					.addComponent(rdbtnNewRohling)

-					.addPreferredGap(ComponentPlacement.RELATED)

-					.addComponent(rdbtnEditVL)

-					.addPreferredGap(ComponentPlacement.RELATED)

-					.addComponent(rdbtnCopyExisiting)

-					.addPreferredGap(ComponentPlacement.UNRELATED)

-					.addComponent(rdbtnLinkExisting)

-					.addGap(18)

-					.addComponent(btnWeiter)

-					.addContainerGap())

-		);

-		contentPane.setLayout(gl_contentPane);

 		

+

 	}

 }

diff --git a/Dozentenmodul/src/GUI/Downloader.java b/Dozentenmodul/src/GUI/Downloader.java
deleted file mode 100644
index 8a44c38b..00000000
--- a/Dozentenmodul/src/GUI/Downloader.java
+++ /dev/null
@@ -1,117 +0,0 @@
-package GUI;

-

-import java.awt.BorderLayout;

-import java.awt.FlowLayout;

-

-import javax.swing.JButton;

-import javax.swing.JDialog;

-import javax.swing.JFileChooser;

-import javax.swing.JPanel;

-import javax.swing.UIManager;

-import javax.swing.UnsupportedLookAndFeelException;

-import javax.swing.border.EmptyBorder;

-import java.awt.Color;

-import javax.swing.SwingConstants;

-import javax.swing.JLabel;

-import java.awt.event.MouseAdapter;

-import java.awt.event.MouseEvent;

-import java.io.File;

-import javax.swing.JProgressBar;

-

-import ftp.ftp;

-

-public class Downloader extends JDialog {

-

-	private final JPanel contentPanel = new JPanel();

-	JLabel lblNewLabel;

-	JProgressBar progressBar;

-	ftp f=new ftp();

-	/**

-	 * Launch the application.

-	 */

-	public static void main(String[] args) {

-		try {

-			Downloader dialog = new Downloader();

-			dialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);

-			dialog.setVisible(true);

-		} catch (Exception e) {

-			e.printStackTrace();

-		}

-	}

-

-	/**

-	 * Create the dialog.

-	 */

-	public Downloader() {

-		try {

-			UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());

-		} catch (ClassNotFoundException | InstantiationException

-				| IllegalAccessException | UnsupportedLookAndFeelException e) {

-			// TODO Auto-generated catch block

-			e.printStackTrace();

-		}

-		setBackground(Color.WHITE);

-		setTitle("Downloader");

-		setBounds(100, 100, 450, 218);

-		getContentPane().setLayout(new BorderLayout());

-		contentPanel.setBackground(Color.WHITE);

-		contentPanel.setBorder(new EmptyBorder(5, 5, 5, 5));

-		getContentPane().add(contentPanel, BorderLayout.CENTER);

-		contentPanel.setLayout(null);

-		{

-			JButton btnSpeicherortAuswhlen = new JButton("Speicherort ausw\u00E4hlen");

-			btnSpeicherortAuswhlen.addMouseListener(new MouseAdapter() {

-				@Override

-				public void mouseClicked(MouseEvent arg0) {

-					JFileChooser fc=new JFileChooser();

-					fc.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY);

-					

-					fc.showOpenDialog(getParent());

-					File dir=fc.getSelectedFile();

-					lblNewLabel.setText(dir.getAbsolutePath());

-				}

-			});

-			btnSpeicherortAuswhlen.setBounds(10, 11, 141, 23);

-			btnSpeicherortAuswhlen.setVerticalAlignment(SwingConstants.TOP);

-			btnSpeicherortAuswhlen.setHorizontalAlignment(SwingConstants.LEFT);

-			contentPanel.add(btnSpeicherortAuswhlen);

-		}

-		

-		lblNewLabel = new JLabel("C:\\");

-		lblNewLabel.setBounds(169, 11, 255, 23);

-		contentPanel.add(lblNewLabel);

-		

-		JButton btnDownloadStarten = new JButton("Download starten");

-		btnDownloadStarten.addMouseListener(new MouseAdapter() {

-			@Override

-			public void mouseClicked(MouseEvent e) {

-				progressBar.setValue(0);

-				long fsize=f.getFileSize("BESCHREIBUNG.xml");

-				f.getFile("BESCHREIBUNG.xml", lblNewLabel.getText().toString());

-			}

-		});

-		btnDownloadStarten.setBounds(10, 106, 141, 23);

-		contentPanel.add(btnDownloadStarten);

-		

-		progressBar = new JProgressBar(0,100);

-		progressBar.setBounds(10, 45, 414, 30);

-		contentPanel.add(progressBar);

-		{

-			JPanel buttonPane = new JPanel();

-			buttonPane.setBackground(Color.WHITE);

-			buttonPane.setLayout(new FlowLayout(FlowLayout.RIGHT));

-			getContentPane().add(buttonPane, BorderLayout.SOUTH);

-			{

-				JButton okButton = new JButton("OK");

-				okButton.setActionCommand("OK");

-				buttonPane.add(okButton);

-				getRootPane().setDefaultButton(okButton);

-			}

-			{

-				JButton cancelButton = new JButton("Zur\u00FCck");

-				cancelButton.setActionCommand("Cancel");

-				buttonPane.add(cancelButton);

-			}

-		}

-	}

-}

diff --git a/Dozentenmodul/src/GUI/LoginWindow.java b/Dozentenmodul/src/GUI/LoginWindow.java
index 0ebea43d..16e7aa22 100644
--- a/Dozentenmodul/src/GUI/LoginWindow.java
+++ b/Dozentenmodul/src/GUI/LoginWindow.java
@@ -3,7 +3,6 @@ package GUI;
 

 import java.awt.EventQueue;

 import java.awt.Image;

-

 import javax.swing.ImageIcon;

 import javax.swing.JFrame;

 import javax.swing.JPanel;

@@ -13,9 +12,7 @@ import javax.swing.border.EmptyBorder;
 import javax.swing.JLabel;

 import javax.swing.JTextField;

 import javax.swing.JButton;

-

 import auth.Ldap;

-

 import java.awt.event.ActionListener;

 import java.awt.event.ActionEvent;

 import javax.swing.JPasswordField;

@@ -112,6 +109,7 @@ public class LoginWindow extends JFrame {
 				boolean login=check.LdapAuth(username.getText(),  new String(pass.getPassword()));

 				if(login==true)

 				{

+					

 					//Erstellen einer Instanz der Aktionsauswahl

 					ActionChooser ac=new ActionChooser();

 					ac.setVisible(true);

diff --git a/Dozentenmodul/src/Wizard/newVLRohlingWizard.java b/Dozentenmodul/src/Wizard/newVLRohlingWizard.java
index 8ddd1bf9..05889927 100644
--- a/Dozentenmodul/src/Wizard/newVLRohlingWizard.java
+++ b/Dozentenmodul/src/Wizard/newVLRohlingWizard.java
@@ -10,7 +10,10 @@ public class newVLRohlingWizard extends Wizard {
 

 	@Override

 	public void addPages() {

+		//addPage(new test());

 		addPage(new searchRohlingPage());

+		addPage(new VMWareInfoPage());

+		

 	}

 

 	@Override

diff --git a/Dozentenmodul/src/Wizard/searchRohlingPage.java b/Dozentenmodul/src/Wizard/searchRohlingPage.java
index 5f574814..519035c0 100644
--- a/Dozentenmodul/src/Wizard/searchRohlingPage.java
+++ b/Dozentenmodul/src/Wizard/searchRohlingPage.java
@@ -1,21 +1,19 @@
 package Wizard;

 

-import java.io.IOException;

+import java.awt.Component;

+import java.awt.EventQueue;

+import java.awt.Panel;

+import java.beans.PropertyChangeEvent;

+import java.beans.PropertyChangeListener;

+import java.io.File;

 import java.net.SocketException;

-import java.util.Collections;

 

-import org.apache.commons.net.ftp.FTPClient;

+import javax.swing.JFileChooser;

+import javax.swing.JProgressBar;

+

 import org.eclipse.jface.wizard.WizardPage;

 import org.eclipse.swt.SWT;

 import org.eclipse.swt.widgets.Composite;

-import org.eclipse.swt.custom.SashForm;

-import org.eclipse.swt.widgets.Tree;

-import org.eclipse.jface.fieldassist.ControlDecoration;

-import org.eclipse.swt.widgets.Combo;

-import org.eclipse.swt.widgets.TabItem;

-import org.eclipse.swt.widgets.Table;

-import org.eclipse.swt.widgets.TableItem;

-import org.eclipse.jface.viewers.CheckboxTableViewer;

 import org.eclipse.swt.widgets.List;

 import org.eclipse.swt.widgets.Button;

 import org.eclipse.swt.widgets.Text;

@@ -26,12 +24,27 @@ import org.eclipse.swt.events.KeyEvent;
 import ftp.ftp;

 import org.eclipse.swt.events.MouseAdapter;

 import org.eclipse.swt.events.MouseEvent;

+import downloader.DownloadTask;

+

+import org.eclipse.swt.widgets.ProgressBar;

+import org.eclipse.swt.widgets.Label;

+import org.eclipse.swt.events.PaintListener;

+import org.eclipse.swt.events.PaintEvent;

 

-public class searchRohlingPage extends WizardPage {

+import GUI.FTPDownloader;

+

+public class searchRohlingPage extends WizardPage  {

 	private Text txtLivesuche;

 	String[] result;

 	List list;

 	ftp f=new ftp();

+	String host="openslx-nfs.rz.hs-offenburg.de";

+	int port=21;

+	String username="tspitzer";

+	String password="21071989";

+	String downloadPath="_vorlagen/";

+	String filename="";

+	private Button btnDownload;

 	/**

 	 * Create the wizard.

 	 */

@@ -39,6 +52,7 @@ public class searchRohlingPage extends WizardPage {
 		super("Wizard");

 		setTitle("Rohling ausw\u00E4hlen (Schritt 1 von ..)");

 		setDescription("W\u00E4hlen Sie bitte Ihr Rohling aus welches Sie bearbeiten m\u00F6chten");

+		

 	}

 

 	/**

@@ -53,16 +67,6 @@ public class searchRohlingPage extends WizardPage {
 		list = new List(container, SWT.BORDER);

 		list.setBounds(0, 34, 574, 276);

 		

-		Button btnDownload = new Button(container, SWT.NONE);

-		btnDownload.addMouseListener(new MouseAdapter() {

-			@Override

-			public void mouseDown(MouseEvent arg0) {

-				

-				System.out.println(list.getItem(list.getSelectionIndex()).toString());

-			}

-		});

-		btnDownload.setBounds(489, 316, 75, 25);

-		btnDownload.setText("Download");

 		

 		txtLivesuche = new Text(container, SWT.BORDER);

 		txtLivesuche.addKeyListener(new KeyAdapter() {

@@ -90,6 +94,16 @@ public class searchRohlingPage extends WizardPage {
 		txtLivesuche.setText("Livesuche");

 		txtLivesuche.setText("");

 		txtLivesuche.setBounds(0, 0, 201, 25);

+		

+		btnDownload = new Button(container, SWT.NONE);

+		btnDownload.addMouseListener(new MouseAdapter() {

+			@Override

+			public void mouseDown(MouseEvent arg0) {

+			mouseClick(arg0);

+			}

+		});

+		btnDownload.setBounds(489, 383, 75, 25);

+		btnDownload.setText("Download");

 

 		try {

 			

@@ -105,7 +119,24 @@ public class searchRohlingPage extends WizardPage {
 			e.printStackTrace();

 		}

 

-	}

-	

 

 }

+	public void mouseClick(MouseEvent e)

+	{

+		

+		Runnable r=new Runnable() {

+			

+			@Override

+			public void run() {

+				// TODO Auto-generated method stub

+				FTPDownloader ftp=new FTPDownloader();

+				

+				

+				

+				ftp.setVisible(true);

+				

+			}

+		};

+		r.run();

+	}

+}
\ No newline at end of file
diff --git a/Dozentenmodul/src/auth/Ldap.java b/Dozentenmodul/src/auth/Ldap.java
index 3bf74440..c6c1f1a5 100644
--- a/Dozentenmodul/src/auth/Ldap.java
+++ b/Dozentenmodul/src/auth/Ldap.java
@@ -26,7 +26,8 @@ public class Ldap {
         environment.put(Context.SECURITY_CREDENTIALS, pass);

         

         try {

-            DirContext authContext = new InitialDirContext(environment);

+            @SuppressWarnings("unused")

+			DirContext authContext = new InitialDirContext(environment);

             // user is authenticated

             

             userok=true;

diff --git a/Dozentenmodul/src/ftp/ftp.java b/Dozentenmodul/src/ftp/ftp.java
index 08ff65f1..036236a5 100644
--- a/Dozentenmodul/src/ftp/ftp.java
+++ b/Dozentenmodul/src/ftp/ftp.java
@@ -1,16 +1,16 @@
 package ftp;

 

-import java.io.File;

+

 import java.io.FileOutputStream;

 import java.io.IOException;

-import java.io.OutputStream;

+

 import java.net.SocketException;

 

 import org.apache.commons.net.ftp.FTPClient;

 import org.apache.commons.net.ftp.FTPFile;

 

 public class ftp {

-

+	

 	/**

 	 * @param args

 	 */

@@ -53,6 +53,7 @@ public class ftp {
 			ftp.login("tspitzer", "21071989");

 			ftp.changeWorkingDirectory("_vorlagen");

 			FileOutputStream os=new FileOutputStream(location+"\\"+name);

+			

 			System.out.println("Start");

 			System.out.println(location+name);