Merge branch 'master' of ssh://git.openslx.org/openslx-ng/tutor-module

Conflicts:
	Dozentenmodul/src/GUI/SearchImage_GUI.java
	Dozentenmodul/src/Models/person.java
	Dozentenmodul/src/Models/vm.java

1 files changed, 0 insertions, 338 deletions

diff --git a/Dozentenmodul/src/gui/MainMenue_GUI.java b/Dozentenmodul/src/gui/MainMenue_GUI.java
deleted file mode 100644
index b879ccf1..00000000
--- a/Dozentenmodul/src/gui/MainMenue_GUI.java
+++ /dev/null
@@ -1,338 +0,0 @@
-package gui;
-
-import java.awt.Dimension;
-import java.awt.FlowLayout;
-import java.awt.Toolkit;
-import javax.swing.JFrame;
-import javax.swing.JButton;
-import javax.swing.JDialog;
-import javax.swing.JPanel;
-import javax.swing.UIManager;
-import javax.swing.UnsupportedLookAndFeelException;
-import javax.swing.border.EmptyBorder;
-import java.awt.Color;
-import javax.swing.JLabel;
-import java.awt.Font;
-import javax.swing.JTextPane;
-import java.awt.SystemColor;
-import java.awt.event.ActionListener;
-import java.awt.event.ActionEvent;
-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;
-import java.awt.event.WindowAdapter;
-import java.awt.event.WindowEvent;
-import javax.swing.border.TitledBorder;
-import java.awt.event.MouseAdapter;
-import java.awt.event.MouseEvent;
-import java.awt.ScrollPane;
-import javax.swing.JTextArea;
-
-@SuppressWarnings("serial")
-public class MainMenue_GUI extends JFrame {
-
-	private final JPanel contentPanel = new JPanel();
-	String[] result;
-	JRadioButton rdbtnImageNew;
-	JRadioButton rdbtnImageEdit;
-	JRadioButton rdbtnImageSearchDownload;
-	JRadioButton rdbtnVeranstaltungNew;
-	JRadioButton rdbtnImageDelete;
-	private final ButtonGroup buttonGroup = new ButtonGroup();
-	/**
-	 * Launch the application.
-	 */
-	public static void main(String[] args) {
-		try {
-			MainMenue_GUI dialog = new MainMenue_GUI();
-			dialog.setDefaultCloseOperation(JDialog.HIDE_ON_CLOSE);
-			dialog.setVisible(true);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-	}
-
-	/**
-	 * Create the dialog.
-	 */
-	public MainMenue_GUI() {
-		addWindowListener(new WindowAdapter() {
-			@Override
-			public void windowClosing(WindowEvent arg0) {
-				System.exit(0);
-			}
-		});
-		try {
-			UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
-		} catch (ClassNotFoundException | InstantiationException
-				| IllegalAccessException | UnsupportedLookAndFeelException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-		setTitle("bwLehrpool Suite *Prototyp*");
-		Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize();
-		int top=(screenSize.height - 722) / 2;
-		int left=(screenSize.width - 603) / 2;
-		setBounds(left, top, 603, 722);
-		//setBounds(100, 100, 545, 366);
-		getContentPane().setLayout(null);
-		{
-			JPanel panel = new JPanel();
-			panel.setBackground(SystemColor.menu);
-			panel.setBounds(10, 11, 567, 69);
-			getContentPane().add(panel);
-			panel.setLayout(null);
-			{
-				JLabel lblNewLabel = new JLabel("Hauptmen\u00FC");
-				lblNewLabel.setBounds(10, 11, 509, 22);
-				panel.add(lblNewLabel);
-				lblNewLabel.setFont(new Font("Tahoma", Font.BOLD, 18));
-			}
-			
-			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, 22);
-			panel.add(txtpnBitteWhlenSie);
-		}
-		contentPanel.setBounds(10, 104, 567, 502);
-		contentPanel.setBackground(SystemColor.menu);
-		
-		contentPanel.setBorder(new EmptyBorder(5, 5, 5, 5));
-		getContentPane().add(contentPanel);
-		contentPanel.setLayout(null);
-		
-		JPanel panelImage = new JPanel();
-		panelImage.setBackground(SystemColor.menu);
-		panelImage.setBorder(new TitledBorder(null, "VL-Image", TitledBorder.LEADING, TitledBorder.TOP, null, null));
-		panelImage.setBounds(10, 86, 270, 200);
-		contentPanel.add(panelImage);
-		panelImage.setLayout(null);
-		
-		rdbtnImageNew = new JRadioButton("Neu");
-		rdbtnImageNew.setToolTipText("Hier k\u00F6nnen Sie eine standard Laborvorlage downloaden");
-		rdbtnImageNew.setBounds(6, 22, 159, 23);
-		panelImage.add(rdbtnImageNew);
-		rdbtnImageNew.setSelected(true);
-		buttonGroup.add(rdbtnImageNew);
-		rdbtnImageNew.setBackground(SystemColor.menu);
-		
-		
-		
-		rdbtnImageEdit = new JRadioButton("Bearbeiten");
-		rdbtnImageEdit.setToolTipText("Hier k\u00F6nnen Sie ein bestehendes Labor zum ver\u00E4ndern downloaden");
-		rdbtnImageEdit.setBounds(6, 48, 185, 23);
-		panelImage.add(rdbtnImageEdit);
-		buttonGroup.add(rdbtnImageEdit);
-		rdbtnImageEdit.setHorizontalAlignment(SwingConstants.LEFT);
-		rdbtnImageEdit.setBackground(SystemColor.menu);
-		
-		rdbtnImageDelete = new JRadioButton("L\u00F6schen");
-		rdbtnImageDelete.setEnabled(false);
-		buttonGroup.add(rdbtnImageDelete);
-		rdbtnImageDelete.setToolTipText("Hier k\u00F6nnen Sie ein bestehendes Labor zum ver\u00E4ndern downloaden");
-		rdbtnImageDelete.setHorizontalAlignment(SwingConstants.LEFT);
-		rdbtnImageDelete.setBackground(SystemColor.menu);
-		rdbtnImageDelete.setBounds(6, 74, 185, 23);
-		panelImage.add(rdbtnImageDelete);
-		
-		rdbtnImageSearchDownload = new JRadioButton("Suche und Download");
-		rdbtnImageSearchDownload.setEnabled(false);
-		buttonGroup.add(rdbtnImageSearchDownload);
-		rdbtnImageSearchDownload.setToolTipText("Hier k\u00F6nnen Sie ein bestehendes Labor zum ver\u00E4ndern downloaden");
-		rdbtnImageSearchDownload.setHorizontalAlignment(SwingConstants.LEFT);
-		rdbtnImageSearchDownload.setBackground(SystemColor.menu);
-		rdbtnImageSearchDownload.setBounds(6, 100, 185, 23);
-		panelImage.add(rdbtnImageSearchDownload);
-		
-		JPanel panelDesc = new JPanel();
-		panelDesc.setLayout(null);
-		panelDesc.setBorder(new TitledBorder(UIManager.getBorder("TitledBorder.border"), "Erklärung", TitledBorder.LEADING, TitledBorder.TOP, null, null));
-		panelDesc.setBackground(SystemColor.menu);
-		panelDesc.setBounds(290, 86, 270, 200);
-		contentPanel.add(panelDesc);
-		
-		ScrollPane scrollPaneDesc = new ScrollPane();
-		scrollPaneDesc.setBounds(5, 15, 260, 180);
-		JTextArea txtDesc=new JTextArea();
-		txtDesc.setBackground(SystemColor.menu);
-		txtDesc.setWrapStyleWord(true);
-		txtDesc.setLineWrap(true);
-		scrollPaneDesc.add(txtDesc);
-		//Pro AUswahl
-		txtDesc.setText("Hier steht irgendwann die Beschreibung der einzelnen Punkte\r\n");
-		panelDesc.add(scrollPaneDesc);
-		
-		JPanel panelVeranstaltung = new JPanel();
-		panelVeranstaltung.setLayout(null);
-		panelVeranstaltung.setBorder(new TitledBorder(UIManager.getBorder("TitledBorder.border"), "Veranstaltung (VMChooser)", TitledBorder.LEADING, TitledBorder.TOP, null, null));
-		panelVeranstaltung.setBackground(SystemColor.menu);
-		panelVeranstaltung.setBounds(10, 297, 270, 200);
-		contentPanel.add(panelVeranstaltung);
-		
-		rdbtnVeranstaltungNew = new JRadioButton("Neu");
-		buttonGroup.add(rdbtnVeranstaltungNew);
-		rdbtnVeranstaltungNew.setToolTipText("Hier k\u00F6nnen Sie Ihre Labordaten eingeben");
-		rdbtnVeranstaltungNew.setBounds(6, 24, 185, 23);
-		panelVeranstaltung.add(rdbtnVeranstaltungNew);
-		rdbtnVeranstaltungNew.setBackground(SystemColor.menu);
-		
-		JRadioButton rdbtnVeranstaltungEdit = new JRadioButton("Bearbeiten");
-		rdbtnVeranstaltungEdit.setEnabled(false);
-		rdbtnVeranstaltungEdit.setToolTipText("Hier k\u00F6nnen Sie einen Link auf ein bestehendes Labor erzeugen");
-		rdbtnVeranstaltungEdit.setBounds(6, 50, 230, 23);
-		panelVeranstaltung.add(rdbtnVeranstaltungEdit);
-		buttonGroup.add(rdbtnVeranstaltungEdit);
-		rdbtnVeranstaltungEdit.setBackground(SystemColor.menu);
-		
-		JRadioButton rdbtnVeranstaltungDelete = new JRadioButton("L\u00F6schen");
-		rdbtnVeranstaltungDelete.setEnabled(false);
-		rdbtnVeranstaltungDelete.setToolTipText("Hier k\u00F6nnen Sie ein Labor l\u00F6schen");
-		rdbtnVeranstaltungDelete.setBounds(6, 76, 175, 23);
-		panelVeranstaltung.add(rdbtnVeranstaltungDelete);
-		buttonGroup.add(rdbtnVeranstaltungDelete);
-		rdbtnVeranstaltungDelete.setBackground(SystemColor.menu);
-		
-		JRadioButton rdbtnVeranstaltungSearch = new JRadioButton("Suche");
-		rdbtnVeranstaltungSearch.setEnabled(false);
-		buttonGroup.add(rdbtnVeranstaltungSearch);
-		rdbtnVeranstaltungSearch.setToolTipText("Hier k\u00F6nnen Sie ein Labor l\u00F6schen");
-		rdbtnVeranstaltungSearch.setBackground(SystemColor.menu);
-		rdbtnVeranstaltungSearch.setBounds(6, 102, 175, 23);
-		panelVeranstaltung.add(rdbtnVeranstaltungSearch);
-		
-		JLabel lblCrumbStart = new JLabel("Startseite");
-		lblCrumbStart.addMouseListener(new MouseAdapter() {
-			@Override
-			public void mouseClicked(MouseEvent arg0) {
-				Login_GUI lw=new Login_GUI();
-				lw.setVisible(true);
-				MainMenue_GUI.this.setVisible(false);
-			}
-		});
-		lblCrumbStart.setForeground(Color.BLUE);
-		lblCrumbStart.setBounds(10, 0, 52, 14);
-		contentPanel.add(lblCrumbStart);
-		
-		JLabel label = new JLabel(">");
-		label.setBounds(60, 0, 13, 14);
-		contentPanel.add(label);
-		
-		JLabel lblRechtshinweis = new JLabel("Rechtshinweis");
-		lblRechtshinweis.addMouseListener(new MouseAdapter() {
-			@Override
-			public void mouseClicked(MouseEvent e) {
-				BillOfRights_GUI rb=new BillOfRights_GUI();
-				rb.setVisible(true);
-				MainMenue_GUI.this.setVisible(false);
-			}
-		});
-		lblRechtshinweis.setForeground(Color.BLUE);
-		lblRechtshinweis.setBounds(72, 0, 68, 14);
-		contentPanel.add(lblRechtshinweis);
-		
-		JLabel label_1 = new JLabel(">");
-		label_1.setBounds(142, 0, 13, 14);
-		contentPanel.add(label_1);
-		
-		JLabel lblNewLabel_1 = new JLabel("Hauptmen\u00FC");
-		lblNewLabel_1.setBounds(150, 0, 74, 14);
-		contentPanel.add(lblNewLabel_1);
-		
-		JLabel lblNewLabel_2 = new JLabel("*Platzhalter Bild*");
-		lblNewLabel_2.setBounds(10, 25, 557, 59);
-		contentPanel.add(lblNewLabel_2);
-		
-		JPanel panelNews = new JPanel();
-		panelNews.setLayout(null);
-		panelNews.setBorder(new TitledBorder(UIManager.getBorder("TitledBorder.border"), "News", TitledBorder.LEADING, TitledBorder.TOP, null, null));
-		panelNews.setBackground(SystemColor.menu);
-		panelNews.setBounds(290, 297, 270, 200);
-		contentPanel.add(panelNews);
-		
-		ScrollPane scrollPaneNews = new ScrollPane();
-		scrollPaneNews.setBounds(5, 15, 260, 180);
-		JTextArea txtNews=new JTextArea();
-		txtNews.setBackground(SystemColor.menu);
-		txtNews.setWrapStyleWord(true);
-		txtNews.setLineWrap(true);
-		txtNews.setText("Hier werden mal die Neuigkeiten stehen");
-		scrollPaneNews.add(txtNews);
-		panelNews.add(scrollPaneNews);
-		{
-			JPanel buttonPane = new JPanel();
-			buttonPane.setBounds(0, 630, 587, 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(rdbtnImageNew.isSelected()==true)
-						{
-						EingabeImageAllgemein_GUI sr=new EingabeImageAllgemein_GUI();
-						sr.setVisible(true);
-						dispose();
-						} else if(rdbtnImageEdit.isSelected()==true)
-						{
-							
-							SearchEditImage_GUI si=new SearchEditImage_GUI();
-							si.setVisible(true);
-							dispose();
-						}else if(rdbtnImageSearchDownload.isSelected()==true)
-						{
-							SearchMethod_GUI sm=new SearchMethod_GUI();
-							sm.setVisible(true);
-							dispose();
-						}else if(rdbtnImageDelete.isSelected()==true)
-						{
-							DeleteImage_GUI di=new DeleteImage_GUI();
-							di.setVisible(true);
-							dispose();
-						}
-						else if(rdbtnVeranstaltungNew.isSelected()==true)
-						{
-							EingabeVeranstaltungAllgemein_GUI av=new EingabeVeranstaltungAllgemein_GUI();
-							av.setVisible(true);
-							dispose();
-						}
-					}
-				});
-				cancelButton.setActionCommand("Cancel");
-				buttonPane.add(cancelButton);
-			}
-		}
-		{
-			JSeparator separator = new JSeparator();
-			separator.setBounds(0, 617, 587, 2);
-			getContentPane().add(separator);
-		}
-		{
-			JSeparator separator = new JSeparator();
-			separator.setBounds(0, 91, 587, 2);
-			getContentPane().add(separator);
-		}
-		
-		JMenuBar menuBar = new JMenuBar();
-		setJMenuBar(menuBar);
-		
-		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);
-		
-		
-
-	}
-}