diff options
22 files changed, 127 insertions, 97 deletions
diff --git a/Dozentenmodul/bin/GUI/EingabeAllgemein.class b/Dozentenmodul/bin/GUI/EingabeAllgemein.class Binary files differindex 9a9ba023..5a33bb2a 100644 --- a/Dozentenmodul/bin/GUI/EingabeAllgemein.class +++ b/Dozentenmodul/bin/GUI/EingabeAllgemein.class diff --git a/Dozentenmodul/bin/GUI/EingabeSoftwareDaten.class b/Dozentenmodul/bin/GUI/EingabeSoftwareDaten.class Binary files differindex c848ef14..7f650ab7 100644 --- a/Dozentenmodul/bin/GUI/EingabeSoftwareDaten.class +++ b/Dozentenmodul/bin/GUI/EingabeSoftwareDaten.class diff --git a/Dozentenmodul/bin/GUI/EingabeSystemDaten$1.class b/Dozentenmodul/bin/GUI/EingabeSystemDaten$1.class Binary files differindex da26975c..8d98a383 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 8798d1f5..4f09d4ad 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 5905324d..74b74d98 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 bf9dba78..7bd7b920 100644 --- a/Dozentenmodul/bin/GUI/EingabeSystemDaten.class +++ b/Dozentenmodul/bin/GUI/EingabeSystemDaten.class diff --git a/Dozentenmodul/bin/GUI/FTPDownloader$1.class b/Dozentenmodul/bin/GUI/FTPDownloader$1.class Binary files differindex c8018a4f..3ad9de05 100644 --- a/Dozentenmodul/bin/GUI/FTPDownloader$1.class +++ b/Dozentenmodul/bin/GUI/FTPDownloader$1.class diff --git a/Dozentenmodul/bin/GUI/FTPDownloader$2.class b/Dozentenmodul/bin/GUI/FTPDownloader$2.class Binary files differindex 86cae62c..36c5c620 100644 --- a/Dozentenmodul/bin/GUI/FTPDownloader$2.class +++ b/Dozentenmodul/bin/GUI/FTPDownloader$2.class diff --git a/Dozentenmodul/bin/GUI/FTPDownloader.class b/Dozentenmodul/bin/GUI/FTPDownloader.class Binary files differindex d07f433f..999992b6 100644 --- a/Dozentenmodul/bin/GUI/FTPDownloader.class +++ b/Dozentenmodul/bin/GUI/FTPDownloader.class diff --git a/Dozentenmodul/bin/GUI/FTPUploader.class b/Dozentenmodul/bin/GUI/FTPUploader.class Binary files differindex a09c94e1..018bcf40 100644 --- a/Dozentenmodul/bin/GUI/FTPUploader.class +++ b/Dozentenmodul/bin/GUI/FTPUploader.class diff --git a/Dozentenmodul/bin/GUI/getVMwarePlayer.class b/Dozentenmodul/bin/GUI/getVMwarePlayer.class Binary files differindex 4f4a4599..51145c51 100644 --- a/Dozentenmodul/bin/GUI/getVMwarePlayer.class +++ b/Dozentenmodul/bin/GUI/getVMwarePlayer.class diff --git a/Dozentenmodul/bin/GUI/searchRohling.class b/Dozentenmodul/bin/GUI/searchRohling.class Binary files differindex 30dc2cf4..bda9671a 100644 --- a/Dozentenmodul/bin/GUI/searchRohling.class +++ b/Dozentenmodul/bin/GUI/searchRohling.class diff --git a/Dozentenmodul/bin/downloader/FTPUtility.class b/Dozentenmodul/bin/downloader/FTPUtility.class Binary files differindex 2e80b7d4..12c72577 100644 --- a/Dozentenmodul/bin/downloader/FTPUtility.class +++ b/Dozentenmodul/bin/downloader/FTPUtility.class diff --git a/Dozentenmodul/src/GUI/EingabeAllgemein.java b/Dozentenmodul/src/GUI/EingabeAllgemein.java index e1811e95..4cc49229 100644 --- a/Dozentenmodul/src/GUI/EingabeAllgemein.java +++ b/Dozentenmodul/src/GUI/EingabeAllgemein.java @@ -80,11 +80,11 @@ public class EingabeAllgemein extends JDialog { e.printStackTrace();
}
setTitle("Dozentenmodul");
- setBounds(100, 100, 545, 689);
+ setBounds(100, 100, 603, 722);
getContentPane().setLayout(null);
{
JPanel panel = new JPanel();
- panel.setBounds(0, 0, 529, 68);
+ panel.setBounds(0, 0, 587, 68);
getContentPane().add(panel);
panel.setLayout(null);
{
@@ -101,7 +101,7 @@ public class EingabeAllgemein extends JDialog { txtpnBitteWhlenSie.setBounds(10, 36, 509, 42);
panel.add(txtpnBitteWhlenSie);
}
- contentPanel.setBounds(10, 91, 509, 483);
+ contentPanel.setBounds(10, 91, 577, 525);
contentPanel.setBackground(Color.WHITE);
contentPanel.setBorder(new EmptyBorder(5, 5, 5, 5));
getContentPane().add(contentPanel);
@@ -117,7 +117,7 @@ public class EingabeAllgemein extends JDialog { contentPanel.add(lblNewLabel_2);
Vorname_V = new JTextField();
- Vorname_V.setBounds(145, 36, 125, 20);
+ Vorname_V.setBounds(145, 36, 350, 20);
Vorname_V.setText(person.verantowrtlicher.getVorname());
contentPanel.add(Vorname_V);
Vorname_V.setColumns(10);
@@ -127,7 +127,7 @@ public class EingabeAllgemein extends JDialog { contentPanel.add(lblNachname);
Nachname_V = new JTextField();
- Nachname_V.setBounds(145, 67, 125, 20);
+ Nachname_V.setBounds(145, 67, 350, 20);
Nachname_V.setText(person.verantowrtlicher.getName());
contentPanel.add(Nachname_V);
Nachname_V.setColumns(10);
@@ -138,7 +138,7 @@ public class EingabeAllgemein extends JDialog { Hochschule_V = new JTextField();
Hochschule_V.setColumns(10);
- Hochschule_V.setBounds(145, 98, 125, 20);
+ Hochschule_V.setBounds(145, 98, 350, 20);
Hochschule_V.setText(person.verantowrtlicher.getHochschule());
contentPanel.add(Hochschule_V);
@@ -148,7 +148,7 @@ public class EingabeAllgemein extends JDialog { EMail_V = new JTextField();
EMail_V.setColumns(10);
- EMail_V.setBounds(145, 129, 125, 20);
+ EMail_V.setBounds(145, 129, 350, 20);
EMail_V.setText(person.verantowrtlicher.getEMail());
contentPanel.add(EMail_V);
@@ -158,7 +158,7 @@ public class EingabeAllgemein extends JDialog { Tel_V = new JTextField();
Tel_V.setColumns(10);
- Tel_V.setBounds(145, 160, 125, 20);
+ Tel_V.setBounds(145, 160, 350, 20);
Tel_V.setText(person.verantowrtlicher.getTel());
contentPanel.add(Tel_V);
@@ -168,7 +168,7 @@ public class EingabeAllgemein extends JDialog { Fak_V = new JTextField();
Fak_V.setColumns(10);
- Fak_V.setBounds(145, 191, 125, 20);
+ Fak_V.setBounds(145, 191, 350, 20);
Fak_V.setText(person.verantowrtlicher.getFakultät());
contentPanel.add(Fak_V);
@@ -208,7 +208,7 @@ public class EingabeAllgemein extends JDialog { Vorname_E = new JTextField();
Vorname_E.setColumns(10);
- Vorname_E.setBounds(145, 294, 125, 20);
+ Vorname_E.setBounds(145, 294, 350, 20);
Vorname_E.setText(person.ersteller.getVorname());
contentPanel.add(Vorname_E);
@@ -218,13 +218,13 @@ public class EingabeAllgemein extends JDialog { Nachname_E = new JTextField();
Nachname_E.setColumns(10);
- Nachname_E.setBounds(145, 325, 125, 20);
+ Nachname_E.setBounds(145, 325, 350, 20);
Nachname_E.setText(person.ersteller.getName());
contentPanel.add(Nachname_E);
Hochschule_E = new JTextField();
Hochschule_E.setColumns(10);
- Hochschule_E.setBounds(145, 356, 125, 20);
+ Hochschule_E.setBounds(145, 356, 350, 20);
Hochschule_E.setText(person.ersteller.getHochschule());
contentPanel.add(Hochschule_E);
@@ -238,13 +238,13 @@ public class EingabeAllgemein extends JDialog { EMail_E = new JTextField();
EMail_E.setColumns(10);
- EMail_E.setBounds(145, 387, 125, 20);
+ EMail_E.setBounds(145, 387, 350, 20);
EMail_E.setText(person.ersteller.getEMail());
contentPanel.add(EMail_E);
Tel_E = new JTextField();
Tel_E.setColumns(10);
- Tel_E.setBounds(145, 418, 125, 20);
+ Tel_E.setBounds(145, 418, 350, 20);
Tel_E.setText(person.ersteller.getTel());
contentPanel.add(Tel_E);
@@ -259,11 +259,11 @@ public class EingabeAllgemein extends JDialog { Fak_E = new JTextField();
Fak_E.setColumns(10);
Fak_E.setText(person.ersteller.getFakultät());
- Fak_E.setBounds(145, 449, 125, 20);
+ Fak_E.setBounds(145, 449, 350, 20);
contentPanel.add(Fak_E);
{
JPanel buttonPane = new JPanel();
- buttonPane.setBounds(0, 597, 529, 33);
+ buttonPane.setBounds(0, 640, 597, 33);
buttonPane.setBackground(SystemColor.menu);
buttonPane.setLayout(new FlowLayout(FlowLayout.RIGHT));
getContentPane().add(buttonPane);
@@ -328,11 +328,11 @@ public class EingabeAllgemein extends JDialog { }
JSeparator separator = new JSeparator();
- separator.setBounds(0, 79, 529, 2);
+ separator.setBounds(0, 79, 597, 2);
getContentPane().add(separator);
JSeparator separator_1 = new JSeparator();
- separator_1.setBounds(0, 585, 529, 2);
+ separator_1.setBounds(0, 627, 597, 2);
getContentPane().add(separator_1);
JMenuBar menuBar = new JMenuBar();
diff --git a/Dozentenmodul/src/GUI/EingabeSoftwareDaten.java b/Dozentenmodul/src/GUI/EingabeSoftwareDaten.java index 2b2d988d..f0eca3ba 100644 --- a/Dozentenmodul/src/GUI/EingabeSoftwareDaten.java +++ b/Dozentenmodul/src/GUI/EingabeSoftwareDaten.java @@ -79,7 +79,7 @@ public class EingabeSoftwareDaten extends JDialog { getContentPane().setLayout(null);
{
JPanel panel = new JPanel();
- panel.setBounds(0, 0, 529, 71);
+ panel.setBounds(0, 0, 577, 71);
getContentPane().add(panel);
panel.setLayout(null);
{
@@ -104,13 +104,13 @@ public class EingabeSoftwareDaten extends JDialog { JLabel lblSysteminformationen = new JLabel("Verf\u00FCgbare Software");
lblSysteminformationen.setFont(new Font("Tahoma", Font.PLAIN, 14));
- lblSysteminformationen.setBounds(10, 11, 162, 14);
+ lblSysteminformationen.setBounds(10, 11, 162, 20);
contentPanel.add(lblSysteminformationen);
- JLabel lblAusgewhlteSoftware = new JLabel("Ausgew\u00E4hlte Software");
+ JLabel lblAusgewhlteSoftware = new JLabel("Installierte Software");
lblAusgewhlteSoftware.setFont(new Font("Tahoma", Font.PLAIN, 14));
- lblAusgewhlteSoftware.setBounds(306, 11, 162, 14);
+ lblAusgewhlteSoftware.setBounds(306, 11, 162, 20);
contentPanel.add(lblAusgewhlteSoftware);
@@ -279,7 +279,7 @@ public class EingabeSoftwareDaten extends JDialog { getContentPane().add(separator);
JSeparator separator_1 = new JSeparator();
- separator_1.setBounds(0, 82, 529, 2);
+ separator_1.setBounds(0, 82, 587, 2);
getContentPane().add(separator_1);
JMenuBar menuBar = new JMenuBar();
diff --git a/Dozentenmodul/src/GUI/EingabeSystemDaten.java b/Dozentenmodul/src/GUI/EingabeSystemDaten.java index 81071323..b5a0b5e4 100644 --- a/Dozentenmodul/src/GUI/EingabeSystemDaten.java +++ b/Dozentenmodul/src/GUI/EingabeSystemDaten.java @@ -23,21 +23,16 @@ import java.awt.Choice; import java.sql.Connection;
import java.sql.ResultSet;
import java.sql.SQLException;
-
import Models.vm;
-
import com.toedter.calendar.JDateChooser;
import javax.swing.JMenuBar;
import javax.swing.JMenu;
import javax.swing.JMenuItem;
import javax.swing.JScrollPane;
-import java.awt.event.FocusAdapter;
-import java.awt.event.FocusEvent;
-import java.awt.event.MouseAdapter;
-import java.awt.event.MouseEvent;
import java.awt.event.WindowAdapter;
import java.awt.event.WindowEvent;
+
@SuppressWarnings("serial")
public class EingabeSystemDaten extends JDialog {
@@ -48,9 +43,9 @@ public class EingabeSystemDaten extends JDialog { JDateChooser dateChooser;
JDateChooser dateChooser_1;
Choice choiceOS;
- JTextArea comment;
JTextArea shortDesc;
JTextArea longDesc;
+ JTextArea comment;
/**
* Launch the application.
*/
@@ -82,15 +77,15 @@ public class EingabeSystemDaten extends JDialog { e.printStackTrace();
}
setTitle("Dozentenmodul");
- setBounds(100, 100, 583, 648);
+ setBounds(100, 100, 603, 722);
getContentPane().setLayout(null);
{
JPanel panel = new JPanel();
- panel.setBounds(0, 0, 567, 71);
+ panel.setBounds(0, 0, 587, 71);
getContentPane().add(panel);
panel.setLayout(null);
{
- JLabel lblNewLabel = new JLabel("Eingabe der systembezogenen Daten (Schritt 4 von 5)");
+ JLabel lblNewLabel = new JLabel("Eingabe der systembezogenen Daten (Schritt 4 von 6)");
lblNewLabel.setBounds(10, 11, 509, 22);
panel.add(lblNewLabel);
lblNewLabel.setFont(new Font("Tahoma", Font.PLAIN, 18));
@@ -103,7 +98,7 @@ public class EingabeSystemDaten extends JDialog { txtpnBitteWhlenSie.setBounds(10, 36, 509, 42);
panel.add(txtpnBitteWhlenSie);
}
- contentPanel.setBounds(10, 95, 547, 441);
+ contentPanel.setBounds(10, 95, 567, 506);
contentPanel.setBackground(Color.WHITE);
contentPanel.setBorder(new EmptyBorder(5, 5, 5, 5));
getContentPane().add(contentPanel);
@@ -120,7 +115,7 @@ public class EingabeSystemDaten extends JDialog { Laborname = new JTextField();
Laborname.setText(vm.vl.getLaborname());
- Laborname.setBounds(170, 36, 150, 20);
+ Laborname.setBounds(170, 36, 350, 20);
contentPanel.add(Laborname);
Laborname.setColumns(10);
@@ -141,12 +136,13 @@ public class EingabeSystemDaten extends JDialog { contentPanel.add(lblBetriebssystem);
choiceOS = new Choice();
+ choiceOS.setFont(new Font("Tahoma", Font.PLAIN, 11));
- choiceOS.setBounds(170, 373, 150, 20);
+ choiceOS.setBounds(170, 373, 226, 20);
Connection con=sql.getConnection();
ResultSet rs=sql.getAllOS(con);
@@ -175,7 +171,7 @@ public class EingabeSystemDaten extends JDialog { dateChooser = new JDateChooser();
dateChooser.setDateFormatString("dd.MM.yyyy HH:mm:ss");
dateChooser.setDate(vm.vl.getBegin());
- dateChooser.setBounds(204, 404, 140, 20);
+ dateChooser.setBounds(204, 404, 132, 20);
contentPanel.add(dateChooser);
JLabel lblNewLabel_1 = new JLabel("bis");
@@ -185,7 +181,7 @@ public class EingabeSystemDaten extends JDialog { dateChooser_1 = new JDateChooser();
dateChooser_1.setDateFormatString("dd.MM.yyyy HH:mm:ss");
dateChooser_1.setDate(vm.vl.getEnd());
- dateChooser_1.setBounds(388, 404, 140, 20);
+ dateChooser_1.setBounds(388, 404, 132, 20);
contentPanel.add(dateChooser_1);
JButton btnHinzufgen = new JButton("Hinzuf\u00FCgen");
@@ -196,29 +192,36 @@ public class EingabeSystemDaten extends JDialog { }
});
- btnHinzufgen.setBounds(326, 372, 118, 23);
+ btnHinzufgen.setBounds(402, 372, 118, 23);
contentPanel.add(btnHinzufgen);
shortDesc=new JTextArea();
+ shortDesc.setBorder(UIManager.getBorder("ComboBox.border"));
shortDesc.setFont(new Font("Tahoma", Font.PLAIN, 11));
shortDesc.setText(vm.vl.getShortDesc());
JScrollPane scrollPane = new JScrollPane(shortDesc);
- scrollPane.setBounds(170, 67, 274, 63);
+ scrollPane.setBorder(null);
+ scrollPane.setBounds(170, 67, 350, 63);
contentPanel.add(scrollPane);
longDesc=new JTextArea();
+ longDesc.setBorder(UIManager.getBorder("TextField.border"));
longDesc.setFont(new Font("Tahoma", Font.PLAIN, 11));
longDesc.setText(vm.vl.getLongDesc());
JScrollPane scrollPane_1 = new JScrollPane(longDesc);
- scrollPane_1.setBounds(170, 139, 274, 158);
+ scrollPane_1.setBorder(null);
+ scrollPane_1.setBounds(170, 139, 350, 158);
contentPanel.add(scrollPane_1);
- comment=new JTextArea();
- comment.setFont(new Font("Tahoma", Font.PLAIN, 11));
- comment.setText(vm.vl.getComment());
- JScrollPane scrollPane_2 = new JScrollPane(comment);
- scrollPane_2.setBounds(170, 308, 274, 59);
+ JScrollPane scrollPane_2 = new JScrollPane();
+ scrollPane_2.setBorder(UIManager.getBorder("TextArea.border"));
+ scrollPane_2.setBounds(170, 308, 350, 59);
contentPanel.add(scrollPane_2);
+
+ comment = new JTextArea();
+ comment.setFont(new Font("Tahoma", Font.PLAIN, 11));
+ comment.setBorder(UIManager.getBorder("TextField.border"));
+ scrollPane_2.setViewportView(comment);
{
JPanel buttonPane = new JPanel();
- buttonPane.setBounds(0, 554, 567, 33);
+ buttonPane.setBounds(0, 630, 587, 33);
buttonPane.setBackground(SystemColor.menu);
buttonPane.setLayout(new FlowLayout(FlowLayout.RIGHT));
getContentPane().add(buttonPane);
@@ -272,11 +275,11 @@ public class EingabeSystemDaten extends JDialog { }
JSeparator separator = new JSeparator();
- separator.setBounds(0, 547, 567, 2);
+ separator.setBounds(0, 617, 587, 2);
getContentPane().add(separator);
JSeparator separator_1 = new JSeparator();
- separator_1.setBounds(0, 82, 567, 2);
+ separator_1.setBounds(0, 82, 587, 2);
getContentPane().add(separator_1);
JMenuBar menuBar = new JMenuBar();
diff --git a/Dozentenmodul/src/GUI/FTPDownloader.java b/Dozentenmodul/src/GUI/FTPDownloader.java index 4e676ace..9cd38d1c 100644 --- a/Dozentenmodul/src/GUI/FTPDownloader.java +++ b/Dozentenmodul/src/GUI/FTPDownloader.java @@ -3,13 +3,7 @@ package GUI; import java.awt.BorderLayout;
import java.awt.Color;
import java.awt.FlowLayout;
-import java.io.BufferedReader;
import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.util.Properties;
-
import javax.swing.JButton;
import javax.swing.JFileChooser;
import javax.swing.JFrame;
@@ -20,15 +14,6 @@ import javax.swing.SwingConstants; import javax.swing.UIManager;
import javax.swing.UnsupportedLookAndFeelException;
import javax.swing.border.EmptyBorder;
-
-import Models.person;
-import Models.vm;
-
-import com.jcraft.jsch.ChannelExec;
-import com.jcraft.jsch.JSch;
-import com.jcraft.jsch.JSchException;
-import com.jcraft.jsch.Session;
-
import downloader.DownloadTask;
import java.awt.event.ActionListener;
import java.awt.event.ActionEvent;
diff --git a/Dozentenmodul/src/GUI/FTPUploader.java b/Dozentenmodul/src/GUI/FTPUploader.java index ee72e7f7..84409327 100644 --- a/Dozentenmodul/src/GUI/FTPUploader.java +++ b/Dozentenmodul/src/GUI/FTPUploader.java @@ -184,10 +184,24 @@ public class FTPUploader extends JFrame implements PropertyChangeListener { }
private void buttonUploadActionPerformed(ActionEvent event) {
- //File f=new File(lblNewLabel.getText());
- //boolean nextStep=f.renameTo(new File(f.getAbsolutePath().substring(0,f.getAbsolutePath().lastIndexOf(File.separator))+"//"+vm.vl.getLaborname()+".vmdk"));
- //if(nextStep==true)
- //{
+ // File (or directory) with old name
+ // File file = new File(lblNewLabel.getText());
+
+ // File (or directory) with new name
+ //System.out.println(file.getAbsolutePath().substring(0,file.getAbsolutePath().lastIndexOf("\\"))+"\\"+vm.vl.getLaborname()+".vmdk");
+ //File file2 = new File(file.getAbsoluteFile()+"\\"+vm.vl.getLaborname()+".vmdk");
+
+
+ // Rename file (or directory)
+ //boolean success = file.renameTo(file2);
+ //if (!success) {
+ // File was not successfully renamed
+ //System.out.println("Not OK");
+ //}
+ //else
+ //{
+ //System.out.println("OK");
+ //}
progressBar.setValue(0);
task=new UploadTask(host,port,username,password,uploadPath, uploadFile);
task.addPropertyChangeListener(this);
@@ -197,7 +211,7 @@ public class FTPUploader extends JFrame implements PropertyChangeListener { createXML();
- //}
+
}
public void propertyChange(PropertyChangeEvent arg0) {
diff --git a/Dozentenmodul/src/GUI/Summary.java b/Dozentenmodul/src/GUI/Summary.java index db3772cf..67727e2f 100644 --- a/Dozentenmodul/src/GUI/Summary.java +++ b/Dozentenmodul/src/GUI/Summary.java @@ -64,11 +64,11 @@ public class Summary extends JDialog { e.printStackTrace();
}
setTitle("Dozentenmodul");
- setBounds(100, 100, 561, 616);
+ setBounds(100, 100, 603, 722);
getContentPane().setLayout(null);
{
JPanel panel = new JPanel();
- panel.setBounds(0, 0, 545, 68);
+ panel.setBounds(0, 0, 577, 68);
getContentPane().add(panel);
panel.setLayout(null);
{
@@ -88,7 +88,7 @@ public class Summary extends JDialog { {
JPanel buttonPane = new JPanel();
- buttonPane.setBounds(0, 521, 545, 36);
+ buttonPane.setBounds(0, 627, 577, 36);
buttonPane.setBackground(SystemColor.menu);
buttonPane.setLayout(new FlowLayout(FlowLayout.RIGHT));
getContentPane().add(buttonPane);
@@ -119,15 +119,15 @@ public class Summary extends JDialog { }
JSeparator separator = new JSeparator();
- separator.setBounds(0, 79, 545, 2);
+ separator.setBounds(0, 79, 587, 2);
getContentPane().add(separator);
JSeparator separator_1 = new JSeparator();
- separator_1.setBounds(0, 518, 545, 2);
+ separator_1.setBounds(0, 614, 587, 2);
getContentPane().add(separator_1);
JTabbedPane tabbedPane = new JTabbedPane(JTabbedPane.TOP);
- tabbedPane.setBounds(10, 111, 525, 369);
+ tabbedPane.setBounds(10, 111, 567, 458);
getContentPane().add(tabbedPane);
@@ -255,6 +255,16 @@ public class Summary extends JDialog { label_25.setBounds(10, 11, 244, 14);
panel.add(label_25);
+ JButton btnZurDateneingabe = new JButton("Daten \u00E4ndern");
+ btnZurDateneingabe.addActionListener(new ActionListener() {
+ public void actionPerformed(ActionEvent arg0) {
+ EingabeAllgemein ea=new EingabeAllgemein();
+ ea.setVisible(true);
+ }
+ });
+ btnZurDateneingabe.setBounds(10, 186, 132, 23);
+ panel.add(btnZurDateneingabe);
+
Panel panel_1 = new Panel();
panel_1.setBackground(Color.WHITE);
tabbedPane.addTab("Systeminformationen", null, panel_1, null);
@@ -338,13 +348,23 @@ public class Summary extends JDialog { label_Laborname.setBounds(120, 11, 395, 14);
panel_1.add(label_Laborname);
+ JButton btnDatenndern = new JButton("Daten \u00E4ndern");
+ btnDatenndern.addActionListener(new ActionListener() {
+ public void actionPerformed(ActionEvent e) {
+ EingabeSystemDaten es=new EingabeSystemDaten();
+ es.setVisible(true);
+ }
+ });
+ btnDatenndern.setBounds(10, 335, 132, 23);
+ panel_1.add(btnDatenndern);
+
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);
+ scrollPane.setBounds(11, 37, 541, 334);
panel_2.add(scrollPane);
List list_sw = new List();
@@ -356,10 +376,20 @@ public class Summary extends JDialog { }
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 lblInstallierteSoftware = new JLabel("Installierte Software");
+ lblInstallierteSoftware.setFont(new Font("Tahoma", Font.PLAIN, 14));
+ lblInstallierteSoftware.setBounds(10, 11, 171, 14);
+ panel_2.add(lblInstallierteSoftware);
+
+ JButton btnDatenndern_1 = new JButton("Daten \u00E4ndern");
+ btnDatenndern_1.addActionListener(new ActionListener() {
+ public void actionPerformed(ActionEvent e) {
+ EingabeSoftwareDaten es=new EingabeSoftwareDaten();
+ es.setVisible(true);
+ }
+ });
+ btnDatenndern_1.setBounds(11, 382, 132, 23);
+ panel_2.add(btnDatenndern_1);
JLabel lblZusammenfassung = new JLabel("Zusammenfassung");
lblZusammenfassung.setFont(new Font("Tahoma", Font.PLAIN, 16));
@@ -373,7 +403,7 @@ public class Summary extends JDialog { up.setVisible(true);
}
});
- btnUploadtoolStarten.setBounds(397, 487, 138, 23);
+ btnUploadtoolStarten.setBounds(439, 580, 138, 23);
getContentPane().add(btnUploadtoolStarten);
JMenuBar menuBar = new JMenuBar();
diff --git a/Dozentenmodul/src/GUI/getVMwarePlayer.java b/Dozentenmodul/src/GUI/getVMwarePlayer.java index 5709639d..52e6044c 100644 --- a/Dozentenmodul/src/GUI/getVMwarePlayer.java +++ b/Dozentenmodul/src/GUI/getVMwarePlayer.java @@ -64,11 +64,11 @@ public class getVMwarePlayer extends JDialog { e.printStackTrace();
}
setTitle("Dozentenmodul");
- setBounds(100, 100, 545, 483);
+ setBounds(100, 100, 603, 722);
getContentPane().setLayout(null);
{
JPanel panel = new JPanel();
- panel.setBounds(0, 0, 529, 80);
+ panel.setBounds(0, 0, 577, 80);
getContentPane().add(panel);
panel.setLayout(null);
{
@@ -85,7 +85,7 @@ public class getVMwarePlayer extends JDialog { txtpnBitteWhlenSie.setBounds(10, 36, 509, 42);
panel.add(txtpnBitteWhlenSie);
}
- contentPanel.setBounds(10, 104, 509, 261);
+ contentPanel.setBounds(10, 104, 567, 502);
contentPanel.setBackground(Color.WHITE);
contentPanel.setBorder(new EmptyBorder(5, 5, 5, 5));
getContentPane().add(contentPanel);
@@ -117,7 +117,7 @@ public class getVMwarePlayer extends JDialog { contentPanel.add(lblNewLabel_1);
{
JPanel buttonPane = new JPanel();
- buttonPane.setBounds(0, 389, 529, 33);
+ buttonPane.setBounds(0, 630, 587, 33);
buttonPane.setBackground(SystemColor.menu);
buttonPane.setLayout(new FlowLayout(FlowLayout.RIGHT));
getContentPane().add(buttonPane);
@@ -149,12 +149,12 @@ public class getVMwarePlayer extends JDialog { }
{
JSeparator separator = new JSeparator();
- separator.setBounds(0, 376, 519, 2);
+ separator.setBounds(0, 617, 587, 2);
getContentPane().add(separator);
}
{
JSeparator separator = new JSeparator();
- separator.setBounds(0, 91, 519, 2);
+ separator.setBounds(0, 91, 587, 2);
getContentPane().add(separator);
}
{
diff --git a/Dozentenmodul/src/GUI/searchRohling.java b/Dozentenmodul/src/GUI/searchRohling.java index 979bc5d2..cafe50ef 100644 --- a/Dozentenmodul/src/GUI/searchRohling.java +++ b/Dozentenmodul/src/GUI/searchRohling.java @@ -72,11 +72,11 @@ public class searchRohling extends JDialog { e.printStackTrace();
}
setTitle("Dozentenmodul");
- setBounds(100, 100, 545, 516);
+ setBounds(100, 100, 603, 722);
getContentPane().setLayout(null);
{
JPanel panel = new JPanel();
- panel.setBounds(0, 0, 529, 71);
+ panel.setBounds(0, 0, 577, 71);
getContentPane().add(panel);
panel.setLayout(null);
{
@@ -93,18 +93,18 @@ public class searchRohling extends JDialog { txtpnBitteWhlenSie.setBounds(10, 36, 509, 42);
panel.add(txtpnBitteWhlenSie);
}
- contentPanel.setBounds(10, 113, 509, 252);
+ contentPanel.setBounds(10, 123, 567, 449);
contentPanel.setBackground(Color.WHITE);
contentPanel.setBorder(new EmptyBorder(5, 5, 5, 5));
getContentPane().add(contentPanel);
contentPanel.setLayout(null);
list = new List();
- list.setBounds(0, 0, 509, 252);
+ list.setBounds(0, 0, 567, 449);
contentPanel.add(list);
{
JPanel buttonPane = new JPanel();
- buttonPane.setBounds(0, 423, 529, 33);
+ buttonPane.setBounds(0, 630, 587, 33);
buttonPane.setBackground(SystemColor.menu);
buttonPane.setLayout(new FlowLayout(FlowLayout.RIGHT));
getContentPane().add(buttonPane);
@@ -142,7 +142,7 @@ public class searchRohling extends JDialog { ftp.setVisible(true);
}
});
- btnDownload.setBounds(430, 376, 89, 23);
+ btnDownload.setBounds(488, 583, 89, 23);
getContentPane().add(btnDownload);
textFieldsearch = new JTextField();
@@ -172,11 +172,11 @@ public class searchRohling extends JDialog { textFieldsearch.setColumns(10);
JSeparator separator = new JSeparator();
- separator.setBounds(0, 410, 529, 2);
+ separator.setBounds(0, 617, 587, 2);
getContentPane().add(separator);
JSeparator separator_1 = new JSeparator();
- separator_1.setBounds(0, 82, 529, 2);
+ separator_1.setBounds(0, 82, 587, 2);
getContentPane().add(separator_1);
JMenuBar menuBar = new JMenuBar();
diff --git a/Dozentenmodul/src/downloader/FTPUtility.java b/Dozentenmodul/src/downloader/FTPUtility.java index ce52b54d..1c62c685 100644 --- a/Dozentenmodul/src/downloader/FTPUtility.java +++ b/Dozentenmodul/src/downloader/FTPUtility.java @@ -5,13 +5,11 @@ import java.io.IOException; import java.io.InputStream;
import java.io.OutputStream;
import java.net.SocketException;
-
import org.apache.commons.net.ftp.FTP;
import org.apache.commons.net.ftp.FTPClient;
import org.apache.commons.net.ftp.FTPFile;
import org.apache.commons.net.ftp.FTPReply;
-import Models.vm;
/**
* A utility class that provides functionality for downloading files from a FTP
|