neue Version

17 files changed, 44 insertions, 174 deletions

diff --git a/Dozentenmodul/.classpath b/Dozentenmodul/.classpath
index d4f76ea8..068f08c8 100644
--- a/Dozentenmodul/.classpath
+++ b/Dozentenmodul/.classpath
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <classpath>

 	<classpathentry kind="src" path="src"/>

+	<classpathentry kind="src" path="img"/>

 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>

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

 	<classpathentry kind="lib" path="swing2swt.jar"/>

@@ -11,5 +12,6 @@
 	<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="lib" path="C:/Users/tspitzer/Downloads/jsch-0.1.50.jar"/>

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

 </classpath>

diff --git a/Dozentenmodul/bin/GUI/ActionChooser$1.class b/Dozentenmodul/bin/GUI/ActionChooser$1.class
index 0b78be44..00bf3506 100644
--- a/Dozentenmodul/bin/GUI/ActionChooser$1.class
+++ b/Dozentenmodul/bin/GUI/ActionChooser$1.class
diff --git a/Dozentenmodul/bin/GUI/ActionChooser.class b/Dozentenmodul/bin/GUI/ActionChooser.class
index 81f01294..a9be28b9 100644
--- a/Dozentenmodul/bin/GUI/ActionChooser.class
+++ b/Dozentenmodul/bin/GUI/ActionChooser.class
diff --git a/Dozentenmodul/bin/GUI/LoginWindow$1.class b/Dozentenmodul/bin/GUI/LoginWindow$1.class
index 0221e712..613f6ffb 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 1e61e1a8..f92ce998 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 7fcf5883..a1618ae7 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
deleted file mode 100644
index 065b7347..00000000
--- a/Dozentenmodul/bin/Wizard/newVLRohlingWizard.class
+++ /dev/null
diff --git a/Dozentenmodul/bin/Wizard/searchRohlingPage$1.class b/Dozentenmodul/bin/Wizard/searchRohlingPage$1.class
deleted file mode 100644
index f9bc440c..00000000
--- a/Dozentenmodul/bin/Wizard/searchRohlingPage$1.class
+++ /dev/null
diff --git a/Dozentenmodul/bin/Wizard/searchRohlingPage$2.class b/Dozentenmodul/bin/Wizard/searchRohlingPage$2.class
deleted file mode 100644
index 72510512..00000000
--- a/Dozentenmodul/bin/Wizard/searchRohlingPage$2.class
+++ /dev/null
diff --git a/Dozentenmodul/bin/Wizard/searchRohlingPage.class b/Dozentenmodul/bin/Wizard/searchRohlingPage.class
deleted file mode 100644
index e37ca2d9..00000000
--- a/Dozentenmodul/bin/Wizard/searchRohlingPage.class
+++ /dev/null
diff --git a/Dozentenmodul/bin/ftp/ftp.class b/Dozentenmodul/bin/ftp/ftp.class
index aa926232..04e68ef9 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 3b26438b..60e3cf6a 100644
--- a/Dozentenmodul/src/GUI/ActionChooser.java
+++ b/Dozentenmodul/src/GUI/ActionChooser.java
@@ -19,6 +19,9 @@ import javax.swing.JSeparator;
 import javax.swing.JRadioButton;

 import javax.swing.SwingConstants;

 import javax.swing.ButtonGroup;

+import javax.swing.JMenuBar;

+import javax.swing.JMenu;

+import javax.swing.JMenuItem;

 

 @SuppressWarnings("serial")

 public class ActionChooser extends JDialog {

@@ -27,6 +30,7 @@ public class ActionChooser extends JDialog {
 	String[] result;

 	ftp f=new ftp();

 	JRadioButton radioButton_1;

+	JRadioButton radioButton;

 	private final ButtonGroup buttonGroup = new ButtonGroup();

 	/**

 	 * Launch the application.

@@ -53,7 +57,7 @@ public class ActionChooser extends JDialog {
 			e.printStackTrace();

 		}

 		setTitle("Dozentenmodul");

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

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

 		getContentPane().setLayout(null);

 		{

 			JPanel panel = new JPanel();

@@ -80,7 +84,7 @@ public class ActionChooser extends JDialog {
 		getContentPane().add(contentPanel);

 		contentPanel.setLayout(null);

 		

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

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

 		buttonGroup.add(radioButton);

 		radioButton.setHorizontalAlignment(SwingConstants.CENTER);

 		radioButton.setBackground(Color.WHITE);

@@ -126,6 +130,11 @@ public class ActionChooser extends JDialog {
 						searchRohling sr=new searchRohling();

 						sr.setVisible(true);

 						dispose();

+						}else if(radioButton.isSelected()==true)

+						{

+							EingabeAllgemein ea = new EingabeAllgemein();

+							ea.setVisible(true);

+							dispose();

 						}

 					}

 				});

@@ -135,15 +144,33 @@ public class ActionChooser extends JDialog {
 		}

 		{

 			JSeparator separator = new JSeparator();

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

+			separator.setBounds(0, 259, 529, 2);

 			getContentPane().add(separator);

 		}

 		{

 			JSeparator separator = new JSeparator();

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

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

 			getContentPane().add(separator);

 		}

 		

+		JMenuBar menuBar = new JMenuBar();

+		setJMenuBar(menuBar);

+		

+		JMenu mnNewMenu = new JMenu("Suche");

+		menuBar.add(mnNewMenu);

+		

+		JMenuItem mntmVlSuche = new JMenuItem("VL Suche");

+		mnNewMenu.add(mntmVlSuche);

+		

+		JMenu mnNewMenu_1 = new JMenu("Hilfe");

+		menuBar.add(mnNewMenu_1);

+		

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

+		mnNewMenu_1.add(mntmFaq);

+		

+		JMenuItem mntmOtrs = new JMenuItem("OTRS");

+		mnNewMenu_1.add(mntmOtrs);

+		

 		

 

 	}

diff --git a/Dozentenmodul/src/GUI/LoginWindow.java b/Dozentenmodul/src/GUI/LoginWindow.java
index 16e7aa22..3063bb81 100644
--- a/Dozentenmodul/src/GUI/LoginWindow.java
+++ b/Dozentenmodul/src/GUI/LoginWindow.java
@@ -5,6 +5,7 @@ import java.awt.EventQueue;
 import java.awt.Image;

 import javax.swing.ImageIcon;

 import javax.swing.JFrame;

+import javax.swing.JOptionPane;

 import javax.swing.JPanel;

 import javax.swing.UIManager;

 import javax.swing.UnsupportedLookAndFeelException;

@@ -116,6 +117,12 @@ public class LoginWindow extends JFrame {
 					//Schließen des Fensters nach erfolgreichen Login

 					dispose();

 				}

+				else

+				{

+		            JOptionPane.showMessageDialog(null,

+		                    "Login denied!", "Message",

+		                    JOptionPane.INFORMATION_MESSAGE);

+				}

 			}

 		});

 		BtnLogin.setBounds(10, 179, 134, 23);

diff --git a/Dozentenmodul/src/Wizard/newVLRohlingWizard.java b/Dozentenmodul/src/Wizard/newVLRohlingWizard.java
deleted file mode 100644
index 05889927..00000000
--- a/Dozentenmodul/src/Wizard/newVLRohlingWizard.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package Wizard;

-

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

-

-public class newVLRohlingWizard extends Wizard {

-

-	public newVLRohlingWizard() {

-		setWindowTitle("New Wizard");

-	}

-

-	@Override

-	public void addPages() {

-		//addPage(new test());

-		addPage(new searchRohlingPage());

-		addPage(new VMWareInfoPage());

-		

-	}

-

-	@Override

-	public boolean performFinish() {

-		return false;

-	}

-

-}

diff --git a/Dozentenmodul/src/Wizard/searchRohlingPage.java b/Dozentenmodul/src/Wizard/searchRohlingPage.java
deleted file mode 100644
index 519035c0..00000000
--- a/Dozentenmodul/src/Wizard/searchRohlingPage.java
+++ /dev/null
@@ -1,142 +0,0 @@
-package Wizard;

-

-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 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.widgets.List;

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

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

-import org.eclipse.wb.swt.SWTResourceManager;

-import org.eclipse.swt.events.KeyAdapter;

-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;

-

-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.

-	 */

-	public searchRohlingPage() {

-		super("Wizard");

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

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

-		

-	}

-

-	/**

-	 * Create contents of the wizard.

-	 * @param parent

-	 */

-	public void createControl(Composite parent) {

-		Composite container = new Composite(parent, SWT.NULL);

-		

-		setControl(container);

-		

-		list = new List(container, SWT.BORDER);

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

-		

-		

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

-		txtLivesuche.addKeyListener(new KeyAdapter() {

-			@Override

-			public void keyReleased(KeyEvent arg0) {

-				

-					try {

-						System.out.println(txtLivesuche.getText().toString());

-						result=f.getAllRohling(txtLivesuche.getText().toString());

-						list.removeAll();

-						for(int i=0;i<result.length;i++)

-						{

-							if(result[i]!=null)

-							list.add(result[i]);

-						}

-					} catch (SocketException e) {

-						// TODO Auto-generated catch block

-						e.printStackTrace();

-					}

-					

-	

-			}

-		});

-		txtLivesuche.setForeground(SWTResourceManager.getColor(SWT.COLOR_WIDGET_LIGHT_SHADOW));

-		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 {

-			

-			result=f.getAllRohling(txtLivesuche.getText().toString());

-			list.removeAll();

-			for(int i=0;i<result.length;i++)

-			{

-				

-				list.add(result[i]);

-			}

-		} catch (SocketException e) {

-			// TODO Auto-generated catch block

-			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 c6c1f1a5..a71d4389 100644
--- a/Dozentenmodul/src/auth/Ldap.java
+++ b/Dozentenmodul/src/auth/Ldap.java
@@ -3,12 +3,12 @@ package auth;
 import java.util.Hashtable;

 import java.util.logging.Level;

 import java.util.logging.Logger;

-

 import javax.naming.Context;

 import javax.naming.NamingException;

 import javax.naming.directory.DirContext;

 import javax.naming.directory.InitialDirContext;

 

+

 public class Ldap {

 

 	public boolean LdapAuth(String user, String pass)

@@ -35,7 +35,7 @@ public class Ldap {
         } catch (NamingException ex) {

             userok=false;

             //user hat keine Zugriffsrechte

-            

+

             Logger.getLogger(Ldap.class.getName()).log(Level.SEVERE, null, ex);

         }

 		return userok;

diff --git a/Dozentenmodul/src/ftp/ftp.java b/Dozentenmodul/src/ftp/ftp.java
index 036236a5..bbb6485b 100644
--- a/Dozentenmodul/src/ftp/ftp.java
+++ b/Dozentenmodul/src/ftp/ftp.java
@@ -20,8 +20,8 @@ public class ftp {
 		String[] filenamelist;

 		

 		try {

-			ftp.connect("openslx-nfs.rz.hs-offenburg.de", 21);

-			ftp.login("tspitzer", "21071989");

+			ftp.connect("141.79.128.103", 21);

+			ftp.login("ftpsecure", "ftp4openslx");

 			ftp.changeWorkingDirectory("_vorlagen");

 			

 			filenamelist=ftp.listNames();