diff options
author | unknown | 2014-04-02 17:37:51 +0200 |
---|---|---|
committer | unknown | 2014-04-02 17:37:51 +0200 |
commit | 20730f37f213a07f990bcb928a9e23f871d49d29 (patch) | |
tree | 31f47c331337a3c6ce7564b64ee8f4d8e2d4a1e6 /Dozentenmodul | |
parent | Uploader angepasst, Thrift connection mit system.out.println versehen (diff) | |
download | tutor-module-20730f37f213a07f990bcb928a9e23f871d49d29.tar.gz tutor-module-20730f37f213a07f990bcb928a9e23f871d49d29.tar.xz tutor-module-20730f37f213a07f990bcb928a9e23f871d49d29.zip |
Diverse kleine Bugfixes
Diffstat (limited to 'Dozentenmodul')
42 files changed, 605 insertions, 511 deletions
diff --git a/Dozentenmodul/bin/GUI/EingabeImageTechnisch_GUI$2.class b/Dozentenmodul/bin/GUI/EingabeImageTechnisch_GUI$2.class Binary files differindex b237ee04..9e20b5fa 100644 --- a/Dozentenmodul/bin/GUI/EingabeImageTechnisch_GUI$2.class +++ b/Dozentenmodul/bin/GUI/EingabeImageTechnisch_GUI$2.class diff --git a/Dozentenmodul/bin/GUI/EingabeImageTechnisch_GUI$3.class b/Dozentenmodul/bin/GUI/EingabeImageTechnisch_GUI$3.class Binary files differindex 2f3bc164..54767b1b 100644 --- a/Dozentenmodul/bin/GUI/EingabeImageTechnisch_GUI$3.class +++ b/Dozentenmodul/bin/GUI/EingabeImageTechnisch_GUI$3.class diff --git a/Dozentenmodul/bin/GUI/EingabeImageTechnisch_GUI$4.class b/Dozentenmodul/bin/GUI/EingabeImageTechnisch_GUI$4.class Binary files differindex 7237fa6b..284319c7 100644 --- a/Dozentenmodul/bin/GUI/EingabeImageTechnisch_GUI$4.class +++ b/Dozentenmodul/bin/GUI/EingabeImageTechnisch_GUI$4.class diff --git a/Dozentenmodul/bin/GUI/EingabeImageTechnisch_GUI.class b/Dozentenmodul/bin/GUI/EingabeImageTechnisch_GUI.class Binary files differindex ecb1cb44..2a2a0020 100644 --- a/Dozentenmodul/bin/GUI/EingabeImageTechnisch_GUI.class +++ b/Dozentenmodul/bin/GUI/EingabeImageTechnisch_GUI.class diff --git a/Dozentenmodul/bin/GUI/FTPDownloader_GUI$1.class b/Dozentenmodul/bin/GUI/FTPDownloader_GUI$1.class Binary files differindex 244b88e2..f8d1dc16 100644 --- a/Dozentenmodul/bin/GUI/FTPDownloader_GUI$1.class +++ b/Dozentenmodul/bin/GUI/FTPDownloader_GUI$1.class diff --git a/Dozentenmodul/bin/GUI/FTPDownloader_GUI$2.class b/Dozentenmodul/bin/GUI/FTPDownloader_GUI$2.class Binary files differindex 42a0f970..a98b364b 100644 --- a/Dozentenmodul/bin/GUI/FTPDownloader_GUI$2.class +++ b/Dozentenmodul/bin/GUI/FTPDownloader_GUI$2.class diff --git a/Dozentenmodul/bin/GUI/FTPDownloader_GUI$3.class b/Dozentenmodul/bin/GUI/FTPDownloader_GUI$3.class Binary files differindex 26910efa..3bffc15f 100644 --- a/Dozentenmodul/bin/GUI/FTPDownloader_GUI$3.class +++ b/Dozentenmodul/bin/GUI/FTPDownloader_GUI$3.class diff --git a/Dozentenmodul/bin/GUI/FTPUploader_GUI$3.class b/Dozentenmodul/bin/GUI/FTPUploader_GUI$3.class Binary files differindex c72d35c6..2422f25a 100644 --- a/Dozentenmodul/bin/GUI/FTPUploader_GUI$3.class +++ b/Dozentenmodul/bin/GUI/FTPUploader_GUI$3.class diff --git a/Dozentenmodul/bin/GUI/FTPUploader_GUI$4.class b/Dozentenmodul/bin/GUI/FTPUploader_GUI$4.class Binary files differindex 03012ec1..551a9ab9 100644 --- a/Dozentenmodul/bin/GUI/FTPUploader_GUI$4.class +++ b/Dozentenmodul/bin/GUI/FTPUploader_GUI$4.class diff --git a/Dozentenmodul/bin/GUI/FTPUploader_GUI$5.class b/Dozentenmodul/bin/GUI/FTPUploader_GUI$5.class Binary files differindex bd46a337..9f214076 100644 --- a/Dozentenmodul/bin/GUI/FTPUploader_GUI$5.class +++ b/Dozentenmodul/bin/GUI/FTPUploader_GUI$5.class diff --git a/Dozentenmodul/bin/GUI/FTPUploader_GUI.class b/Dozentenmodul/bin/GUI/FTPUploader_GUI.class Binary files differindex ec900ffd..b1d61364 100644 --- a/Dozentenmodul/bin/GUI/FTPUploader_GUI.class +++ b/Dozentenmodul/bin/GUI/FTPUploader_GUI.class diff --git a/Dozentenmodul/bin/GUI/SearchImage_GUI$1.class b/Dozentenmodul/bin/GUI/SearchImage_GUI$1.class Binary files differindex be572a32..3839b528 100644 --- a/Dozentenmodul/bin/GUI/SearchImage_GUI$1.class +++ b/Dozentenmodul/bin/GUI/SearchImage_GUI$1.class diff --git a/Dozentenmodul/bin/GUI/SearchImage_GUI.class b/Dozentenmodul/bin/GUI/SearchImage_GUI.class Binary files differindex c676d0a8..87386672 100644 --- a/Dozentenmodul/bin/GUI/SearchImage_GUI.class +++ b/Dozentenmodul/bin/GUI/SearchImage_GUI.class diff --git a/Dozentenmodul/bin/gui/EingabeImageTechnisch_GUI$2.class b/Dozentenmodul/bin/gui/EingabeImageTechnisch_GUI$2.class Binary files differindex b237ee04..9e20b5fa 100644 --- a/Dozentenmodul/bin/gui/EingabeImageTechnisch_GUI$2.class +++ b/Dozentenmodul/bin/gui/EingabeImageTechnisch_GUI$2.class diff --git a/Dozentenmodul/bin/gui/EingabeImageTechnisch_GUI$3.class b/Dozentenmodul/bin/gui/EingabeImageTechnisch_GUI$3.class Binary files differindex 2f3bc164..54767b1b 100644 --- a/Dozentenmodul/bin/gui/EingabeImageTechnisch_GUI$3.class +++ b/Dozentenmodul/bin/gui/EingabeImageTechnisch_GUI$3.class diff --git a/Dozentenmodul/bin/gui/EingabeImageTechnisch_GUI$4.class b/Dozentenmodul/bin/gui/EingabeImageTechnisch_GUI$4.class Binary files differindex 7237fa6b..284319c7 100644 --- a/Dozentenmodul/bin/gui/EingabeImageTechnisch_GUI$4.class +++ b/Dozentenmodul/bin/gui/EingabeImageTechnisch_GUI$4.class diff --git a/Dozentenmodul/bin/gui/EingabeImageTechnisch_GUI.class b/Dozentenmodul/bin/gui/EingabeImageTechnisch_GUI.class Binary files differindex ecb1cb44..2a2a0020 100644 --- a/Dozentenmodul/bin/gui/EingabeImageTechnisch_GUI.class +++ b/Dozentenmodul/bin/gui/EingabeImageTechnisch_GUI.class diff --git a/Dozentenmodul/bin/gui/FTPUploader_GUI$3.class b/Dozentenmodul/bin/gui/FTPUploader_GUI$3.class Binary files differindex c72d35c6..2422f25a 100644 --- a/Dozentenmodul/bin/gui/FTPUploader_GUI$3.class +++ b/Dozentenmodul/bin/gui/FTPUploader_GUI$3.class diff --git a/Dozentenmodul/bin/gui/FTPUploader_GUI$4.class b/Dozentenmodul/bin/gui/FTPUploader_GUI$4.class Binary files differindex 03012ec1..551a9ab9 100644 --- a/Dozentenmodul/bin/gui/FTPUploader_GUI$4.class +++ b/Dozentenmodul/bin/gui/FTPUploader_GUI$4.class diff --git a/Dozentenmodul/bin/gui/FTPUploader_GUI$5.class b/Dozentenmodul/bin/gui/FTPUploader_GUI$5.class Binary files differindex bd46a337..9f214076 100644 --- a/Dozentenmodul/bin/gui/FTPUploader_GUI$5.class +++ b/Dozentenmodul/bin/gui/FTPUploader_GUI$5.class diff --git a/Dozentenmodul/bin/gui/FTPUploader_GUI$6.class b/Dozentenmodul/bin/gui/FTPUploader_GUI$6.class Binary files differindex 0176a3a2..a7c0b511 100644 --- a/Dozentenmodul/bin/gui/FTPUploader_GUI$6.class +++ b/Dozentenmodul/bin/gui/FTPUploader_GUI$6.class diff --git a/Dozentenmodul/bin/gui/FTPUploader_GUI$7.class b/Dozentenmodul/bin/gui/FTPUploader_GUI$7.class Binary files differindex 6597ecfb..10890564 100644 --- a/Dozentenmodul/bin/gui/FTPUploader_GUI$7.class +++ b/Dozentenmodul/bin/gui/FTPUploader_GUI$7.class diff --git a/Dozentenmodul/bin/gui/FTPUploader_GUI$8.class b/Dozentenmodul/bin/gui/FTPUploader_GUI$8.class Binary files differnew file mode 100644 index 00000000..07752dad --- /dev/null +++ b/Dozentenmodul/bin/gui/FTPUploader_GUI$8.class diff --git a/Dozentenmodul/bin/gui/FTPUploader_GUI.class b/Dozentenmodul/bin/gui/FTPUploader_GUI.class Binary files differindex ec900ffd..b1d61364 100644 --- a/Dozentenmodul/bin/gui/FTPUploader_GUI.class +++ b/Dozentenmodul/bin/gui/FTPUploader_GUI.class diff --git a/Dozentenmodul/bin/gui/SearchImage_GUI$1.class b/Dozentenmodul/bin/gui/SearchImage_GUI$1.class Binary files differindex be572a32..3839b528 100644 --- a/Dozentenmodul/bin/gui/SearchImage_GUI$1.class +++ b/Dozentenmodul/bin/gui/SearchImage_GUI$1.class diff --git a/Dozentenmodul/bin/gui/SearchImage_GUI$2.class b/Dozentenmodul/bin/gui/SearchImage_GUI$2.class Binary files differindex 3a6ee9ab..9b8efb38 100644 --- a/Dozentenmodul/bin/gui/SearchImage_GUI$2.class +++ b/Dozentenmodul/bin/gui/SearchImage_GUI$2.class diff --git a/Dozentenmodul/bin/gui/SearchImage_GUI$3.class b/Dozentenmodul/bin/gui/SearchImage_GUI$3.class Binary files differindex 721116df..6317e30c 100644 --- a/Dozentenmodul/bin/gui/SearchImage_GUI$3.class +++ b/Dozentenmodul/bin/gui/SearchImage_GUI$3.class diff --git a/Dozentenmodul/bin/gui/SearchImage_GUI$4.class b/Dozentenmodul/bin/gui/SearchImage_GUI$4.class Binary files differindex 33a3f111..8b38dc60 100644 --- a/Dozentenmodul/bin/gui/SearchImage_GUI$4.class +++ b/Dozentenmodul/bin/gui/SearchImage_GUI$4.class diff --git a/Dozentenmodul/bin/gui/SearchImage_GUI$5.class b/Dozentenmodul/bin/gui/SearchImage_GUI$5.class Binary files differindex 6673eef5..a238b34c 100644 --- a/Dozentenmodul/bin/gui/SearchImage_GUI$5.class +++ b/Dozentenmodul/bin/gui/SearchImage_GUI$5.class diff --git a/Dozentenmodul/bin/gui/SearchImage_GUI$6.class b/Dozentenmodul/bin/gui/SearchImage_GUI$6.class Binary files differindex 1863e40f..ae62d5aa 100644 --- a/Dozentenmodul/bin/gui/SearchImage_GUI$6.class +++ b/Dozentenmodul/bin/gui/SearchImage_GUI$6.class diff --git a/Dozentenmodul/bin/gui/SearchImage_GUI$7.class b/Dozentenmodul/bin/gui/SearchImage_GUI$7.class Binary files differindex ef51173a..c68c74e6 100644 --- a/Dozentenmodul/bin/gui/SearchImage_GUI$7.class +++ b/Dozentenmodul/bin/gui/SearchImage_GUI$7.class diff --git a/Dozentenmodul/bin/gui/SearchImage_GUI$8.class b/Dozentenmodul/bin/gui/SearchImage_GUI$8.class Binary files differindex 5e5bfeb5..e5e281b0 100644 --- a/Dozentenmodul/bin/gui/SearchImage_GUI$8.class +++ b/Dozentenmodul/bin/gui/SearchImage_GUI$8.class diff --git a/Dozentenmodul/bin/gui/SearchImage_GUI$9.class b/Dozentenmodul/bin/gui/SearchImage_GUI$9.class Binary files differindex e231bdf7..28b5e4df 100644 --- a/Dozentenmodul/bin/gui/SearchImage_GUI$9.class +++ b/Dozentenmodul/bin/gui/SearchImage_GUI$9.class diff --git a/Dozentenmodul/bin/gui/SearchImage_GUI.class b/Dozentenmodul/bin/gui/SearchImage_GUI.class Binary files differindex c676d0a8..87386672 100644 --- a/Dozentenmodul/bin/gui/SearchImage_GUI.class +++ b/Dozentenmodul/bin/gui/SearchImage_GUI.class diff --git a/Dozentenmodul/bin/thrift/ThriftConnection.class b/Dozentenmodul/bin/thrift/ThriftConnection.class Binary files differindex df283ea9..7f087cc1 100644 --- a/Dozentenmodul/bin/thrift/ThriftConnection.class +++ b/Dozentenmodul/bin/thrift/ThriftConnection.class diff --git a/Dozentenmodul/src/GUI/EingabeImageTechnisch_GUI.java b/Dozentenmodul/src/GUI/EingabeImageTechnisch_GUI.java index 9358f33d..f31f811d 100644 --- a/Dozentenmodul/src/GUI/EingabeImageTechnisch_GUI.java +++ b/Dozentenmodul/src/GUI/EingabeImageTechnisch_GUI.java @@ -116,102 +116,71 @@ public class EingabeImageTechnisch_GUI extends JFrame { JPanel panel_1 = new JPanel();
panel_1.setBackground(SystemColor.menu);
panel_1.setBorder(new TitledBorder(null, "Informationen zum Image", TitledBorder.LEADING, TitledBorder.TOP, null, null));
- panel_1.setBounds(10, 66, 557, 95);
+ panel_1.setBounds(10, 66, 557, 124);
contentPanel.add(panel_1);
panel_1.setLayout(null);
- JLabel lblNewLabel_2 = new JLabel("Image enth\u00E4lt lizenzpflichtige Software:");
- lblNewLabel_2.setBounds(10, 30, 250, 20);
- panel_1.add(lblNewLabel_2);
-
- rdbtnlicenseJa = new JRadioButton("Ja");
- rdbtnlicenseJa.setSelected(true);
- buttonGrouplicense.add(rdbtnlicenseJa);
- rdbtnlicenseJa.setBounds(266, 29, 109, 23);
- panel_1.add(rdbtnlicenseJa);
-
rdbtnlicenseNein = new JRadioButton("Nein");
buttonGrouplicense.add(rdbtnlicenseNein);
- rdbtnlicenseNein.setBounds(377, 29, 109, 23);
+ rdbtnlicenseNein.setBounds(377, 29, 46, 23);
panel_1.add(rdbtnlicenseNein);
- JLabel lblInternetIstInnerhalb = new JLabel("Internet ist innerhalb des Image gesperrt:");
+ rdbtnInternetNein = new JRadioButton("Nein");
+ rdbtnInternetNein.setSelected(true);
+ buttonGroupInternet.add(rdbtnInternetNein);
+ rdbtnInternetNein.setBounds(377, 57, 46, 23);
+ panel_1.add(rdbtnInternetNein);
+
+ JLabel lblInternetIstInnerhalb = new JLabel("Internet ist f\u00FCr dieses Image gesperrt:");
lblInternetIstInnerhalb.setBounds(10, 58, 250, 20);
panel_1.add(lblInternetIstInnerhalb);
+ JButton btnInternetSettings = new JButton("Einstellungen...");
+ btnInternetSettings.setEnabled(false);
+ btnInternetSettings.setBounds(439, 57, 108, 23);
+ panel_1.add(btnInternetSettings);
+
rdbtnInternetJa = new JRadioButton("Ja");
+
buttonGroupInternet.add(rdbtnInternetJa);
- rdbtnInternetJa.setBounds(266, 57, 109, 23);
+ rdbtnInternetJa.setBounds(266, 57, 41, 23);
panel_1.add(rdbtnInternetJa);
- rdbtnInternetNein = new JRadioButton("Nein");
- rdbtnInternetNein.setSelected(true);
- buttonGroupInternet.add(rdbtnInternetNein);
- rdbtnInternetNein.setBounds(377, 57, 109, 23);
- panel_1.add(rdbtnInternetNein);
-
- JLabel lblHauptmen = new JLabel("Hauptmen\u00FC");
- lblHauptmen.addMouseListener(new MouseAdapter() {
- @Override
- public void mouseClicked(MouseEvent arg0) {
-
- EingabeImageTechnisch_GUI.this.setVisible(false);
- MainMenue_GUI main=new MainMenue_GUI();
- main.setVisible(true);
- }
- });
- lblHauptmen.setForeground(Color.BLUE);
- lblHauptmen.setBounds(10, 11, 61, 14);
- contentPanel.add(lblHauptmen);
-
- JLabel label_1 = new JLabel(">");
- label_1.setBounds(69, 11, 13, 14);
- contentPanel.add(label_1);
+ rdbtnlicenseJa = new JRadioButton("Ja");
+ rdbtnlicenseJa.setSelected(true);
+ buttonGrouplicense.add(rdbtnlicenseJa);
+ rdbtnlicenseJa.setBounds(266, 29, 41, 23);
+ panel_1.add(rdbtnlicenseJa);
- JLabel lblVlimage = new JLabel("VL-Image");
- lblVlimage.setForeground(Color.BLUE);
- lblVlimage.setBounds(81, 11, 45, 14);
- contentPanel.add(lblVlimage);
+ JLabel lblNewLabel_2 = new JLabel("Image enth\u00E4lt lizenzpflichtige Software:");
+ lblNewLabel_2.setBounds(10, 30, 250, 20);
+ panel_1.add(lblNewLabel_2);
- JLabel label_2 = new JLabel(">");
- label_2.setBounds(133, 11, 13, 14);
- contentPanel.add(label_2);
+ JLabel lblLizenzserverEintragen = new JLabel("Lizenzserver eintragen:");
+ lblLizenzserverEintragen.setBounds(10, 85, 250, 20);
+ panel_1.add(lblLizenzserverEintragen);
- JLabel lblNewLabel_1 = new JLabel("Neu");
- lblNewLabel_1.setBounds(146, 11, 46, 14);
- contentPanel.add(lblNewLabel_1);
+ JButton btnLicenseServer = new JButton("Server-Adresse...");
+ btnLicenseServer.setEnabled(false);
+ btnLicenseServer.setBounds(266, 84, 157, 23);
+ panel_1.add(btnLicenseServer);
JPanel panel_2 = new JPanel();
panel_2.setLayout(null);
panel_2.setBorder(new TitledBorder(null, "Empfehlung bezüglich Ressourcen", TitledBorder.LEADING, TitledBorder.TOP, null, null));
panel_2.setBackground(SystemColor.menu);
- panel_2.setBounds(10, 172, 557, 338);
+ panel_2.setBounds(11, 196, 557, 338);
contentPanel.add(panel_2);
- JTextArea txtrHinweisSolltenSie = new JTextArea();
- txtrHinweisSolltenSie.setBackground(SystemColor.menu);
- txtrHinweisSolltenSie.setFont(new Font("Tahoma", Font.PLAIN, 13));
- txtrHinweisSolltenSie.setText("Hinweis: Sollten Sie keine Software einsetzen, die viele Ressourcen ben\u00F6tigt,\r\nk\u00F6nnen Sie sich an den Beispielwerten orientieren.");
- txtrHinweisSolltenSie.setBounds(10, 25, 537, 55);
- panel_2.add(txtrHinweisSolltenSie);
-
- JLabel lblNewLabel_3 = new JLabel("Wie viel Arbeitsspeicher empfehlen Sie f\u00FCr das Image:");
- lblNewLabel_3.setBounds(10, 91, 280, 20);
- panel_2.add(lblNewLabel_3);
-
- JLabel lblMindestens = new JLabel("mindestens");
- lblMindestens.setBounds(315, 91, 60, 20);
- panel_2.add(lblMindestens);
-
- spinnerRam = new JSpinner();
- spinnerRam.setModel(new SpinnerNumberModel(1, 1, 8, 1));
- spinnerRam.setBounds(385, 88, 29, 20);
- panel_2.add(spinnerRam);
-
JLabel lblGbyte = new JLabel("GByte");
lblGbyte.setBounds(424, 91, 46, 20);
panel_2.add(lblGbyte);
+ spinnerCPU = new JSpinner();
+ spinnerCPU.setModel(new SpinnerNumberModel(1, 1, 4, 1));
+ spinnerCPU.setBounds(385, 188, 29, 20);
+ panel_2.add(spinnerCPU);
+
JTextArea txtrBeispielWindows = new JTextArea();
txtrBeispielWindows.setText("Beispiel:\r\nWindows 7 32/64 Bit: 2 GByte\r\nLinux/Unix 32/64 Bit: 1 GByte");
txtrBeispielWindows.setFont(new Font("Tahoma", Font.PLAIN, 11));
@@ -219,29 +188,77 @@ public class EingabeImageTechnisch_GUI extends JFrame { txtrBeispielWindows.setBounds(10, 122, 280, 55);
panel_2.add(txtrBeispielWindows);
- JTextArea txtrBeispielWindows_1 = new JTextArea();
- txtrBeispielWindows_1.setText("Beispiel:\r\nWindows 7 32/64 Bit: 1 Kern\r\nLinux/Unix 32/64 Bit: 1 Kern");
- txtrBeispielWindows_1.setFont(new Font("Tahoma", Font.PLAIN, 11));
- txtrBeispielWindows_1.setBackground(SystemColor.menu);
- txtrBeispielWindows_1.setBounds(10, 222, 280, 55);
- panel_2.add(txtrBeispielWindows_1);
+
+
+ JLabel lblKerne = new JLabel("Kerne");
+ lblKerne.setBounds(424, 191, 46, 20);
+ panel_2.add(lblKerne);
JLabel lblWieVieleCpus = new JLabel("Wie viele CPUs empfehlen Sie f\u00FCr das Image:");
lblWieVieleCpus.setBounds(10, 191, 280, 20);
panel_2.add(lblWieVieleCpus);
+ spinnerRam = new JSpinner();
+ spinnerRam.setModel(new SpinnerNumberModel(1, 1, 8, 1));
+ spinnerRam.setBounds(385, 88, 29, 20);
+ panel_2.add(spinnerRam);
+
JLabel label_3 = new JLabel("mindestens");
label_3.setBounds(315, 191, 60, 20);
panel_2.add(label_3);
- spinnerCPU = new JSpinner();
- spinnerCPU.setModel(new SpinnerNumberModel(1, 1, 4, 1));
- spinnerCPU.setBounds(385, 188, 29, 20);
- panel_2.add(spinnerCPU);
+ JLabel lblMindestens = new JLabel("mindestens");
+ lblMindestens.setBounds(315, 91, 60, 20);
+ panel_2.add(lblMindestens);
- JLabel lblKerne = new JLabel("Kerne");
- lblKerne.setBounds(424, 191, 46, 20);
- panel_2.add(lblKerne);
+ JTextArea txtrBeispielWindows_1 = new JTextArea();
+ txtrBeispielWindows_1.setText("Beispiel:\r\nWindows 7 32/64 Bit: 1 Kern\r\nLinux/Unix 32/64 Bit: 1 Kern");
+ txtrBeispielWindows_1.setFont(new Font("Tahoma", Font.PLAIN, 11));
+ txtrBeispielWindows_1.setBackground(SystemColor.menu);
+ txtrBeispielWindows_1.setBounds(10, 222, 280, 55);
+ panel_2.add(txtrBeispielWindows_1);
+
+ JLabel lblNewLabel_3 = new JLabel("Wie viel Arbeitsspeicher empfehlen Sie f\u00FCr das Image:");
+ lblNewLabel_3.setBounds(10, 91, 280, 20);
+ panel_2.add(lblNewLabel_3);
+
+ JTextArea txtrHinweisSolltenSie = new JTextArea();
+ txtrHinweisSolltenSie.setBackground(SystemColor.menu);
+ txtrHinweisSolltenSie.setFont(new Font("Tahoma", Font.PLAIN, 13));
+ txtrHinweisSolltenSie.setText("Hinweis: Sollten Sie keine Software einsetzen, die viele Ressourcen ben\u00F6tigt,\r\nk\u00F6nnen Sie sich an den Beispielwerten orientieren.");
+ txtrHinweisSolltenSie.setBounds(10, 25, 537, 55);
+ panel_2.add(txtrHinweisSolltenSie);
+
+ JLabel lblHauptmen = new JLabel("Hauptmen\u00FC");
+ lblHauptmen.addMouseListener(new MouseAdapter() {
+ @Override
+ public void mouseClicked(MouseEvent arg0) {
+
+ EingabeImageTechnisch_GUI.this.setVisible(false);
+ MainMenue_GUI main=new MainMenue_GUI();
+ main.setVisible(true);
+ }
+ });
+ lblHauptmen.setForeground(Color.BLUE);
+ lblHauptmen.setBounds(10, 11, 61, 14);
+ contentPanel.add(lblHauptmen);
+
+ JLabel label_1 = new JLabel(">");
+ label_1.setBounds(69, 11, 13, 14);
+ contentPanel.add(label_1);
+
+ JLabel lblVlimage = new JLabel("VL-Image");
+ lblVlimage.setForeground(Color.BLUE);
+ lblVlimage.setBounds(81, 11, 45, 14);
+ contentPanel.add(lblVlimage);
+
+ JLabel label_2 = new JLabel(">");
+ label_2.setBounds(133, 11, 13, 14);
+ contentPanel.add(label_2);
+
+ JLabel lblNewLabel_1 = new JLabel("Neu");
+ lblNewLabel_1.setBounds(146, 11, 46, 14);
+ contentPanel.add(lblNewLabel_1);
{
JPanel buttonPane = new JPanel();
buttonPane.setBounds(0, 640, 597, 33);
diff --git a/Dozentenmodul/src/GUI/FTPUploader_GUI.java b/Dozentenmodul/src/GUI/FTPUploader_GUI.java index 25fd436f..f435f3ff 100644 --- a/Dozentenmodul/src/GUI/FTPUploader_GUI.java +++ b/Dozentenmodul/src/GUI/FTPUploader_GUI.java @@ -128,31 +128,38 @@ public class FTPUploader_GUI extends JFrame implements PropertyChangeListener { getContentPane().add(contentPanel, BorderLayout.CENTER);
contentPanel.setLayout(null);
{
- JButton btnSpeicherortAuswhlen = new JButton("VMDK ausw\u00E4hlen");
+ JButton btnSpeicherortAuswhlen = new JButton("Image ausw\u00E4hlen");
btnSpeicherortAuswhlen.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent arg0) {
JFileChooser fc = new JFileChooser();
fc.setFileSelectionMode(JFileChooser.FILES_ONLY);
fc.showOpenDialog(getParent());
- File dir = fc.getSelectedFile();
- uploadFile = dir;
- filename = uploadFile.getName();
- lblNewLabel.setText(dir.getAbsolutePath());
+ File file = fc.getSelectedFile();
+ //check if a file is selected and exists
+ if (file != null) {
+ System.out.println("File to upload exists");
+ uploadFile = file;
+ filename = uploadFile.getName();
+ lblNewLabel.setText(file.getAbsolutePath());
+ } else {
+ System.out.println("No file selected");
+ lblNewLabel.setText("");
+ }//end if
}
});
- btnSpeicherortAuswhlen.setBounds(57, 124, 117, 23);
+ btnSpeicherortAuswhlen.setBounds(102, 124, 173, 23);
btnSpeicherortAuswhlen.setVerticalAlignment(SwingConstants.TOP);
- btnSpeicherortAuswhlen.setHorizontalAlignment(SwingConstants.LEFT);
contentPanel.add(btnSpeicherortAuswhlen);
}
lblNewLabel = new JLabel("");
- lblNewLabel.setBounds(191, 124, 255, 23);
+ lblNewLabel.setHorizontalAlignment(SwingConstants.LEFT);
+ lblNewLabel.setBounds(285, 124, 302, 23);
contentPanel.add(lblNewLabel);
- JButton btnUploadStarten = new JButton("Upload starten");
+ JButton btnUploadStarten = new JButton("Upload auf Server starten");
btnUploadStarten.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent arg0) {
buttonUploadActionPerformed(arg0);
@@ -160,53 +167,58 @@ public class FTPUploader_GUI extends JFrame implements PropertyChangeListener { }
});
- btnUploadStarten.setBounds(57, 168, 141, 23);
+ btnUploadStarten.setBounds(102, 168, 173, 23);
contentPanel.add(btnUploadStarten);
progressBar = new JProgressBar(0, 100);
progressBar.setStringPainted(true);
- progressBar.setBounds(57, 202, 497, 30);
+ progressBar.setBounds(102, 202, 485, 30);
contentPanel.add(progressBar);
JLabel label = new JLabel("Downloadgeschwindigkeit:");
- label.setBounds(57, 243, 141, 14);
+ label.setBounds(102, 243, 141, 14);
contentPanel.add(label);
JLabel label_1 = new JLabel("Fertig:");
- label_1.setBounds(57, 293, 46, 14);
+ label_1.setBounds(102, 293, 46, 14);
contentPanel.add(label_1);
labelfertig = new JLabel("0");
- labelfertig.setBounds(113, 293, 71, 14);
+ labelfertig.setHorizontalAlignment(SwingConstants.LEFT);
+ labelfertig.setBounds(183, 293, 108, 14);
contentPanel.add(labelfertig);
UpSpeed = new JLabel("0");
- UpSpeed.setBounds(329, 243, 95, 14);
+ UpSpeed.setHorizontalAlignment(SwingConstants.LEFT);
+ UpSpeed.setBounds(374, 243, 117, 14);
contentPanel.add(UpSpeed);
JLabel label_4 = new JLabel("von:");
- label_4.setBounds(184, 293, 46, 14);
+ label_4.setBounds(318, 293, 46, 14);
contentPanel.add(label_4);
labelfilesize = new JLabel("0");
- labelfilesize.setBounds(240, 293, 108, 14);
+ labelfilesize.setHorizontalAlignment(SwingConstants.LEFT);
+ labelfilesize.setBounds(374, 293, 117, 14);
contentPanel.add(labelfilesize);
JLabel label_6 = new JLabel("Verbleibend:");
- label_6.setBounds(57, 318, 71, 14);
+ label_6.setBounds(102, 318, 71, 14);
contentPanel.add(label_6);
JLabel label_7 = new JLabel("Gesch\u00E4tzte Verbleibende Zeit:");
- label_7.setBounds(57, 268, 150, 14);
+ label_7.setBounds(102, 268, 150, 14);
contentPanel.add(label_7);
labelZeit = new JLabel("0");
- labelZeit.setBounds(329, 268, 117, 14);
+ labelZeit.setHorizontalAlignment(SwingConstants.LEFT);
+ labelZeit.setBounds(374, 268, 117, 14);
contentPanel.add(labelZeit);
labelverbleibend = new JLabel("0");
- labelverbleibend.setBounds(138, 318, 108, 14);
+ labelverbleibend.setHorizontalAlignment(SwingConstants.LEFT);
+ labelverbleibend.setBounds(183, 318, 108, 14);
contentPanel.add(labelverbleibend);
JPanel panel = new JPanel();
@@ -221,7 +233,8 @@ public class FTPUploader_GUI extends JFrame implements PropertyChangeListener { panel.add(lblUploadIhresImage);
JTextPane txtpnFhreSieBitte = new JTextPane();
- txtpnFhreSieBitte.setText("F\u00FChre Sie bitte die folgenden 3 Schritte aus um Ihr Image auf unseren Server zu laden.");
+ txtpnFhreSieBitte
+ .setText("F\u00FChre Sie bitte die folgenden 3 Schritte aus um Ihr Image auf unseren Server zu laden.");
txtpnFhreSieBitte.setEditable(false);
txtpnFhreSieBitte.setBackground(SystemColor.menu);
txtpnFhreSieBitte.setBounds(10, 36, 509, 32);
@@ -261,6 +274,7 @@ public class FTPUploader_GUI extends JFrame implements PropertyChangeListener { btnCopyFileTo.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) {
try {
+ System.out.println("Copying file to "+ user.path + "/" + uploadFile.getName());
client.startFileCopy(user.path + "/" + uploadFile.getName());
} catch (TException e1) {
// TODO Auto-generated catch block
@@ -268,24 +282,24 @@ public class FTPUploader_GUI extends JFrame implements PropertyChangeListener { }
}
});
- btnCopyFileTo.setBounds(57, 343, 217, 23);
+ btnCopyFileTo.setBounds(102, 343, 173, 23);
contentPanel.add(btnCopyFileTo);
- JLabel label_8 = new JLabel("1.");
- label_8.setBounds(24, 128, 23, 14);
- contentPanel.add(label_8);
+ JLabel lblShritt = new JLabel("Schritt 1:");
+ lblShritt.setBounds(24, 128, 57, 14);
+ contentPanel.add(lblShritt);
- JLabel label_9 = new JLabel("2.");
- label_9.setBounds(24, 172, 23, 14);
- contentPanel.add(label_9);
+ JLabel lblSchritt = new JLabel("Schritt 2:");
+ lblSchritt.setBounds(24, 172, 57, 14);
+ contentPanel.add(lblSchritt);
- JLabel label_10 = new JLabel("3.");
- label_10.setBounds(20, 391, 23, 14);
- contentPanel.add(label_10);
+ JLabel lblSchritt_1 = new JLabel("Schritt 3:");
+ lblSchritt_1.setBounds(20, 391, 57, 14);
+ contentPanel.add(lblSchritt_1);
JLabel lblKlickenSieAuf = new JLabel(
"Klicken Sie auf \"Fertigstellen\".");
- lblKlickenSieAuf.setBounds(53, 391, 241, 14);
+ lblKlickenSieAuf.setBounds(98, 391, 241, 14);
contentPanel.add(lblKlickenSieAuf);
{
JPanel buttonPane = new JPanel();
@@ -326,6 +340,17 @@ public class FTPUploader_GUI extends JFrame implements PropertyChangeListener { }
});
+ JButton btnZurck = new JButton("Zur\u00FCck");
+ btnZurck.addActionListener(new ActionListener() {
+ public void actionPerformed(ActionEvent e) {
+ dispose();
+ EingabeImageTechnisch_GUI m = new EingabeImageTechnisch_GUI();
+ m.setVisible(true);
+ }
+ });
+ btnZurck.setActionCommand("Cancel");
+ buttonPane.add(btnZurck);
+
cancelButton.setActionCommand("Cancel");
buttonPane.add(cancelButton);
finishButton.setActionCommand("Cancel");
@@ -400,7 +425,7 @@ public class FTPUploader_GUI extends JFrame implements PropertyChangeListener { progress = (Integer) arg0.getNewValue();
progressBar.setValue(progress);
- // Button zum Fertigstellen freischalten
+ // Button zum Fertigstellen freischalten, wenn 100% erreicht sind
if (progress == 100) {
finishButton.setEnabled(true);
}
diff --git a/Dozentenmodul/src/GUI/SearchImage_GUI.java b/Dozentenmodul/src/GUI/SearchImage_GUI.java index 4225a295..ee7727c3 100644 --- a/Dozentenmodul/src/GUI/SearchImage_GUI.java +++ b/Dozentenmodul/src/GUI/SearchImage_GUI.java @@ -1,6 +1,5 @@ package gui; - import java.awt.Color; import java.awt.Dimension; import java.awt.FlowLayout; @@ -34,6 +33,7 @@ import javax.swing.JTabbedPane; import javax.swing.JTable; import javax.swing.JTextField; import javax.swing.JTextPane; +import javax.swing.ListSelectionModel; import javax.swing.RowFilter; import javax.swing.UIManager; import javax.swing.UnsupportedLookAndFeelException; @@ -62,14 +62,17 @@ public class SearchImage_GUI extends JFrame { JTable tablemyImages; private JTextField textFieldName; JTabbedPane tabbedPane; - String[] titles= {"Image-Name", "Lizenzpflichtig", "OS", "Veranstaltung", "Verantwortlicher", "Letztes Update", "Schlagwort"}; - ThriftConnection con=new ThriftConnection(); - Client client=con.getThriftConnection(); - final DefaultTableModel modelAll = new DefaultTableModel( titles, 0 ); - final DefaultTableModel modelMyImages = new DefaultTableModel( titles, 0 ); - final TableRowSorter<TableModel> rowSorterAll = new TableRowSorter<TableModel>( modelAll ); - final TableRowSorter<TableModel> rowSorterMyImages = new TableRowSorter<TableModel>( modelMyImages ); - + String[] titles = { "Image-Name", "Lizenzpflichtig", "OS", "Veranstaltung", + "Verantwortlicher", "Letztes Update", "Schlagwort" }; + ThriftConnection con = new ThriftConnection(); + Client client = con.getThriftConnection(); + final DefaultTableModel modelAll = new DefaultTableModel(titles, 0); + final DefaultTableModel modelMyImages = new DefaultTableModel(titles, 0); + final TableRowSorter<TableModel> rowSorterAll = new TableRowSorter<TableModel>( + modelAll); + final TableRowSorter<TableModel> rowSorterMyImages = new TableRowSorter<TableModel>( + modelMyImages); + /** * Launch the application. */ @@ -90,34 +93,31 @@ public class SearchImage_GUI extends JFrame { addWindowListener(new WindowAdapter() { @Override public void windowClosing(WindowEvent arg0) { - //Beendet die Anwendung nach klick auf X + // Beendet die Anwendung nach klick auf X System.exit(0); } }); - //Verhindert das Vergrößern Des Fensters + // Verhindert das Vergrößern Des Fensters setResizable(false); - + try { - //Setzt das Look & Feel auf System + // Setzt das Look & Feel auf System UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName()); } catch (ClassNotFoundException | InstantiationException | IllegalAccessException | UnsupportedLookAndFeelException e) { // TODO Auto-generated catch block e.printStackTrace(); } - //Setzt den Fenstertitel + // Setzt den Fenstertitel setTitle("bwLehrpool Suite *Prototyp*"); - //Zentriert das Fenster in die Bildmitte + // Zentriert das Fenster in die Bildmitte Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize(); - int top=(screenSize.height - 722) / 2; - int left=(screenSize.width - 603) / 2; + int top = (screenSize.height - 722) / 2; + int left = (screenSize.width - 603) / 2; setBounds(left, top, 603, 722); - - - final DefaultTableModel model = new DefaultTableModel( titles, 0 ); - - + final DefaultTableModel model = new DefaultTableModel(titles, 0); + getContentPane().setLayout(null); { JPanel panel = new JPanel(); @@ -131,11 +131,12 @@ public class SearchImage_GUI extends JFrame { panel.add(lblNewLabel); lblNewLabel.setFont(new Font("Tahoma", Font.BOLD, 18)); } - + JTextPane txtpnBitteWhlenSie = new JTextPane(); txtpnBitteWhlenSie.setEditable(false); txtpnBitteWhlenSie.setBackground(SystemColor.menu); - txtpnBitteWhlenSie.setText("Hier k\u00F6nnen Sie nach Ihrem gew\u00FCnschten VL-Image suchen und dieses f\u00FCr weitere Schritte ausw\u00E4hlen"); + txtpnBitteWhlenSie + .setText("Hier k\u00F6nnen Sie nach Ihrem gew\u00FCnschten VL-Image suchen und dieses f\u00FCr weitere Schritte ausw\u00E4hlen"); txtpnBitteWhlenSie.setBounds(10, 36, 509, 32); panel.add(txtpnBitteWhlenSie); } @@ -144,144 +145,145 @@ public class SearchImage_GUI extends JFrame { contentPanel.setBorder(new EmptyBorder(5, 5, 5, 5)); getContentPane().add(contentPanel); contentPanel.setLayout(null); - + JPanel panel_1 = new JPanel(); panel_1.setBackground(SystemColor.menu); - panel_1.setBorder(new TitledBorder(null, "Filterfunktionen", TitledBorder.LEADING, TitledBorder.TOP, null, null)); + panel_1.setBorder(new TitledBorder(null, "Filterfunktionen", + TitledBorder.LEADING, TitledBorder.TOP, null, null)); panel_1.setBounds(10, 49, 557, 131); contentPanel.add(panel_1); panel_1.setLayout(null); - + JLabel lblNewLabel_2 = new JLabel("Anzeigename:"); lblNewLabel_2.setBounds(10, 30, 250, 20); panel_1.add(lblNewLabel_2); - + JLabel lblInternetIstInnerhalb = new JLabel("Betriebssystem:"); lblInternetIstInnerhalb.setBounds(10, 58, 250, 20); panel_1.add(lblInternetIstInnerhalb); - + textFieldName = new JTextField(); - //Key Listener der Tastatureingabe registriert + // Key Listener der Tastatureingabe registriert textFieldName.addKeyListener(new KeyAdapter() { @Override public void keyReleased(KeyEvent e) { - //Textfield eingabe auslesen - String stext=textFieldName.getText(); - - //Wenn Textfield nicht leer - if(stext!="") - { - //Filtere nach der Eingabe - rowSorterAll.setRowFilter(RowFilter.regexFilter(textFieldName.getText(), 0)); - rowSorterMyImages.setRowFilter(RowFilter.regexFilter(textFieldName.getText(), 0)); - - } - }}); + // Textfield eingabe auslesen + String stext = textFieldName.getText(); + + // Wenn Textfield nicht leer + if (stext != "") { + // Filtere nach der Eingabe + rowSorterAll.setRowFilter(RowFilter.regexFilter( + textFieldName.getText(), 0)); + rowSorterMyImages.setRowFilter(RowFilter.regexFilter( + textFieldName.getText(), 0)); + } + } + }); textFieldName.setBounds(270, 30, 250, 20); panel_1.add(textFieldName); textFieldName.setColumns(10); - - JLabel lblErweiterteSuche = new JLabel("<html><u>Erweiterte Suche</u></html>"); + + JLabel lblErweiterteSuche = new JLabel( + "<html><u>Erweiterte Suche</u></html>"); lblErweiterteSuche.addMouseListener(new MouseAdapter() { @Override public void mouseClicked(MouseEvent arg0) { - //Öffnet das Fenster Extended GUI - ExtendedSearch_GUI es=new ExtendedSearch_GUI(); + // Öffnet das Fenster Extended GUI + ExtendedSearch_GUI es = new ExtendedSearch_GUI(); es.setVisible(true); } }); lblErweiterteSuche.setForeground(Color.BLUE); - + lblErweiterteSuche.setBounds(431, 106, 89, 14); panel_1.add(lblErweiterteSuche); - + comboBox = new JComboBox<String>(); try { - //Holt sich eine Liste aller verfügbaren Betriebssysteme vom Server - List<String> list=client.getAllOS(); - //Leeres Item hinzufügen + // Holt sich eine Liste aller verfügbaren Betriebssysteme vom Server + List<String> list = client.getAllOS(); + // Leeres Item hinzufügen comboBox.addItem(""); - for(int i=0;i<list.size();i++) - { - //Hinzufügen der verfügbaren Betriebssysteme + for (int i = 0; i < list.size(); i++) { + // Hinzufügen der verfügbaren Betriebssysteme comboBox.addItem(list.get(i)); } } catch (TException e2) { // TODO Auto-generated catch block e2.printStackTrace(); } - //Registriert Auswahländerungen der Box + // Registriert Auswahländerungen der Box comboBox.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent arg0) { - //Prüft das die Auswahl nicht leer ist - if(comboBox.getSelectedItem().toString()!="") - { - //Filtert nach dem ausgewählten Betriebssystem - rowSorterAll.setRowFilter(RowFilter.regexFilter(comboBox.getSelectedItem().toString(), 2)); - rowSorterMyImages.setRowFilter(RowFilter.regexFilter(comboBox.getSelectedItem().toString(), 2)); - } + // Prüft das die Auswahl nicht leer ist + if (comboBox.getSelectedItem().toString() != "") { + // Filtert nach dem ausgewählten Betriebssystem + rowSorterAll.setRowFilter(RowFilter.regexFilter(comboBox + .getSelectedItem().toString(), 2)); + rowSorterMyImages.setRowFilter(RowFilter.regexFilter( + comboBox.getSelectedItem().toString(), 2)); + } } - + }); comboBox.setBounds(270, 58, 250, 20); panel_1.add(comboBox); - + JLabel lblHauptmen = new JLabel("Hauptmen\u00FC"); lblHauptmen.addMouseListener(new MouseAdapter() { @Override public void mouseClicked(MouseEvent arg0) { - //Öffnet das Hauütmenü + // Öffnet das Hauütmenü SearchImage_GUI.this.setVisible(false); - MainMenue_GUI main=new MainMenue_GUI(); + MainMenue_GUI main = new MainMenue_GUI(); main.setVisible(true); } }); lblHauptmen.setForeground(Color.BLUE); lblHauptmen.setBounds(10, 11, 61, 14); contentPanel.add(lblHauptmen); - + JLabel label_1 = new JLabel(">"); label_1.setBounds(69, 11, 13, 14); contentPanel.add(label_1); - + JLabel lblVlimage = new JLabel("VL-Image"); lblVlimage.setForeground(Color.BLUE); lblVlimage.setBounds(81, 11, 45, 14); contentPanel.add(lblVlimage); - + JLabel label_2 = new JLabel(">"); label_2.setBounds(133, 11, 13, 14); contentPanel.add(label_2); - + JLabel lblNewLabel_1 = new JLabel("Imageauswahl"); lblNewLabel_1.setBounds(146, 11, 85, 14); contentPanel.add(lblNewLabel_1); - + tabbedPane = new JTabbedPane(JTabbedPane.TOP); tabbedPane.addChangeListener(new ChangeListener() { public void stateChanged(ChangeEvent arg0) { System.out.println(tabbedPane.getSelectedIndex()); - if(tabbedPane.getSelectedIndex()==0){ - - - - } - else if(tabbedPane.getSelectedIndex()==1){ - String username="Spitzer Tobias"; - rowSorterMyImages.setRowFilter(RowFilter.regexFilter(username, 4)); - //rowSorterMyImages.toggleSortOrder(0); + if (tabbedPane.getSelectedIndex() == 0) { + + } else if (tabbedPane.getSelectedIndex() == 1) { + String username = "Spitzer Tobias"; + rowSorterMyImages.setRowFilter(RowFilter.regexFilter( + username, 4)); + // rowSorterMyImages.toggleSortOrder(0); } - + } }); tabbedPane.setBounds(10, 197, 557, 300); contentPanel.add(tabbedPane); - + JScrollPane scrollPaneMyImage = new JScrollPane(); - tablemyImages=new JTable(); + tablemyImages = new JTable(); tablemyImages.setModel(modelMyImages); tablemyImages.getColumnModel().getColumn(1).sizeWidthToFit(); tablemyImages.getColumnModel().getColumn(2).sizeWidthToFit(); @@ -290,9 +292,9 @@ public class SearchImage_GUI extends JFrame { tablemyImages.getColumnModel().getColumn(5).sizeWidthToFit(); initTableModel(modelMyImages); tablemyImages.setRowSorter(rowSorterMyImages); - + JScrollPane scrollPaneAllImages = new JScrollPane(); - tableAllImages=new JTable(); + tableAllImages = new JTable(); tableAllImages.setModel(modelAll); tableAllImages.getColumnModel().getColumn(1).sizeWidthToFit(); tableAllImages.getColumnModel().getColumn(2).sizeWidthToFit(); @@ -301,15 +303,15 @@ public class SearchImage_GUI extends JFrame { tableAllImages.getColumnModel().getColumn(5).sizeWidthToFit(); initTableModel(modelAll); tableAllImages.setRowSorter(rowSorterAll); - - scrollPaneAllImages.setViewportView(tableAllImages); - tabbedPane.addTab("Alle", null, scrollPaneAllImages, null); + + scrollPaneAllImages.setViewportView(tableAllImages); + tabbedPane.addTab("Alle", null, scrollPaneAllImages, null); scrollPaneMyImage.setViewportView(tablemyImages); tabbedPane.addTab("Meine Images", null, scrollPaneMyImage, null); - + JScrollPane scrollPaneCoopImages = new JScrollPane(); - JTable tableCoopImages=new JTable(); + JTable tableCoopImages = new JTable(); tableCoopImages.setModel(model); tableCoopImages.getColumnModel().getColumn(1).sizeWidthToFit(); tableCoopImages.getColumnModel().getColumn(2).sizeWidthToFit(); @@ -318,11 +320,12 @@ public class SearchImage_GUI extends JFrame { tableCoopImages.getColumnModel().getColumn(5).sizeWidthToFit(); scrollPaneCoopImages.setViewportView(tableCoopImages); - tabbedPane.addTab("Kooperative Images", null, scrollPaneCoopImages, null); + tabbedPane.addTab("Kooperative Images", null, scrollPaneCoopImages, + null); tabbedPane.setEnabledAt(2, false); - + JScrollPane scrollPanePublicImages = new JScrollPane(); - JTable tablePublicImages=new JTable(); + JTable tablePublicImages = new JTable(); tablePublicImages.setModel(model); tablePublicImages.getColumnModel().getColumn(1).sizeWidthToFit(); tablePublicImages.getColumnModel().getColumn(2).sizeWidthToFit(); @@ -331,11 +334,12 @@ public class SearchImage_GUI extends JFrame { tablePublicImages.getColumnModel().getColumn(5).sizeWidthToFit(); scrollPanePublicImages.setViewportView(tablePublicImages); - tabbedPane.addTab("\u00D6ffentliche Images", null, scrollPanePublicImages, null); + tabbedPane.addTab("\u00D6ffentliche Images", null, + scrollPanePublicImages, null); tabbedPane.setEnabledAt(3, false); - + JScrollPane scrollPanePublicVorlagen = new JScrollPane(); - JTable tablePublicVorlagen=new JTable(); + JTable tablePublicVorlagen = new JTable(); tablePublicVorlagen.setModel(model); tablePublicVorlagen.getColumnModel().getColumn(1).sizeWidthToFit(); tablePublicVorlagen.getColumnModel().getColumn(2).sizeWidthToFit(); @@ -344,17 +348,15 @@ public class SearchImage_GUI extends JFrame { tablePublicVorlagen.getColumnModel().getColumn(5).sizeWidthToFit(); scrollPanePublicVorlagen.setViewportView(tablePublicVorlagen); - tabbedPane.addTab("\u00D6ffentliche Vorlagen", null, scrollPanePublicVorlagen, null); + tabbedPane.addTab("\u00D6ffentliche Vorlagen", null, + scrollPanePublicVorlagen, null); tabbedPane.setEnabledAt(4, false); - - - JButton btnDownload = new JButton("Download"); btnDownload.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent arg0) { - //Öffnet den Downloader - FTPDownloader_GUI down=new FTPDownloader_GUI("Test"); + // Öffnet den Downloader + FTPDownloader_GUI down = new FTPDownloader_GUI("Test"); down.setVisible(true); SearchImage_GUI.this.setVisible(false); } @@ -368,78 +370,83 @@ public class SearchImage_GUI extends JFrame { buttonPane.setLayout(new FlowLayout(FlowLayout.RIGHT)); getContentPane().add(buttonPane); { - JButton okButton = new JButton("Zur\u00FCck"); - okButton.addActionListener(new ActionListener() { + JButton cancelButton = new JButton("Zur\u00FCck"); + cancelButton.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { - //Öffnet das Hauptmenü - MainMenue_GUI main=new MainMenue_GUI(); + // Öffnet das Hauptmenü + MainMenue_GUI main = new MainMenue_GUI(); main.setVisible(true); dispose(); } }); - okButton.setActionCommand("OK"); - buttonPane.add(okButton); - getRootPane().setDefaultButton(okButton); + cancelButton.setActionCommand("OK"); + buttonPane.add(cancelButton); + getRootPane().setDefaultButton(cancelButton); } { - JButton cancelButton = new JButton("Weiter"); - cancelButton.addActionListener(new ActionListener() { + JButton continueButton = new JButton("Weiter"); + continueButton.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { - EditImageAllgemein_GUI ea=new EditImageAllgemein_GUI(); + EditImageAllgemein_GUI ea = new EditImageAllgemein_GUI(); ea.setVisible(true); dispose(); - + } }); - cancelButton.setActionCommand("Cancel"); - buttonPane.add(cancelButton); + continueButton.setActionCommand("Cancel"); + buttonPane.add(continueButton); } } - + JSeparator separator = new JSeparator(); separator.setBounds(0, 78, 597, 2); getContentPane().add(separator); - + JSeparator separator_1 = new JSeparator(); separator_1.setBounds(0, 627, 597, 2); getContentPane().add(separator_1); - + 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); - + } - //Initiale Beffülung eines Table models - public DefaultTableModel initTableModel(DefaultTableModel model){ + + // Initiale Beffülung eines Table models + public DefaultTableModel initTableModel(DefaultTableModel model) { List<server.Image> images; try { - //Hole eine Liste der Images - + // Hole eine Liste der Images + images = client.getImageList(); - Iterator<server.Image> i=images.iterator(); - - int x=0; - - while(i.hasNext()) - { - //erzeuge Objekte für die Tabelle - Object [] obj={images.get(x).getImageName(),images.get(x).getLicenseRestriction(),images.get(x).getOsName(),images.get(x).getLectureName(),images.get(x).getUserData(),images.get(x).getUpdateTime()}; - //Füge diese Objekte der Tabelle hinzu + Iterator<server.Image> i = images.iterator(); + + int x = 0; + + while (i.hasNext()) { + // erzeuge Objekte für die Tabelle + Object[] obj = { images.get(x).getImageName(), + images.get(x).getLicenseRestriction(), + images.get(x).getOsName(), + images.get(x).getLectureName(), + images.get(x).getUserData(), + images.get(x).getUpdateTime() }; + // Füge diese Objekte der Tabelle hinzu model.addRow(obj); x++; i.next(); - + } - + return model; } catch (TException e1) { // TODO Auto-generated catch block @@ -447,7 +454,5 @@ public class SearchImage_GUI extends JFrame { } return model; } - - } - +} diff --git a/Dozentenmodul/src/gui/EingabeImageTechnisch_GUI.java b/Dozentenmodul/src/gui/EingabeImageTechnisch_GUI.java index 43482544..7c26ca23 100644 --- a/Dozentenmodul/src/gui/EingabeImageTechnisch_GUI.java +++ b/Dozentenmodul/src/gui/EingabeImageTechnisch_GUI.java @@ -116,102 +116,71 @@ public class EingabeImageTechnisch_GUI extends JFrame { JPanel panel_1 = new JPanel(); panel_1.setBackground(SystemColor.menu); panel_1.setBorder(new TitledBorder(null, "Informationen zum Image", TitledBorder.LEADING, TitledBorder.TOP, null, null)); - panel_1.setBounds(10, 66, 557, 95); + panel_1.setBounds(10, 66, 557, 124); contentPanel.add(panel_1); panel_1.setLayout(null); - JLabel lblNewLabel_2 = new JLabel("Image enth\u00E4lt lizenzpflichtige Software:"); - lblNewLabel_2.setBounds(10, 30, 250, 20); - panel_1.add(lblNewLabel_2); - - rdbtnlicenseJa = new JRadioButton("Ja"); - rdbtnlicenseJa.setSelected(true); - buttonGrouplicense.add(rdbtnlicenseJa); - rdbtnlicenseJa.setBounds(266, 29, 109, 23); - panel_1.add(rdbtnlicenseJa); - rdbtnlicenseNein = new JRadioButton("Nein"); buttonGrouplicense.add(rdbtnlicenseNein); - rdbtnlicenseNein.setBounds(377, 29, 109, 23); + rdbtnlicenseNein.setBounds(377, 29, 46, 23); panel_1.add(rdbtnlicenseNein); - JLabel lblInternetIstInnerhalb = new JLabel("Internet ist innerhalb des Image gesperrt:"); + rdbtnInternetNein = new JRadioButton("Nein"); + rdbtnInternetNein.setSelected(true); + buttonGroupInternet.add(rdbtnInternetNein); + rdbtnInternetNein.setBounds(377, 57, 46, 23); + panel_1.add(rdbtnInternetNein); + + JLabel lblInternetIstInnerhalb = new JLabel("Internet ist f\u00FCr dieses Image gesperrt:"); lblInternetIstInnerhalb.setBounds(10, 58, 250, 20); panel_1.add(lblInternetIstInnerhalb); + JButton btnInternetSettings = new JButton("Einstellungen..."); + btnInternetSettings.setEnabled(false); + btnInternetSettings.setBounds(439, 57, 108, 23); + panel_1.add(btnInternetSettings); + rdbtnInternetJa = new JRadioButton("Ja"); + buttonGroupInternet.add(rdbtnInternetJa); - rdbtnInternetJa.setBounds(266, 57, 109, 23); + rdbtnInternetJa.setBounds(266, 57, 41, 23); panel_1.add(rdbtnInternetJa); - rdbtnInternetNein = new JRadioButton("Nein"); - rdbtnInternetNein.setSelected(true); - buttonGroupInternet.add(rdbtnInternetNein); - rdbtnInternetNein.setBounds(377, 57, 109, 23); - panel_1.add(rdbtnInternetNein); - - JLabel lblHauptmen = new JLabel("Hauptmen\u00FC"); - lblHauptmen.addMouseListener(new MouseAdapter() { - @Override - public void mouseClicked(MouseEvent arg0) { - - EingabeImageTechnisch_GUI.this.setVisible(false); - MainMenue_GUI main=new MainMenue_GUI(); - main.setVisible(true); - } - }); - lblHauptmen.setForeground(Color.BLUE); - lblHauptmen.setBounds(10, 11, 61, 14); - contentPanel.add(lblHauptmen); - - JLabel label_1 = new JLabel(">"); - label_1.setBounds(69, 11, 13, 14); - contentPanel.add(label_1); + rdbtnlicenseJa = new JRadioButton("Ja"); + rdbtnlicenseJa.setSelected(true); + buttonGrouplicense.add(rdbtnlicenseJa); + rdbtnlicenseJa.setBounds(266, 29, 41, 23); + panel_1.add(rdbtnlicenseJa); - JLabel lblVlimage = new JLabel("VL-Image"); - lblVlimage.setForeground(Color.BLUE); - lblVlimage.setBounds(81, 11, 45, 14); - contentPanel.add(lblVlimage); + JLabel lblNewLabel_2 = new JLabel("Image enth\u00E4lt lizenzpflichtige Software:"); + lblNewLabel_2.setBounds(10, 30, 250, 20); + panel_1.add(lblNewLabel_2); - JLabel label_2 = new JLabel(">"); - label_2.setBounds(133, 11, 13, 14); - contentPanel.add(label_2); + JLabel lblLizenzserverEintragen = new JLabel("Lizenzserver eintragen:"); + lblLizenzserverEintragen.setBounds(10, 85, 250, 20); + panel_1.add(lblLizenzserverEintragen); - JLabel lblNewLabel_1 = new JLabel("Neu"); - lblNewLabel_1.setBounds(146, 11, 46, 14); - contentPanel.add(lblNewLabel_1); + JButton btnLicenseServer = new JButton("Server-Adresse..."); + btnLicenseServer.setEnabled(false); + btnLicenseServer.setBounds(266, 84, 157, 23); + panel_1.add(btnLicenseServer); JPanel panel_2 = new JPanel(); panel_2.setLayout(null); panel_2.setBorder(new TitledBorder(null, "Empfehlung bezüglich Ressourcen", TitledBorder.LEADING, TitledBorder.TOP, null, null)); panel_2.setBackground(SystemColor.menu); - panel_2.setBounds(10, 172, 557, 338); + panel_2.setBounds(11, 196, 557, 338); contentPanel.add(panel_2); - JTextArea txtrHinweisSolltenSie = new JTextArea(); - txtrHinweisSolltenSie.setBackground(SystemColor.menu); - txtrHinweisSolltenSie.setFont(new Font("Tahoma", Font.PLAIN, 13)); - txtrHinweisSolltenSie.setText("Hinweis: Sollten Sie keine Software einsetzen, die viele Ressourcen ben\u00F6tigt,\r\nk\u00F6nnen Sie sich an den Beispielwerten orientieren."); - txtrHinweisSolltenSie.setBounds(10, 25, 537, 55); - panel_2.add(txtrHinweisSolltenSie); - - JLabel lblNewLabel_3 = new JLabel("Wie viel Arbeitsspeicher empfehlen Sie f\u00FCr das Image:"); - lblNewLabel_3.setBounds(10, 91, 280, 20); - panel_2.add(lblNewLabel_3); - - JLabel lblMindestens = new JLabel("mindestens"); - lblMindestens.setBounds(315, 91, 60, 20); - panel_2.add(lblMindestens); - - spinnerRam = new JSpinner(); - spinnerRam.setModel(new SpinnerNumberModel(1, 1, 8, 1)); - spinnerRam.setBounds(385, 88, 29, 20); - panel_2.add(spinnerRam); - JLabel lblGbyte = new JLabel("GByte"); lblGbyte.setBounds(424, 91, 46, 20); panel_2.add(lblGbyte); + spinnerCPU = new JSpinner(); + spinnerCPU.setModel(new SpinnerNumberModel(1, 1, 4, 1)); + spinnerCPU.setBounds(385, 188, 29, 20); + panel_2.add(spinnerCPU); + JTextArea txtrBeispielWindows = new JTextArea(); txtrBeispielWindows.setText("Beispiel:\r\nWindows 7 32/64 Bit: 2 GByte\r\nLinux/Unix 32/64 Bit: 1 GByte"); txtrBeispielWindows.setFont(new Font("Tahoma", Font.PLAIN, 11)); @@ -219,29 +188,77 @@ public class EingabeImageTechnisch_GUI extends JFrame { txtrBeispielWindows.setBounds(10, 122, 280, 55); panel_2.add(txtrBeispielWindows); - JTextArea txtrBeispielWindows_1 = new JTextArea(); - txtrBeispielWindows_1.setText("Beispiel:\r\nWindows 7 32/64 Bit: 1 Kern\r\nLinux/Unix 32/64 Bit: 1 Kern"); - txtrBeispielWindows_1.setFont(new Font("Tahoma", Font.PLAIN, 11)); - txtrBeispielWindows_1.setBackground(SystemColor.menu); - txtrBeispielWindows_1.setBounds(10, 222, 280, 55); - panel_2.add(txtrBeispielWindows_1); + + + JLabel lblKerne = new JLabel("Kerne"); + lblKerne.setBounds(424, 191, 46, 20); + panel_2.add(lblKerne); JLabel lblWieVieleCpus = new JLabel("Wie viele CPUs empfehlen Sie f\u00FCr das Image:"); lblWieVieleCpus.setBounds(10, 191, 280, 20); panel_2.add(lblWieVieleCpus); + spinnerRam = new JSpinner(); + spinnerRam.setModel(new SpinnerNumberModel(1, 1, 8, 1)); + spinnerRam.setBounds(385, 88, 29, 20); + panel_2.add(spinnerRam); + JLabel label_3 = new JLabel("mindestens"); label_3.setBounds(315, 191, 60, 20); panel_2.add(label_3); - spinnerCPU = new JSpinner(); - spinnerCPU.setModel(new SpinnerNumberModel(1, 1, 4, 1)); - spinnerCPU.setBounds(385, 188, 29, 20); - panel_2.add(spinnerCPU); + JLabel lblMindestens = new JLabel("mindestens"); + lblMindestens.setBounds(315, 91, 60, 20); + panel_2.add(lblMindestens); - JLabel lblKerne = new JLabel("Kerne"); - lblKerne.setBounds(424, 191, 46, 20); - panel_2.add(lblKerne); + JTextArea txtrBeispielWindows_1 = new JTextArea(); + txtrBeispielWindows_1.setText("Beispiel:\r\nWindows 7 32/64 Bit: 1 Kern\r\nLinux/Unix 32/64 Bit: 1 Kern"); + txtrBeispielWindows_1.setFont(new Font("Tahoma", Font.PLAIN, 11)); + txtrBeispielWindows_1.setBackground(SystemColor.menu); + txtrBeispielWindows_1.setBounds(10, 222, 280, 55); + panel_2.add(txtrBeispielWindows_1); + + JLabel lblNewLabel_3 = new JLabel("Wie viel Arbeitsspeicher empfehlen Sie f\u00FCr das Image:"); + lblNewLabel_3.setBounds(10, 91, 280, 20); + panel_2.add(lblNewLabel_3); + + JTextArea txtrHinweisSolltenSie = new JTextArea(); + txtrHinweisSolltenSie.setBackground(SystemColor.menu); + txtrHinweisSolltenSie.setFont(new Font("Tahoma", Font.PLAIN, 13)); + txtrHinweisSolltenSie.setText("Hinweis: Sollten Sie keine Software einsetzen, die viele Ressourcen ben\u00F6tigt,\r\nk\u00F6nnen Sie sich an den Beispielwerten orientieren."); + txtrHinweisSolltenSie.setBounds(10, 25, 537, 55); + panel_2.add(txtrHinweisSolltenSie); + + JLabel lblHauptmen = new JLabel("Hauptmen\u00FC"); + lblHauptmen.addMouseListener(new MouseAdapter() { + @Override + public void mouseClicked(MouseEvent arg0) { + + EingabeImageTechnisch_GUI.this.setVisible(false); + MainMenue_GUI main=new MainMenue_GUI(); + main.setVisible(true); + } + }); + lblHauptmen.setForeground(Color.BLUE); + lblHauptmen.setBounds(10, 11, 61, 14); + contentPanel.add(lblHauptmen); + + JLabel label_1 = new JLabel(">"); + label_1.setBounds(69, 11, 13, 14); + contentPanel.add(label_1); + + JLabel lblVlimage = new JLabel("VL-Image"); + lblVlimage.setForeground(Color.BLUE); + lblVlimage.setBounds(81, 11, 45, 14); + contentPanel.add(lblVlimage); + + JLabel label_2 = new JLabel(">"); + label_2.setBounds(133, 11, 13, 14); + contentPanel.add(label_2); + + JLabel lblNewLabel_1 = new JLabel("Neu"); + lblNewLabel_1.setBounds(146, 11, 46, 14); + contentPanel.add(lblNewLabel_1); { JPanel buttonPane = new JPanel(); buttonPane.setBounds(0, 640, 597, 33); diff --git a/Dozentenmodul/src/gui/FTPUploader_GUI.java b/Dozentenmodul/src/gui/FTPUploader_GUI.java index 14cb40f5..2b5badd7 100644 --- a/Dozentenmodul/src/gui/FTPUploader_GUI.java +++ b/Dozentenmodul/src/gui/FTPUploader_GUI.java @@ -128,31 +128,38 @@ public class FTPUploader_GUI extends JFrame implements PropertyChangeListener { getContentPane().add(contentPanel, BorderLayout.CENTER); contentPanel.setLayout(null); { - JButton btnSpeicherortAuswhlen = new JButton("VMDK ausw\u00E4hlen"); + JButton btnSpeicherortAuswhlen = new JButton("Image ausw\u00E4hlen"); btnSpeicherortAuswhlen.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent arg0) { JFileChooser fc = new JFileChooser(); fc.setFileSelectionMode(JFileChooser.FILES_ONLY); fc.showOpenDialog(getParent()); - File dir = fc.getSelectedFile(); - uploadFile = dir; - filename = uploadFile.getName(); - lblNewLabel.setText(dir.getAbsolutePath()); + File file = fc.getSelectedFile(); + //check if a file is selected and exists + if (file != null) { + System.out.println("File to upload exists"); + uploadFile = file; + filename = uploadFile.getName(); + lblNewLabel.setText(file.getAbsolutePath()); + } else { + System.out.println("No file selected"); + lblNewLabel.setText(""); + }//end if } }); - btnSpeicherortAuswhlen.setBounds(57, 124, 117, 23); + btnSpeicherortAuswhlen.setBounds(102, 124, 173, 23); btnSpeicherortAuswhlen.setVerticalAlignment(SwingConstants.TOP); - btnSpeicherortAuswhlen.setHorizontalAlignment(SwingConstants.LEFT); contentPanel.add(btnSpeicherortAuswhlen); } lblNewLabel = new JLabel(""); - lblNewLabel.setBounds(191, 124, 255, 23); + lblNewLabel.setHorizontalAlignment(SwingConstants.LEFT); + lblNewLabel.setBounds(285, 124, 302, 23); contentPanel.add(lblNewLabel); - JButton btnUploadStarten = new JButton("Upload starten"); + JButton btnUploadStarten = new JButton("Upload auf Server starten"); btnUploadStarten.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent arg0) { buttonUploadActionPerformed(arg0); @@ -160,53 +167,58 @@ public class FTPUploader_GUI extends JFrame implements PropertyChangeListener { } }); - btnUploadStarten.setBounds(57, 168, 141, 23); + btnUploadStarten.setBounds(102, 168, 173, 23); contentPanel.add(btnUploadStarten); progressBar = new JProgressBar(0, 100); progressBar.setStringPainted(true); - progressBar.setBounds(57, 202, 497, 30); + progressBar.setBounds(102, 202, 485, 30); contentPanel.add(progressBar); JLabel label = new JLabel("Downloadgeschwindigkeit:"); - label.setBounds(57, 243, 141, 14); + label.setBounds(102, 243, 141, 14); contentPanel.add(label); JLabel label_1 = new JLabel("Fertig:"); - label_1.setBounds(57, 293, 46, 14); + label_1.setBounds(102, 293, 46, 14); contentPanel.add(label_1); labelfertig = new JLabel("0"); - labelfertig.setBounds(113, 293, 71, 14); + labelfertig.setHorizontalAlignment(SwingConstants.LEFT); + labelfertig.setBounds(183, 293, 108, 14); contentPanel.add(labelfertig); UpSpeed = new JLabel("0"); - UpSpeed.setBounds(329, 243, 95, 14); + UpSpeed.setHorizontalAlignment(SwingConstants.LEFT); + UpSpeed.setBounds(374, 243, 117, 14); contentPanel.add(UpSpeed); JLabel label_4 = new JLabel("von:"); - label_4.setBounds(184, 293, 46, 14); + label_4.setBounds(318, 293, 46, 14); contentPanel.add(label_4); labelfilesize = new JLabel("0"); - labelfilesize.setBounds(240, 293, 108, 14); + labelfilesize.setHorizontalAlignment(SwingConstants.LEFT); + labelfilesize.setBounds(374, 293, 117, 14); contentPanel.add(labelfilesize); JLabel label_6 = new JLabel("Verbleibend:"); - label_6.setBounds(57, 318, 71, 14); + label_6.setBounds(102, 318, 71, 14); contentPanel.add(label_6); JLabel label_7 = new JLabel("Gesch\u00E4tzte Verbleibende Zeit:"); - label_7.setBounds(57, 268, 150, 14); + label_7.setBounds(102, 268, 150, 14); contentPanel.add(label_7); labelZeit = new JLabel("0"); - labelZeit.setBounds(329, 268, 117, 14); + labelZeit.setHorizontalAlignment(SwingConstants.LEFT); + labelZeit.setBounds(374, 268, 117, 14); contentPanel.add(labelZeit); labelverbleibend = new JLabel("0"); - labelverbleibend.setBounds(138, 318, 108, 14); + labelverbleibend.setHorizontalAlignment(SwingConstants.LEFT); + labelverbleibend.setBounds(183, 318, 108, 14); contentPanel.add(labelverbleibend); JPanel panel = new JPanel(); @@ -221,7 +233,8 @@ public class FTPUploader_GUI extends JFrame implements PropertyChangeListener { panel.add(lblUploadIhresImage); JTextPane txtpnFhreSieBitte = new JTextPane(); - txtpnFhreSieBitte.setText("F\u00FChre Sie bitte die folgenden 3 Schritte aus um Ihr Image auf unseren Server zu laden."); + txtpnFhreSieBitte + .setText("F\u00FChre Sie bitte die folgenden 3 Schritte aus um Ihr Image auf unseren Server zu laden."); txtpnFhreSieBitte.setEditable(false); txtpnFhreSieBitte.setBackground(SystemColor.menu); txtpnFhreSieBitte.setBounds(10, 36, 509, 32); @@ -261,6 +274,7 @@ public class FTPUploader_GUI extends JFrame implements PropertyChangeListener { btnCopyFileTo.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { try { + System.out.println("Copying file to "+ user.path + "/" + uploadFile.getName()); client.startFileCopy(user.path + "/" + uploadFile.getName()); } catch (TException e1) { // TODO Auto-generated catch block @@ -268,24 +282,24 @@ public class FTPUploader_GUI extends JFrame implements PropertyChangeListener { } } }); - btnCopyFileTo.setBounds(57, 343, 217, 23); + btnCopyFileTo.setBounds(102, 343, 173, 23); contentPanel.add(btnCopyFileTo); - JLabel label_8 = new JLabel("1."); - label_8.setBounds(24, 128, 23, 14); - contentPanel.add(label_8); + JLabel lblShritt = new JLabel("Schritt 1:"); + lblShritt.setBounds(24, 128, 57, 14); + contentPanel.add(lblShritt); - JLabel label_9 = new JLabel("2."); - label_9.setBounds(24, 172, 23, 14); - contentPanel.add(label_9); + JLabel lblSchritt = new JLabel("Schritt 2:"); + lblSchritt.setBounds(24, 172, 57, 14); + contentPanel.add(lblSchritt); - JLabel label_10 = new JLabel("3."); - label_10.setBounds(20, 391, 23, 14); - contentPanel.add(label_10); + JLabel lblSchritt_1 = new JLabel("Schritt 3:"); + lblSchritt_1.setBounds(20, 391, 57, 14); + contentPanel.add(lblSchritt_1); JLabel lblKlickenSieAuf = new JLabel( "Klicken Sie auf \"Fertigstellen\"."); - lblKlickenSieAuf.setBounds(53, 391, 241, 14); + lblKlickenSieAuf.setBounds(98, 391, 241, 14); contentPanel.add(lblKlickenSieAuf); { JPanel buttonPane = new JPanel(); @@ -326,6 +340,17 @@ public class FTPUploader_GUI extends JFrame implements PropertyChangeListener { } }); + JButton btnZurck = new JButton("Zur\u00FCck"); + btnZurck.addActionListener(new ActionListener() { + public void actionPerformed(ActionEvent e) { + dispose(); + EingabeImageTechnisch_GUI m = new EingabeImageTechnisch_GUI(); + m.setVisible(true); + } + }); + btnZurck.setActionCommand("Cancel"); + buttonPane.add(btnZurck); + cancelButton.setActionCommand("Cancel"); buttonPane.add(cancelButton); finishButton.setActionCommand("Cancel"); @@ -400,7 +425,7 @@ public class FTPUploader_GUI extends JFrame implements PropertyChangeListener { progress = (Integer) arg0.getNewValue(); progressBar.setValue(progress); - // Button zum Fertigstellen freischalten + // Button zum Fertigstellen freischalten, wenn 100% erreicht sind if (progress == 100) { finishButton.setEnabled(true); } diff --git a/Dozentenmodul/src/gui/SearchImage_GUI.java b/Dozentenmodul/src/gui/SearchImage_GUI.java index 4225a295..ee7727c3 100644 --- a/Dozentenmodul/src/gui/SearchImage_GUI.java +++ b/Dozentenmodul/src/gui/SearchImage_GUI.java @@ -1,6 +1,5 @@ package gui; - import java.awt.Color; import java.awt.Dimension; import java.awt.FlowLayout; @@ -34,6 +33,7 @@ import javax.swing.JTabbedPane; import javax.swing.JTable; import javax.swing.JTextField; import javax.swing.JTextPane; +import javax.swing.ListSelectionModel; import javax.swing.RowFilter; import javax.swing.UIManager; import javax.swing.UnsupportedLookAndFeelException; @@ -62,14 +62,17 @@ public class SearchImage_GUI extends JFrame { JTable tablemyImages; private JTextField textFieldName; JTabbedPane tabbedPane; - String[] titles= {"Image-Name", "Lizenzpflichtig", "OS", "Veranstaltung", "Verantwortlicher", "Letztes Update", "Schlagwort"}; - ThriftConnection con=new ThriftConnection(); - Client client=con.getThriftConnection(); - final DefaultTableModel modelAll = new DefaultTableModel( titles, 0 ); - final DefaultTableModel modelMyImages = new DefaultTableModel( titles, 0 ); - final TableRowSorter<TableModel> rowSorterAll = new TableRowSorter<TableModel>( modelAll ); - final TableRowSorter<TableModel> rowSorterMyImages = new TableRowSorter<TableModel>( modelMyImages ); - + String[] titles = { "Image-Name", "Lizenzpflichtig", "OS", "Veranstaltung", + "Verantwortlicher", "Letztes Update", "Schlagwort" }; + ThriftConnection con = new ThriftConnection(); + Client client = con.getThriftConnection(); + final DefaultTableModel modelAll = new DefaultTableModel(titles, 0); + final DefaultTableModel modelMyImages = new DefaultTableModel(titles, 0); + final TableRowSorter<TableModel> rowSorterAll = new TableRowSorter<TableModel>( + modelAll); + final TableRowSorter<TableModel> rowSorterMyImages = new TableRowSorter<TableModel>( + modelMyImages); + /** * Launch the application. */ @@ -90,34 +93,31 @@ public class SearchImage_GUI extends JFrame { addWindowListener(new WindowAdapter() { @Override public void windowClosing(WindowEvent arg0) { - //Beendet die Anwendung nach klick auf X + // Beendet die Anwendung nach klick auf X System.exit(0); } }); - //Verhindert das Vergrößern Des Fensters + // Verhindert das Vergrößern Des Fensters setResizable(false); - + try { - //Setzt das Look & Feel auf System + // Setzt das Look & Feel auf System UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName()); } catch (ClassNotFoundException | InstantiationException | IllegalAccessException | UnsupportedLookAndFeelException e) { // TODO Auto-generated catch block e.printStackTrace(); } - //Setzt den Fenstertitel + // Setzt den Fenstertitel setTitle("bwLehrpool Suite *Prototyp*"); - //Zentriert das Fenster in die Bildmitte + // Zentriert das Fenster in die Bildmitte Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize(); - int top=(screenSize.height - 722) / 2; - int left=(screenSize.width - 603) / 2; + int top = (screenSize.height - 722) / 2; + int left = (screenSize.width - 603) / 2; setBounds(left, top, 603, 722); - - - final DefaultTableModel model = new DefaultTableModel( titles, 0 ); - - + final DefaultTableModel model = new DefaultTableModel(titles, 0); + getContentPane().setLayout(null); { JPanel panel = new JPanel(); @@ -131,11 +131,12 @@ public class SearchImage_GUI extends JFrame { panel.add(lblNewLabel); lblNewLabel.setFont(new Font("Tahoma", Font.BOLD, 18)); } - + JTextPane txtpnBitteWhlenSie = new JTextPane(); txtpnBitteWhlenSie.setEditable(false); txtpnBitteWhlenSie.setBackground(SystemColor.menu); - txtpnBitteWhlenSie.setText("Hier k\u00F6nnen Sie nach Ihrem gew\u00FCnschten VL-Image suchen und dieses f\u00FCr weitere Schritte ausw\u00E4hlen"); + txtpnBitteWhlenSie + .setText("Hier k\u00F6nnen Sie nach Ihrem gew\u00FCnschten VL-Image suchen und dieses f\u00FCr weitere Schritte ausw\u00E4hlen"); txtpnBitteWhlenSie.setBounds(10, 36, 509, 32); panel.add(txtpnBitteWhlenSie); } @@ -144,144 +145,145 @@ public class SearchImage_GUI extends JFrame { contentPanel.setBorder(new EmptyBorder(5, 5, 5, 5)); getContentPane().add(contentPanel); contentPanel.setLayout(null); - + JPanel panel_1 = new JPanel(); panel_1.setBackground(SystemColor.menu); - panel_1.setBorder(new TitledBorder(null, "Filterfunktionen", TitledBorder.LEADING, TitledBorder.TOP, null, null)); + panel_1.setBorder(new TitledBorder(null, "Filterfunktionen", + TitledBorder.LEADING, TitledBorder.TOP, null, null)); panel_1.setBounds(10, 49, 557, 131); contentPanel.add(panel_1); panel_1.setLayout(null); - + JLabel lblNewLabel_2 = new JLabel("Anzeigename:"); lblNewLabel_2.setBounds(10, 30, 250, 20); panel_1.add(lblNewLabel_2); - + JLabel lblInternetIstInnerhalb = new JLabel("Betriebssystem:"); lblInternetIstInnerhalb.setBounds(10, 58, 250, 20); panel_1.add(lblInternetIstInnerhalb); - + textFieldName = new JTextField(); - //Key Listener der Tastatureingabe registriert + // Key Listener der Tastatureingabe registriert textFieldName.addKeyListener(new KeyAdapter() { @Override public void keyReleased(KeyEvent e) { - //Textfield eingabe auslesen - String stext=textFieldName.getText(); - - //Wenn Textfield nicht leer - if(stext!="") - { - //Filtere nach der Eingabe - rowSorterAll.setRowFilter(RowFilter.regexFilter(textFieldName.getText(), 0)); - rowSorterMyImages.setRowFilter(RowFilter.regexFilter(textFieldName.getText(), 0)); - - } - }}); + // Textfield eingabe auslesen + String stext = textFieldName.getText(); + + // Wenn Textfield nicht leer + if (stext != "") { + // Filtere nach der Eingabe + rowSorterAll.setRowFilter(RowFilter.regexFilter( + textFieldName.getText(), 0)); + rowSorterMyImages.setRowFilter(RowFilter.regexFilter( + textFieldName.getText(), 0)); + } + } + }); textFieldName.setBounds(270, 30, 250, 20); panel_1.add(textFieldName); textFieldName.setColumns(10); - - JLabel lblErweiterteSuche = new JLabel("<html><u>Erweiterte Suche</u></html>"); + + JLabel lblErweiterteSuche = new JLabel( + "<html><u>Erweiterte Suche</u></html>"); lblErweiterteSuche.addMouseListener(new MouseAdapter() { @Override public void mouseClicked(MouseEvent arg0) { - //Öffnet das Fenster Extended GUI - ExtendedSearch_GUI es=new ExtendedSearch_GUI(); + // Öffnet das Fenster Extended GUI + ExtendedSearch_GUI es = new ExtendedSearch_GUI(); es.setVisible(true); } }); lblErweiterteSuche.setForeground(Color.BLUE); - + lblErweiterteSuche.setBounds(431, 106, 89, 14); panel_1.add(lblErweiterteSuche); - + comboBox = new JComboBox<String>(); try { - //Holt sich eine Liste aller verfügbaren Betriebssysteme vom Server - List<String> list=client.getAllOS(); - //Leeres Item hinzufügen + // Holt sich eine Liste aller verfügbaren Betriebssysteme vom Server + List<String> list = client.getAllOS(); + // Leeres Item hinzufügen comboBox.addItem(""); - for(int i=0;i<list.size();i++) - { - //Hinzufügen der verfügbaren Betriebssysteme + for (int i = 0; i < list.size(); i++) { + // Hinzufügen der verfügbaren Betriebssysteme comboBox.addItem(list.get(i)); } } catch (TException e2) { // TODO Auto-generated catch block e2.printStackTrace(); } - //Registriert Auswahländerungen der Box + // Registriert Auswahländerungen der Box comboBox.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent arg0) { - //Prüft das die Auswahl nicht leer ist - if(comboBox.getSelectedItem().toString()!="") - { - //Filtert nach dem ausgewählten Betriebssystem - rowSorterAll.setRowFilter(RowFilter.regexFilter(comboBox.getSelectedItem().toString(), 2)); - rowSorterMyImages.setRowFilter(RowFilter.regexFilter(comboBox.getSelectedItem().toString(), 2)); - } + // Prüft das die Auswahl nicht leer ist + if (comboBox.getSelectedItem().toString() != "") { + // Filtert nach dem ausgewählten Betriebssystem + rowSorterAll.setRowFilter(RowFilter.regexFilter(comboBox + .getSelectedItem().toString(), 2)); + rowSorterMyImages.setRowFilter(RowFilter.regexFilter( + comboBox.getSelectedItem().toString(), 2)); + } } - + }); comboBox.setBounds(270, 58, 250, 20); panel_1.add(comboBox); - + JLabel lblHauptmen = new JLabel("Hauptmen\u00FC"); lblHauptmen.addMouseListener(new MouseAdapter() { @Override public void mouseClicked(MouseEvent arg0) { - //Öffnet das Hauütmenü + // Öffnet das Hauütmenü SearchImage_GUI.this.setVisible(false); - MainMenue_GUI main=new MainMenue_GUI(); + MainMenue_GUI main = new MainMenue_GUI(); main.setVisible(true); } }); lblHauptmen.setForeground(Color.BLUE); lblHauptmen.setBounds(10, 11, 61, 14); contentPanel.add(lblHauptmen); - + JLabel label_1 = new JLabel(">"); label_1.setBounds(69, 11, 13, 14); contentPanel.add(label_1); - + JLabel lblVlimage = new JLabel("VL-Image"); lblVlimage.setForeground(Color.BLUE); lblVlimage.setBounds(81, 11, 45, 14); contentPanel.add(lblVlimage); - + JLabel label_2 = new JLabel(">"); label_2.setBounds(133, 11, 13, 14); contentPanel.add(label_2); - + JLabel lblNewLabel_1 = new JLabel("Imageauswahl"); lblNewLabel_1.setBounds(146, 11, 85, 14); contentPanel.add(lblNewLabel_1); - + tabbedPane = new JTabbedPane(JTabbedPane.TOP); tabbedPane.addChangeListener(new ChangeListener() { public void stateChanged(ChangeEvent arg0) { System.out.println(tabbedPane.getSelectedIndex()); - if(tabbedPane.getSelectedIndex()==0){ - - - - } - else if(tabbedPane.getSelectedIndex()==1){ - String username="Spitzer Tobias"; - rowSorterMyImages.setRowFilter(RowFilter.regexFilter(username, 4)); - //rowSorterMyImages.toggleSortOrder(0); + if (tabbedPane.getSelectedIndex() == 0) { + + } else if (tabbedPane.getSelectedIndex() == 1) { + String username = "Spitzer Tobias"; + rowSorterMyImages.setRowFilter(RowFilter.regexFilter( + username, 4)); + // rowSorterMyImages.toggleSortOrder(0); } - + } }); tabbedPane.setBounds(10, 197, 557, 300); contentPanel.add(tabbedPane); - + JScrollPane scrollPaneMyImage = new JScrollPane(); - tablemyImages=new JTable(); + tablemyImages = new JTable(); tablemyImages.setModel(modelMyImages); tablemyImages.getColumnModel().getColumn(1).sizeWidthToFit(); tablemyImages.getColumnModel().getColumn(2).sizeWidthToFit(); @@ -290,9 +292,9 @@ public class SearchImage_GUI extends JFrame { tablemyImages.getColumnModel().getColumn(5).sizeWidthToFit(); initTableModel(modelMyImages); tablemyImages.setRowSorter(rowSorterMyImages); - + JScrollPane scrollPaneAllImages = new JScrollPane(); - tableAllImages=new JTable(); + tableAllImages = new JTable(); tableAllImages.setModel(modelAll); tableAllImages.getColumnModel().getColumn(1).sizeWidthToFit(); tableAllImages.getColumnModel().getColumn(2).sizeWidthToFit(); @@ -301,15 +303,15 @@ public class SearchImage_GUI extends JFrame { tableAllImages.getColumnModel().getColumn(5).sizeWidthToFit(); initTableModel(modelAll); tableAllImages.setRowSorter(rowSorterAll); - - scrollPaneAllImages.setViewportView(tableAllImages); - tabbedPane.addTab("Alle", null, scrollPaneAllImages, null); + + scrollPaneAllImages.setViewportView(tableAllImages); + tabbedPane.addTab("Alle", null, scrollPaneAllImages, null); scrollPaneMyImage.setViewportView(tablemyImages); tabbedPane.addTab("Meine Images", null, scrollPaneMyImage, null); - + JScrollPane scrollPaneCoopImages = new JScrollPane(); - JTable tableCoopImages=new JTable(); + JTable tableCoopImages = new JTable(); tableCoopImages.setModel(model); tableCoopImages.getColumnModel().getColumn(1).sizeWidthToFit(); tableCoopImages.getColumnModel().getColumn(2).sizeWidthToFit(); @@ -318,11 +320,12 @@ public class SearchImage_GUI extends JFrame { tableCoopImages.getColumnModel().getColumn(5).sizeWidthToFit(); scrollPaneCoopImages.setViewportView(tableCoopImages); - tabbedPane.addTab("Kooperative Images", null, scrollPaneCoopImages, null); + tabbedPane.addTab("Kooperative Images", null, scrollPaneCoopImages, + null); tabbedPane.setEnabledAt(2, false); - + JScrollPane scrollPanePublicImages = new JScrollPane(); - JTable tablePublicImages=new JTable(); + JTable tablePublicImages = new JTable(); tablePublicImages.setModel(model); tablePublicImages.getColumnModel().getColumn(1).sizeWidthToFit(); tablePublicImages.getColumnModel().getColumn(2).sizeWidthToFit(); @@ -331,11 +334,12 @@ public class SearchImage_GUI extends JFrame { tablePublicImages.getColumnModel().getColumn(5).sizeWidthToFit(); scrollPanePublicImages.setViewportView(tablePublicImages); - tabbedPane.addTab("\u00D6ffentliche Images", null, scrollPanePublicImages, null); + tabbedPane.addTab("\u00D6ffentliche Images", null, + scrollPanePublicImages, null); tabbedPane.setEnabledAt(3, false); - + JScrollPane scrollPanePublicVorlagen = new JScrollPane(); - JTable tablePublicVorlagen=new JTable(); + JTable tablePublicVorlagen = new JTable(); tablePublicVorlagen.setModel(model); tablePublicVorlagen.getColumnModel().getColumn(1).sizeWidthToFit(); tablePublicVorlagen.getColumnModel().getColumn(2).sizeWidthToFit(); @@ -344,17 +348,15 @@ public class SearchImage_GUI extends JFrame { tablePublicVorlagen.getColumnModel().getColumn(5).sizeWidthToFit(); scrollPanePublicVorlagen.setViewportView(tablePublicVorlagen); - tabbedPane.addTab("\u00D6ffentliche Vorlagen", null, scrollPanePublicVorlagen, null); + tabbedPane.addTab("\u00D6ffentliche Vorlagen", null, + scrollPanePublicVorlagen, null); tabbedPane.setEnabledAt(4, false); - - - JButton btnDownload = new JButton("Download"); btnDownload.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent arg0) { - //Öffnet den Downloader - FTPDownloader_GUI down=new FTPDownloader_GUI("Test"); + // Öffnet den Downloader + FTPDownloader_GUI down = new FTPDownloader_GUI("Test"); down.setVisible(true); SearchImage_GUI.this.setVisible(false); } @@ -368,78 +370,83 @@ public class SearchImage_GUI extends JFrame { buttonPane.setLayout(new FlowLayout(FlowLayout.RIGHT)); getContentPane().add(buttonPane); { - JButton okButton = new JButton("Zur\u00FCck"); - okButton.addActionListener(new ActionListener() { + JButton cancelButton = new JButton("Zur\u00FCck"); + cancelButton.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { - //Öffnet das Hauptmenü - MainMenue_GUI main=new MainMenue_GUI(); + // Öffnet das Hauptmenü + MainMenue_GUI main = new MainMenue_GUI(); main.setVisible(true); dispose(); } }); - okButton.setActionCommand("OK"); - buttonPane.add(okButton); - getRootPane().setDefaultButton(okButton); + cancelButton.setActionCommand("OK"); + buttonPane.add(cancelButton); + getRootPane().setDefaultButton(cancelButton); } { - JButton cancelButton = new JButton("Weiter"); - cancelButton.addActionListener(new ActionListener() { + JButton continueButton = new JButton("Weiter"); + continueButton.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { - EditImageAllgemein_GUI ea=new EditImageAllgemein_GUI(); + EditImageAllgemein_GUI ea = new EditImageAllgemein_GUI(); ea.setVisible(true); dispose(); - + } }); - cancelButton.setActionCommand("Cancel"); - buttonPane.add(cancelButton); + continueButton.setActionCommand("Cancel"); + buttonPane.add(continueButton); } } - + JSeparator separator = new JSeparator(); separator.setBounds(0, 78, 597, 2); getContentPane().add(separator); - + JSeparator separator_1 = new JSeparator(); separator_1.setBounds(0, 627, 597, 2); getContentPane().add(separator_1); - + 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); - + } - //Initiale Beffülung eines Table models - public DefaultTableModel initTableModel(DefaultTableModel model){ + + // Initiale Beffülung eines Table models + public DefaultTableModel initTableModel(DefaultTableModel model) { List<server.Image> images; try { - //Hole eine Liste der Images - + // Hole eine Liste der Images + images = client.getImageList(); - Iterator<server.Image> i=images.iterator(); - - int x=0; - - while(i.hasNext()) - { - //erzeuge Objekte für die Tabelle - Object [] obj={images.get(x).getImageName(),images.get(x).getLicenseRestriction(),images.get(x).getOsName(),images.get(x).getLectureName(),images.get(x).getUserData(),images.get(x).getUpdateTime()}; - //Füge diese Objekte der Tabelle hinzu + Iterator<server.Image> i = images.iterator(); + + int x = 0; + + while (i.hasNext()) { + // erzeuge Objekte für die Tabelle + Object[] obj = { images.get(x).getImageName(), + images.get(x).getLicenseRestriction(), + images.get(x).getOsName(), + images.get(x).getLectureName(), + images.get(x).getUserData(), + images.get(x).getUpdateTime() }; + // Füge diese Objekte der Tabelle hinzu model.addRow(obj); x++; i.next(); - + } - + return model; } catch (TException e1) { // TODO Auto-generated catch block @@ -447,7 +454,5 @@ public class SearchImage_GUI extends JFrame { } return model; } - - } - +} diff --git a/Dozentenmodul/src/thrift/ThriftConnection.java b/Dozentenmodul/src/thrift/ThriftConnection.java index 2a2bbf35..79f4a123 100644 --- a/Dozentenmodul/src/thrift/ThriftConnection.java +++ b/Dozentenmodul/src/thrift/ThriftConnection.java @@ -25,7 +25,7 @@ public class ThriftConnection { final Server.Client client = new Server.Client(protocol); - System.out.println("Der Server läuft!"); + System.out.println("Verbindung wurde aufgebaut."); return client; } |