From 54e068bdef858a1fd601ddd3f24e0c730b4be4ee Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 8 Apr 2014 10:47:01 +0200 Subject: Unterordner hinzugefügt und überflüssige Imports gelöscht --- .../src/gui/image/EditImageAllgemein_GUI.java | 347 +++++++++++++++++++++ 1 file changed, 347 insertions(+) create mode 100644 Dozentenmodul/src/gui/image/EditImageAllgemein_GUI.java (limited to 'Dozentenmodul/src/gui/image/EditImageAllgemein_GUI.java') diff --git a/Dozentenmodul/src/gui/image/EditImageAllgemein_GUI.java b/Dozentenmodul/src/gui/image/EditImageAllgemein_GUI.java new file mode 100644 index 00000000..9d8ffdfe --- /dev/null +++ b/Dozentenmodul/src/gui/image/EditImageAllgemein_GUI.java @@ -0,0 +1,347 @@ +package gui.image; + +import gui.intro.MainMenue_GUI; + +import java.awt.Color; +import java.awt.Dimension; +import java.awt.FlowLayout; +import java.awt.Font; +import java.awt.SystemColor; +import java.awt.Toolkit; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.awt.event.MouseAdapter; +import java.awt.event.MouseEvent; +import java.awt.event.WindowAdapter; +import java.awt.event.WindowEvent; +import java.util.Map; +import javax.swing.JButton; +import javax.swing.JFrame; +import javax.swing.JLabel; +import javax.swing.JMenu; +import javax.swing.JMenuBar; +import javax.swing.JMenuItem; +import javax.swing.JOptionPane; +import javax.swing.JPanel; +import javax.swing.JSeparator; +import javax.swing.JTextArea; +import javax.swing.JTextField; +import javax.swing.JTextPane; +import javax.swing.UIManager; +import javax.swing.UnsupportedLookAndFeelException; +import javax.swing.border.EmptyBorder; +import javax.swing.border.TitledBorder; +import org.apache.thrift.TException; +import models.Image; +import models.person; +import server.Server.Client; +import thrift.ThriftConnection; + +@SuppressWarnings("serial") +public class EditImageAllgemein_GUI extends JFrame { + + private final JPanel contentPanel = new JPanel(); + String[] result; + private JTextField Vorname; + private JTextField Nachname; + private JTextField Hochschule; + private JTextField EMail; + private JTextField imagename; + ThriftConnection con=new ThriftConnection(); + Client client=con.getThriftConnection(); + private JPanel panel_2; + private JLabel lblNewLabel; + private JTextPane txtpnBitteWhlenSie; + private JPanel buttonPane; + private JButton backButton; + private JButton okButton; + + /** + * Create the dialog. + */ + public EditImageAllgemein_GUI() { + addWindowListener(new WindowAdapter() { + @Override + public void windowClosing(WindowEvent arg0) { + //Beendet die Anwendung bei einem Klick auf das X + con.closeThriftConnection(); + System.exit(0); + } + }); + //Verhindert das vergrößern des Fensters + setResizable(false); + + try { + UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName()); + } catch (ClassNotFoundException | InstantiationException + | IllegalAccessException | UnsupportedLookAndFeelException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + //Setzt den Fenstertitel + setTitle("bwLehrpool Suite *Prototyp*"); + + //Zentriert das Fenster in der Bildmitte + Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize(); + int top=(screenSize.height - 722) / 2; + int left=(screenSize.width - 603) / 2; + setBounds(left, top, 603, 722); + initData(); + getContentPane().setLayout(null); + { + panel_2 = new JPanel(); + panel_2.setBackground(SystemColor.menu); + panel_2.setBounds(10, 11, 577, 57); + getContentPane().add(panel_2); + panel_2.setLayout(null); + { + lblNewLabel = new JLabel("Bearbeiten Ihrer Daten"); + lblNewLabel.setBounds(10, 11, 509, 22); + panel_2.add(lblNewLabel); + lblNewLabel.setFont(new Font("Tahoma", Font.BOLD, 18)); + } + + txtpnBitteWhlenSie = new JTextPane(); + txtpnBitteWhlenSie.setEditable(false); + txtpnBitteWhlenSie.setBackground(SystemColor.menu); + txtpnBitteWhlenSie.setText("Geben Sie hier bitte einen sprechenden Imagename sowie Ihre Kontaktdaten an"); + txtpnBitteWhlenSie.setBounds(10, 36, 509, 32); + panel_2.add(txtpnBitteWhlenSie); + } + contentPanel.setBounds(10, 85, 577, 493); + contentPanel.setBackground(SystemColor.menu); + 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, "Informationen zum Besitzer", TitledBorder.LEADING, TitledBorder.TOP, null, null)); + panel_1.setBounds(10, 66, 557, 369); + contentPanel.add(panel_1); + panel_1.setLayout(null); + + JLabel label = new JLabel("Vorname: *"); + label.setBackground(SystemColor.menu); + label.setBounds(10, 245, 125, 20); + panel_1.add(label); + + Vorname = new JTextField(); + Vorname.setEditable(false); + Vorname.setEnabled(false); + Vorname.setBackground(Color.WHITE); + Vorname.setText(person.verantwortlicher.getVorname()); + Vorname.setColumns(10); + Vorname.setBounds(145, 245, 350, 20); + panel_1.add(Vorname); + + JLabel label_7 = new JLabel("Nachname: *"); + label_7.setBackground(SystemColor.menu); + label_7.setBounds(10, 276, 125, 20); + panel_1.add(label_7); + + Nachname = new JTextField(); + Nachname.setEnabled(false); + Nachname.setEditable(false); + Nachname.setBackground(Color.WHITE); + Nachname.setText(person.verantwortlicher.getName()); + Nachname.setColumns(10); + Nachname.setBounds(145, 276, 350, 20); + panel_1.add(Nachname); + + JLabel label_8 = new JLabel("Hochschule: *"); + label_8.setBackground(SystemColor.menu); + label_8.setBounds(10, 307, 125, 20); + panel_1.add(label_8); + + Hochschule = new JTextField(); + Hochschule.setEnabled(false); + Hochschule.setEditable(false); + Hochschule.setBackground(Color.WHITE); + Hochschule.setText(person.verantwortlicher.getHochschule()); + Hochschule.setColumns(10); + Hochschule.setBounds(145, 307, 350, 20); + panel_1.add(Hochschule); + + JLabel label_9 = new JLabel("E-Mail: *"); + label_9.setBackground(SystemColor.menu); + label_9.setBounds(10, 338, 125, 20); + panel_1.add(label_9); + + EMail = new JTextField(); + EMail.setEnabled(false); + EMail.setEditable(false); + EMail.setBackground(Color.WHITE); + EMail.setText(person.verantwortlicher.getEMail()); + EMail.setColumns(10); + EMail.setBounds(145, 338, 350, 20); + panel_1.add(EMail); + + JLabel lblImagename = new JLabel("Imagename: *"); + lblImagename.setBackground(SystemColor.menu); + lblImagename.setBounds(10, 31, 125, 20); + panel_1.add(lblImagename); + + imagename = new JTextField(); + imagename.setToolTipText("Bitte geben Sie hier den Namen des Image ein, z.B. \"Programmieren\"."); + imagename.setBackground(Color.WHITE); + imagename.setText(Image.image.getImagename()); + imagename.setColumns(10); + imagename.setBounds(145, 31, 350, 20); + panel_1.add(imagename); + + JTextArea txtrGebenSieBitte = new JTextArea(); + txtrGebenSieBitte.setBackground(SystemColor.menu); + txtrGebenSieBitte.setLineWrap(true); + txtrGebenSieBitte.setFont(new Font("Tahoma", Font.PLAIN, 12)); + txtrGebenSieBitte.setText("Geben Sie bitte einen sprechenden Namen f\u00FCr das Image an.\r\nDieser soll jedoch recht allgemein gehalten werden.\r\nBeispiel: \"Programmieren\", nicht \"Programmieren 1\""); + txtrGebenSieBitte.setBounds(145, 62, 350, 110); + panel_1.add(txtrGebenSieBitte); + + JPanel panel = new JPanel(); + panel.setBounds(10, 402, 577, 33); + contentPanel.add(panel); + panel.setLayout(null); + panel.setBorder(new EmptyBorder(5, 5, 5, 5)); + panel.setBackground(SystemColor.menu); + + JLabel lblPflichtfelder = new JLabel("* Pflichtfelder"); + lblPflichtfelder.setBounds(10, 442, 136, 14); + contentPanel.add(lblPflichtfelder); + + JLabel lblHauptmen = new JLabel("Hauptmen\u00FC"); + lblHauptmen.addMouseListener(new MouseAdapter() { + @Override + public void mouseClicked(MouseEvent arg0) { + //Durch den Klick auf Button Hauptmenpü wird dieses Fenster unsichtbar und das Hauptmenü sichtbar + con.closeThriftConnection(); + EditImageAllgemein_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("Bearbeiten"); + lblNewLabel_1.setBounds(146, 11, 71, 14); + contentPanel.add(lblNewLabel_1); + { + buttonPane = new JPanel(); + buttonPane.setBounds(0, 640, 597, 33); + buttonPane.setBackground(SystemColor.menu); + buttonPane.setLayout(new FlowLayout(FlowLayout.RIGHT)); + getContentPane().add(buttonPane); + { + backButton = new JButton("Zur\u00FCck"); + backButton.addActionListener(new ActionListener() { + public void actionPerformed(ActionEvent e) { + + //Setzen der Eingabe im Model, dadurch bleiben die Daten bei einem erneuten Aufruf verfügbar + //Image.image.setImagename(imagename.getText()); + con.closeThriftConnection(); + MainMenue_GUI sr=new MainMenue_GUI(); + sr.setVisible(true); + dispose(); + } + }); + backButton.setActionCommand("CANCEL"); + buttonPane.add(backButton); + + } + { + okButton = new JButton("Weiter"); + okButton.addActionListener(new ActionListener() { + public void actionPerformed(ActionEvent arg0) { + System.out.println("text length="+imagename.getText().length()); + //Setzen der Eingabe im Model, dadurch bleiben die Daten bei einem erneuten Aufruf verfügbar + + //TODO + //Prüfung ob alle notwendigen Felder ausgefüllt sind --> funktioniert aktuell nicht + //der Button wechselt beim Klick auf die nächste Seite, selbst wenn kein handler implementiert ist... WTF??? + if(imagename.getText().length() <= 0){ + JOptionPane.showMessageDialog(null, + "Bitte geben Sie einen Labornamen ein.", + "Daten nicht vollständig", + JOptionPane.WARNING_MESSAGE); + } else { + Image.image.setNewName(imagename.getText()); + con.closeThriftConnection(); + EditImageTechnisch_GUI ea=new EditImageTechnisch_GUI(); + ea.setVisible(true); + dispose(); + }//end else + } + }); + + okButton.setActionCommand("OK"); + buttonPane.add(okButton); + getRootPane().setDefaultButton(okButton); + } + } + + 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); + //setFocusTraversalPolicy(new FocusTraversalOnArray(new Component[]{getContentPane(), panel_2, lblNewLabel, txtpnBitteWhlenSie, contentPanel, panel_1, label, Vorname, label_7, Nachname, label_8, Hochschule, label_9, EMail, lblImagename, imagename, txtrGebenSieBitte, panel, lblPflichtfelder, lblHauptmen, label_1, lblVlimage, label_2, lblNewLabel_1, buttonPane, backButton, okButton, separator, separator_1, menuBar, mnNewMenu_1, mntmFaq, mntmOtrs})); + + } + + public void initData(){ + try { + + Map map=client.getImageData(Image.image.getImageId(),Image.image.getVersion()); + if(map.get("internet").equals("0")){ + Image.image.setInternet(false); + } + else + { + Image.image.setInternet(true); + } + if(map.get("license").equals("0")){ + Image.image.setLicensed(false); + } + else{ + Image.image.setLicensed(true); + } + Image.image.setImagename(map.get("name")); + Image.image.setRam(Integer.parseInt(map.get("ram"))); + Image.image.setCpu(Integer.parseInt(map.get("cpu"))); + } catch (TException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } + + +} -- cgit v1.2.3-55-g7522 From 38284aaf433cd7b4c14542e01ac6f93a0758a2ae Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 9 Apr 2014 12:22:00 +0200 Subject: Message Boxen angespasst --- Dozentenmodul/src/gui/image/EditImageAllgemein_GUI.java | 2 +- Dozentenmodul/src/gui/image/EingabeImageAllgemein_GUI.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'Dozentenmodul/src/gui/image/EditImageAllgemein_GUI.java') diff --git a/Dozentenmodul/src/gui/image/EditImageAllgemein_GUI.java b/Dozentenmodul/src/gui/image/EditImageAllgemein_GUI.java index 9d8ffdfe..6b813e48 100644 --- a/Dozentenmodul/src/gui/image/EditImageAllgemein_GUI.java +++ b/Dozentenmodul/src/gui/image/EditImageAllgemein_GUI.java @@ -277,7 +277,7 @@ public class EditImageAllgemein_GUI extends JFrame { JOptionPane.showMessageDialog(null, "Bitte geben Sie einen Labornamen ein.", "Daten nicht vollständig", - JOptionPane.WARNING_MESSAGE); + JOptionPane.INFORMATION_MESSAGE); } else { Image.image.setNewName(imagename.getText()); con.closeThriftConnection(); diff --git a/Dozentenmodul/src/gui/image/EingabeImageAllgemein_GUI.java b/Dozentenmodul/src/gui/image/EingabeImageAllgemein_GUI.java index 1cff0677..3e45ffc5 100644 --- a/Dozentenmodul/src/gui/image/EingabeImageAllgemein_GUI.java +++ b/Dozentenmodul/src/gui/image/EingabeImageAllgemein_GUI.java @@ -270,7 +270,7 @@ public class EingabeImageAllgemein_GUI extends JFrame { } else{ JOptionPane.showMessageDialog(null, "Bitte geben Sie alle notwendigen Daten an!", - "Error", JOptionPane.ERROR_MESSAGE); + "Daten unvollständig", JOptionPane.INFORMATION_MESSAGE); } } }); -- cgit v1.2.3-55-g7522 From 9f793f5073c59890bb9617f224c53c07bc9e6196 Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 9 Apr 2014 14:16:53 +0200 Subject: test --- .../bin/gui/image/EditImageAllgemein_GUI$3.class | Bin 996 -> 1008 bytes .../bin/gui/image/EditImageAllgemein_GUI$4.class | Bin 1889 -> 1889 bytes .../bin/gui/image/EingabeImageAllgemein_GUI$4.class | Bin 1650 -> 1665 bytes .../bin/gui/image/FTPDownloader_GUI$1.class | Bin 1391 -> 1414 bytes .../bin/gui/image/FTPDownloader_GUI$2.class | Bin 1236 -> 1452 bytes .../bin/gui/image/FTPDownloader_GUI$3.class | Bin 785 -> 1167 bytes .../bin/gui/image/FTPDownloader_GUI$4.class | Bin 1557 -> 785 bytes .../bin/gui/image/FTPDownloader_GUI$5.class | Bin 0 -> 1557 bytes .../bin/gui/image/FTPDownloader_GUI$6.class | Bin 0 -> 972 bytes Dozentenmodul/bin/gui/image/FTPDownloader_GUI.class | Bin 9530 -> 10072 bytes Dozentenmodul/bin/gui/image/FTPUploader_GUI$2.class | Bin 1223 -> 1277 bytes Dozentenmodul/bin/gui/image/FTPUploader_GUI$3.class | Bin 0 -> 1590 bytes Dozentenmodul/bin/gui/image/FTPUploader_GUI$4.class | Bin 0 -> 1162 bytes Dozentenmodul/bin/gui/image/FTPUploader_GUI$5.class | Bin 0 -> 771 bytes Dozentenmodul/bin/gui/image/FTPUploader_GUI$6.class | Bin 0 -> 1671 bytes Dozentenmodul/bin/gui/image/FTPUploader_GUI$7.class | Bin 0 -> 1616 bytes Dozentenmodul/bin/gui/image/FTPUploader_GUI$8.class | Bin 0 -> 856 bytes Dozentenmodul/bin/gui/image/FTPUploader_GUI.class | Bin 12168 -> 12180 bytes .../bin/gui/image/SearchEditImage_GUI$1.class | Bin 849 -> 1094 bytes .../bin/gui/image/SearchEditImage_GUI$2.class | Bin 1301 -> 1301 bytes .../bin/gui/image/SearchEditImage_GUI$3.class | Bin 951 -> 951 bytes .../bin/gui/image/SearchEditImage_GUI$4.class | Bin 1298 -> 1298 bytes .../bin/gui/image/SearchEditImage_GUI$5.class | Bin 938 -> 938 bytes .../bin/gui/image/SearchEditImage_GUI$6.class | Bin 1771 -> 1771 bytes .../bin/gui/image/SearchEditImage_GUI$7.class | Bin 1941 -> 1941 bytes .../bin/gui/image/SearchEditImage_GUI$8.class | Bin 980 -> 980 bytes .../bin/gui/image/SearchEditImage_GUI$9.class | Bin 2080 -> 2177 bytes .../bin/gui/image/SearchEditImage_GUI.class | Bin 12001 -> 11743 bytes .../src/gui/image/EditImageAllgemein_GUI.java | 4 ++-- Dozentenmodulserver/bin/server/BinaryListener.class | Bin 2151 -> 2456 bytes Dozentenmodulserver/bin/server/ServerHandler.class | Bin 10497 -> 10530 bytes .../bin/server/User$UserStandardScheme.class | Bin 2737 -> 2769 bytes .../bin/server/User$UserStandardSchemeFactory.class | Bin 853 -> 853 bytes .../bin/server/User$UserTupleScheme.class | Bin 2173 -> 2173 bytes .../bin/server/User$UserTupleSchemeFactory.class | Bin 829 -> 829 bytes Dozentenmodulserver/bin/server/User$_Fields.class | Bin 2938 -> 2946 bytes Dozentenmodulserver/bin/server/startServer.class | Bin 1889 -> 1891 bytes Dozentenmodulserver/bin/sql/SQL.class | Bin 12095 -> 13630 bytes Dozentenmodulserver/bin/util/XMLCreator.class | Bin 6327 -> 7428 bytes 39 files changed, 2 insertions(+), 2 deletions(-) create mode 100644 Dozentenmodul/bin/gui/image/FTPDownloader_GUI$5.class create mode 100644 Dozentenmodul/bin/gui/image/FTPDownloader_GUI$6.class create mode 100644 Dozentenmodul/bin/gui/image/FTPUploader_GUI$3.class create mode 100644 Dozentenmodul/bin/gui/image/FTPUploader_GUI$4.class create mode 100644 Dozentenmodul/bin/gui/image/FTPUploader_GUI$5.class create mode 100644 Dozentenmodul/bin/gui/image/FTPUploader_GUI$6.class create mode 100644 Dozentenmodul/bin/gui/image/FTPUploader_GUI$7.class create mode 100644 Dozentenmodul/bin/gui/image/FTPUploader_GUI$8.class (limited to 'Dozentenmodul/src/gui/image/EditImageAllgemein_GUI.java') diff --git a/Dozentenmodul/bin/gui/image/EditImageAllgemein_GUI$3.class b/Dozentenmodul/bin/gui/image/EditImageAllgemein_GUI$3.class index 8468f633..e28ed09a 100644 Binary files a/Dozentenmodul/bin/gui/image/EditImageAllgemein_GUI$3.class and b/Dozentenmodul/bin/gui/image/EditImageAllgemein_GUI$3.class differ diff --git a/Dozentenmodul/bin/gui/image/EditImageAllgemein_GUI$4.class b/Dozentenmodul/bin/gui/image/EditImageAllgemein_GUI$4.class index d87f50a2..fd8e0655 100644 Binary files a/Dozentenmodul/bin/gui/image/EditImageAllgemein_GUI$4.class and b/Dozentenmodul/bin/gui/image/EditImageAllgemein_GUI$4.class differ diff --git a/Dozentenmodul/bin/gui/image/EingabeImageAllgemein_GUI$4.class b/Dozentenmodul/bin/gui/image/EingabeImageAllgemein_GUI$4.class index 0ccaaa47..02bb9564 100644 Binary files a/Dozentenmodul/bin/gui/image/EingabeImageAllgemein_GUI$4.class and b/Dozentenmodul/bin/gui/image/EingabeImageAllgemein_GUI$4.class differ diff --git a/Dozentenmodul/bin/gui/image/FTPDownloader_GUI$1.class b/Dozentenmodul/bin/gui/image/FTPDownloader_GUI$1.class index 90a9b390..40fe319c 100644 Binary files a/Dozentenmodul/bin/gui/image/FTPDownloader_GUI$1.class and b/Dozentenmodul/bin/gui/image/FTPDownloader_GUI$1.class differ diff --git a/Dozentenmodul/bin/gui/image/FTPDownloader_GUI$2.class b/Dozentenmodul/bin/gui/image/FTPDownloader_GUI$2.class index ae1b44e0..0c902bbd 100644 Binary files a/Dozentenmodul/bin/gui/image/FTPDownloader_GUI$2.class and b/Dozentenmodul/bin/gui/image/FTPDownloader_GUI$2.class differ diff --git a/Dozentenmodul/bin/gui/image/FTPDownloader_GUI$3.class b/Dozentenmodul/bin/gui/image/FTPDownloader_GUI$3.class index 3b6b83fb..f2ab99cc 100644 Binary files a/Dozentenmodul/bin/gui/image/FTPDownloader_GUI$3.class and b/Dozentenmodul/bin/gui/image/FTPDownloader_GUI$3.class differ diff --git a/Dozentenmodul/bin/gui/image/FTPDownloader_GUI$4.class b/Dozentenmodul/bin/gui/image/FTPDownloader_GUI$4.class index 8401b2ec..70a5c30b 100644 Binary files a/Dozentenmodul/bin/gui/image/FTPDownloader_GUI$4.class and b/Dozentenmodul/bin/gui/image/FTPDownloader_GUI$4.class differ diff --git a/Dozentenmodul/bin/gui/image/FTPDownloader_GUI$5.class b/Dozentenmodul/bin/gui/image/FTPDownloader_GUI$5.class new file mode 100644 index 00000000..34e4f69a Binary files /dev/null and b/Dozentenmodul/bin/gui/image/FTPDownloader_GUI$5.class differ diff --git a/Dozentenmodul/bin/gui/image/FTPDownloader_GUI$6.class b/Dozentenmodul/bin/gui/image/FTPDownloader_GUI$6.class new file mode 100644 index 00000000..52cf6065 Binary files /dev/null and b/Dozentenmodul/bin/gui/image/FTPDownloader_GUI$6.class differ diff --git a/Dozentenmodul/bin/gui/image/FTPDownloader_GUI.class b/Dozentenmodul/bin/gui/image/FTPDownloader_GUI.class index 60383d7e..2961f5f1 100644 Binary files a/Dozentenmodul/bin/gui/image/FTPDownloader_GUI.class and b/Dozentenmodul/bin/gui/image/FTPDownloader_GUI.class differ diff --git a/Dozentenmodul/bin/gui/image/FTPUploader_GUI$2.class b/Dozentenmodul/bin/gui/image/FTPUploader_GUI$2.class index b2455840..cc009734 100644 Binary files a/Dozentenmodul/bin/gui/image/FTPUploader_GUI$2.class and b/Dozentenmodul/bin/gui/image/FTPUploader_GUI$2.class differ diff --git a/Dozentenmodul/bin/gui/image/FTPUploader_GUI$3.class b/Dozentenmodul/bin/gui/image/FTPUploader_GUI$3.class new file mode 100644 index 00000000..836abc27 Binary files /dev/null and b/Dozentenmodul/bin/gui/image/FTPUploader_GUI$3.class differ diff --git a/Dozentenmodul/bin/gui/image/FTPUploader_GUI$4.class b/Dozentenmodul/bin/gui/image/FTPUploader_GUI$4.class new file mode 100644 index 00000000..a06a172b Binary files /dev/null and b/Dozentenmodul/bin/gui/image/FTPUploader_GUI$4.class differ diff --git a/Dozentenmodul/bin/gui/image/FTPUploader_GUI$5.class b/Dozentenmodul/bin/gui/image/FTPUploader_GUI$5.class new file mode 100644 index 00000000..a3f4459b Binary files /dev/null and b/Dozentenmodul/bin/gui/image/FTPUploader_GUI$5.class differ diff --git a/Dozentenmodul/bin/gui/image/FTPUploader_GUI$6.class b/Dozentenmodul/bin/gui/image/FTPUploader_GUI$6.class new file mode 100644 index 00000000..b4a9fbbf Binary files /dev/null and b/Dozentenmodul/bin/gui/image/FTPUploader_GUI$6.class differ diff --git a/Dozentenmodul/bin/gui/image/FTPUploader_GUI$7.class b/Dozentenmodul/bin/gui/image/FTPUploader_GUI$7.class new file mode 100644 index 00000000..ea3b93d2 Binary files /dev/null and b/Dozentenmodul/bin/gui/image/FTPUploader_GUI$7.class differ diff --git a/Dozentenmodul/bin/gui/image/FTPUploader_GUI$8.class b/Dozentenmodul/bin/gui/image/FTPUploader_GUI$8.class new file mode 100644 index 00000000..ed60d191 Binary files /dev/null and b/Dozentenmodul/bin/gui/image/FTPUploader_GUI$8.class differ diff --git a/Dozentenmodul/bin/gui/image/FTPUploader_GUI.class b/Dozentenmodul/bin/gui/image/FTPUploader_GUI.class index 06003d58..49b56187 100644 Binary files a/Dozentenmodul/bin/gui/image/FTPUploader_GUI.class and b/Dozentenmodul/bin/gui/image/FTPUploader_GUI.class differ diff --git a/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$1.class b/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$1.class index ed060fc5..80795cad 100644 Binary files a/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$1.class and b/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$1.class differ diff --git a/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$2.class b/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$2.class index ff02ba32..bbfae636 100644 Binary files a/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$2.class and b/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$2.class differ diff --git a/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$3.class b/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$3.class index 5b3e93a0..146b3f50 100644 Binary files a/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$3.class and b/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$3.class differ diff --git a/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$4.class b/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$4.class index e0ebd234..41b0f8a0 100644 Binary files a/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$4.class and b/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$4.class differ diff --git a/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$5.class b/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$5.class index f0cfc5da..cf73744d 100644 Binary files a/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$5.class and b/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$5.class differ diff --git a/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$6.class b/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$6.class index b6600cc8..ddc1f540 100644 Binary files a/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$6.class and b/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$6.class differ diff --git a/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$7.class b/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$7.class index 772ed400..ee72ad78 100644 Binary files a/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$7.class and b/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$7.class differ diff --git a/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$8.class b/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$8.class index ffde361f..37a9ab4b 100644 Binary files a/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$8.class and b/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$8.class differ diff --git a/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$9.class b/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$9.class index 345a0f36..b0ed7cbd 100644 Binary files a/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$9.class and b/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$9.class differ diff --git a/Dozentenmodul/bin/gui/image/SearchEditImage_GUI.class b/Dozentenmodul/bin/gui/image/SearchEditImage_GUI.class index b804db88..533b5b24 100644 Binary files a/Dozentenmodul/bin/gui/image/SearchEditImage_GUI.class and b/Dozentenmodul/bin/gui/image/SearchEditImage_GUI.class differ diff --git a/Dozentenmodul/src/gui/image/EditImageAllgemein_GUI.java b/Dozentenmodul/src/gui/image/EditImageAllgemein_GUI.java index 6b813e48..cdcf9f6d 100644 --- a/Dozentenmodul/src/gui/image/EditImageAllgemein_GUI.java +++ b/Dozentenmodul/src/gui/image/EditImageAllgemein_GUI.java @@ -254,8 +254,8 @@ public class EditImageAllgemein_GUI extends JFrame { //Setzen der Eingabe im Model, dadurch bleiben die Daten bei einem erneuten Aufruf verfügbar //Image.image.setImagename(imagename.getText()); con.closeThriftConnection(); - MainMenue_GUI sr=new MainMenue_GUI(); - sr.setVisible(true); + SearchEditImage_GUI se=new SearchEditImage_GUI(); + se.setVisible(true); dispose(); } }); diff --git a/Dozentenmodulserver/bin/server/BinaryListener.class b/Dozentenmodulserver/bin/server/BinaryListener.class index 8635e9d8..d53cdc9d 100644 Binary files a/Dozentenmodulserver/bin/server/BinaryListener.class and b/Dozentenmodulserver/bin/server/BinaryListener.class differ diff --git a/Dozentenmodulserver/bin/server/ServerHandler.class b/Dozentenmodulserver/bin/server/ServerHandler.class index 6af1fa09..20c993d6 100644 Binary files a/Dozentenmodulserver/bin/server/ServerHandler.class and b/Dozentenmodulserver/bin/server/ServerHandler.class differ diff --git a/Dozentenmodulserver/bin/server/User$UserStandardScheme.class b/Dozentenmodulserver/bin/server/User$UserStandardScheme.class index cf96c062..e7db11e2 100644 Binary files a/Dozentenmodulserver/bin/server/User$UserStandardScheme.class and b/Dozentenmodulserver/bin/server/User$UserStandardScheme.class differ diff --git a/Dozentenmodulserver/bin/server/User$UserStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/User$UserStandardSchemeFactory.class index a409161e..ba7dd5e3 100644 Binary files a/Dozentenmodulserver/bin/server/User$UserStandardSchemeFactory.class and b/Dozentenmodulserver/bin/server/User$UserStandardSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/User$UserTupleScheme.class b/Dozentenmodulserver/bin/server/User$UserTupleScheme.class index 1eea1bb0..5ed83c90 100644 Binary files a/Dozentenmodulserver/bin/server/User$UserTupleScheme.class and b/Dozentenmodulserver/bin/server/User$UserTupleScheme.class differ diff --git a/Dozentenmodulserver/bin/server/User$UserTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/User$UserTupleSchemeFactory.class index c76c48fe..f47e6ad9 100644 Binary files a/Dozentenmodulserver/bin/server/User$UserTupleSchemeFactory.class and b/Dozentenmodulserver/bin/server/User$UserTupleSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/User$_Fields.class b/Dozentenmodulserver/bin/server/User$_Fields.class index 191396fc..98d36091 100644 Binary files a/Dozentenmodulserver/bin/server/User$_Fields.class and b/Dozentenmodulserver/bin/server/User$_Fields.class differ diff --git a/Dozentenmodulserver/bin/server/startServer.class b/Dozentenmodulserver/bin/server/startServer.class index 9788373f..030b565e 100644 Binary files a/Dozentenmodulserver/bin/server/startServer.class and b/Dozentenmodulserver/bin/server/startServer.class differ diff --git a/Dozentenmodulserver/bin/sql/SQL.class b/Dozentenmodulserver/bin/sql/SQL.class index 03c89341..336f2aa4 100644 Binary files a/Dozentenmodulserver/bin/sql/SQL.class and b/Dozentenmodulserver/bin/sql/SQL.class differ diff --git a/Dozentenmodulserver/bin/util/XMLCreator.class b/Dozentenmodulserver/bin/util/XMLCreator.class index 9700459e..59247610 100644 Binary files a/Dozentenmodulserver/bin/util/XMLCreator.class and b/Dozentenmodulserver/bin/util/XMLCreator.class differ -- cgit v1.2.3-55-g7522 From 7f129e45b05c27ff84c61569d11aec0e8ff2dbe8 Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 9 Apr 2014 18:36:41 +0200 Subject: Haufen Konsolenausgaben enfernt --- .../bin/gui/image/EditImageAllgemein_GUI$4.class | Bin 1889 -> 1616 bytes .../bin/gui/image/EditImageAllgemein_GUI.class | Bin 9112 -> 9112 bytes .../bin/gui/image/FTPCreateUploader_GUI$3.class | Bin 1626 -> 1446 bytes .../bin/gui/image/FTPCreateUploader_GUI.class | Bin 12294 -> 12313 bytes .../bin/gui/image/FTPDownloader_GUI$2.class | Bin 1452 -> 1303 bytes .../bin/gui/image/FTPDownloader_GUI$3.class | Bin 1167 -> 1167 bytes .../bin/gui/image/FTPDownloader_GUI$4.class | Bin 785 -> 785 bytes .../bin/gui/image/FTPDownloader_GUI$5.class | Bin 1557 -> 1557 bytes .../bin/gui/image/FTPDownloader_GUI$6.class | Bin 972 -> 972 bytes Dozentenmodul/bin/gui/image/FTPDownloader_GUI.class | Bin 10072 -> 10072 bytes .../bin/gui/image/FTPEditUploader_GUI$3.class | Bin 1614 -> 1434 bytes .../bin/gui/image/FTPEditUploader_GUI.class | Bin 11883 -> 11869 bytes .../bin/gui/image/SearchEditImage_GUI.class | Bin 11743 -> 11743 bytes Dozentenmodul/bin/gui/intro/Login_GUI.class | Bin 7818 -> 7783 bytes .../src/gui/image/EditImageAllgemein_GUI.java | 7 +------ .../src/gui/image/FTPCreateUploader_GUI.java | 10 +++++----- Dozentenmodul/src/gui/image/FTPDownloader_GUI.java | 1 - .../src/gui/image/FTPEditUploader_GUI.java | 12 +++++------- .../src/gui/image/SearchEditImage_GUI.java | 1 - Dozentenmodul/src/gui/intro/Login_GUI.java | 2 +- .../src/gui/lecture/CreateLectureLink_GUI.java | 2 +- .../src/gui/lecture/EditLectureLink_GUI.java | 11 +++-------- .../src/gui/lecture/EditLectureSearch_GUI.java | 11 +---------- 23 files changed, 17 insertions(+), 40 deletions(-) (limited to 'Dozentenmodul/src/gui/image/EditImageAllgemein_GUI.java') diff --git a/Dozentenmodul/bin/gui/image/EditImageAllgemein_GUI$4.class b/Dozentenmodul/bin/gui/image/EditImageAllgemein_GUI$4.class index fd8e0655..64a79922 100644 Binary files a/Dozentenmodul/bin/gui/image/EditImageAllgemein_GUI$4.class and b/Dozentenmodul/bin/gui/image/EditImageAllgemein_GUI$4.class differ diff --git a/Dozentenmodul/bin/gui/image/EditImageAllgemein_GUI.class b/Dozentenmodul/bin/gui/image/EditImageAllgemein_GUI.class index b7fda6b3..c0b072cf 100644 Binary files a/Dozentenmodul/bin/gui/image/EditImageAllgemein_GUI.class and b/Dozentenmodul/bin/gui/image/EditImageAllgemein_GUI.class differ diff --git a/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$3.class b/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$3.class index 39c2910f..a788e377 100644 Binary files a/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$3.class and b/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$3.class differ diff --git a/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI.class b/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI.class index 6613c5db..bddb3425 100644 Binary files a/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI.class and b/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI.class differ diff --git a/Dozentenmodul/bin/gui/image/FTPDownloader_GUI$2.class b/Dozentenmodul/bin/gui/image/FTPDownloader_GUI$2.class index 0c902bbd..30c1812c 100644 Binary files a/Dozentenmodul/bin/gui/image/FTPDownloader_GUI$2.class and b/Dozentenmodul/bin/gui/image/FTPDownloader_GUI$2.class differ diff --git a/Dozentenmodul/bin/gui/image/FTPDownloader_GUI$3.class b/Dozentenmodul/bin/gui/image/FTPDownloader_GUI$3.class index f2ab99cc..6d6c863c 100644 Binary files a/Dozentenmodul/bin/gui/image/FTPDownloader_GUI$3.class and b/Dozentenmodul/bin/gui/image/FTPDownloader_GUI$3.class differ diff --git a/Dozentenmodul/bin/gui/image/FTPDownloader_GUI$4.class b/Dozentenmodul/bin/gui/image/FTPDownloader_GUI$4.class index 70a5c30b..ef04eb8c 100644 Binary files a/Dozentenmodul/bin/gui/image/FTPDownloader_GUI$4.class and b/Dozentenmodul/bin/gui/image/FTPDownloader_GUI$4.class differ diff --git a/Dozentenmodul/bin/gui/image/FTPDownloader_GUI$5.class b/Dozentenmodul/bin/gui/image/FTPDownloader_GUI$5.class index 34e4f69a..d4bc6778 100644 Binary files a/Dozentenmodul/bin/gui/image/FTPDownloader_GUI$5.class and b/Dozentenmodul/bin/gui/image/FTPDownloader_GUI$5.class differ diff --git a/Dozentenmodul/bin/gui/image/FTPDownloader_GUI$6.class b/Dozentenmodul/bin/gui/image/FTPDownloader_GUI$6.class index 52cf6065..623a9c0e 100644 Binary files a/Dozentenmodul/bin/gui/image/FTPDownloader_GUI$6.class and b/Dozentenmodul/bin/gui/image/FTPDownloader_GUI$6.class differ diff --git a/Dozentenmodul/bin/gui/image/FTPDownloader_GUI.class b/Dozentenmodul/bin/gui/image/FTPDownloader_GUI.class index 2961f5f1..c8860206 100644 Binary files a/Dozentenmodul/bin/gui/image/FTPDownloader_GUI.class and b/Dozentenmodul/bin/gui/image/FTPDownloader_GUI.class differ diff --git a/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$3.class b/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$3.class index 3933987c..b790203f 100644 Binary files a/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$3.class and b/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$3.class differ diff --git a/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI.class b/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI.class index 8fa34671..5a6ea8fa 100644 Binary files a/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI.class and b/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI.class differ diff --git a/Dozentenmodul/bin/gui/image/SearchEditImage_GUI.class b/Dozentenmodul/bin/gui/image/SearchEditImage_GUI.class index c0b06c44..264f9d4a 100644 Binary files a/Dozentenmodul/bin/gui/image/SearchEditImage_GUI.class and b/Dozentenmodul/bin/gui/image/SearchEditImage_GUI.class differ diff --git a/Dozentenmodul/bin/gui/intro/Login_GUI.class b/Dozentenmodul/bin/gui/intro/Login_GUI.class index 8da7aa27..26499333 100644 Binary files a/Dozentenmodul/bin/gui/intro/Login_GUI.class and b/Dozentenmodul/bin/gui/intro/Login_GUI.class differ diff --git a/Dozentenmodul/src/gui/image/EditImageAllgemein_GUI.java b/Dozentenmodul/src/gui/image/EditImageAllgemein_GUI.java index cdcf9f6d..b80e4953 100644 --- a/Dozentenmodul/src/gui/image/EditImageAllgemein_GUI.java +++ b/Dozentenmodul/src/gui/image/EditImageAllgemein_GUI.java @@ -267,12 +267,7 @@ public class EditImageAllgemein_GUI extends JFrame { okButton = new JButton("Weiter"); okButton.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent arg0) { - System.out.println("text length="+imagename.getText().length()); - //Setzen der Eingabe im Model, dadurch bleiben die Daten bei einem erneuten Aufruf verfügbar - - //TODO - //Prüfung ob alle notwendigen Felder ausgefüllt sind --> funktioniert aktuell nicht - //der Button wechselt beim Klick auf die nächste Seite, selbst wenn kein handler implementiert ist... WTF??? + //check is textfield has content if(imagename.getText().length() <= 0){ JOptionPane.showMessageDialog(null, "Bitte geben Sie einen Labornamen ein.", diff --git a/Dozentenmodul/src/gui/image/FTPCreateUploader_GUI.java b/Dozentenmodul/src/gui/image/FTPCreateUploader_GUI.java index b585fa50..e8c0c4b9 100644 --- a/Dozentenmodul/src/gui/image/FTPCreateUploader_GUI.java +++ b/Dozentenmodul/src/gui/image/FTPCreateUploader_GUI.java @@ -142,12 +142,12 @@ public class FTPCreateUploader_GUI extends JFrame implements File file = fc.getSelectedFile(); // check if a file is selected and exists if (file != null) { - System.out.println("File to upload exists"); + // file selected uploadFile = file; filename = uploadFile.getName(); lblPath.setText(file.getAbsolutePath()); } else { - System.out.println("No file selected"); + // no file selected lblPath.setText(""); }// end if } @@ -378,9 +378,9 @@ public class FTPCreateUploader_GUI extends JFrame implements try { user = client.getFtpUser(); - System.out.println("name" + user.userName); - System.out.println("path" + user.path); - System.out.println("pass" + user.password); + System.out.println("FTP name" + user.userName); + System.out.println("FTP path" + user.path); + System.out.println("FTP pass" + user.password); } catch (TException e) { // TODO Auto-generated catch block e.printStackTrace(); diff --git a/Dozentenmodul/src/gui/image/FTPDownloader_GUI.java b/Dozentenmodul/src/gui/image/FTPDownloader_GUI.java index f6175934..4a54e346 100644 --- a/Dozentenmodul/src/gui/image/FTPDownloader_GUI.java +++ b/Dozentenmodul/src/gui/image/FTPDownloader_GUI.java @@ -124,7 +124,6 @@ public class FTPDownloader_GUI extends JFrame implements PropertyChangeListener // check if directory is selected if (dir != null) { // is selected - System.out.println("Target directory exists."); lblPath.setText(dir.getAbsolutePath()); } else { // no directory selected diff --git a/Dozentenmodul/src/gui/image/FTPEditUploader_GUI.java b/Dozentenmodul/src/gui/image/FTPEditUploader_GUI.java index dd35ad83..9863c1c6 100644 --- a/Dozentenmodul/src/gui/image/FTPEditUploader_GUI.java +++ b/Dozentenmodul/src/gui/image/FTPEditUploader_GUI.java @@ -145,12 +145,12 @@ public class FTPEditUploader_GUI extends JFrame implements File file = fc.getSelectedFile(); // check if a file is selected and exists if (file != null) { - System.out.println("File to upload exists"); + // file exists uploadFile = file; filename = uploadFile.getName(); lblPath.setText(file.getAbsolutePath()); } else { - System.out.println("No file selected"); + // no file selected lblPath.setText(""); }// end if } @@ -374,9 +374,9 @@ public class FTPEditUploader_GUI extends JFrame implements try { user = client.getFtpUser(); - System.out.println("name" + user.userName); - System.out.println("path" + user.path); - System.out.println("pass" + user.password); + System.out.println("FTP name" + user.userName); + System.out.println("FTP path" + user.path); + System.out.println("FTP pass" + user.password); } catch (TException e) { // TODO Auto-generated catch block e.printStackTrace(); @@ -457,8 +457,6 @@ public class FTPEditUploader_GUI extends JFrame implements public boolean updateData() { try { - - System.out.println("Start Update"); client.updateImageData(Image.image.getImagename(), Image.image.getNewName(), Image.image.isLicensed(), Image.image.isInternet(), Image.image.getRam(), diff --git a/Dozentenmodul/src/gui/image/SearchEditImage_GUI.java b/Dozentenmodul/src/gui/image/SearchEditImage_GUI.java index 95a50732..e6bb055e 100644 --- a/Dozentenmodul/src/gui/image/SearchEditImage_GUI.java +++ b/Dozentenmodul/src/gui/image/SearchEditImage_GUI.java @@ -502,7 +502,6 @@ public class SearchEditImage_GUI extends JFrame { images.get(x).getUserData(), images.get(x).getUpdateTime(), "", images.get(x).id, images.get(x).getVersion() }; - // System.out.println("id:"+images.get(x).getId()); // Füge diese Objekte der Tabelle hinzu model.addRow(obj); x++; diff --git a/Dozentenmodul/src/gui/intro/Login_GUI.java b/Dozentenmodul/src/gui/intro/Login_GUI.java index 586b8d13..488c6b69 100644 --- a/Dozentenmodul/src/gui/intro/Login_GUI.java +++ b/Dozentenmodul/src/gui/intro/Login_GUI.java @@ -177,7 +177,7 @@ public class Login_GUI extends JFrame { final thrift.SessionData result; try { String passText = new String(pass.getPassword()); - System.out.println(username.getText() + " " + passText); + System.out.println("Benutzer:" +username.getText() + "\nPasswort" + passText); result = client.authenticate(username.getText(), passText); } catch (thrift.AuthenticationException e) { diff --git a/Dozentenmodul/src/gui/lecture/CreateLectureLink_GUI.java b/Dozentenmodul/src/gui/lecture/CreateLectureLink_GUI.java index 29193798..a9125829 100644 --- a/Dozentenmodul/src/gui/lecture/CreateLectureLink_GUI.java +++ b/Dozentenmodul/src/gui/lecture/CreateLectureLink_GUI.java @@ -374,7 +374,7 @@ public class CreateLectureLink_GUI extends JFrame { try { DateFormat formatter = new SimpleDateFormat( "yyyy-MM-dd hh:mm:ss"); - System.out.println("Veranstaltung anlegen um: " + System.out.println("Veranstaltung angelegt um: " + formatter.format( Lecture.lecture.getStartdate()) .toString()); diff --git a/Dozentenmodul/src/gui/lecture/EditLectureLink_GUI.java b/Dozentenmodul/src/gui/lecture/EditLectureLink_GUI.java index 819f3541..c245ce79 100644 --- a/Dozentenmodul/src/gui/lecture/EditLectureLink_GUI.java +++ b/Dozentenmodul/src/gui/lecture/EditLectureLink_GUI.java @@ -116,7 +116,8 @@ public class EditLectureLink_GUI extends JFrame { getContentPane().add(panel); panel.setLayout(null); { - JLabel lblNewLabel = new JLabel("Image zur Verlinkung ausw\u00E4hlen"); + JLabel lblNewLabel = new JLabel( + "Image zur Verlinkung ausw\u00E4hlen"); lblNewLabel.setBounds(10, 11, 509, 22); panel.add(lblNewLabel); lblNewLabel.setFont(new Font("Tahoma", Font.BOLD, 18)); @@ -357,13 +358,7 @@ public class EditLectureLink_GUI extends JFrame { "Veranstaltung erzeugen und abschlie\u00DFen"); cancelButton.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { - - System.out.println("\ntableAllImages.getSelectedRow() = "+tableAllImages.getSelectedRow() - +"\ntablemyImages.getSelectedRow() = "+tablemyImages.getSelectedRow() - +"\ntableCoopImages.getSelectedRow() = "+tableCoopImages.getSelectedRow() - +"\ntablePublicImages.getSelectedRow() = "+tablePublicImages.getSelectedRow() - +"\ntablePublicVorlagen.getSelectedRow() = "+tablePublicVorlagen.getSelectedRow() ); - + // check if a row is selected if ((tableAllImages.getSelectedRow() != -1) || (tablemyImages.getSelectedRow() != -1) diff --git a/Dozentenmodul/src/gui/lecture/EditLectureSearch_GUI.java b/Dozentenmodul/src/gui/lecture/EditLectureSearch_GUI.java index c1ac5790..ae50fa22 100644 --- a/Dozentenmodul/src/gui/lecture/EditLectureSearch_GUI.java +++ b/Dozentenmodul/src/gui/lecture/EditLectureSearch_GUI.java @@ -256,7 +256,6 @@ public class EditLectureSearch_GUI extends JFrame { tabbedPane.setBounds(10, 197, 557, 323); contentPanel.add(tabbedPane); - System.out.println("haaaaaaaaaaa"); initTableModel(modelMyLectures); JScrollPane scrollPaneAllImages = new JScrollPane(); @@ -402,13 +401,7 @@ public class EditLectureSearch_GUI extends JFrame { .convertRowIndexToModel(tablemyLectures .getSelectedRow()), 2).toString(); - System.out.println("original date = " - + modelMyLectures - .getValueAt( - tablemyLectures - .convertRowIndexToModel(tablemyLectures - .getSelectedRow()), - 2).toString()); + Lecture.lecture.setLinkedImagename(modelMyLectures .getValueAt( tablemyLectures @@ -423,8 +416,6 @@ public class EditLectureSearch_GUI extends JFrame { zweitesLeerzeichen); String enddate = date .substring(zweitesLeerzeichen); - System.out.println("startdate = " + startdate); - System.out.println("enddate = " + enddate); DateFormat df = new SimpleDateFormat( "yyyy-MM-dd hh:mm:ss"); -- cgit v1.2.3-55-g7522