From fee1f46c12470fd5909aaf1b84a479ec2d2d42a7 Mon Sep 17 00:00:00 2001 From: Michael Wilson Date: Thu, 21 Aug 2014 13:40:29 +0200 Subject: Imagename darf keine Sonderzeichen enthalten --- .../src/gui/image/CreateImageAllgemein_GUI.java | 189 +++++++++++++-------- 1 file changed, 118 insertions(+), 71 deletions(-) (limited to 'Dozentenmodul/src/gui/image/CreateImageAllgemein_GUI.java') diff --git a/Dozentenmodul/src/gui/image/CreateImageAllgemein_GUI.java b/Dozentenmodul/src/gui/image/CreateImageAllgemein_GUI.java index 4b48b3e4..ee8b1068 100644 --- a/Dozentenmodul/src/gui/image/CreateImageAllgemein_GUI.java +++ b/Dozentenmodul/src/gui/image/CreateImageAllgemein_GUI.java @@ -1,6 +1,5 @@ package gui.image; - import gui.intro.About_GUI; import gui.intro.MainMenue_GUI; @@ -51,7 +50,10 @@ public class CreateImageAllgemein_GUI extends JFrame { private JTextField Hochschule; private JTextField EMail; private JTextField imagename; - JTextArea textAreadesc; + private JTextArea textAreadesc; + boolean textfieldsHaveContent = false; //no textfield is empty + boolean nameIsLettersOnly = false; //imagename only contains letters + /** * Create the dialog. @@ -60,31 +62,32 @@ public class CreateImageAllgemein_GUI extends JFrame { addWindowListener(new WindowAdapter() { @Override public void windowClosing(WindowEvent arg0) { - //Beendet das Fenster auf X + // Beendet das Fenster auf X System.exit(0); } + @Override public void windowOpened(WindowEvent arg0) { imagename.requestFocusInWindow(); } }); - //Verhindert das Vergroessern des Fensters + // Verhindert das Vergroessern des Fensters setResizable(false); - + try { - //setzt das Look & Feel + // setzt das Look & Feel UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName()); } catch (ClassNotFoundException | InstantiationException | IllegalAccessException | UnsupportedLookAndFeelException e) { // TODO Auto-generated catch block e.printStackTrace(); JOptionPane.showMessageDialog(null, - e.getCause()+"\n"+e.getStackTrace(), - "Debug-Message", JOptionPane.ERROR_MESSAGE); + e.getCause() + "\n" + e.getStackTrace(), "Debug-Message", + JOptionPane.ERROR_MESSAGE); } - //Setzt den Titel + // Setzt den Titel setTitle("bwLehrpool Suite *Prototyp* - Image erzeugen"); - //Zentriert das Fenster + // Zentriert das Fenster setBounds(0, 0, 603, 722); GuiOrganizer.centerGUI(this); @@ -101,11 +104,12 @@ public class CreateImageAllgemein_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("Geben Sie hier bitte einen sprechenden Imagename sowie Ihre Kontaktdaten an"); + txtpnBitteWhlenSie + .setText("Geben Sie hier bitte einen sprechenden Imagename sowie Ihre Kontaktdaten an"); txtpnBitteWhlenSie.setBounds(10, 36, 509, 32); panel.add(txtpnBitteWhlenSie); } @@ -114,19 +118,20 @@ public class CreateImageAllgemein_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, "Informationen zum Besitzer", TitledBorder.LEADING, TitledBorder.TOP, null, null)); + 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.setEnabled(false); Vorname.setEditable(false); @@ -135,12 +140,12 @@ public class CreateImageAllgemein_GUI extends JFrame { 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); @@ -149,12 +154,12 @@ public class CreateImageAllgemein_GUI extends JFrame { 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); @@ -163,12 +168,12 @@ public class CreateImageAllgemein_GUI extends JFrame { 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); @@ -177,81 +182,85 @@ public class CreateImageAllgemein_GUI extends JFrame { 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.setBackground(Color.WHITE); imagename.setText((String) null); imagename.setColumns(10); imagename.setBounds(145, 31, 350, 20); - imagename.setText(Image.image.getImagename()); //null am Anfang, aber speichert die Eingabe, wenn man zurueck kommt zur Seite + imagename.setText(Image.image.getImagename()); // null am Anfang, aber + // speichert die + // Eingabe, wenn man + // zurueck kommt zur + // Seite panel_1.add(imagename); - + JTextArea txtrGebenSieBitte = new JTextArea(); txtrGebenSieBitte.setEditable(false); 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 + .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, 49); panel_1.add(txtrGebenSieBitte); - + JLabel lblBeschreibung = new JLabel("Beschreibung: *"); lblBeschreibung.setBackground(SystemColor.menu); lblBeschreibung.setBounds(10, 120, 125, 20); panel_1.add(lblBeschreibung); - + JScrollPane scrollPane = new JScrollPane(); scrollPane.setBounds(145, 120, 350, 114); panel_1.add(scrollPane); - + textAreadesc = new JTextArea(); textAreadesc.setLineWrap(true); scrollPane.setViewportView(textAreadesc); - + 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) { - //oeffnet das Hauptmenue + // oeffnet das Hauptmenue CreateImageAllgemein_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("Neu"); lblNewLabel_1.setBounds(146, 11, 46, 14); contentPanel.add(lblNewLabel_1); @@ -266,7 +275,7 @@ public class CreateImageAllgemein_GUI extends JFrame { backButton.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { Image.image.setImagename(imagename.getText()); - MainMenue_GUI sr=new MainMenue_GUI(); + MainMenue_GUI sr = new MainMenue_GUI(); sr.setVisible(true); dispose(); } @@ -278,19 +287,16 @@ public class CreateImageAllgemein_GUI extends JFrame { JButton continueButton = new JButton("Weiter"); continueButton.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { - //Prueft die Eingabe - if(imagename.getText().isEmpty()==false && Vorname.getText().isEmpty()==false && Nachname.getText().isEmpty()==false && Hochschule.getText().isEmpty()==false&&EMail.getText().isEmpty()==false) - { - //Schreibt die Daten in das Model - Image.image.setImagename(imagename.getText()); - Image.image.setDesc(textAreadesc.getText()); - CreateImageTechnisch_GUI ea=new CreateImageTechnisch_GUI(); - ea.setVisible(true); - dispose(); - } - else{ - JOptionPane.showMessageDialog(null, "Bitte geben Sie alle notwendigen Daten an!", - "Daten unvollst\u00e4ndig", JOptionPane.INFORMATION_MESSAGE); + // Prueft die Eingabe und leitet weiter zur naechsten Seite + if (checkContent() == true && checkNameIsLettersOnly() == true) { + // Schreibt die Daten in das Model + Image.image.setImagename(imagename.getText()); + Image.image.setDesc(textAreadesc.getText()); + CreateImageTechnisch_GUI ea = new CreateImageTechnisch_GUI(); + ea.setVisible(true); + dispose(); + } else { + } } }); @@ -299,34 +305,34 @@ public class CreateImageAllgemein_GUI extends JFrame { getRootPane().setDefaultButton(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"); mntmFaq.addMouseListener(new MouseAdapter() { @Override public void mousePressed(MouseEvent arg0) { - + OpenLinks open = new OpenLinks(); - + URI windows; try { windows = new URI(Links.getFAQ()); - + open.openWebpage(windows); - + } catch (URISyntaxException e) { // TODO Auto-generated catch block e.printStackTrace(); @@ -334,7 +340,6 @@ public class CreateImageAllgemein_GUI extends JFrame { } }); mnNewMenu_1.add(mntmFaq); - JMenuItem mntmOtrs = new JMenuItem("OTRS"); mntmOtrs.addMouseListener(new MouseAdapter() { @@ -342,13 +347,13 @@ public class CreateImageAllgemein_GUI extends JFrame { public void mousePressed(MouseEvent arg0) { OpenLinks open = new OpenLinks(); - + URI windows; try { windows = new URI(Links.getOTRS()); - + open.openWebpage(windows); - + } catch (URISyntaxException e) { // TODO Auto-generated catch block e.printStackTrace(); @@ -357,7 +362,7 @@ public class CreateImageAllgemein_GUI extends JFrame { } }); mnNewMenu_1.add(mntmOtrs); - + JMenuItem menuItem = new JMenuItem("About"); menuItem.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent arg0) { @@ -366,6 +371,48 @@ public class CreateImageAllgemein_GUI extends JFrame { } }); mnNewMenu_1.add(menuItem); - - }//end main -} + + }// end main + + public boolean checkNameIsLettersOnly() { + nameIsLettersOnly = false; + + //only allow letter from alphabet and nothing else + if (imagename.getText().matches("[a-zA-Z]+")) { + nameIsLettersOnly = true; + } else { + JOptionPane + .showMessageDialog( + null, + "Der Imagename darf keine Leer- oder Sonderzeichen enthalten.", + "Unerlaubte Zeichen", + JOptionPane.INFORMATION_MESSAGE); + }// if + + return nameIsLettersOnly; + }// end nameIsLettersOnly + + public boolean checkContent(){ + textfieldsHaveContent=false; + + //check if any textfield is empty + if(imagename.getText().isEmpty() == false + && textAreadesc.getText().isEmpty() == false + && Vorname.getText().isEmpty() == false + && Nachname.getText().isEmpty() == false + && Hochschule.getText().isEmpty() == false + && EMail.getText().isEmpty() == false) { + //all textfields have content + textfieldsHaveContent = true; + } else { + JOptionPane + .showMessageDialog( + null, + "Bitte geben Sie alle notwendigen Daten an!", + "Daten unvollst\u00e4ndig", + JOptionPane.INFORMATION_MESSAGE); + }//end if + + return textfieldsHaveContent; + }//end checkContent +}//end Class -- cgit v1.2.3-55-g7522 From 8058cebaaf7ad36dab32cfe8004991ad07219c4e Mon Sep 17 00:00:00 2001 From: Michael Wilson Date: Thu, 21 Aug 2014 13:54:48 +0200 Subject: Anzeigenamen der Fenster korrigiert --- .../bin/gui/image/CreateImageAllgemein_GUI.class | Bin 9395 -> 9384 bytes .../bin/gui/image/CreateImageTechnisch_GUI.class | Bin 10107 -> 10096 bytes Dozentenmodul/bin/gui/image/DeleteImage_GUI.class | Bin 16148 -> 16137 bytes .../bin/gui/image/EditImageAllgemein_GUI.class | Bin 11706 -> 11695 bytes .../bin/gui/image/EditImageTechnisch_GUI.class | Bin 10902 -> 10891 bytes .../bin/gui/image/FTPCreateUploader_GUI.class | Bin 13176 -> 13165 bytes .../bin/gui/image/FTPEditUploader_GUI.class | Bin 12883 -> 12872 bytes .../bin/gui/image/SearchEditImage_GUI.class | Bin 16293 -> 16282 bytes Dozentenmodul/bin/gui/image/SearchImage_GUI.class | Bin 16071 -> 16058 bytes Dozentenmodul/bin/gui/intro/BillOfRights_GUI.class | Bin 10743 -> 10732 bytes Dozentenmodul/bin/gui/intro/Login_GUI.class | Bin 10575 -> 10564 bytes Dozentenmodul/bin/gui/intro/MainMenue_GUI.class | Bin 10342 -> 10330 bytes Dozentenmodul/bin/gui/intro/VmWareLink_GUI.class | Bin 4865 -> 4857 bytes .../gui/lecture/CreateLectureAllgemein_GUI.class | Bin 10580 -> 10569 bytes .../bin/gui/lecture/EditLectureAllgemein_GUI.class | Bin 9792 -> 9781 bytes .../src/gui/image/CreateImageAllgemein_GUI.java | 2 +- .../src/gui/image/CreateImageFreigabe_GUI.java | 2 +- .../src/gui/image/CreateImageTechnisch_GUI.java | 2 +- Dozentenmodul/src/gui/image/DeleteImage_GUI.java | 2 +- .../src/gui/image/EditImageAllgemein_GUI.java | 2 +- .../src/gui/image/EditImageFreigabe_GUI.java | 2 +- .../src/gui/image/EditImageTechnisch_GUI.java | 2 +- .../src/gui/image/FTPCreateUploader_GUI.java | 2 +- .../src/gui/image/FTPEditDownloader_GUI.java | 2 +- .../src/gui/image/FTPEditUploader_GUI.java | 2 +- .../src/gui/image/FTPSearchDownloader_GUI.java | 2 +- .../src/gui/image/PermissionCreateImage_GUI.java | 2 +- .../src/gui/image/PermissionEditImage_GUI.java | 2 +- .../src/gui/image/SearchEditImage_GUI.java | 2 +- Dozentenmodul/src/gui/image/SearchImage_GUI.java | 2 +- Dozentenmodul/src/gui/intro/About_GUI.java | 2 +- Dozentenmodul/src/gui/intro/BillOfRights_GUI.java | 2 +- Dozentenmodul/src/gui/intro/Login_GUI.java | 2 +- Dozentenmodul/src/gui/intro/MainMenue_GUI.java | 2 +- Dozentenmodul/src/gui/intro/VmWareLink_GUI.java | 2 +- .../src/gui/lecture/CreateLectureAllgemein_GUI.java | 2 +- .../src/gui/lecture/CreateLectureLink_GUI.java | 2 +- .../src/gui/lecture/DeleteLecture_GUI.java | 2 +- .../src/gui/lecture/EditLectureAllgemein_GUI.java | 2 +- .../src/gui/lecture/EditLectureLink_GUI.java | 8 ++++---- .../src/gui/lecture/EditLectureSearch_GUI.java | 2 +- .../gui/lecture/PermissionCreateLecture_GUI.java | 2 +- .../src/gui/lecture/PermissionEditLecture_GUI.java | 2 +- .../src/gui/lecture/SearchLecture_GUI.java | 2 +- 44 files changed, 32 insertions(+), 32 deletions(-) (limited to 'Dozentenmodul/src/gui/image/CreateImageAllgemein_GUI.java') diff --git a/Dozentenmodul/bin/gui/image/CreateImageAllgemein_GUI.class b/Dozentenmodul/bin/gui/image/CreateImageAllgemein_GUI.class index cc870522..b2fce5f2 100644 Binary files a/Dozentenmodul/bin/gui/image/CreateImageAllgemein_GUI.class and b/Dozentenmodul/bin/gui/image/CreateImageAllgemein_GUI.class differ diff --git a/Dozentenmodul/bin/gui/image/CreateImageTechnisch_GUI.class b/Dozentenmodul/bin/gui/image/CreateImageTechnisch_GUI.class index 26a24072..29e1b8fb 100644 Binary files a/Dozentenmodul/bin/gui/image/CreateImageTechnisch_GUI.class and b/Dozentenmodul/bin/gui/image/CreateImageTechnisch_GUI.class differ diff --git a/Dozentenmodul/bin/gui/image/DeleteImage_GUI.class b/Dozentenmodul/bin/gui/image/DeleteImage_GUI.class index c49ec97a..6016028e 100644 Binary files a/Dozentenmodul/bin/gui/image/DeleteImage_GUI.class and b/Dozentenmodul/bin/gui/image/DeleteImage_GUI.class differ diff --git a/Dozentenmodul/bin/gui/image/EditImageAllgemein_GUI.class b/Dozentenmodul/bin/gui/image/EditImageAllgemein_GUI.class index 21600d9f..f5c529eb 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/EditImageTechnisch_GUI.class b/Dozentenmodul/bin/gui/image/EditImageTechnisch_GUI.class index f053a43d..456d5d97 100644 Binary files a/Dozentenmodul/bin/gui/image/EditImageTechnisch_GUI.class and b/Dozentenmodul/bin/gui/image/EditImageTechnisch_GUI.class differ diff --git a/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI.class b/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI.class index f3082b06..dcd9a8b8 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/FTPEditUploader_GUI.class b/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI.class index 67681e1c..96d6d2ed 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 7655aeef..dea19aba 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/image/SearchImage_GUI.class b/Dozentenmodul/bin/gui/image/SearchImage_GUI.class index 3eb9a7dd..9af5859a 100644 Binary files a/Dozentenmodul/bin/gui/image/SearchImage_GUI.class and b/Dozentenmodul/bin/gui/image/SearchImage_GUI.class differ diff --git a/Dozentenmodul/bin/gui/intro/BillOfRights_GUI.class b/Dozentenmodul/bin/gui/intro/BillOfRights_GUI.class index 7118cb01..066bf952 100644 Binary files a/Dozentenmodul/bin/gui/intro/BillOfRights_GUI.class and b/Dozentenmodul/bin/gui/intro/BillOfRights_GUI.class differ diff --git a/Dozentenmodul/bin/gui/intro/Login_GUI.class b/Dozentenmodul/bin/gui/intro/Login_GUI.class index 72c06338..29da5290 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/bin/gui/intro/MainMenue_GUI.class b/Dozentenmodul/bin/gui/intro/MainMenue_GUI.class index 1f61a168..f8171274 100644 Binary files a/Dozentenmodul/bin/gui/intro/MainMenue_GUI.class and b/Dozentenmodul/bin/gui/intro/MainMenue_GUI.class differ diff --git a/Dozentenmodul/bin/gui/intro/VmWareLink_GUI.class b/Dozentenmodul/bin/gui/intro/VmWareLink_GUI.class index 713871fa..7a90480e 100644 Binary files a/Dozentenmodul/bin/gui/intro/VmWareLink_GUI.class and b/Dozentenmodul/bin/gui/intro/VmWareLink_GUI.class differ diff --git a/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI.class b/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI.class index 45526d36..b5becda3 100644 Binary files a/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI.class and b/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI.class differ diff --git a/Dozentenmodul/bin/gui/lecture/EditLectureAllgemein_GUI.class b/Dozentenmodul/bin/gui/lecture/EditLectureAllgemein_GUI.class index 1ff0d787..7d58f1a2 100644 Binary files a/Dozentenmodul/bin/gui/lecture/EditLectureAllgemein_GUI.class and b/Dozentenmodul/bin/gui/lecture/EditLectureAllgemein_GUI.class differ diff --git a/Dozentenmodul/src/gui/image/CreateImageAllgemein_GUI.java b/Dozentenmodul/src/gui/image/CreateImageAllgemein_GUI.java index ee8b1068..71283844 100644 --- a/Dozentenmodul/src/gui/image/CreateImageAllgemein_GUI.java +++ b/Dozentenmodul/src/gui/image/CreateImageAllgemein_GUI.java @@ -86,7 +86,7 @@ public class CreateImageAllgemein_GUI extends JFrame { JOptionPane.ERROR_MESSAGE); } // Setzt den Titel - setTitle("bwLehrpool Suite *Prototyp* - Image erzeugen"); + setTitle("bwLehrpool Suite - Image erzeugen"); // Zentriert das Fenster setBounds(0, 0, 603, 722); GuiOrganizer.centerGUI(this); diff --git a/Dozentenmodul/src/gui/image/CreateImageFreigabe_GUI.java b/Dozentenmodul/src/gui/image/CreateImageFreigabe_GUI.java index 89722cdb..84d61fdd 100644 --- a/Dozentenmodul/src/gui/image/CreateImageFreigabe_GUI.java +++ b/Dozentenmodul/src/gui/image/CreateImageFreigabe_GUI.java @@ -67,7 +67,7 @@ public class CreateImageFreigabe_GUI extends JFrame { // TODO Auto-generated catch block e.printStackTrace(); } - setTitle("bwLehrpool Suite *Prototyp* - Image erzeugen"); + setTitle("bwLehrpool Suite - Image erzeugen"); setBounds(0, 0, 603, 722); GuiOrganizer.centerGUI(this); diff --git a/Dozentenmodul/src/gui/image/CreateImageTechnisch_GUI.java b/Dozentenmodul/src/gui/image/CreateImageTechnisch_GUI.java index 9dfdc815..a30a33dd 100644 --- a/Dozentenmodul/src/gui/image/CreateImageTechnisch_GUI.java +++ b/Dozentenmodul/src/gui/image/CreateImageTechnisch_GUI.java @@ -87,7 +87,7 @@ public class CreateImageTechnisch_GUI extends JFrame { // TODO Auto-generated catch block e.printStackTrace(); } - setTitle("bwLehrpool Suite *Prototyp* - Image erzeugen"); + setTitle("bwLehrpool Suite - Image erzeugen"); setBounds(0, 0, 603, 722); GuiOrganizer.centerGUI(this); diff --git a/Dozentenmodul/src/gui/image/DeleteImage_GUI.java b/Dozentenmodul/src/gui/image/DeleteImage_GUI.java index d0bf9481..843df2cf 100644 --- a/Dozentenmodul/src/gui/image/DeleteImage_GUI.java +++ b/Dozentenmodul/src/gui/image/DeleteImage_GUI.java @@ -184,7 +184,7 @@ public class DeleteImage_GUI extends JFrame { e.printStackTrace(); } // Setzt den Fenstertitel - setTitle("bwLehrpool Suite *Prototyp* - Image l\u00F6schen"); + setTitle("bwLehrpool Suite - Image l\u00F6schen"); // Zentriert das Fenster in die Bildmitte setBounds(0, 0, 918, 722); GuiOrganizer.centerGUI(this); diff --git a/Dozentenmodul/src/gui/image/EditImageAllgemein_GUI.java b/Dozentenmodul/src/gui/image/EditImageAllgemein_GUI.java index 114e6952..35b6e930 100644 --- a/Dozentenmodul/src/gui/image/EditImageAllgemein_GUI.java +++ b/Dozentenmodul/src/gui/image/EditImageAllgemein_GUI.java @@ -91,7 +91,7 @@ public class EditImageAllgemein_GUI extends JFrame { e.printStackTrace(); } // Setzt den Fenstertitel - setTitle("bwLehrpool Suite *Prototyp* - Image bearbeiten"); + setTitle("bwLehrpool Suite - Image bearbeiten"); // Zentriert das Fenster in der Bildmitte setBounds(0, 0, 603, 722); diff --git a/Dozentenmodul/src/gui/image/EditImageFreigabe_GUI.java b/Dozentenmodul/src/gui/image/EditImageFreigabe_GUI.java index d056fed3..97237c84 100644 --- a/Dozentenmodul/src/gui/image/EditImageFreigabe_GUI.java +++ b/Dozentenmodul/src/gui/image/EditImageFreigabe_GUI.java @@ -68,7 +68,7 @@ public class EditImageFreigabe_GUI extends JFrame { // TODO Auto-generated catch block e.printStackTrace(); } - setTitle("bwLehrpool Suite *Prototyp* - Image erzeugen"); + setTitle("bwLehrpool Suite - Image erzeugen"); setBounds(0, 0, 603, 722); GuiOrganizer.centerGUI(this); diff --git a/Dozentenmodul/src/gui/image/EditImageTechnisch_GUI.java b/Dozentenmodul/src/gui/image/EditImageTechnisch_GUI.java index beb77898..ea81e3c2 100644 --- a/Dozentenmodul/src/gui/image/EditImageTechnisch_GUI.java +++ b/Dozentenmodul/src/gui/image/EditImageTechnisch_GUI.java @@ -92,7 +92,7 @@ public class EditImageTechnisch_GUI extends JFrame { e.printStackTrace(); } // Setzt den Titel des Fensters - setTitle("bwLehrpool Suite *Prototyp* - Image bearbeiten"); + setTitle("bwLehrpool Suite - Image bearbeiten"); // Zentriert das Fenster setBounds(0, 0, 603, 722); GuiOrganizer.centerGUI(this); diff --git a/Dozentenmodul/src/gui/image/FTPCreateUploader_GUI.java b/Dozentenmodul/src/gui/image/FTPCreateUploader_GUI.java index cd9b63d2..3d02a7ed 100644 --- a/Dozentenmodul/src/gui/image/FTPCreateUploader_GUI.java +++ b/Dozentenmodul/src/gui/image/FTPCreateUploader_GUI.java @@ -123,7 +123,7 @@ public class FTPCreateUploader_GUI extends JFrame implements // filename=name; setBackground(Color.WHITE); - setTitle("Dozentenmodul *Prototyp* - Image erzeugen"); + setTitle("Dozentenmodul - Image erzeugen"); setBounds(0, 0, 603, 722); GuiOrganizer.centerGUI(this); diff --git a/Dozentenmodul/src/gui/image/FTPEditDownloader_GUI.java b/Dozentenmodul/src/gui/image/FTPEditDownloader_GUI.java index aef06fcc..acd95833 100644 --- a/Dozentenmodul/src/gui/image/FTPEditDownloader_GUI.java +++ b/Dozentenmodul/src/gui/image/FTPEditDownloader_GUI.java @@ -116,7 +116,7 @@ public class FTPEditDownloader_GUI extends JFrame implements PropertyChangeListe } setBackground(Color.WHITE); - setTitle("Dozentenmodul *Prototyp* - Image herunterladen"); + setTitle("Dozentenmodul - Image herunterladen"); setBounds(0, 0, 603, 722); GuiOrganizer.centerGUI(this); diff --git a/Dozentenmodul/src/gui/image/FTPEditUploader_GUI.java b/Dozentenmodul/src/gui/image/FTPEditUploader_GUI.java index cc143924..246c6eb6 100644 --- a/Dozentenmodul/src/gui/image/FTPEditUploader_GUI.java +++ b/Dozentenmodul/src/gui/image/FTPEditUploader_GUI.java @@ -120,7 +120,7 @@ public class FTPEditUploader_GUI extends JFrame implements // filename=name; setBackground(Color.WHITE); - setTitle("Dozentenmodul *Prototyp* - Image bearbeiten"); + setTitle("Dozentenmodul - Image bearbeiten"); setBounds(0, 0, 603, 722); GuiOrganizer.centerGUI(this); diff --git a/Dozentenmodul/src/gui/image/FTPSearchDownloader_GUI.java b/Dozentenmodul/src/gui/image/FTPSearchDownloader_GUI.java index 7898beb6..f28c358e 100644 --- a/Dozentenmodul/src/gui/image/FTPSearchDownloader_GUI.java +++ b/Dozentenmodul/src/gui/image/FTPSearchDownloader_GUI.java @@ -116,7 +116,7 @@ public class FTPSearchDownloader_GUI extends JFrame implements PropertyChangeLis } setBackground(Color.WHITE); - setTitle("Dozentenmodul *Prototyp* - Image herunterladen"); + setTitle("Dozentenmodul - Image herunterladen"); setBounds(0, 0, 603, 722); GuiOrganizer.centerGUI(this); diff --git a/Dozentenmodul/src/gui/image/PermissionCreateImage_GUI.java b/Dozentenmodul/src/gui/image/PermissionCreateImage_GUI.java index 59f7c8f0..24605b6d 100644 --- a/Dozentenmodul/src/gui/image/PermissionCreateImage_GUI.java +++ b/Dozentenmodul/src/gui/image/PermissionCreateImage_GUI.java @@ -123,7 +123,7 @@ public class PermissionCreateImage_GUI extends JFrame { // TODO Auto-generated catch block e.printStackTrace(); } - setTitle("bwLehrpool Suite *Prototyp* - Image erzeugen"); + setTitle("bwLehrpool Suite - Image erzeugen"); setBounds(0, 0, 603, 722); GuiOrganizer.centerGUI(this); diff --git a/Dozentenmodul/src/gui/image/PermissionEditImage_GUI.java b/Dozentenmodul/src/gui/image/PermissionEditImage_GUI.java index ad81a79f..744532b4 100644 --- a/Dozentenmodul/src/gui/image/PermissionEditImage_GUI.java +++ b/Dozentenmodul/src/gui/image/PermissionEditImage_GUI.java @@ -113,7 +113,7 @@ public class PermissionEditImage_GUI extends JFrame { // TODO Auto-generated catch block e.printStackTrace(); } - setTitle("bwLehrpool Suite *Prototyp* - Image erzeugen"); + setTitle("bwLehrpool Suite - Image erzeugen"); setBounds(0, 0, 603, 722); GuiOrganizer.centerGUI(this); diff --git a/Dozentenmodul/src/gui/image/SearchEditImage_GUI.java b/Dozentenmodul/src/gui/image/SearchEditImage_GUI.java index 5ae1e0c4..be864ba7 100644 --- a/Dozentenmodul/src/gui/image/SearchEditImage_GUI.java +++ b/Dozentenmodul/src/gui/image/SearchEditImage_GUI.java @@ -183,7 +183,7 @@ public class SearchEditImage_GUI extends JFrame { e.printStackTrace(); } // Setzt den Fenstertitel - setTitle("bwLehrpool Suite *Prototyp* - Image bearbeiten"); + setTitle("bwLehrpool Suite - Image bearbeiten"); // Zentriert das Fenster in die Bildmitte setBounds(0, 0, 918, 722); GuiOrganizer.centerGUI(this); diff --git a/Dozentenmodul/src/gui/image/SearchImage_GUI.java b/Dozentenmodul/src/gui/image/SearchImage_GUI.java index a19057cc..2c9d7704 100644 --- a/Dozentenmodul/src/gui/image/SearchImage_GUI.java +++ b/Dozentenmodul/src/gui/image/SearchImage_GUI.java @@ -187,7 +187,7 @@ public class SearchImage_GUI extends JFrame { e.printStackTrace(); } // Setzt den Fenstertitel - setTitle("bwLehrpool Suite *Prototyp* - Suche VL-Image"); + setTitle("bwLehrpool Suite - Image suchen"); // Zentriert das Fenster in die Bildmitte setBounds(0, 0, 918, 722); GuiOrganizer.centerGUI(this); diff --git a/Dozentenmodul/src/gui/intro/About_GUI.java b/Dozentenmodul/src/gui/intro/About_GUI.java index d98790a5..12ab22fa 100644 --- a/Dozentenmodul/src/gui/intro/About_GUI.java +++ b/Dozentenmodul/src/gui/intro/About_GUI.java @@ -43,7 +43,7 @@ public class About_GUI extends JFrame { JOptionPane.ERROR_MESSAGE); } // Titel des Fensters setzen - setTitle("Dozentenmodul *Prototyp* - About"); + setTitle("Dozentenmodul - About"); // Aktion die beim Schliessen durchgefuehrt werden soll setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE); // Groesse des Fensters definieren diff --git a/Dozentenmodul/src/gui/intro/BillOfRights_GUI.java b/Dozentenmodul/src/gui/intro/BillOfRights_GUI.java index 58166bef..b11dc746 100644 --- a/Dozentenmodul/src/gui/intro/BillOfRights_GUI.java +++ b/Dozentenmodul/src/gui/intro/BillOfRights_GUI.java @@ -75,7 +75,7 @@ public class BillOfRights_GUI extends JFrame { e.printStackTrace(); } //Setzt den Fenstertitel - setTitle("bwLehrpool Suite *Prototyp*"); + setTitle("bwLehrpool Suite"); //Zentiert das Fenster in der Bildschirmmitte setBounds(0, 0, 603, 722); diff --git a/Dozentenmodul/src/gui/intro/Login_GUI.java b/Dozentenmodul/src/gui/intro/Login_GUI.java index de8082d6..5104da02 100644 --- a/Dozentenmodul/src/gui/intro/Login_GUI.java +++ b/Dozentenmodul/src/gui/intro/Login_GUI.java @@ -109,7 +109,7 @@ public class Login_GUI extends JFrame { JOptionPane.ERROR_MESSAGE); } // Titel des Fensters setzen - setTitle("bwLehrpool Suite *Prototyp*"); + setTitle("bwLehrpool Suite"); // Aktion die beim Schliessen durchgefuehrt werden soll setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); diff --git a/Dozentenmodul/src/gui/intro/MainMenue_GUI.java b/Dozentenmodul/src/gui/intro/MainMenue_GUI.java index 2954ca3b..c80fe077 100644 --- a/Dozentenmodul/src/gui/intro/MainMenue_GUI.java +++ b/Dozentenmodul/src/gui/intro/MainMenue_GUI.java @@ -84,7 +84,7 @@ public class MainMenue_GUI extends JFrame { // TODO Auto-generated catch block e.printStackTrace(); } - setTitle("bwLehrpool Suite *Prototyp* - Connected Server: "+SessionData.session.getServerAdress()); + setTitle("bwLehrpool Suite - Connected Server: "+SessionData.session.getServerAdress()); setBounds(0, 0, 603, 722); GuiOrganizer.centerGUI(this); diff --git a/Dozentenmodul/src/gui/intro/VmWareLink_GUI.java b/Dozentenmodul/src/gui/intro/VmWareLink_GUI.java index 0de9fe21..d5350fbd 100644 --- a/Dozentenmodul/src/gui/intro/VmWareLink_GUI.java +++ b/Dozentenmodul/src/gui/intro/VmWareLink_GUI.java @@ -68,7 +68,7 @@ public class VmWareLink_GUI extends JFrame { // TODO Auto-generated catch block e.printStackTrace(); } - setTitle("Dozentenmodul *Prototyp*"); + setTitle("bwLehrpool Suite"); setBounds(0, 0, 603, 722); GuiOrganizer.centerGUI(this); diff --git a/Dozentenmodul/src/gui/lecture/CreateLectureAllgemein_GUI.java b/Dozentenmodul/src/gui/lecture/CreateLectureAllgemein_GUI.java index 567583d1..5ba357f9 100644 --- a/Dozentenmodul/src/gui/lecture/CreateLectureAllgemein_GUI.java +++ b/Dozentenmodul/src/gui/lecture/CreateLectureAllgemein_GUI.java @@ -93,7 +93,7 @@ public class CreateLectureAllgemein_GUI extends JFrame { // TODO Auto-generated catch block e.printStackTrace(); } - setTitle("bwLehrpool Suite *Prototyp* - Veranstaltung erzeugen"); + setTitle("bwLehrpool Suite - Veranstaltung erzeugen"); setBounds(0, 0, 603, 722); GuiOrganizer.centerGUI(this); diff --git a/Dozentenmodul/src/gui/lecture/CreateLectureLink_GUI.java b/Dozentenmodul/src/gui/lecture/CreateLectureLink_GUI.java index 4e276aec..62613905 100644 --- a/Dozentenmodul/src/gui/lecture/CreateLectureLink_GUI.java +++ b/Dozentenmodul/src/gui/lecture/CreateLectureLink_GUI.java @@ -130,7 +130,7 @@ public class CreateLectureLink_GUI extends JFrame { // TODO Auto-generated catch block e.printStackTrace(); } - setTitle("bwLehrpool Suite *Prototyp* - Veranstaltung erzeugen"); + setTitle("bwLehrpool Suite - Veranstaltung erzeugen"); setBounds(0, 0, 603, 722); GuiOrganizer.centerGUI(this); diff --git a/Dozentenmodul/src/gui/lecture/DeleteLecture_GUI.java b/Dozentenmodul/src/gui/lecture/DeleteLecture_GUI.java index cadb4ca3..4cf7c618 100644 --- a/Dozentenmodul/src/gui/lecture/DeleteLecture_GUI.java +++ b/Dozentenmodul/src/gui/lecture/DeleteLecture_GUI.java @@ -169,7 +169,7 @@ public class DeleteLecture_GUI extends JFrame { e.printStackTrace(); } // Setzt den Fenstertitel - setTitle("bwLehrpool Suite *Prototyp* - Veranstaltung l\u00F6schen"); + setTitle("bwLehrpool Suite - Veranstaltung l\u00F6schen"); // Zentriert das Fenster in die Bildmitte setBounds(0, 0, 842, 722); GuiOrganizer.centerGUI(this); diff --git a/Dozentenmodul/src/gui/lecture/EditLectureAllgemein_GUI.java b/Dozentenmodul/src/gui/lecture/EditLectureAllgemein_GUI.java index 650095f0..d3c3d538 100644 --- a/Dozentenmodul/src/gui/lecture/EditLectureAllgemein_GUI.java +++ b/Dozentenmodul/src/gui/lecture/EditLectureAllgemein_GUI.java @@ -83,7 +83,7 @@ public class EditLectureAllgemein_GUI extends JFrame { // TODO Auto-generated catch block e.printStackTrace(); } - setTitle("bwLehrpool Suite *Prototyp* - Veranstaltung bearbeiten");; + setTitle("bwLehrpool Suite - Veranstaltung bearbeiten");; setBounds(0, 0, 603, 722); GuiOrganizer.centerGUI(this); diff --git a/Dozentenmodul/src/gui/lecture/EditLectureLink_GUI.java b/Dozentenmodul/src/gui/lecture/EditLectureLink_GUI.java index 3a7f6eaa..6ef6749f 100644 --- a/Dozentenmodul/src/gui/lecture/EditLectureLink_GUI.java +++ b/Dozentenmodul/src/gui/lecture/EditLectureLink_GUI.java @@ -187,7 +187,7 @@ public class EditLectureLink_GUI extends JFrame { // TODO Auto-generated catch block e.printStackTrace(); } - setTitle("bwLehrpool Suite *Prototyp* - Veranstaltung bearbeiten"); + setTitle("bwLehrpool Suite - Veranstaltung bearbeiten"); setBounds(0, 0, 918, 722); GuiOrganizer.centerGUI(this); @@ -556,7 +556,7 @@ public class EditLectureLink_GUI extends JFrame { JOptionPane .showMessageDialog( null, - "Ihre Veranstaltung wurde erfolgreich geändert. Sie kehren nun zum Hauptmen\u00fc zur\u00fcck.", + "Ihre Veranstaltung wurde erfolgreich ge�ndert. Sie kehren nun zum Hauptmen\u00fc zur\u00fcck.", "Veranstaltung angelegt", JOptionPane.INFORMATION_MESSAGE); // zurueck zum Menue @@ -619,7 +619,7 @@ public class EditLectureLink_GUI extends JFrame { JOptionPane .showMessageDialog( null, - "Ihre Veranstaltung wurde erfolgreich geändert. Sie kehren nun zum Hauptmen\u00fc zur\u00fcck.", + "Ihre Veranstaltung wurde erfolgreich ge�ndert. Sie kehren nun zum Hauptmen\u00fc zur\u00fcck.", "Veranstaltung angelegt", JOptionPane.INFORMATION_MESSAGE); // zurueck zum Menue @@ -685,7 +685,7 @@ public class EditLectureLink_GUI extends JFrame { JOptionPane .showMessageDialog( null, - "Ihre Veranstaltung wurde erfolgreich geändert. Sie kehren nun zum Hauptmen\u00fc zur\u00fcck.", + "Ihre Veranstaltung wurde erfolgreich ge�ndert. Sie kehren nun zum Hauptmen\u00fc zur\u00fcck.", "Veranstaltung angelegt", JOptionPane.INFORMATION_MESSAGE); // zurueck zum Menue diff --git a/Dozentenmodul/src/gui/lecture/EditLectureSearch_GUI.java b/Dozentenmodul/src/gui/lecture/EditLectureSearch_GUI.java index 0a81f96d..36a163e9 100644 --- a/Dozentenmodul/src/gui/lecture/EditLectureSearch_GUI.java +++ b/Dozentenmodul/src/gui/lecture/EditLectureSearch_GUI.java @@ -179,7 +179,7 @@ public class EditLectureSearch_GUI extends JFrame { e.printStackTrace(); } // Setzt den Fenstertitel - setTitle("bwLehrpool Suite *Prototyp* - Veranstaltung bearbeiten"); + setTitle("bwLehrpool Suite - Veranstaltung bearbeiten"); // Zentriert das Fenster in die Bildmitte setBounds(0, 0, 842, 722); GuiOrganizer.centerGUI(this); diff --git a/Dozentenmodul/src/gui/lecture/PermissionCreateLecture_GUI.java b/Dozentenmodul/src/gui/lecture/PermissionCreateLecture_GUI.java index 28d23824..e3067b03 100644 --- a/Dozentenmodul/src/gui/lecture/PermissionCreateLecture_GUI.java +++ b/Dozentenmodul/src/gui/lecture/PermissionCreateLecture_GUI.java @@ -113,7 +113,7 @@ public class PermissionCreateLecture_GUI extends JFrame { // TODO Auto-generated catch block e.printStackTrace(); } - setTitle("bwLehrpool Suite *Prototyp* - Image erzeugen"); + setTitle("bwLehrpool Suite - Veranstaltung erzeugen"); setBounds(0, 0, 603, 722); GuiOrganizer.centerGUI(this); diff --git a/Dozentenmodul/src/gui/lecture/PermissionEditLecture_GUI.java b/Dozentenmodul/src/gui/lecture/PermissionEditLecture_GUI.java index 57080e8c..fdb7cc31 100644 --- a/Dozentenmodul/src/gui/lecture/PermissionEditLecture_GUI.java +++ b/Dozentenmodul/src/gui/lecture/PermissionEditLecture_GUI.java @@ -113,7 +113,7 @@ public class PermissionEditLecture_GUI extends JFrame { // TODO Auto-generated catch block e.printStackTrace(); } - setTitle("bwLehrpool Suite *Prototyp* - Image erzeugen"); + setTitle("bwLehrpool Suite - Image erzeugen"); setBounds(0, 0, 603, 722); GuiOrganizer.centerGUI(this); diff --git a/Dozentenmodul/src/gui/lecture/SearchLecture_GUI.java b/Dozentenmodul/src/gui/lecture/SearchLecture_GUI.java index 07a48925..3e54ec65 100644 --- a/Dozentenmodul/src/gui/lecture/SearchLecture_GUI.java +++ b/Dozentenmodul/src/gui/lecture/SearchLecture_GUI.java @@ -175,7 +175,7 @@ public class SearchLecture_GUI extends JFrame { e.printStackTrace(); } // Setzt den Fenstertitel - setTitle("bwLehrpool Suite *Prototyp* - Veranstaltung suchen"); + setTitle("bwLehrpool Suite - Veranstaltung suchen"); // Zentriert das Fenster in die Bildmitte 2; setBounds(0, 0, 842, 722); GuiOrganizer.centerGUI(this); -- cgit v1.2.3-55-g7522 From 1a21cd59b2abdc0344144e5076422d4380646d31 Mon Sep 17 00:00:00 2001 From: Michael Wilson Date: Thu, 21 Aug 2014 16:24:16 +0200 Subject: Fehlermeldung entfernt und Debug-Ausgaben hinzugefuegt --- .../bin/gui/image/CreateImageAllgemein_GUI.class | Bin 9384 -> 9384 bytes .../bin/gui/image/EditImageTechnisch_GUI.class | Bin 10891 -> 10891 bytes .../bin/gui/image/FTPCreateUploader_GUI.class | Bin 13165 -> 13210 bytes .../bin/gui/image/FTPEditUploader_GUI.class | Bin 12872 -> 13030 bytes Dozentenmodul/bin/gui/intro/Login_GUI.class | Bin 10564 -> 10581 bytes Dozentenmodul/bin/gui/intro/MainMenue_GUI$1.class | Bin 692 -> 692 bytes Dozentenmodul/bin/gui/intro/MainMenue_GUI$10.class | Bin 2247 -> 2247 bytes Dozentenmodul/bin/gui/intro/MainMenue_GUI$2.class | Bin 1088 -> 1088 bytes Dozentenmodul/bin/gui/intro/MainMenue_GUI$3.class | Bin 1006 -> 1006 bytes Dozentenmodul/bin/gui/intro/MainMenue_GUI$4.class | Bin 977 -> 977 bytes Dozentenmodul/bin/gui/intro/MainMenue_GUI$5.class | Bin 1068 -> 1068 bytes Dozentenmodul/bin/gui/intro/MainMenue_GUI$6.class | Bin 1083 -> 1083 bytes Dozentenmodul/bin/gui/intro/MainMenue_GUI$7.class | Bin 974 -> 974 bytes Dozentenmodul/bin/gui/intro/MainMenue_GUI$8.class | Bin 996 -> 996 bytes Dozentenmodul/bin/gui/intro/MainMenue_GUI$9.class | Bin 1096 -> 1096 bytes Dozentenmodul/bin/gui/intro/MainMenue_GUI.class | Bin 10327 -> 10456 bytes .../src/gui/image/CreateImageAllgemein_GUI.java | 2 + .../src/gui/image/CreateImageTechnisch_GUI.java | 2 +- .../src/gui/image/EditImageTechnisch_GUI.java | 1 + .../src/gui/image/FTPCreateUploader_GUI.java | 10 +- .../src/gui/image/FTPEditUploader_GUI.java | 102 +++++++++++---------- Dozentenmodul/src/gui/intro/Login_GUI.java | 16 ++-- Dozentenmodul/src/gui/intro/MainMenue_GUI.java | 4 + 23 files changed, 75 insertions(+), 62 deletions(-) (limited to 'Dozentenmodul/src/gui/image/CreateImageAllgemein_GUI.java') diff --git a/Dozentenmodul/bin/gui/image/CreateImageAllgemein_GUI.class b/Dozentenmodul/bin/gui/image/CreateImageAllgemein_GUI.class index b2fce5f2..b616cb4f 100644 Binary files a/Dozentenmodul/bin/gui/image/CreateImageAllgemein_GUI.class and b/Dozentenmodul/bin/gui/image/CreateImageAllgemein_GUI.class differ diff --git a/Dozentenmodul/bin/gui/image/EditImageTechnisch_GUI.class b/Dozentenmodul/bin/gui/image/EditImageTechnisch_GUI.class index 456d5d97..98947f75 100644 Binary files a/Dozentenmodul/bin/gui/image/EditImageTechnisch_GUI.class and b/Dozentenmodul/bin/gui/image/EditImageTechnisch_GUI.class differ diff --git a/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI.class b/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI.class index dcd9a8b8..315e2376 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/FTPEditUploader_GUI.class b/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI.class index 96d6d2ed..e899713c 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/intro/Login_GUI.class b/Dozentenmodul/bin/gui/intro/Login_GUI.class index 29da5290..31b8abb9 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/bin/gui/intro/MainMenue_GUI$1.class b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$1.class index 8f2c2337..8d37d092 100644 Binary files a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$1.class and b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$1.class differ diff --git a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$10.class b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$10.class index 55965fd2..55cd9b99 100644 Binary files a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$10.class and b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$10.class differ diff --git a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$2.class b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$2.class index d88ea420..c084472f 100644 Binary files a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$2.class and b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$2.class differ diff --git a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$3.class b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$3.class index bb811f7a..c17f71ce 100644 Binary files a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$3.class and b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$3.class differ diff --git a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$4.class b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$4.class index 1cf17778..6a8ae8a9 100644 Binary files a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$4.class and b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$4.class differ diff --git a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$5.class b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$5.class index e4c4e858..bc299712 100644 Binary files a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$5.class and b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$5.class differ diff --git a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$6.class b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$6.class index 715c30d8..1df126f0 100644 Binary files a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$6.class and b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$6.class differ diff --git a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$7.class b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$7.class index 10cac7e7..9a0c30f4 100644 Binary files a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$7.class and b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$7.class differ diff --git a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$8.class b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$8.class index c742cf3c..161cf622 100644 Binary files a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$8.class and b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$8.class differ diff --git a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$9.class b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$9.class index 193a25de..7d1f0399 100644 Binary files a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$9.class and b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$9.class differ diff --git a/Dozentenmodul/bin/gui/intro/MainMenue_GUI.class b/Dozentenmodul/bin/gui/intro/MainMenue_GUI.class index 3bfa0437..ad440fcd 100644 Binary files a/Dozentenmodul/bin/gui/intro/MainMenue_GUI.class and b/Dozentenmodul/bin/gui/intro/MainMenue_GUI.class differ diff --git a/Dozentenmodul/src/gui/image/CreateImageAllgemein_GUI.java b/Dozentenmodul/src/gui/image/CreateImageAllgemein_GUI.java index 71283844..dea44e97 100644 --- a/Dozentenmodul/src/gui/image/CreateImageAllgemein_GUI.java +++ b/Dozentenmodul/src/gui/image/CreateImageAllgemein_GUI.java @@ -292,6 +292,8 @@ public class CreateImageAllgemein_GUI extends JFrame { // Schreibt die Daten in das Model Image.image.setImagename(imagename.getText()); Image.image.setDesc(textAreadesc.getText()); + //Info + System.out.println("Alle Eingaben in Ordnung. Imagename= "+imagename.getText()+", Imagebeschreibung="+textAreadesc.getText()); CreateImageTechnisch_GUI ea = new CreateImageTechnisch_GUI(); ea.setVisible(true); dispose(); diff --git a/Dozentenmodul/src/gui/image/CreateImageTechnisch_GUI.java b/Dozentenmodul/src/gui/image/CreateImageTechnisch_GUI.java index a30a33dd..a31e0ecb 100644 --- a/Dozentenmodul/src/gui/image/CreateImageTechnisch_GUI.java +++ b/Dozentenmodul/src/gui/image/CreateImageTechnisch_GUI.java @@ -370,7 +370,7 @@ public class CreateImageTechnisch_GUI extends JFrame { Image.image.setCpu(Integer.valueOf(spinnerCPU.getValue().toString()).intValue()); Image.image.setRam(Integer.valueOf(spinnerRam.getValue().toString()).intValue()); Image.image.setOS(comboBox.getSelectedItem().toString()); - System.out.println(Image.image.getOS()); + System.out.println("Betriebssystem: "+Image.image.getOS()+", istVorlage: "+Image.image.isVorlage()+", Lizenzpflichtig: "+Image.image.isLicensed()+", Internetsperre: "+Image.image.isInternet()+", CPU: "+Image.image.getCpu()+", RAM: "+Image.image.getRam()); CreateImageFreigabe_GUI ea=new CreateImageFreigabe_GUI(); ea.setVisible(true); dispose(); diff --git a/Dozentenmodul/src/gui/image/EditImageTechnisch_GUI.java b/Dozentenmodul/src/gui/image/EditImageTechnisch_GUI.java index ea81e3c2..f44378fb 100644 --- a/Dozentenmodul/src/gui/image/EditImageTechnisch_GUI.java +++ b/Dozentenmodul/src/gui/image/EditImageTechnisch_GUI.java @@ -391,6 +391,7 @@ public class EditImageTechnisch_GUI extends JFrame { Image.image.setVorlage(false); } Image.image.setOS(comboBox.getSelectedItem().toString()); + System.out.println("Betriebssystem: "+Image.image.getOS()+", istVorlage: "+Image.image.isVorlage()+", Lizenzpflichtig: "+Image.image.isLicensed()+", Internetsperre: "+Image.image.isInternet()+", CPU: "+Image.image.getCpu()+", RAM: "+Image.image.getRam()); // oeffnet das naechste Fenster EditImageFreigabe_GUI ea=new EditImageFreigabe_GUI(); ea.setVisible(true); diff --git a/Dozentenmodul/src/gui/image/FTPCreateUploader_GUI.java b/Dozentenmodul/src/gui/image/FTPCreateUploader_GUI.java index 3d02a7ed..686ee63f 100644 --- a/Dozentenmodul/src/gui/image/FTPCreateUploader_GUI.java +++ b/Dozentenmodul/src/gui/image/FTPCreateUploader_GUI.java @@ -420,11 +420,11 @@ public class FTPCreateUploader_GUI extends JFrame implements btnUploadStarten.setText("Bitte warten"); try { - System.out.println("Test"); + System.out.println("Getting FTP User"); user = client.getFtpUser(); - System.out.println("FTP name" + user.userName); - System.out.println("FTP path" + user.path); - System.out.println("FTP 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(); @@ -434,7 +434,7 @@ public class FTPCreateUploader_GUI extends JFrame implements } DateFormat formatter = new SimpleDateFormat("yyyMMddhhmmss"); - System.out.println(formatter.format(new Date()) + "_" + System.out.println("Setting new Name: " + formatter.format(new Date()) + "_" + person.verantwortlicher.getHochschule() + "_" + person.verantwortlicher.getUsername() + "_" + Image.image.getImagename() + ".vmdk"); diff --git a/Dozentenmodul/src/gui/image/FTPEditUploader_GUI.java b/Dozentenmodul/src/gui/image/FTPEditUploader_GUI.java index 246c6eb6..17b7449d 100644 --- a/Dozentenmodul/src/gui/image/FTPEditUploader_GUI.java +++ b/Dozentenmodul/src/gui/image/FTPEditUploader_GUI.java @@ -85,7 +85,6 @@ public class FTPEditUploader_GUI extends JFrame implements JButton finishButton = new JButton("Fertigstellen"); JButton btnZurck = new JButton("Zur\u00FCck"); - /** * Create the frame. */ @@ -302,7 +301,7 @@ public class FTPEditUploader_GUI extends JFrame implements getContentPane().add(buttonPane, BorderLayout.SOUTH); { - //finishButton.setEnabled(false); + // finishButton.setEnabled(false); finishButton.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { @@ -318,13 +317,16 @@ public class FTPEditUploader_GUI extends JFrame implements } catch (TException e1) { // TODO Auto-generated catch block e1.printStackTrace(); - JOptionPane.showMessageDialog(null, - e1.getCause()+"\n"+e1.getStackTrace(), - "Debug-Message", JOptionPane.ERROR_MESSAGE); + JOptionPane.showMessageDialog( + null, + e1.getCause() + "\n" + + e1.getStackTrace(), + "Debug-Message", + JOptionPane.ERROR_MESSAGE); } task.cancel(true); } - + } }); btnZurck.addActionListener(new ActionListener() { @@ -344,58 +346,56 @@ public class FTPEditUploader_GUI extends JFrame implements JMenuBar menuBar = new JMenuBar(); setJMenuBar(menuBar); - + JMenu menu = new JMenu("Hilfe"); menuBar.add(menu); - + JMenuItem menuItem = new JMenuItem("FAQ"); menuItem.addMouseListener(new MouseAdapter() { @Override public void mousePressed(MouseEvent arg0) { - + OpenLinks open = new OpenLinks(); - + URI windows; try { windows = new URI(Links.getFAQ()); - + open.openWebpage(windows); - + } catch (URISyntaxException e) { // TODO Auto-generated catch block e.printStackTrace(); } - - + } }); menu.add(menuItem); - + JMenuItem menuItem_1 = new JMenuItem("OTRS"); menuItem_1.addMouseListener(new MouseAdapter() { @Override public void mousePressed(MouseEvent arg0) { OpenLinks open = new OpenLinks(); - + URI windows; try { windows = new URI(Links.getOTRS()); - + open.openWebpage(windows); - + } catch (URISyntaxException e) { // TODO Auto-generated catch block e.printStackTrace(); } - } }); menu.add(menuItem_1); - + JMenuItem mntmAbout = new JMenuItem("About"); mntmAbout.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { @@ -416,24 +416,28 @@ public class FTPEditUploader_GUI extends JFrame implements try { user = client.getFtpUser(); - System.out.println("FTP name" + user.userName); - System.out.println("FTP path" + user.path); - System.out.println("FTP 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(); JOptionPane.showMessageDialog(null, - e.getCause()+"\n"+e.getStackTrace(), - "Debug-Message", JOptionPane.ERROR_MESSAGE); + e.getCause() + "\n" + e.getStackTrace(), "Debug-Message", + JOptionPane.ERROR_MESSAGE); } DateFormat formatter = new SimpleDateFormat("yyyMMddhhmmss"); - + + System.out.println("Setting new Name: " + formatter.format(new Date()) + + "_" + person.verantwortlicher.getHochschule() + "_" + + person.verantwortlicher.getUsername() + "_" + + Image.image.getImagename() + ".vmdk"); Image.image.setNewName(formatter.format(new Date()) + "_" + person.verantwortlicher.getHochschule() + "_" + person.verantwortlicher.getUsername() + "_" - + Image.image.getImagename()+ ".vmdk"); + + Image.image.getImagename() + ".vmdk"); task = new UploadTask(host, port, user.userName, user.password, - user.path+"temp/", uploadFile); + user.path + "temp/", uploadFile); task.addPropertyChangeListener(this); task.execute(); @@ -445,7 +449,7 @@ public class FTPEditUploader_GUI extends JFrame implements if ("progress" == arg0.getPropertyName()) { progress = (Integer) arg0.getNewValue(); progressBar.setValue(progress); - + // Button zum Fertigstellen freischalten, wenn 100% erreicht sind if (progress == 100) { // not uploading currently @@ -463,8 +467,6 @@ public class FTPEditUploader_GUI extends JFrame implements } } - - if ("speed" == arg0.getPropertyName()) { speed = (double) arg0.getNewValue(); // if(speed<=1){ @@ -504,32 +506,36 @@ public class FTPEditUploader_GUI extends JFrame implements public boolean updateData() { try { - System.out.println("NewName="+Image.image.getNewName()); - System.out.println("OldName="+Image.image.getImagename()); - if(Image.image.getNewName()!=null){ + System.out.println("NewName=" + Image.image.getNewName()); + System.out.println("OldName=" + Image.image.getImagename()); + if (Image.image.getNewName() != null) { client.updateImageData(Image.image.getImagename(), - Image.image.getImagename(),Image.image.getDesc(),Image.image.getImagepath(), Image.image.isLicensed(), + Image.image.getImagename(), Image.image.getDesc(), + Image.image.getImagepath(), Image.image.isLicensed(), Image.image.isInternet(), Image.image.getRam(), Image.image.getCpu(), Image.image.getImageId(), - Image.image.getVersion(), Image.image.isVorlage(),Image.image.getFilesize(),Image.image.getShareMode(),Image.image.getOS()); + Image.image.getVersion(), Image.image.isVorlage(), + Image.image.getFilesize(), Image.image.getShareMode(), + Image.image.getOS()); + client.startFileCopy(Image.image.getNewName()); + } else { + + client.updateImageData(Image.image.getImagename(), + Image.image.getImagename(), Image.image.getDesc(), + "temp/" + Image.image.getNewName(), + Image.image.isLicensed(), Image.image.isInternet(), + Image.image.getRam(), Image.image.getCpu(), + Image.image.getImageId(), Image.image.getVersion(), + Image.image.isVorlage(), Image.image.getFilesize(), + Image.image.getShareMode(), Image.image.getOS()); client.startFileCopy(Image.image.getNewName()); - } - else{ - - - client.updateImageData(Image.image.getImagename(), - Image.image.getImagename(),Image.image.getDesc(),"temp/" + Image.image.getNewName(), Image.image.isLicensed(), - Image.image.isInternet(), Image.image.getRam(), - Image.image.getCpu(), Image.image.getImageId(), - Image.image.getVersion(), Image.image.isVorlage(),Image.image.getFilesize(),Image.image.getShareMode(),Image.image.getOS()); - client.startFileCopy(Image.image.getNewName()); } } catch (TException e) { // TODO Auto-generated catch block e.printStackTrace(); JOptionPane.showMessageDialog(null, - e.getCause()+"\n"+e.getStackTrace(), - "Debug-Message", JOptionPane.ERROR_MESSAGE); + e.getCause() + "\n" + e.getStackTrace(), "Debug-Message", + JOptionPane.ERROR_MESSAGE); return false; } return true; diff --git a/Dozentenmodul/src/gui/intro/Login_GUI.java b/Dozentenmodul/src/gui/intro/Login_GUI.java index 5104da02..a26b80c9 100644 --- a/Dozentenmodul/src/gui/intro/Login_GUI.java +++ b/Dozentenmodul/src/gui/intro/Login_GUI.java @@ -243,18 +243,18 @@ public class Login_GUI extends JFrame { // null package if (checkClientPackage() == true) { // package has information - System.out.println("Auth"); + System.out.println("Authentifiziere - warte auf Masterserver"); result = client.authenticate(lblusername.getText(), passText); - System.out.println("Succes Auth"); + System.out.println("Authentifizierung erfolgreich"); SessionData.session.setAuthToken(result.authToken); SessionData.session.setSessionID(result.sessionId); SessionData.session.setServerAdress(result.serverAddress); - System.out.println("Master"); + System.out.println("warte auf Masterserver"); // set connection to bwLehrpoolSuiteServer ThriftConnection bwthrift = new ThriftConnection(); server.Server.Client bwClient = bwthrift.getThriftConnection(); models.Client.clientcon.setClient(bwClient); - System.out.println("Client"); + System.out.println("Client macht weiter"); System.out.println("Session-ID: " + result.sessionId + "\nToken: " + result.authToken); @@ -266,7 +266,7 @@ public class Login_GUI extends JFrame { "Error: Token ist null", "Token defekt", JOptionPane.ERROR_MESSAGE); } - System.out.println("Hole jetzt Infos aus SessionData..."); + System.out.println("Arbeite ab jetzt mit Infos aus SessionData."); UserInfo user = client.getUserFromToken(SessionData.session .getAuthToken()); @@ -354,9 +354,9 @@ public class Login_GUI extends JFrame { "Anmeldung fehlgeschlagen", JOptionPane.ERROR_MESSAGE); e.printStackTrace(); - JOptionPane.showMessageDialog(null, - e.getCause() + "\n" + e.getMessage(), "Message", - JOptionPane.ERROR_MESSAGE); + //JOptionPane.showMessageDialog(null, + // e.getCause() + "\n" + e.getStackTrace(), "Message", + // JOptionPane.ERROR_MESSAGE); return; } catch (TException e) { // TODO Auto-generated catch block diff --git a/Dozentenmodul/src/gui/intro/MainMenue_GUI.java b/Dozentenmodul/src/gui/intro/MainMenue_GUI.java index 70c12319..52632ee5 100644 --- a/Dozentenmodul/src/gui/intro/MainMenue_GUI.java +++ b/Dozentenmodul/src/gui/intro/MainMenue_GUI.java @@ -71,6 +71,10 @@ public class MainMenue_GUI extends JFrame { * Create the dialog. */ public MainMenue_GUI() { + + //Leerzeile auf Konsole bei Rueckkehr ins Hauptmenue fuer leichteres Lesen + System.out.println("\n"); + addWindowListener(new WindowAdapter() { @Override public void windowClosing(WindowEvent arg0) { -- cgit v1.2.3-55-g7522