diff options
30 files changed, 702 insertions, 56 deletions
diff --git a/Dozentenmodul/bin/GUI/EingabeAllgemein$1.class b/Dozentenmodul/bin/GUI/EingabeAllgemein$1.class Binary files differindex 1530b4ac..0748ef80 100644 --- a/Dozentenmodul/bin/GUI/EingabeAllgemein$1.class +++ b/Dozentenmodul/bin/GUI/EingabeAllgemein$1.class diff --git a/Dozentenmodul/bin/GUI/EingabeAllgemein$2.class b/Dozentenmodul/bin/GUI/EingabeAllgemein$2.class Binary files differindex fb242ba5..9142d58b 100644 --- a/Dozentenmodul/bin/GUI/EingabeAllgemein$2.class +++ b/Dozentenmodul/bin/GUI/EingabeAllgemein$2.class diff --git a/Dozentenmodul/bin/GUI/EingabeAllgemein$3.class b/Dozentenmodul/bin/GUI/EingabeAllgemein$3.class Binary files differindex a4ace51f..36f51fa0 100644 --- a/Dozentenmodul/bin/GUI/EingabeAllgemein$3.class +++ b/Dozentenmodul/bin/GUI/EingabeAllgemein$3.class diff --git a/Dozentenmodul/bin/GUI/EingabeAllgemein.class b/Dozentenmodul/bin/GUI/EingabeAllgemein.class Binary files differindex 1287812a..6e2b06e6 100644 --- a/Dozentenmodul/bin/GUI/EingabeAllgemein.class +++ b/Dozentenmodul/bin/GUI/EingabeAllgemein.class diff --git a/Dozentenmodul/bin/GUI/EingabeSoftwareDaten$6.class b/Dozentenmodul/bin/GUI/EingabeSoftwareDaten$6.class Binary files differindex 9d81e757..7b6f68a7 100644 --- a/Dozentenmodul/bin/GUI/EingabeSoftwareDaten$6.class +++ b/Dozentenmodul/bin/GUI/EingabeSoftwareDaten$6.class diff --git a/Dozentenmodul/bin/GUI/EingabeSystemDaten$1.class b/Dozentenmodul/bin/GUI/EingabeSystemDaten$1.class Binary files differindex cb960f7a..94a76687 100644 --- a/Dozentenmodul/bin/GUI/EingabeSystemDaten$1.class +++ b/Dozentenmodul/bin/GUI/EingabeSystemDaten$1.class diff --git a/Dozentenmodul/bin/GUI/EingabeSystemDaten$2.class b/Dozentenmodul/bin/GUI/EingabeSystemDaten$2.class Binary files differindex 0bbbfc75..263d3105 100644 --- a/Dozentenmodul/bin/GUI/EingabeSystemDaten$2.class +++ b/Dozentenmodul/bin/GUI/EingabeSystemDaten$2.class diff --git a/Dozentenmodul/bin/GUI/EingabeSystemDaten$3.class b/Dozentenmodul/bin/GUI/EingabeSystemDaten$3.class Binary files differindex 5f5e0ec1..3e0ce2f3 100644 --- a/Dozentenmodul/bin/GUI/EingabeSystemDaten$3.class +++ b/Dozentenmodul/bin/GUI/EingabeSystemDaten$3.class diff --git a/Dozentenmodul/bin/GUI/EingabeSystemDaten.class b/Dozentenmodul/bin/GUI/EingabeSystemDaten.class Binary files differindex 1d979361..779e0251 100644 --- a/Dozentenmodul/bin/GUI/EingabeSystemDaten.class +++ b/Dozentenmodul/bin/GUI/EingabeSystemDaten.class diff --git a/Dozentenmodul/bin/GUI/FertigStellen$1.class b/Dozentenmodul/bin/GUI/FertigStellen$1.class Binary files differindex 2c925056..0b1a6977 100644 --- a/Dozentenmodul/bin/GUI/FertigStellen$1.class +++ b/Dozentenmodul/bin/GUI/FertigStellen$1.class diff --git a/Dozentenmodul/bin/GUI/FertigStellen$2.class b/Dozentenmodul/bin/GUI/FertigStellen$2.class Binary files differindex 549176b7..1ddf9c1b 100644 --- a/Dozentenmodul/bin/GUI/FertigStellen$2.class +++ b/Dozentenmodul/bin/GUI/FertigStellen$2.class diff --git a/Dozentenmodul/bin/GUI/FertigStellen$3.class b/Dozentenmodul/bin/GUI/FertigStellen$3.class Binary files differindex fd98d74b..f9cb619e 100644 --- a/Dozentenmodul/bin/GUI/FertigStellen$3.class +++ b/Dozentenmodul/bin/GUI/FertigStellen$3.class diff --git a/Dozentenmodul/bin/GUI/FertigStellen.class b/Dozentenmodul/bin/GUI/FertigStellen.class Binary files differindex 7e99e37c..ecaeb49a 100644 --- a/Dozentenmodul/bin/GUI/FertigStellen.class +++ b/Dozentenmodul/bin/GUI/FertigStellen.class diff --git a/Dozentenmodul/bin/GUI/LoginWindow$1.class b/Dozentenmodul/bin/GUI/LoginWindow$1.class Binary files differindex 613f6ffb..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 Binary files differindex 29f40298..33142bef 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 Binary files differindex cacefec3..a4fc3451 100644 --- a/Dozentenmodul/bin/GUI/LoginWindow.class +++ b/Dozentenmodul/bin/GUI/LoginWindow.class diff --git a/Dozentenmodul/bin/GUI/getVMwarePlayer$1.class b/Dozentenmodul/bin/GUI/getVMwarePlayer$1.class Binary files differindex ef8cbe2b..26da6ad7 100644 --- a/Dozentenmodul/bin/GUI/getVMwarePlayer$1.class +++ b/Dozentenmodul/bin/GUI/getVMwarePlayer$1.class diff --git a/Dozentenmodul/bin/GUI/getVMwarePlayer$2.class b/Dozentenmodul/bin/GUI/getVMwarePlayer$2.class Binary files differindex d9aae3c0..9c711eea 100644 --- a/Dozentenmodul/bin/GUI/getVMwarePlayer$2.class +++ b/Dozentenmodul/bin/GUI/getVMwarePlayer$2.class diff --git a/Dozentenmodul/bin/GUI/getVMwarePlayer.class b/Dozentenmodul/bin/GUI/getVMwarePlayer.class Binary files differindex b6ff6d8f..2882d967 100644 --- a/Dozentenmodul/bin/GUI/getVMwarePlayer.class +++ b/Dozentenmodul/bin/GUI/getVMwarePlayer.class diff --git a/Dozentenmodul/bin/Jsch/scriptExecutor.class b/Dozentenmodul/bin/Jsch/scriptExecutor.class Binary files differindex 40c7afa7..7604f55f 100644 --- a/Dozentenmodul/bin/Jsch/scriptExecutor.class +++ b/Dozentenmodul/bin/Jsch/scriptExecutor.class diff --git a/Dozentenmodul/bin/ftp/ftp.class b/Dozentenmodul/bin/ftp/ftp.class Binary files differindex 04e68ef9..b3ce9c80 100644 --- a/Dozentenmodul/bin/ftp/ftp.class +++ b/Dozentenmodul/bin/ftp/ftp.class diff --git a/Dozentenmodul/src/GUI/EingabeAllgemein.java b/Dozentenmodul/src/GUI/EingabeAllgemein.java index b28147b7..86488036 100644 --- a/Dozentenmodul/src/GUI/EingabeAllgemein.java +++ b/Dozentenmodul/src/GUI/EingabeAllgemein.java @@ -4,6 +4,7 @@ package GUI; import java.awt.FlowLayout;
import javax.swing.JButton;
import javax.swing.JDialog;
+import javax.swing.JOptionPane;
import javax.swing.JPanel;
import javax.swing.UIManager;
import javax.swing.UnsupportedLookAndFeelException;
@@ -64,6 +65,7 @@ public class EingabeAllgemein extends JDialog { * Create the dialog.
*/
public EingabeAllgemein() {
+ setResizable(false);
try {
UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
@@ -290,6 +292,8 @@ public class EingabeAllgemein extends JDialog { JButton cancelButton = new JButton("Weiter");
cancelButton.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) {
+ if(Vorname_V.getText().isEmpty()==false && Nachname_V.getText().isEmpty()==false && Hochschule_V.getText().isEmpty()==false&&EMail_V.getText().isEmpty()==false&&Vorname_E.getText().isEmpty()==false && Nachname_E.getText().isEmpty()==false && Hochschule_E.getText().isEmpty()==false&&EMail_E.getText().isEmpty()==false)
+ {
person.verantowrtlicher.setVorname(Vorname_V.getText());
person.verantowrtlicher.setName(Nachname_V.getText());
person.verantowrtlicher.setEMail(EMail_V.getText());
@@ -306,6 +310,11 @@ public class EingabeAllgemein extends JDialog { EingabeSystemDaten ea=new EingabeSystemDaten();
ea.setVisible(true);
dispose();
+ }
+ else{
+ JOptionPane.showMessageDialog(null, "Bitte geben Sie alle notwendigen Daten an!",
+ "Error", JOptionPane.ERROR_MESSAGE);
+ }
}
});
cancelButton.setActionCommand("Cancel");
diff --git a/Dozentenmodul/src/GUI/EingabeSoftwareDaten.java b/Dozentenmodul/src/GUI/EingabeSoftwareDaten.java index f99fd88e..bf88f665 100644 --- a/Dozentenmodul/src/GUI/EingabeSoftwareDaten.java +++ b/Dozentenmodul/src/GUI/EingabeSoftwareDaten.java @@ -258,7 +258,7 @@ public class EingabeSoftwareDaten extends JDialog { cancelButton.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent arg0) {
vm.vl.setSoftware(listchoosed);
- FertigStellen fs=new FertigStellen();
+ Summary fs=new Summary();
fs.setVisible(true);
dispose();
}
diff --git a/Dozentenmodul/src/GUI/EingabeSystemDaten.java b/Dozentenmodul/src/GUI/EingabeSystemDaten.java index bbbfa98a..f94efbef 100644 --- a/Dozentenmodul/src/GUI/EingabeSystemDaten.java +++ b/Dozentenmodul/src/GUI/EingabeSystemDaten.java @@ -3,6 +3,7 @@ package GUI; import java.awt.FlowLayout;
import javax.swing.JButton;
import javax.swing.JDialog;
+import javax.swing.JOptionPane;
import javax.swing.JPanel;
import javax.swing.UIManager;
import javax.swing.UnsupportedLookAndFeelException;
@@ -30,6 +31,7 @@ import com.toedter.calendar.JDateChooser; import javax.swing.JMenuBar;
import javax.swing.JMenu;
import javax.swing.JMenuItem;
+import javax.swing.JScrollPane;
@SuppressWarnings("serial")
public class EingabeSystemDaten extends JDialog {
@@ -40,11 +42,11 @@ public class EingabeSystemDaten extends JDialog { sql sql=new sql();
private JTextField Laborname;
JDateChooser dateChooser;
- JTextArea textArea_2;
JDateChooser dateChooser_1;
- JTextArea textArea_1;
Choice choiceOS;
- JTextArea textArea;
+ JTextArea comment;
+ JTextArea shortDesc;
+ JTextArea longDesc;
/**
* Launch the application.
*/
@@ -116,32 +118,14 @@ public class EingabeSystemDaten extends JDialog { lblKurzbeschreibung.setBounds(10, 67, 150, 20);
contentPanel.add(lblKurzbeschreibung);
- textArea = new JTextArea();
- textArea.setBorder(UIManager.getBorder("TextField.border"));
- textArea.setText(vm.vl.getShortDesc());
- textArea.setBounds(170, 67, 274, 63);
- contentPanel.add(textArea);
-
JLabel lblLangbeschreibung = new JLabel("Langbeschreibung: *");
lblLangbeschreibung.setBounds(10, 139, 150, 20);
contentPanel.add(lblLangbeschreibung);
- textArea_1 = new JTextArea();
- textArea_1.setBorder(UIManager.getBorder("TextField.border"));
- textArea_1.setText(vm.vl.getLongDesc());
- textArea_1.setBounds(170, 141, 274, 152);
- contentPanel.add(textArea_1);
-
JLabel lblKommentar = new JLabel("Kommentar:");
lblKommentar.setBounds(10, 308, 150, 20);
contentPanel.add(lblKommentar);
- textArea_2 = new JTextArea();
- textArea_2.setBorder(UIManager.getBorder("TextField.border"));
- textArea_2.setText(vm.vl.getComment());
- textArea_2.setBounds(170, 304, 274, 63);
- contentPanel.add(textArea_2);
-
JLabel lblBetriebssystem = new JLabel("Betriebssystem: *");
lblBetriebssystem.setBounds(10, 373, 150, 20);
contentPanel.add(lblBetriebssystem);
@@ -175,7 +159,7 @@ public class EingabeSystemDaten extends JDialog { contentPanel.add(lblVon);
dateChooser = new JDateChooser();
- dateChooser.setDateFormatString("dd.MM.yyyy hh:mm:ss");
+ dateChooser.setDateFormatString("dd.MM.yyyy HH:mm:ss");
dateChooser.setDate(vm.vl.getBegin());
dateChooser.setBounds(204, 404, 140, 20);
contentPanel.add(dateChooser);
@@ -185,7 +169,7 @@ public class EingabeSystemDaten extends JDialog { contentPanel.add(lblNewLabel_1);
dateChooser_1 = new JDateChooser();
- dateChooser_1.setDateFormatString("dd.MM.yyyy hh:mm:ss");
+ dateChooser_1.setDateFormatString("dd.MM.yyyy HH:mm:ss");
dateChooser_1.setDate(vm.vl.getEnd());
dateChooser_1.setBounds(388, 404, 140, 20);
contentPanel.add(dateChooser_1);
@@ -199,6 +183,21 @@ public class EingabeSystemDaten extends JDialog { });
btnHinzufgen.setBounds(326, 372, 118, 23);
contentPanel.add(btnHinzufgen);
+ shortDesc=new JTextArea();
+ shortDesc.setText(vm.vl.getShortDesc());
+ JScrollPane scrollPane = new JScrollPane(shortDesc);
+ scrollPane.setBounds(170, 67, 274, 63);
+ contentPanel.add(scrollPane);
+ longDesc=new JTextArea();
+ longDesc.setText(vm.vl.getLongDesc());
+ JScrollPane scrollPane_1 = new JScrollPane(longDesc);
+ scrollPane_1.setBounds(170, 139, 274, 158);
+ contentPanel.add(scrollPane_1);
+ comment=new JTextArea();
+ comment.setText(vm.vl.getComment());
+ JScrollPane scrollPane_2 = new JScrollPane(comment);
+ scrollPane_2.setBounds(170, 308, 274, 59);
+ contentPanel.add(scrollPane_2);
{
JPanel buttonPane = new JPanel();
buttonPane.setBounds(0, 554, 567, 33);
@@ -210,12 +209,12 @@ public class EingabeSystemDaten extends JDialog { okButton.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent arg0) {
vm.vl.setBegin(dateChooser.getDate());
- vm.vl.setComment(textArea_2.getText());
+ vm.vl.setComment(comment.getText());
vm.vl.setEnd(dateChooser_1.getDate());
vm.vl.setLaborname(Laborname.getText());
- vm.vl.setLongDesc(textArea_1.getText());
+ vm.vl.setLongDesc(longDesc.getText());
vm.vl.setOS(choiceOS.getSelectedItem());
- vm.vl.setShortDesc(textArea.getText());
+ vm.vl.setShortDesc(shortDesc.getText());
EingabeAllgemein ea= new EingabeAllgemein();
ea.setVisible(true);
dispose();
@@ -230,16 +229,23 @@ public class EingabeSystemDaten extends JDialog { cancelButton.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent arg0) {
vm.vl.setBegin(dateChooser.getDate());
- vm.vl.setComment(textArea_2.getText());
+ vm.vl.setComment(comment.getText());
vm.vl.setEnd(dateChooser_1.getDate());
vm.vl.setLaborname(Laborname.getText());
- vm.vl.setLongDesc(textArea_1.getText());
+ vm.vl.setLongDesc(longDesc.getText());
vm.vl.setOS(choiceOS.getSelectedItem());
- vm.vl.setShortDesc(textArea.getText());
-
+ vm.vl.setShortDesc(shortDesc.getText());
+ if(Laborname.getText().isEmpty()==false&&shortDesc.getText().isEmpty()==false&&longDesc.getText().isEmpty()==false&&dateChooser.getDate()!=null&&dateChooser_1.getDate()!=null)
+ {
EingabeSoftwareDaten ea=new EingabeSoftwareDaten();
ea.setVisible(true);
dispose();
+ }
+ else
+ {
+ JOptionPane.showMessageDialog(null, "Bitte geben Sie alle notwendigen Daten an!",
+ "Error", JOptionPane.ERROR_MESSAGE);
+ }
}
});
cancelButton.setActionCommand("Cancel");
@@ -252,7 +258,7 @@ public class EingabeSystemDaten extends JDialog { getContentPane().add(separator);
JSeparator separator_1 = new JSeparator();
- separator_1.setBounds(0, 82, 529, 2);
+ separator_1.setBounds(0, 82, 567, 2);
getContentPane().add(separator_1);
JMenuBar menuBar = new JMenuBar();
@@ -273,8 +279,5 @@ public class EingabeSystemDaten extends JDialog { JMenuItem mntmOtrs = new JMenuItem("OTRS");
mnHilfe.add(mntmOtrs);
-
-
-
}
}
diff --git a/Dozentenmodul/src/GUI/FertigStellen.java b/Dozentenmodul/src/GUI/FertigStellen.java index e9beb598..3ff09ee6 100644 --- a/Dozentenmodul/src/GUI/FertigStellen.java +++ b/Dozentenmodul/src/GUI/FertigStellen.java @@ -1,7 +1,10 @@ package GUI;
import java.awt.FlowLayout;
+import java.awt.List;
+
import javax.swing.JButton;
import javax.swing.JDialog;
+import javax.swing.JList;
import javax.swing.JPanel;
import javax.swing.UIManager;
import javax.swing.UnsupportedLookAndFeelException;
@@ -18,12 +21,20 @@ import javax.swing.JSeparator; import javax.swing.JMenuBar;
import javax.swing.JMenuItem;
import javax.swing.JMenu;
+import javax.swing.JTable;
+
+import Models.person;
+import Models.vm;
+import java.awt.TextArea;
+import javax.swing.JTextArea;
+import javax.swing.JScrollPane;
+import com.toedter.calendar.JDateChooser;
@SuppressWarnings("serial")
public class FertigStellen extends JDialog {
- private final JPanel contentPanel = new JPanel();
+ private final JScrollPane contentPanel = new JScrollPane();
String[] result;
ftp f=new ftp();
/**
@@ -42,6 +53,7 @@ public class FertigStellen extends JDialog { /**
* Create the dialog.
*/
+ @SuppressWarnings("deprecation")
public FertigStellen() {
try {
UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
@@ -51,11 +63,11 @@ public class FertigStellen extends JDialog { e.printStackTrace();
}
setTitle("Dozentenmodul");
- setBounds(100, 100, 417, 307);
+ setBounds(100, 100, 561, 908);
getContentPane().setLayout(null);
{
JPanel panel = new JPanel();
- panel.setBounds(0, 0, 529, 68);
+ panel.setBounds(0, 0, 545, 68);
getContentPane().add(panel);
panel.setLayout(null);
{
@@ -72,28 +84,236 @@ public class FertigStellen extends JDialog { txtpnBitteWhlenSie.setBounds(10, 36, 391, 42);
panel.add(txtpnBitteWhlenSie);
}
- contentPanel.setBounds(10, 91, 381, 97);
+ contentPanel.setBounds(10, 87, 525, 702);
contentPanel.setBackground(Color.WHITE);
contentPanel.setBorder(new EmptyBorder(5, 5, 5, 5));
getContentPane().add(contentPanel);
contentPanel.setLayout(null);
+ JLabel lblZusammenfassung = new JLabel("Zusammenfassung");
+ lblZusammenfassung.setFont(new Font("Tahoma", Font.PLAIN, 16));
+ lblZusammenfassung.setBounds(10, 11, 505, 14);
+ contentPanel.add(lblZusammenfassung);
+
+ JLabel lblVerantwortlicher = new JLabel("Verantwortlicher");
+ lblVerantwortlicher.setFont(new Font("Tahoma", Font.PLAIN, 14));
+ lblVerantwortlicher.setBounds(10, 36, 244, 14);
+ contentPanel.add(lblVerantwortlicher);
+
+ JLabel lblErsteller = new JLabel("Ersteller");
+ lblErsteller.setFont(new Font("Tahoma", Font.PLAIN, 14));
+ lblErsteller.setBounds(264, 36, 251, 14);
+ contentPanel.add(lblErsteller);
+
+ JLabel lblName = new JLabel("Vorname:");
+ lblName.setBounds(10, 61, 65, 14);
+ contentPanel.add(lblName);
+
+ JLabel lblName_1 = new JLabel("Nachname:");
+ lblName_1.setBounds(10, 86, 65, 14);
+ contentPanel.add(lblName_1);
+
+ JLabel lblHochschule = new JLabel("Hochschule:");
+ lblHochschule.setBounds(10, 111, 65, 14);
+ contentPanel.add(lblHochschule);
+
+ JLabel lblEmail = new JLabel("E-Mail:");
+ lblEmail.setBounds(10, 136, 65, 14);
+ contentPanel.add(lblEmail);
+
+ JLabel lblTelnummer = new JLabel("Tel.-Nummer:");
+ lblTelnummer.setBounds(10, 161, 65, 14);
+ contentPanel.add(lblTelnummer);
+
+ JLabel lblFakultt = new JLabel("Fakult\u00E4t:");
+ lblFakultt.setBounds(10, 186, 65, 14);
+ contentPanel.add(lblFakultt);
+
+ JLabel label = new JLabel("Fakult\u00E4t:");
+ label.setBounds(264, 186, 65, 14);
+ contentPanel.add(label);
+
+ JLabel label_1 = new JLabel("Tel.-Nummer:");
+ label_1.setBounds(264, 161, 65, 14);
+ contentPanel.add(label_1);
+
+ JLabel label_2 = new JLabel("E-Mail:");
+ label_2.setBounds(264, 136, 65, 14);
+ contentPanel.add(label_2);
+
+ JLabel label_3 = new JLabel("Hochschule:");
+ label_3.setBounds(264, 111, 65, 14);
+ contentPanel.add(label_3);
+
+ JLabel label_4 = new JLabel("Nachname:");
+ label_4.setBounds(264, 86, 65, 14);
+ contentPanel.add(label_4);
+
+ JLabel label_5 = new JLabel("Vorname:");
+ label_5.setBounds(264, 61, 65, 14);
+ contentPanel.add(label_5);
+
+ JLabel lblSystem = new JLabel("System");
+ lblSystem.setFont(new Font("Tahoma", Font.PLAIN, 14));
+ lblSystem.setBounds(10, 211, 171, 14);
+ contentPanel.add(lblSystem);
+
+ JLabel lblLaborname = new JLabel("Laborname:");
+ lblLaborname.setBounds(10, 236, 100, 14);
+ contentPanel.add(lblLaborname);
+
+ JLabel lblKurzbeschreibung = new JLabel("Kurzbeschreibung:");
+ lblKurzbeschreibung.setBounds(10, 261, 100, 14);
+ contentPanel.add(lblKurzbeschreibung);
+
+ JLabel lblLangbeschreibung = new JLabel("Langbeschreibung:");
+ lblLangbeschreibung.setBounds(10, 341, 100, 14);
+ contentPanel.add(lblLangbeschreibung);
+
+ JLabel lblKommentar = new JLabel("Kommentar:");
+ lblKommentar.setBounds(10, 425, 100, 14);
+ contentPanel.add(lblKommentar);
+
+ JLabel lblBetriebssystem = new JLabel("Betriebssystem:");
+ lblBetriebssystem.setBounds(10, 510, 100, 14);
+ contentPanel.add(lblBetriebssystem);
+
+ JLabel lblGltigVon = new JLabel("G\u00FCltig von");
+ lblGltigVon.setBounds(10, 535, 100, 14);
+ contentPanel.add(lblGltigVon);
+
+ JLabel lblBis = new JLabel("bis");
+ lblBis.setBounds(262, 535, 46, 14);
+ contentPanel.add(lblBis);
+
+ JLabel lblSoftware = new JLabel("Ausgew\u00E4hlte Software");
+ lblSoftware.setFont(new Font("Tahoma", Font.PLAIN, 14));
+ lblSoftware.setBounds(10, 560, 171, 14);
+ contentPanel.add(lblSoftware);
+
+ JLabel label_Vorname_V = new JLabel("");
+ label_Vorname_V.setText(person.verantowrtlicher.getVorname());
+ label_Vorname_V.setBounds(85, 61, 169, 14);
+ contentPanel.add(label_Vorname_V);
+
+ JLabel label_Nachname_V = new JLabel((String) null);
+ label_Nachname_V.setText(person.verantowrtlicher.getName());
+ label_Nachname_V.setBounds(85, 86, 169, 14);
+ contentPanel.add(label_Nachname_V);
+
+ JLabel label_Hochschule_V = new JLabel((String) null);
+ label_Hochschule_V.setText(person.verantowrtlicher.getHochschule());
+ label_Hochschule_V.setBounds(85, 111, 169, 14);
+ contentPanel.add(label_Hochschule_V);
+
+ JLabel label_EMail_V = new JLabel((String) null);
+ label_EMail_V.setText(person.verantowrtlicher.getEMail());
+ label_EMail_V.setBounds(85, 136, 169, 14);
+ contentPanel.add(label_EMail_V);
+
+ JLabel label_Tel_V = new JLabel((String) null);
+ label_Tel_V.setText(person.verantowrtlicher.getTel());
+ label_Tel_V.setBounds(85, 161, 169, 14);
+ contentPanel.add(label_Tel_V);
+
+ JLabel label_Fak_V = new JLabel((String) null);
+ label_Fak_V.setText(person.verantowrtlicher.getFakultät());
+ label_Fak_V.setBounds(85, 186, 169, 14);
+ contentPanel.add(label_Fak_V);
+
+ JLabel label_Vorname_E = new JLabel((String) null);
+ label_Vorname_E.setText(person.ersteller.getVorname());
+ label_Vorname_E.setBounds(339, 61, 169, 14);
+ contentPanel.add(label_Vorname_E);
+
+ JLabel label_Nachname_E = new JLabel((String) null);
+ label_Nachname_E.setText(person.ersteller.getName());
+ label_Nachname_E.setBounds(339, 86, 169, 14);
+ contentPanel.add(label_Nachname_E);
+
+ JLabel label_Hochschule_E = new JLabel((String) null);
+ label_Hochschule_E.setText(person.ersteller.getHochschule());
+ label_Hochschule_E.setBounds(339, 111, 169, 14);
+ contentPanel.add(label_Hochschule_E);
+
+ JLabel label_EMail_E = new JLabel((String) null);
+ label_EMail_E.setText(person.ersteller.getEMail());
+ label_EMail_E.setBounds(339, 136, 169, 14);
+ contentPanel.add(label_EMail_E);
+
+ JLabel label_Tel_E = new JLabel((String) null);
+ label_Tel_E.setText(person.ersteller.getTel());
+ label_Tel_E.setBounds(339, 161, 169, 14);
+ contentPanel.add(label_Tel_E);
+
+ JLabel label_Fak_E = new JLabel((String) null);
+ label_Fak_E.setText(person.ersteller.getFakultät());
+ label_Fak_E.setBounds(339, 186, 169, 14);
+ contentPanel.add(label_Fak_E);
+
+ JLabel label_Laborname = new JLabel("");
+ label_Laborname.setText(vm.vl.getLaborname());
+ label_Laborname.setBounds(120, 236, 395, 14);
+ contentPanel.add(label_Laborname);
+
+ JTextArea textArea = new JTextArea();
+ textArea.setText(vm.vl.getShortDesc());
+ textArea.setEditable(false);
+ JScrollPane scrollPane = new JScrollPane(textArea);
+ scrollPane.setBounds(120, 261, 395, 74);
+ contentPanel.add(scrollPane);
+
+ JTextArea textArea_1 = new JTextArea();
+ textArea_1.setText(vm.vl.getLongDesc());
+ textArea_1.setEditable(false);
+ JScrollPane scrollPane_1 = new JScrollPane(textArea_1);
+ scrollPane_1.setBounds(120, 341, 395, 74);
+ contentPanel.add(scrollPane_1);
+
+ JTextArea textArea_2 = new JTextArea();
+ textArea_2.setText(vm.vl.getComment());
+ textArea_2.setEditable(false);
+ JScrollPane scrollPane_2 = new JScrollPane(textArea_2);
+ scrollPane_2.setBounds(120, 425, 395, 74);
+ contentPanel.add(scrollPane_2);
+
+ JLabel label_os = new JLabel("");
+ label_os.setText(vm.vl.getOS());
+ label_os.setBounds(120, 510, 395, 14);
+ contentPanel.add(label_os);
+
+ JLabel label_start = new JLabel("");
+ label_start.setText(vm.vl.getBegin().toString());
+ label_start.setBounds(120, 535, 134, 14);
+ contentPanel.add(label_start);
+
+ JLabel label_end = new JLabel("");
+ label_end.setText(vm.vl.getEnd().toString());
+ label_end.setBounds(318, 535, 197, 14);
+ contentPanel.add(label_end);
+
JButton btnUploaderStarten = new JButton("Uploader starten");
+ btnUploaderStarten.setBounds(402, 670, 113, 23);
+ contentPanel.add(btnUploaderStarten);
+ List sum=new List();
+ List temp=vm.vl.getSoftware();
+ for(int i=0;i<temp.getItemCount();i++)
+ {
+ sum.addItem(temp.getItem(i));
+ }
+ JScrollPane scrollPane_3 = new JScrollPane(sum);
+
+ scrollPane_3.setBounds(10, 585, 505, 74);
+ contentPanel.add(scrollPane_3);
btnUploaderStarten.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent arg0) {
FTPUploader ftp=new FTPUploader();
ftp.setVisible(true);
}
});
- btnUploaderStarten.setBounds(10, 11, 203, 23);
- contentPanel.add(btnUploaderStarten);
-
- JButton btnSofortigeSyncronisation = new JButton("Sofortige Syncronisation");
- btnSofortigeSyncronisation.setBounds(10, 63, 203, 23);
- contentPanel.add(btnSofortigeSyncronisation);
{
JPanel buttonPane = new JPanel();
- buttonPane.setBounds(0, 212, 401, 36);
+ buttonPane.setBounds(0, 813, 545, 36);
buttonPane.setBackground(SystemColor.menu);
buttonPane.setLayout(new FlowLayout(FlowLayout.RIGHT));
getContentPane().add(buttonPane);
@@ -123,11 +343,11 @@ public class FertigStellen extends JDialog { }
JSeparator separator = new JSeparator();
- separator.setBounds(0, 79, 529, 2);
+ separator.setBounds(0, 79, 545, 2);
getContentPane().add(separator);
JSeparator separator_1 = new JSeparator();
- separator_1.setBounds(0, 199, 401, 2);
+ separator_1.setBounds(0, 800, 545, 2);
getContentPane().add(separator_1);
JMenuBar menuBar = new JMenuBar();
diff --git a/Dozentenmodul/src/GUI/LoginWindow.java b/Dozentenmodul/src/GUI/LoginWindow.java index 4f9268ef..3b292e42 100644 --- a/Dozentenmodul/src/GUI/LoginWindow.java +++ b/Dozentenmodul/src/GUI/LoginWindow.java @@ -13,7 +13,6 @@ 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;
@@ -107,8 +106,9 @@ public class LoginWindow extends JFrame { BtnLogin.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent arg0) {
//Aufruf der Ldap Klasse, welche die Ldap überprüfung vornimmt
- Ldap check=new Ldap();
- boolean login=check.LdapAuth(username.getText(), new String(pass.getPassword()));
+ //Ldap check=new Ldap();
+ boolean login=true;
+ //boolean login=check.LdapAuth(username.getText(), new String(pass.getPassword()));
if(login==true)
{
diff --git a/Dozentenmodul/src/GUI/Summary.java b/Dozentenmodul/src/GUI/Summary.java new file mode 100644 index 00000000..d09f7391 --- /dev/null +++ b/Dozentenmodul/src/GUI/Summary.java @@ -0,0 +1,392 @@ +package GUI;
+import java.awt.FlowLayout;
+import java.awt.List;
+
+import javax.swing.JButton;
+import javax.swing.JDialog;
+import javax.swing.JPanel;
+import javax.swing.UIManager;
+import javax.swing.UnsupportedLookAndFeelException;
+import java.awt.Color;
+import javax.swing.JLabel;
+import java.awt.Font;
+import javax.swing.JTextPane;
+import java.awt.SystemColor;
+import ftp.ftp;
+import java.awt.event.ActionListener;
+import java.awt.event.ActionEvent;
+import javax.swing.JSeparator;
+import javax.swing.JMenuBar;
+import javax.swing.JMenuItem;
+import javax.swing.JMenu;
+import Models.person;
+import Models.vm;
+import javax.swing.JTextArea;
+import javax.swing.JScrollPane;
+import javax.swing.JTabbedPane;
+import java.awt.Panel;
+import java.text.SimpleDateFormat;
+
+
+@SuppressWarnings("serial")
+public class Summary extends JDialog {
+ String[] result;
+ ftp f=new ftp();
+ /**
+ * Launch the application.
+ */
+ public static void main(String[] args) {
+ try {
+ Summary dialog = new Summary();
+ dialog.setDefaultCloseOperation(JDialog.DISPOSE_ON_CLOSE);
+ dialog.setVisible(true);
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+
+ /**
+ * Create the dialog.
+ */
+ public Summary() {
+ try {
+ UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
+ } catch (ClassNotFoundException | InstantiationException
+ | IllegalAccessException | UnsupportedLookAndFeelException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+ setTitle("Dozentenmodul");
+ setBounds(100, 100, 561, 616);
+ getContentPane().setLayout(null);
+ {
+ JPanel panel = new JPanel();
+ panel.setBounds(0, 0, 545, 68);
+ getContentPane().add(panel);
+ panel.setLayout(null);
+ {
+ JLabel lblNewLabel = new JLabel("Fertig stellen (Schritt 6 von 6)");
+ lblNewLabel.setBounds(10, 11, 391, 22);
+ panel.add(lblNewLabel);
+ lblNewLabel.setFont(new Font("Tahoma", Font.PLAIN, 18));
+ }
+
+ JTextPane txtpnBitteWhlenSie = new JTextPane();
+ txtpnBitteWhlenSie.setEditable(false);
+ txtpnBitteWhlenSie.setBackground(SystemColor.menu);
+ txtpnBitteWhlenSie.setText("Bitte laden Sie nun ihre fertige VL mithilfe des Uploaders auf den Server.");
+ txtpnBitteWhlenSie.setBounds(10, 36, 391, 42);
+ panel.add(txtpnBitteWhlenSie);
+ }
+
+ {
+ JPanel buttonPane = new JPanel();
+ buttonPane.setBounds(0, 521, 545, 36);
+ buttonPane.setBackground(SystemColor.menu);
+ buttonPane.setLayout(new FlowLayout(FlowLayout.RIGHT));
+ getContentPane().add(buttonPane);
+ {
+ JButton okButton = new JButton("Zur\u00FCck");
+ okButton.addActionListener(new ActionListener() {
+ public void actionPerformed(ActionEvent e) {
+ EingabeSoftwareDaten ea=new EingabeSoftwareDaten();
+ ea.setVisible(true);
+ dispose();
+ }
+ });
+ okButton.setActionCommand("OK");
+ buttonPane.add(okButton);
+ getRootPane().setDefaultButton(okButton);
+ }
+ {
+ JButton cancelButton = new JButton("Fertig");
+ cancelButton.addActionListener(new ActionListener() {
+ public void actionPerformed(ActionEvent e) {
+ System.exit(0);
+ }
+ });
+ cancelButton.setActionCommand("Cancel");
+ buttonPane.add(cancelButton);
+ }
+ }
+
+ JSeparator separator = new JSeparator();
+ separator.setBounds(0, 79, 545, 2);
+ getContentPane().add(separator);
+
+ JSeparator separator_1 = new JSeparator();
+ separator_1.setBounds(0, 518, 545, 2);
+ getContentPane().add(separator_1);
+
+ JTabbedPane tabbedPane = new JTabbedPane(JTabbedPane.TOP);
+ tabbedPane.setBounds(10, 111, 525, 369);
+
+
+ getContentPane().add(tabbedPane);
+
+ Panel panel = new Panel();
+ panel.setBackground(Color.WHITE);
+ tabbedPane.addTab("Allgemein", null, panel, null);
+ panel.setLayout(null);
+
+ JLabel label = new JLabel("Ersteller");
+ label.setFont(new Font("Tahoma", Font.PLAIN, 14));
+ label.setBounds(264, 11, 251, 14);
+ panel.add(label);
+
+ JLabel label_1 = new JLabel("Vorname:");
+ label_1.setBounds(10, 36, 65, 14);
+ panel.add(label_1);
+
+ JLabel label_2 = new JLabel("Vorname:");
+ label_2.setBounds(264, 36, 65, 14);
+ panel.add(label_2);
+
+ JLabel label_3 = new JLabel("Nachname:");
+ label_3.setBounds(10, 61, 65, 14);
+ panel.add(label_3);
+
+ JLabel label_4 = new JLabel("Nachname:");
+ label_4.setBounds(264, 61, 65, 14);
+ panel.add(label_4);
+
+ JLabel label_5 = new JLabel("Hochschule:");
+ label_5.setBounds(10, 86, 65, 14);
+ panel.add(label_5);
+
+ JLabel label_6 = new JLabel("Hochschule:");
+ label_6.setBounds(264, 86, 65, 14);
+ panel.add(label_6);
+
+ JLabel label_Vorname_V = new JLabel((String) null);
+ label_Vorname_V.setText(person.verantowrtlicher.getVorname());
+ label_Vorname_V.setBounds(85, 36, 169, 14);
+ panel.add(label_Vorname_V);
+
+ JLabel label_Vorname_E = new JLabel((String) null);
+ label_Vorname_E.setText(person.ersteller.getVorname());
+ label_Vorname_E.setBounds(339, 36, 169, 14);
+ panel.add(label_Vorname_E);
+
+ JLabel label_Nachname_E = new JLabel((String) null);
+ label_Nachname_E.setText(person.ersteller.getName());
+ label_Nachname_E.setBounds(339, 61, 169, 14);
+ panel.add(label_Nachname_E);
+
+ JLabel label_Nachname_V = new JLabel((String) null);
+ label_Nachname_V.setText(person.verantowrtlicher.getName());
+ label_Nachname_V.setBounds(85, 61, 169, 14);
+ panel.add(label_Nachname_V);
+
+ JLabel label_Hochschule_V = new JLabel((String) null);
+ label_Hochschule_V.setText(person.verantowrtlicher.getHochschule());
+ label_Hochschule_V.setBounds(85, 86, 169, 14);
+ panel.add(label_Hochschule_V);
+
+ JLabel label_Hochschule_E = new JLabel((String) null);
+ label_Hochschule_E.setText(person.ersteller.getHochschule());
+ label_Hochschule_E.setBounds(339, 86, 169, 14);
+ panel.add(label_Hochschule_E);
+
+ JLabel label_Mail_E = new JLabel((String) null);
+ label_Mail_E.setText(person.ersteller.getEMail());
+ label_Mail_E.setBounds(339, 111, 169, 14);
+ panel.add(label_Mail_E);
+
+ JLabel label_14 = new JLabel("E-Mail:");
+ label_14.setBounds(264, 111, 65, 14);
+ panel.add(label_14);
+
+ JLabel label_Mail_V = new JLabel((String) null);
+ label_Mail_V.setText(person.verantowrtlicher.getEMail());
+ label_Mail_V.setBounds(85, 111, 169, 14);
+ panel.add(label_Mail_V);
+
+ JLabel label_16 = new JLabel("E-Mail:");
+ label_16.setBounds(10, 111, 65, 14);
+ panel.add(label_16);
+
+ JLabel label_17 = new JLabel("Tel.-Nummer:");
+ label_17.setBounds(10, 136, 65, 14);
+ panel.add(label_17);
+
+ JLabel label_Tel_V = new JLabel((String) null);
+ label_Tel_V.setText(person.verantowrtlicher.getTel());
+ label_Tel_V.setBounds(85, 136, 169, 14);
+ panel.add(label_Tel_V);
+
+ JLabel label_19 = new JLabel("Tel.-Nummer:");
+ label_19.setBounds(264, 136, 65, 14);
+ panel.add(label_19);
+
+ JLabel label_Tel_E = new JLabel((String) null);
+ label_Tel_E.setText(person.ersteller.getTel());
+ label_Tel_E.setBounds(339, 136, 169, 14);
+ panel.add(label_Tel_E);
+
+ JLabel label_Fak_E = new JLabel((String) null);
+ label_Fak_E.setText(person.ersteller.getFakultät());
+ label_Fak_E.setBounds(339, 161, 169, 14);
+ panel.add(label_Fak_E);
+
+ JLabel label_22 = new JLabel("Fakult\u00E4t:");
+ label_22.setBounds(264, 161, 65, 14);
+ panel.add(label_22);
+
+ JLabel label_Fak_V = new JLabel((String) null);
+ label_Fak_V.setText(person.verantowrtlicher.getFakultät());
+ label_Fak_V.setBounds(85, 161, 169, 14);
+ panel.add(label_Fak_V);
+
+ JLabel label_24 = new JLabel("Fakult\u00E4t:");
+ label_24.setBounds(10, 161, 65, 14);
+ panel.add(label_24);
+
+ JLabel label_25 = new JLabel("Verantwortlicher");
+ label_25.setFont(new Font("Tahoma", Font.PLAIN, 14));
+ label_25.setBounds(10, 11, 244, 14);
+ panel.add(label_25);
+
+ Panel panel_1 = new Panel();
+ panel_1.setBackground(Color.WHITE);
+ tabbedPane.addTab("Systeminformationen", null, panel_1, null);
+ panel_1.setLayout(null);
+
+ JLabel label_end = new JLabel((String) null);
+ SimpleDateFormat fmt = new SimpleDateFormat("dd.MM.yyyy HH:mm:ss");
+ String Date_End=fmt.format(vm.vl.getEnd());
+ label_end.setText(Date_End);
+ label_end.setBounds(318, 310, 197, 14);
+ panel_1.add(label_end);
+
+ JLabel label_27 = new JLabel("bis");
+ label_27.setBounds(262, 310, 46, 14);
+ panel_1.add(label_27);
+
+ JLabel label_begin = new JLabel((String) null);
+ String Date_Begin=fmt.format(vm.vl.getBegin());
+ label_begin.setText(Date_Begin);
+ label_begin.setBounds(120, 310, 134, 14);
+ panel_1.add(label_begin);
+
+ JLabel label_29 = new JLabel("G\u00FCltig von");
+ label_29.setBounds(10, 310, 100, 14);
+ panel_1.add(label_29);
+
+ JLabel label_30 = new JLabel("Betriebssystem:");
+ label_30.setBounds(10, 285, 100, 14);
+ panel_1.add(label_30);
+
+ JLabel label_OS = new JLabel((String) null);
+ label_OS.setText(vm.vl.getOS());
+ label_OS.setBounds(120, 285, 395, 14);
+ panel_1.add(label_OS);
+
+ JScrollPane scrollPane_3 = new JScrollPane();
+ scrollPane_3.setBounds(121, 201, 393, 72);
+ panel_1.add(scrollPane_3);
+
+ JTextArea textArea_comment = new JTextArea();
+ textArea_comment.setText(vm.vl.getComment());
+ scrollPane_3.setViewportView(textArea_comment);
+ textArea_comment.setEditable(false);
+
+ JLabel label_32 = new JLabel("Kommentar:");
+ label_32.setBounds(10, 200, 100, 14);
+ panel_1.add(label_32);
+
+ JScrollPane scrollPane_2 = new JScrollPane();
+ scrollPane_2.setBounds(121, 117, 393, 72);
+ panel_1.add(scrollPane_2);
+
+ JTextArea textArea_long = new JTextArea();
+ textArea_long.setText(vm.vl.getLongDesc());
+ scrollPane_2.setViewportView(textArea_long);
+ textArea_long.setEditable(false);
+
+ JLabel label_33 = new JLabel("Langbeschreibung:");
+ label_33.setBounds(10, 116, 100, 14);
+ panel_1.add(label_33);
+
+ JScrollPane scrollPane_1 = new JScrollPane();
+ scrollPane_1.setBounds(121, 37, 393, 72);
+ panel_1.add(scrollPane_1);
+
+ JTextArea textArea_short = new JTextArea();
+ textArea_short.setText(vm.vl.getShortDesc());
+ scrollPane_1.setViewportView(textArea_short);
+ textArea_short.setEditable(false);
+
+ JLabel label_34 = new JLabel("Kurzbeschreibung:");
+ label_34.setBounds(10, 36, 100, 14);
+ panel_1.add(label_34);
+
+ JLabel label_35 = new JLabel("Laborname:");
+ label_35.setBounds(10, 11, 100, 14);
+ panel_1.add(label_35);
+
+ JLabel label_Laborname = new JLabel((String) null);
+ label_Laborname.setText(vm.vl.getLaborname());
+ label_Laborname.setBounds(120, 11, 395, 14);
+ panel_1.add(label_Laborname);
+
+ Panel panel_2 = new Panel();
+ panel_2.setBackground(Color.WHITE);
+ tabbedPane.addTab("Software", null, panel_2, null);
+ panel_2.setLayout(null);
+
+ JScrollPane scrollPane = new JScrollPane();
+ scrollPane.setBounds(11, 37, 499, 293);
+ panel_2.add(scrollPane);
+
+ List list_sw = new List();
+ list_sw.setEnabled(false);
+ List temp=vm.vl.getSoftware();
+ for(int i=0;i<temp.getItemCount();i++)
+ {
+ list_sw.add(temp.getItem(i));
+ }
+ scrollPane.setViewportView(list_sw);
+
+ JLabel label_37 = new JLabel("Ausgew\u00E4hlte Software");
+ label_37.setFont(new Font("Tahoma", Font.PLAIN, 14));
+ label_37.setBounds(10, 11, 171, 14);
+ panel_2.add(label_37);
+
+ JLabel lblZusammenfassung = new JLabel("Zusammenfassung");
+ lblZusammenfassung.setFont(new Font("Tahoma", Font.PLAIN, 16));
+ lblZusammenfassung.setBounds(10, 86, 223, 14);
+ getContentPane().add(lblZusammenfassung);
+
+ JButton btnUploadtoolStarten = new JButton("Uploadtool starten");
+ btnUploadtoolStarten.addActionListener(new ActionListener() {
+ public void actionPerformed(ActionEvent arg0) {
+ FTPUploader up=new FTPUploader();
+ up.setVisible(true);
+ }
+ });
+ btnUploadtoolStarten.setBounds(397, 487, 138, 23);
+ getContentPane().add(btnUploadtoolStarten);
+
+ JMenuBar menuBar = new JMenuBar();
+ setJMenuBar(menuBar);
+
+ JMenu mnSuchen = new JMenu("Suchen");
+ menuBar.add(mnSuchen);
+
+ JMenuItem mntmVlSuche = new JMenuItem("VL Suche");
+ mnSuchen.add(mntmVlSuche);
+
+ JMenu mnHilfe = new JMenu("Hilfe");
+ menuBar.add(mnHilfe);
+
+ JMenuItem mntmFaq = new JMenuItem("FAQ");
+ mnHilfe.add(mntmFaq);
+
+ JMenuItem mntmOtrs = new JMenuItem("OTRS");
+ mnHilfe.add(mntmOtrs);
+
+
+
+ }
+}
diff --git a/Dozentenmodul/src/GUI/getVMwarePlayer.java b/Dozentenmodul/src/GUI/getVMwarePlayer.java index 47a09de5..c08411a1 100644 --- a/Dozentenmodul/src/GUI/getVMwarePlayer.java +++ b/Dozentenmodul/src/GUI/getVMwarePlayer.java @@ -1,5 +1,6 @@ package GUI;
+import java.awt.Desktop;
import java.awt.FlowLayout;
import javax.swing.JButton;
import javax.swing.JDialog;
@@ -19,6 +20,12 @@ import javax.swing.JSeparator; import javax.swing.JMenuBar;
import javax.swing.JMenu;
import javax.swing.JMenuItem;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+import java.io.IOException;
+import java.net.URI;
+import java.net.URISyntaxException;
+
@SuppressWarnings("serial")
public class getVMwarePlayer extends JDialog {
@@ -81,8 +88,27 @@ public class getVMwarePlayer extends JDialog { JTextPane txtpnUmIhreVmdk = new JTextPane();
txtpnUmIhreVmdk.setEditable(false);
txtpnUmIhreVmdk.setText("Um Ihre VMDK zu bearbeiten bzw. die notwendigen Programme zu installieren, ben\u00F6tigen sie den VMware Player. Den VMware Player k\u00F6nnen Sie unter folgendem Link downloaden.");
- txtpnUmIhreVmdk.setBounds(0, 0, 499, 154);
+ txtpnUmIhreVmdk.setBounds(0, 0, 499, 66);
contentPanel.add(txtpnUmIhreVmdk);
+
+ JLabel lblNewLabel_1 = new JLabel("<html><a href=\"https:////my.vmware.com//web//vmware//free#desktop_end_user_computing//vmware_player//6_0\" >vmWare Player Download</a></html>");
+ lblNewLabel_1.addMouseListener(new MouseAdapter() {
+ @Override
+ public void mouseReleased(MouseEvent arg0) {
+ URI url;
+ try {
+ url = new URI("https://my.vmware.com/web/vmware/free#desktop_end_user_computing/vmware_player/6_0");
+ Desktop.getDesktop().browse(url);
+ } catch (URISyntaxException | IOException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+
+ }
+ });
+
+ lblNewLabel_1.setBounds(10, 93, 499, 14);
+ contentPanel.add(lblNewLabel_1);
{
JPanel buttonPane = new JPanel();
buttonPane.setBounds(0, 423, 529, 33);
diff --git a/Dozentenmodul/src/Jsch/scriptExecutor.java b/Dozentenmodul/src/Jsch/scriptExecutor.java index 4d7b8f17..0ded43b8 100644 --- a/Dozentenmodul/src/Jsch/scriptExecutor.java +++ b/Dozentenmodul/src/Jsch/scriptExecutor.java @@ -5,8 +5,6 @@ import java.io.IOException; import java.io.InputStream;
import java.io.InputStreamReader;
import java.util.Properties;
-
-import com.jcraft.jsch.Channel;
import com.jcraft.jsch.ChannelExec;
import com.jcraft.jsch.JSch;
import com.jcraft.jsch.JSchException;
diff --git a/Dozentenmodul/src/ftp/ftp.java b/Dozentenmodul/src/ftp/ftp.java index bbb6485b..e128c1d0 100644 --- a/Dozentenmodul/src/ftp/ftp.java +++ b/Dozentenmodul/src/ftp/ftp.java @@ -3,9 +3,7 @@ package ftp; import java.io.FileOutputStream;
import java.io.IOException;
-
import java.net.SocketException;
-
import org.apache.commons.net.ftp.FTPClient;
import org.apache.commons.net.ftp.FTPFile;
|