From 62e2f1b6e031753d9af83adb65683a6bdd5673e7 Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 30 Apr 2014 16:09:11 +0200 Subject: Untersuche das Update von Images, Name wird nicht korrekt übermittelt und Version nicht hochgezählt --- .../src/gui/image/EditImageAllgemein_GUI.java | 167 +++++++++++---------- 1 file changed, 91 insertions(+), 76 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 949aeed6..0c50cc2b 100644 --- a/Dozentenmodul/src/gui/image/EditImageAllgemein_GUI.java +++ b/Dozentenmodul/src/gui/image/EditImageAllgemein_GUI.java @@ -47,14 +47,14 @@ public class EditImageAllgemein_GUI extends JFrame { 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; + 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. @@ -63,14 +63,14 @@ public class EditImageAllgemein_GUI extends JFrame { addWindowListener(new WindowAdapter() { @Override public void windowClosing(WindowEvent arg0) { - //Beendet die Anwendung bei einem Klick auf das X + // Beendet die Anwendung bei einem Klick auf das X con.closeThriftConnection(); System.exit(0); } }); - //Verhindert das vergrößern des Fensters + // Verhindert das vergrößern des Fensters setResizable(false); - + try { UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName()); } catch (ClassNotFoundException | InstantiationException @@ -78,13 +78,13 @@ public class EditImageAllgemein_GUI extends JFrame { // TODO Auto-generated catch block e.printStackTrace(); } - //Setzt den Fenstertitel + // Setzt den Fenstertitel setTitle("bwLehrpool Suite *Prototyp* - Image bearbeiten"); - //Zentriert das Fenster in der Bildmitte + // Zentriert das Fenster in der Bildmitte Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize(); - int top=(screenSize.height - 722) / 2; - int left=(screenSize.width - 603) / 2; + int top = (screenSize.height - 722) / 2; + int left = (screenSize.width - 603) / 2; setBounds(left, top, 603, 722); initData(); getContentPane().setLayout(null); @@ -100,11 +100,12 @@ public class EditImageAllgemein_GUI extends JFrame { 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 + .setText("Geben Sie hier bitte einen sprechenden Imagename sowie Ihre Kontaktdaten an"); txtpnBitteWhlenSie.setBounds(10, 36, 509, 32); panel_2.add(txtpnBitteWhlenSie); } @@ -113,19 +114,20 @@ public class EditImageAllgemein_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.setEditable(false); Vorname.setEnabled(false); @@ -134,12 +136,12 @@ public class EditImageAllgemein_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); @@ -148,12 +150,12 @@ public class EditImageAllgemein_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); @@ -162,12 +164,12 @@ public class EditImageAllgemein_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); @@ -176,67 +178,70 @@ public class EditImageAllgemein_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.setToolTipText("Bitte geben Sie hier den Namen des Image ein, z.B. \"Programmieren\"."); + 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 + .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 + // 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(); + 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); @@ -250,83 +255,94 @@ public class EditImageAllgemein_GUI extends JFrame { 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()); + + // Setzen der Eingabe im Model, dadurch bleiben die + // Daten bei einem erneuten Aufruf verfügbar + // Image.image.setImagename(imagename.getText()); con.closeThriftConnection(); - SearchEditImage_GUI se=new SearchEditImage_GUI(); + SearchEditImage_GUI se = new SearchEditImage_GUI(); se.setVisible(true); dispose(); } }); backButton.setActionCommand("CANCEL"); buttonPane.add(backButton); - + } { okButton = new JButton("Weiter"); okButton.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent arg0) { - //check is textfield has content - if(imagename.getText().length() <= 0){ + // check is textfield is empty + if (imagename.getText().length() <= 0) { JOptionPane.showMessageDialog(null, - "Bitte geben Sie einen Labornamen ein.", - "Daten nicht vollständig", - JOptionPane.INFORMATION_MESSAGE); + "Bitte geben Sie einen Labornamen ein.", + "Daten nicht vollständig", + JOptionPane.INFORMATION_MESSAGE); + } else { + + // setze Namen, egal ob alt oder nicht Image.image.setNewName(imagename.getText()); + System.out.println("Changing name to:" + imagename.getText()+ "\nNewName is: "+Image.image.getNewName()); + con.closeThriftConnection(); - EditImageTechnisch_GUI ea=new EditImageTechnisch_GUI(); + EditImageTechnisch_GUI ea = new EditImageTechnisch_GUI(); ea.setVisible(true); dispose(); - }//end else + }// 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})); - + // 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(){ + + public void initData() { try { - - Map map=client.getImageData(Image.image.getImageId(),Image.image.getVersion()); - if(map.get("internet").equals("0")){ + + Map map = client.getImageData( + Image.image.getImageId(), Image.image.getVersion()); + if (map.get("internet").equals("0")) { Image.image.setInternet(false); - } - else - { + } else { Image.image.setInternet(true); } - if(map.get("license").equals("0")){ + if (map.get("license").equals("0")) { Image.image.setLicensed(false); - } - else{ + } else { Image.image.setLicensed(true); } Image.image.setImagename(map.get("name")); @@ -336,10 +352,9 @@ public class EditImageAllgemein_GUI extends JFrame { // TODO Auto-generated catch block e.printStackTrace(); JOptionPane.showMessageDialog(null, - e.getCause()+"\n"+e.getMessage(), - "Debug-Message", JOptionPane.ERROR_MESSAGE); + e.getCause() + "\n" + e.getMessage(), "Debug-Message", + JOptionPane.ERROR_MESSAGE); } } - } -- cgit v1.2.3-55-g7522 From f8479ea377b8a0baae5146dbe4af8933adc9cb74 Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 2 May 2014 13:13:25 +0200 Subject: Problem beim bearbeiten eines Image behoben. DB pk's auf UUID umgestellt --- Dozentenmodul/bin/Models/Image.class | Bin 1979 -> 2176 bytes .../bin/gui/image/FTPEditUploader_GUI.class | Bin 12324 -> 12438 bytes Dozentenmodul/bin/gui/intro/Login_GUI$1.class | Bin 1190 -> 1190 bytes Dozentenmodul/bin/gui/intro/Login_GUI$2.class | Bin 665 -> 665 bytes Dozentenmodul/bin/gui/intro/Login_GUI$4.class | Bin 677 -> 677 bytes Dozentenmodul/bin/gui/intro/Login_GUI.class | Bin 10551 -> 10551 bytes Dozentenmodul/bin/models/Image.class | Bin 1979 -> 2176 bytes Dozentenmodul/src/Models/Image.java | 8 + .../src/gui/image/EditImageAllgemein_GUI.java | 2 +- .../src/gui/image/FTPEditUploader_GUI.java | 6 +- Dozentenmodul/src/gui/intro/Login_GUI.java | 3 + Dozentenmodul/src/models/Image.java | 8 + .../Server$AsyncClient$DeleteFtpUser_call.class | Bin 3131 -> 3131 bytes .../bin/server/Server$AsyncClient$Factory.class | Bin 1442 -> 1442 bytes .../server/Server$AsyncClient$getAllOS_call.class | Bin 2993 -> 2993 bytes .../Server$AsyncClient$getFtpUser_call.class | Bin 2945 -> 2945 bytes .../Server$AsyncClient$getImageData_call.class | Bin 3332 -> 3332 bytes .../Server$AsyncClient$getImageList_call.class | Bin 3021 -> 3021 bytes .../Server$AsyncClient$getLectureData_call.class | Bin 3246 -> 3246 bytes .../Server$AsyncClient$getLectureList_call.class | Bin 3039 -> 3039 bytes .../Server$AsyncClient$getPathOfImage_call.class | Bin 3267 -> 3267 bytes .../Server$AsyncClient$getPersonData_call.class | Bin 3333 -> 3333 bytes .../Server$AsyncClient$startFileCopy_call.class | Bin 3131 -> 3131 bytes .../Server$AsyncClient$updateImageData_call.class | Bin 3863 -> 3971 bytes .../Server$AsyncClient$writeLecturedata_call.class | Bin 4508 -> 4508 bytes .../Server$AsyncClient$writeVLdata_call.class | Bin 4339 -> 4339 bytes .../bin/server/Server$AsyncClient.class | Bin 11231 -> 11292 bytes .../bin/server/Server$AsyncIface.class | Bin 2090 -> 2108 bytes .../Server$AsyncProcessor$DeleteFtpUser.class | Bin 3107 -> 3107 bytes .../server/Server$AsyncProcessor$getAllOS.class | Bin 3062 -> 3062 bytes .../server/Server$AsyncProcessor$getFtpUser.class | Bin 2996 -> 2996 bytes .../Server$AsyncProcessor$getImageData.class | Bin 3292 -> 3292 bytes .../Server$AsyncProcessor$getImageList.class | Bin 3098 -> 3098 bytes .../Server$AsyncProcessor$getLectureData.class | Bin 3275 -> 3275 bytes .../Server$AsyncProcessor$getLectureList.class | Bin 3132 -> 3132 bytes .../Server$AsyncProcessor$getPathOfImage.class | Bin 3174 -> 3174 bytes .../Server$AsyncProcessor$getPersonData.class | Bin 3301 -> 3301 bytes .../Server$AsyncProcessor$startFileCopy.class | Bin 3119 -> 3119 bytes .../Server$AsyncProcessor$updateImageData.class | Bin 3367 -> 3412 bytes .../Server$AsyncProcessor$writeLecturedata.class | Bin 3688 -> 3688 bytes .../server/Server$AsyncProcessor$writeVLdata.class | Bin 3530 -> 3530 bytes .../bin/server/Server$AsyncProcessor.class | Bin 3912 -> 3912 bytes Dozentenmodulserver/bin/server/Server$Client.class | Bin 20725 -> 20834 bytes ...ser_args$DeleteFtpUser_argsStandardScheme.class | Bin 2628 -> 2628 bytes ...s$DeleteFtpUser_argsStandardSchemeFactory.class | Bin 1162 -> 1162 bytes ...tpUser_args$DeleteFtpUser_argsTupleScheme.class | Bin 2112 -> 2112 bytes ...args$DeleteFtpUser_argsTupleSchemeFactory.class | Bin 1138 -> 1138 bytes .../server/Server$DeleteFtpUser_args$_Fields.class | Bin 3004 -> 3004 bytes .../bin/server/Server$DeleteFtpUser_args.class | Bin 9460 -> 9460 bytes ...result$DeleteFtpUser_resultStandardScheme.class | Bin 2632 -> 2632 bytes ...DeleteFtpUser_resultStandardSchemeFactory.class | Bin 1194 -> 1194 bytes ...er_result$DeleteFtpUser_resultTupleScheme.class | Bin 2088 -> 2088 bytes ...lt$DeleteFtpUser_resultTupleSchemeFactory.class | Bin 1170 -> 1170 bytes .../Server$DeleteFtpUser_result$_Fields.class | Bin 3030 -> 3030 bytes .../bin/server/Server$DeleteFtpUser_result.class | Bin 9823 -> 9823 bytes Dozentenmodulserver/bin/server/Server$Iface.class | Bin 2277 -> 2295 bytes .../server/Server$Processor$DeleteFtpUser.class | Bin 2029 -> 2029 bytes .../bin/server/Server$Processor$getAllOS.class | Bin 1875 -> 1875 bytes .../bin/server/Server$Processor$getFtpUser.class | Bin 1901 -> 1901 bytes .../bin/server/Server$Processor$getImageData.class | Bin 2047 -> 2047 bytes .../bin/server/Server$Processor$getImageList.class | Bin 1939 -> 1939 bytes .../server/Server$Processor$getLectureData.class | Bin 2036 -> 2036 bytes .../server/Server$Processor$getLectureList.class | Bin 1971 -> 1971 bytes .../server/Server$Processor$getPathOfImage.class | Bin 2060 -> 2060 bytes .../server/Server$Processor$getPersonData.class | Bin 2059 -> 2059 bytes .../server/Server$Processor$startFileCopy.class | Bin 2029 -> 2029 bytes .../server/Server$Processor$updateImageData.class | Bin 2279 -> 2324 bytes .../server/Server$Processor$writeLecturedata.class | Bin 2603 -> 2603 bytes .../bin/server/Server$Processor$writeVLdata.class | Bin 2430 -> 2430 bytes .../bin/server/Server$Processor.class | Bin 3715 -> 3715 bytes .../bin/server/Server$getAllOS_args$_Fields.class | Bin 2848 -> 2848 bytes ...getAllOS_args$getAllOS_argsStandardScheme.class | Bin 2153 -> 2153 bytes ...S_args$getAllOS_argsStandardSchemeFactory.class | Bin 1082 -> 1082 bytes ...er$getAllOS_args$getAllOS_argsTupleScheme.class | Bin 1463 -> 1463 bytes ...llOS_args$getAllOS_argsTupleSchemeFactory.class | Bin 1058 -> 1058 bytes .../bin/server/Server$getAllOS_args.class | Bin 7328 -> 7328 bytes .../server/Server$getAllOS_result$_Fields.class | Bin 2980 -> 2980 bytes ...llOS_result$getAllOS_resultStandardScheme.class | Bin 3464 -> 3464 bytes ...sult$getAllOS_resultStandardSchemeFactory.class | Bin 1114 -> 1114 bytes ...etAllOS_result$getAllOS_resultTupleScheme.class | Bin 2849 -> 2849 bytes ..._result$getAllOS_resultTupleSchemeFactory.class | Bin 1090 -> 1090 bytes .../bin/server/Server$getAllOS_result.class | Bin 10548 -> 10548 bytes .../server/Server$getFtpUser_args$_Fields.class | Bin 2868 -> 2868 bytes ...tpUser_args$getFtpUser_argsStandardScheme.class | Bin 2177 -> 2177 bytes ...args$getFtpUser_argsStandardSchemeFactory.class | Bin 1114 -> 1114 bytes ...etFtpUser_args$getFtpUser_argsTupleScheme.class | Bin 1487 -> 1487 bytes ...er_args$getFtpUser_argsTupleSchemeFactory.class | Bin 1090 -> 1090 bytes .../bin/server/Server$getFtpUser_args.class | Bin 7400 -> 7400 bytes .../server/Server$getFtpUser_result$_Fields.class | Bin 3000 -> 3000 bytes ...er_result$getFtpUser_resultStandardScheme.class | Bin 2624 -> 2624 bytes ...lt$getFtpUser_resultStandardSchemeFactory.class | Bin 1146 -> 1146 bytes ...pUser_result$getFtpUser_resultTupleScheme.class | Bin 2111 -> 2111 bytes ...esult$getFtpUser_resultTupleSchemeFactory.class | Bin 1122 -> 1122 bytes .../bin/server/Server$getFtpUser_result.class | Bin 9665 -> 9665 bytes .../server/Server$getImageData_args$_Fields.class | Bin 3094 -> 3094 bytes ...Data_args$getImageData_argsStandardScheme.class | Bin 2811 -> 2811 bytes ...gs$getImageData_argsStandardSchemeFactory.class | Bin 1146 -> 1146 bytes ...ageData_args$getImageData_argsTupleScheme.class | Bin 2278 -> 2278 bytes ..._args$getImageData_argsTupleSchemeFactory.class | Bin 1122 -> 1122 bytes .../bin/server/Server$getImageData_args.class | Bin 10767 -> 10767 bytes .../Server$getImageData_result$_Fields.class | Bin 3020 -> 3020 bytes ..._result$getImageData_resultStandardScheme.class | Bin 3869 -> 3869 bytes ...$getImageData_resultStandardSchemeFactory.class | Bin 1178 -> 1178 bytes ...ata_result$getImageData_resultTupleScheme.class | Bin 3261 -> 3261 bytes ...ult$getImageData_resultTupleSchemeFactory.class | Bin 1154 -> 1154 bytes .../bin/server/Server$getImageData_result.class | Bin 10534 -> 10534 bytes .../server/Server$getImageList_args$_Fields.class | Bin 2888 -> 2888 bytes ...List_args$getImageList_argsStandardScheme.class | Bin 2201 -> 2201 bytes ...gs$getImageList_argsStandardSchemeFactory.class | Bin 1146 -> 1146 bytes ...ageList_args$getImageList_argsTupleScheme.class | Bin 1511 -> 1511 bytes ..._args$getImageList_argsTupleSchemeFactory.class | Bin 1122 -> 1122 bytes .../bin/server/Server$getImageList_args.class | Bin 7472 -> 7472 bytes .../Server$getImageList_result$_Fields.class | Bin 3020 -> 3020 bytes ..._result$getImageList_resultStandardScheme.class | Bin 3488 -> 3488 bytes ...$getImageList_resultStandardSchemeFactory.class | Bin 1178 -> 1178 bytes ...ist_result$getImageList_resultTupleScheme.class | Bin 2873 -> 2873 bytes ...ult$getImageList_resultTupleSchemeFactory.class | Bin 1154 -> 1154 bytes .../bin/server/Server$getImageList_result.class | Bin 10892 -> 10892 bytes .../Server$getLectureData_args$_Fields.class | Bin 3028 -> 3028 bytes ...ta_args$getLectureData_argsStandardScheme.class | Bin 2654 -> 2654 bytes ...$getLectureData_argsStandardSchemeFactory.class | Bin 1178 -> 1178 bytes ...eData_args$getLectureData_argsTupleScheme.class | Bin 2145 -> 2145 bytes ...rgs$getLectureData_argsTupleSchemeFactory.class | Bin 1154 -> 1154 bytes .../bin/server/Server$getLectureData_args.class | Bin 9574 -> 9574 bytes .../Server$getLectureData_result$_Fields.class | Bin 3040 -> 3040 bytes ...esult$getLectureData_resultStandardScheme.class | Bin 3893 -> 3893 bytes ...etLectureData_resultStandardSchemeFactory.class | Bin 1210 -> 1210 bytes ...a_result$getLectureData_resultTupleScheme.class | Bin 3285 -> 3285 bytes ...t$getLectureData_resultTupleSchemeFactory.class | Bin 1186 -> 1186 bytes .../bin/server/Server$getLectureData_result.class | Bin 10610 -> 10610 bytes .../Server$getLectureList_args$_Fields.class | Bin 2908 -> 2908 bytes ...st_args$getLectureList_argsStandardScheme.class | Bin 2225 -> 2225 bytes ...$getLectureList_argsStandardSchemeFactory.class | Bin 1178 -> 1178 bytes ...eList_args$getLectureList_argsTupleScheme.class | Bin 1535 -> 1535 bytes ...rgs$getLectureList_argsTupleSchemeFactory.class | Bin 1154 -> 1154 bytes .../bin/server/Server$getLectureList_args.class | Bin 7544 -> 7544 bytes .../Server$getLectureList_result$_Fields.class | Bin 3040 -> 3040 bytes ...esult$getLectureList_resultStandardScheme.class | Bin 3518 -> 3518 bytes ...etLectureList_resultStandardSchemeFactory.class | Bin 1210 -> 1210 bytes ...t_result$getLectureList_resultTupleScheme.class | Bin 2905 -> 2905 bytes ...t$getLectureList_resultTupleSchemeFactory.class | Bin 1186 -> 1186 bytes .../bin/server/Server$getLectureList_result.class | Bin 10984 -> 10984 bytes .../Server$getPathOfImage_args$_Fields.class | Bin 3106 -> 3106 bytes ...ge_args$getPathOfImage_argsStandardScheme.class | Bin 2827 -> 2827 bytes ...$getPathOfImage_argsStandardSchemeFactory.class | Bin 1178 -> 1178 bytes ...Image_args$getPathOfImage_argsTupleScheme.class | Bin 2290 -> 2290 bytes ...rgs$getPathOfImage_argsTupleSchemeFactory.class | Bin 1154 -> 1154 bytes .../bin/server/Server$getPathOfImage_args.class | Bin 10797 -> 10797 bytes .../Server$getPathOfImage_result$_Fields.class | Bin 3040 -> 3040 bytes ...esult$getPathOfImage_resultStandardScheme.class | Bin 2670 -> 2670 bytes ...etPathOfImage_resultStandardSchemeFactory.class | Bin 1210 -> 1210 bytes ...e_result$getPathOfImage_resultTupleScheme.class | Bin 2157 -> 2157 bytes ...t$getPathOfImage_resultTupleSchemeFactory.class | Bin 1186 -> 1186 bytes .../bin/server/Server$getPathOfImage_result.class | Bin 9604 -> 9604 bytes .../server/Server$getPersonData_args$_Fields.class | Bin 3096 -> 3096 bytes ...ata_args$getPersonData_argsStandardScheme.class | Bin 2815 -> 2815 bytes ...s$getPersonData_argsStandardSchemeFactory.class | Bin 1162 -> 1162 bytes ...onData_args$getPersonData_argsTupleScheme.class | Bin 2278 -> 2278 bytes ...args$getPersonData_argsTupleSchemeFactory.class | Bin 1138 -> 1138 bytes .../bin/server/Server$getPersonData_args.class | Bin 10760 -> 10760 bytes .../Server$getPersonData_result$_Fields.class | Bin 3030 -> 3030 bytes ...result$getPersonData_resultStandardScheme.class | Bin 3881 -> 3881 bytes ...getPersonData_resultStandardSchemeFactory.class | Bin 1194 -> 1194 bytes ...ta_result$getPersonData_resultTupleScheme.class | Bin 3273 -> 3273 bytes ...lt$getPersonData_resultTupleSchemeFactory.class | Bin 1170 -> 1170 bytes .../bin/server/Server$getPersonData_result.class | Bin 10572 -> 10572 bytes .../server/Server$startFileCopy_args$_Fields.class | Bin 3004 -> 3004 bytes ...opy_args$startFileCopy_argsStandardScheme.class | Bin 2628 -> 2628 bytes ...s$startFileCopy_argsStandardSchemeFactory.class | Bin 1162 -> 1162 bytes ...leCopy_args$startFileCopy_argsTupleScheme.class | Bin 2112 -> 2112 bytes ...args$startFileCopy_argsTupleSchemeFactory.class | Bin 1138 -> 1138 bytes .../bin/server/Server$startFileCopy_args.class | Bin 9460 -> 9460 bytes .../Server$startFileCopy_result$_Fields.class | Bin 3030 -> 3030 bytes ...result$startFileCopy_resultStandardScheme.class | Bin 2620 -> 2620 bytes ...startFileCopy_resultStandardSchemeFactory.class | Bin 1194 -> 1194 bytes ...py_result$startFileCopy_resultTupleScheme.class | Bin 2077 -> 2077 bytes ...lt$startFileCopy_resultTupleSchemeFactory.class | Bin 1170 -> 1170 bytes .../bin/server/Server$startFileCopy_result.class | Bin 9724 -> 9724 bytes .../Server$updateImageData_args$_Fields.class | Bin 3587 -> 3679 bytes ...a_args$updateImageData_argsStandardScheme.class | Bin 3944 -> 4130 bytes ...updateImageData_argsStandardSchemeFactory.class | Bin 1194 -> 1194 bytes ...Data_args$updateImageData_argsTupleScheme.class | Bin 3289 -> 3454 bytes ...gs$updateImageData_argsTupleSchemeFactory.class | Bin 1170 -> 1170 bytes .../bin/server/Server$updateImageData_args.class | Bin 18468 -> 19726 bytes .../Server$updateImageData_result$_Fields.class | Bin 3050 -> 3050 bytes ...sult$updateImageData_resultStandardScheme.class | Bin 2644 -> 2644 bytes ...dateImageData_resultStandardSchemeFactory.class | Bin 1226 -> 1226 bytes ..._result$updateImageData_resultTupleScheme.class | Bin 2101 -> 2101 bytes ...$updateImageData_resultTupleSchemeFactory.class | Bin 1202 -> 1202 bytes .../bin/server/Server$updateImageData_result.class | Bin 9798 -> 9798 bytes .../Server$writeLecturedata_args$_Fields.class | Bin 4135 -> 4135 bytes ..._args$writeLecturedata_argsStandardScheme.class | Bin 5038 -> 5038 bytes ...riteLecturedata_argsStandardSchemeFactory.class | Bin 1210 -> 1210 bytes ...ata_args$writeLecturedata_argsTupleScheme.class | Bin 4206 -> 4206 bytes ...s$writeLecturedata_argsTupleSchemeFactory.class | Bin 1186 -> 1186 bytes .../bin/server/Server$writeLecturedata_args.class | Bin 25807 -> 25807 bytes .../Server$writeLecturedata_result$_Fields.class | Bin 3060 -> 3060 bytes ...ult$writeLecturedata_resultStandardScheme.class | Bin 2656 -> 2656 bytes ...teLecturedata_resultStandardSchemeFactory.class | Bin 1242 -> 1242 bytes ...result$writeLecturedata_resultTupleScheme.class | Bin 2113 -> 2113 bytes ...writeLecturedata_resultTupleSchemeFactory.class | Bin 1218 -> 1218 bytes .../server/Server$writeLecturedata_result.class | Bin 9835 -> 9835 bytes .../server/Server$writeVLdata_args$_Fields.class | Bin 3996 -> 3996 bytes ...Ldata_args$writeVLdata_argsStandardScheme.class | Bin 4813 -> 4813 bytes ...rgs$writeVLdata_argsStandardSchemeFactory.class | Bin 1130 -> 1130 bytes ...teVLdata_args$writeVLdata_argsTupleScheme.class | Bin 4036 -> 4036 bytes ...a_args$writeVLdata_argsTupleSchemeFactory.class | Bin 1106 -> 1106 bytes .../bin/server/Server$writeVLdata_args.class | Bin 24513 -> 24513 bytes .../server/Server$writeVLdata_result$_Fields.class | Bin 3010 -> 3010 bytes ...a_result$writeVLdata_resultStandardScheme.class | Bin 2596 -> 2596 bytes ...t$writeVLdata_resultStandardSchemeFactory.class | Bin 1162 -> 1162 bytes ...data_result$writeVLdata_resultTupleScheme.class | Bin 2053 -> 2053 bytes ...sult$writeVLdata_resultTupleSchemeFactory.class | Bin 1138 -> 1138 bytes .../bin/server/Server$writeVLdata_result.class | Bin 9650 -> 9650 bytes Dozentenmodulserver/bin/server/ServerHandler.class | Bin 14741 -> 14948 bytes Dozentenmodulserver/bin/sql/SQL.class | Bin 17876 -> 18003 bytes Dozentenmodulserver/src/server/Server.java | 198 ++++++++++++++++----- Dozentenmodulserver/src/server/ServerHandler.java | 16 +- Dozentenmodulserver/src/sql/SQL.java | 46 ++--- Dozentenmodulserver/thrift/server.thrift | 2 +- 220 files changed, 210 insertions(+), 79 deletions(-) (limited to 'Dozentenmodul/src/gui/image/EditImageAllgemein_GUI.java') diff --git a/Dozentenmodul/bin/Models/Image.class b/Dozentenmodul/bin/Models/Image.class index 4c70ef81..92835598 100644 Binary files a/Dozentenmodul/bin/Models/Image.class and b/Dozentenmodul/bin/Models/Image.class differ diff --git a/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI.class b/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI.class index 8a8771d9..5f49649b 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$1.class b/Dozentenmodul/bin/gui/intro/Login_GUI$1.class index 780e5fd1..0f948630 100644 Binary files a/Dozentenmodul/bin/gui/intro/Login_GUI$1.class and b/Dozentenmodul/bin/gui/intro/Login_GUI$1.class differ diff --git a/Dozentenmodul/bin/gui/intro/Login_GUI$2.class b/Dozentenmodul/bin/gui/intro/Login_GUI$2.class index 6ecad17e..37d3827f 100644 Binary files a/Dozentenmodul/bin/gui/intro/Login_GUI$2.class and b/Dozentenmodul/bin/gui/intro/Login_GUI$2.class differ diff --git a/Dozentenmodul/bin/gui/intro/Login_GUI$4.class b/Dozentenmodul/bin/gui/intro/Login_GUI$4.class index 6ff76a07..50bac1aa 100644 Binary files a/Dozentenmodul/bin/gui/intro/Login_GUI$4.class and b/Dozentenmodul/bin/gui/intro/Login_GUI$4.class differ diff --git a/Dozentenmodul/bin/gui/intro/Login_GUI.class b/Dozentenmodul/bin/gui/intro/Login_GUI.class index 73bacfd2..e45c4bb5 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/models/Image.class b/Dozentenmodul/bin/models/Image.class index 4c70ef81..92835598 100644 Binary files a/Dozentenmodul/bin/models/Image.class and b/Dozentenmodul/bin/models/Image.class differ diff --git a/Dozentenmodul/src/Models/Image.java b/Dozentenmodul/src/Models/Image.java index cdc8264c..33a9a558 100644 --- a/Dozentenmodul/src/Models/Image.java +++ b/Dozentenmodul/src/Models/Image.java @@ -6,6 +6,7 @@ public class Image { private String imagename; private String newName; + private String imagepath; private boolean licensed; private boolean internet; private int ram; @@ -13,6 +14,13 @@ public class Image { public static Image image =new Image(); + + public String getImagepath() { + return imagepath; + } + public void setImagepath(String imagepath) { + this.imagepath = imagepath; + } public String getImagename() { return imagename; } diff --git a/Dozentenmodul/src/gui/image/EditImageAllgemein_GUI.java b/Dozentenmodul/src/gui/image/EditImageAllgemein_GUI.java index 0c50cc2b..da3a29e4 100644 --- a/Dozentenmodul/src/gui/image/EditImageAllgemein_GUI.java +++ b/Dozentenmodul/src/gui/image/EditImageAllgemein_GUI.java @@ -283,7 +283,7 @@ public class EditImageAllgemein_GUI extends JFrame { } else { // setze Namen, egal ob alt oder nicht - Image.image.setNewName(imagename.getText()); + Image.image.setImagename(imagename.getText()); System.out.println("Changing name to:" + imagename.getText()+ "\nNewName is: "+Image.image.getNewName()); con.closeThriftConnection(); diff --git a/Dozentenmodul/src/gui/image/FTPEditUploader_GUI.java b/Dozentenmodul/src/gui/image/FTPEditUploader_GUI.java index 8d14458a..ebeec090 100644 --- a/Dozentenmodul/src/gui/image/FTPEditUploader_GUI.java +++ b/Dozentenmodul/src/gui/image/FTPEditUploader_GUI.java @@ -392,10 +392,11 @@ public class FTPEditUploader_GUI extends JFrame implements "Debug-Message", JOptionPane.ERROR_MESSAGE); } DateFormat formatter = new SimpleDateFormat("yyyMMddhhmmss"); + 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, uploadFile); @@ -469,8 +470,9 @@ public class FTPEditUploader_GUI extends JFrame implements try { System.out.println("NewName="+Image.image.getNewName()); + System.out.println("OldName="+Image.image.getImagename()); client.updateImageData(Image.image.getImagename(), - Image.image.getNewName(), Image.image.isLicensed(), + Image.image.getImagename(),"/srv/openslx/nfs/temp/" + Image.image.getNewName(), Image.image.isLicensed(), Image.image.isInternet(), Image.image.getRam(), Image.image.getCpu(), Image.image.getImageId(), Image.image.getVersion()); diff --git a/Dozentenmodul/src/gui/intro/Login_GUI.java b/Dozentenmodul/src/gui/intro/Login_GUI.java index 019a2ec7..3d882da0 100644 --- a/Dozentenmodul/src/gui/intro/Login_GUI.java +++ b/Dozentenmodul/src/gui/intro/Login_GUI.java @@ -12,6 +12,8 @@ import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; import java.io.File; import java.io.IOException; +import java.util.UUID; + import javax.swing.ImageIcon; import javax.swing.JButton; import javax.swing.JFrame; @@ -89,6 +91,7 @@ public class Login_GUI extends JFrame { // Fenster darf nicht vergrößert werden setResizable(false); + try { // Setzt das Look and Feel auf System UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName()); diff --git a/Dozentenmodul/src/models/Image.java b/Dozentenmodul/src/models/Image.java index cdc8264c..33a9a558 100644 --- a/Dozentenmodul/src/models/Image.java +++ b/Dozentenmodul/src/models/Image.java @@ -6,6 +6,7 @@ public class Image { private String imagename; private String newName; + private String imagepath; private boolean licensed; private boolean internet; private int ram; @@ -13,6 +14,13 @@ public class Image { public static Image image =new Image(); + + public String getImagepath() { + return imagepath; + } + public void setImagepath(String imagepath) { + this.imagepath = imagepath; + } public String getImagename() { return imagename; } diff --git a/Dozentenmodulserver/bin/server/Server$AsyncClient$DeleteFtpUser_call.class b/Dozentenmodulserver/bin/server/Server$AsyncClient$DeleteFtpUser_call.class index 99096196..2a703edb 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncClient$DeleteFtpUser_call.class and b/Dozentenmodulserver/bin/server/Server$AsyncClient$DeleteFtpUser_call.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncClient$Factory.class b/Dozentenmodulserver/bin/server/Server$AsyncClient$Factory.class index 3b5b8668..58b8e2a2 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncClient$Factory.class and b/Dozentenmodulserver/bin/server/Server$AsyncClient$Factory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncClient$getAllOS_call.class b/Dozentenmodulserver/bin/server/Server$AsyncClient$getAllOS_call.class index 163327ae..a00ad055 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncClient$getAllOS_call.class and b/Dozentenmodulserver/bin/server/Server$AsyncClient$getAllOS_call.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncClient$getFtpUser_call.class b/Dozentenmodulserver/bin/server/Server$AsyncClient$getFtpUser_call.class index 16e030a5..0b92f799 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncClient$getFtpUser_call.class and b/Dozentenmodulserver/bin/server/Server$AsyncClient$getFtpUser_call.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncClient$getImageData_call.class b/Dozentenmodulserver/bin/server/Server$AsyncClient$getImageData_call.class index 1a845e78..d55d1e7b 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncClient$getImageData_call.class and b/Dozentenmodulserver/bin/server/Server$AsyncClient$getImageData_call.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncClient$getImageList_call.class b/Dozentenmodulserver/bin/server/Server$AsyncClient$getImageList_call.class index 5ae1d472..6e35a446 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncClient$getImageList_call.class and b/Dozentenmodulserver/bin/server/Server$AsyncClient$getImageList_call.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncClient$getLectureData_call.class b/Dozentenmodulserver/bin/server/Server$AsyncClient$getLectureData_call.class index ceba873e..94b45f21 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncClient$getLectureData_call.class and b/Dozentenmodulserver/bin/server/Server$AsyncClient$getLectureData_call.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncClient$getLectureList_call.class b/Dozentenmodulserver/bin/server/Server$AsyncClient$getLectureList_call.class index 74627ae1..1582e9cf 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncClient$getLectureList_call.class and b/Dozentenmodulserver/bin/server/Server$AsyncClient$getLectureList_call.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncClient$getPathOfImage_call.class b/Dozentenmodulserver/bin/server/Server$AsyncClient$getPathOfImage_call.class index 0be04673..d775783a 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncClient$getPathOfImage_call.class and b/Dozentenmodulserver/bin/server/Server$AsyncClient$getPathOfImage_call.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncClient$getPersonData_call.class b/Dozentenmodulserver/bin/server/Server$AsyncClient$getPersonData_call.class index 3001a150..ffdbbb75 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncClient$getPersonData_call.class and b/Dozentenmodulserver/bin/server/Server$AsyncClient$getPersonData_call.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncClient$startFileCopy_call.class b/Dozentenmodulserver/bin/server/Server$AsyncClient$startFileCopy_call.class index 3c51c321..490d4b24 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncClient$startFileCopy_call.class and b/Dozentenmodulserver/bin/server/Server$AsyncClient$startFileCopy_call.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncClient$updateImageData_call.class b/Dozentenmodulserver/bin/server/Server$AsyncClient$updateImageData_call.class index e7cd737a..aa0ee7f2 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncClient$updateImageData_call.class and b/Dozentenmodulserver/bin/server/Server$AsyncClient$updateImageData_call.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncClient$writeLecturedata_call.class b/Dozentenmodulserver/bin/server/Server$AsyncClient$writeLecturedata_call.class index 1cb6760d..45b79054 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncClient$writeLecturedata_call.class and b/Dozentenmodulserver/bin/server/Server$AsyncClient$writeLecturedata_call.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncClient$writeVLdata_call.class b/Dozentenmodulserver/bin/server/Server$AsyncClient$writeVLdata_call.class index 2e5b048d..b1cd5368 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncClient$writeVLdata_call.class and b/Dozentenmodulserver/bin/server/Server$AsyncClient$writeVLdata_call.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncClient.class b/Dozentenmodulserver/bin/server/Server$AsyncClient.class index 41cbbca6..f603e376 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncClient.class and b/Dozentenmodulserver/bin/server/Server$AsyncClient.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncIface.class b/Dozentenmodulserver/bin/server/Server$AsyncIface.class index 6c6287fb..1046d036 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncIface.class and b/Dozentenmodulserver/bin/server/Server$AsyncIface.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$DeleteFtpUser.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$DeleteFtpUser.class index 7c95b3bb..1e153a8e 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$DeleteFtpUser.class and b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$DeleteFtpUser.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getAllOS.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getAllOS.class index 89773d07..2158cc02 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getAllOS.class and b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getAllOS.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getFtpUser.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getFtpUser.class index 2c388ded..5ad37c7a 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getFtpUser.class and b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getFtpUser.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getImageData.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getImageData.class index a8c3bbb0..82b35bd0 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getImageData.class and b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getImageData.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getImageList.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getImageList.class index b5bb26ef..5f228647 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getImageList.class and b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getImageList.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getLectureData.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getLectureData.class index 6a04fe4d..917aa711 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getLectureData.class and b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getLectureData.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getLectureList.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getLectureList.class index 417280c4..c5dc6a1e 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getLectureList.class and b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getLectureList.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getPathOfImage.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getPathOfImage.class index c53fb59b..70f7c93d 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getPathOfImage.class and b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getPathOfImage.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getPersonData.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getPersonData.class index 5466d4f3..bc394167 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getPersonData.class and b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$getPersonData.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$startFileCopy.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$startFileCopy.class index b7a6d45b..78d4e3a4 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$startFileCopy.class and b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$startFileCopy.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$updateImageData.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$updateImageData.class index d014f3c5..4fdb102b 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$updateImageData.class and b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$updateImageData.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$writeLecturedata.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$writeLecturedata.class index e3b0ee41..c32910b4 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$writeLecturedata.class and b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$writeLecturedata.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$writeVLdata.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$writeVLdata.class index 1e2046d1..abbece84 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncProcessor$writeVLdata.class and b/Dozentenmodulserver/bin/server/Server$AsyncProcessor$writeVLdata.class differ diff --git a/Dozentenmodulserver/bin/server/Server$AsyncProcessor.class b/Dozentenmodulserver/bin/server/Server$AsyncProcessor.class index f1ecd262..41ee8a64 100644 Binary files a/Dozentenmodulserver/bin/server/Server$AsyncProcessor.class and b/Dozentenmodulserver/bin/server/Server$AsyncProcessor.class differ diff --git a/Dozentenmodulserver/bin/server/Server$Client.class b/Dozentenmodulserver/bin/server/Server$Client.class index f9fd387f..2fcaf9de 100644 Binary files a/Dozentenmodulserver/bin/server/Server$Client.class and b/Dozentenmodulserver/bin/server/Server$Client.class differ diff --git a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$DeleteFtpUser_argsStandardScheme.class b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$DeleteFtpUser_argsStandardScheme.class index d5b7e725..d5eff44a 100644 Binary files a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$DeleteFtpUser_argsStandardScheme.class and b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$DeleteFtpUser_argsStandardScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$DeleteFtpUser_argsStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$DeleteFtpUser_argsStandardSchemeFactory.class index 121d6e06..20abf97b 100644 Binary files a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$DeleteFtpUser_argsStandardSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$DeleteFtpUser_argsStandardSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$DeleteFtpUser_argsTupleScheme.class b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$DeleteFtpUser_argsTupleScheme.class index 338099bb..de602e7c 100644 Binary files a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$DeleteFtpUser_argsTupleScheme.class and b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$DeleteFtpUser_argsTupleScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$DeleteFtpUser_argsTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$DeleteFtpUser_argsTupleSchemeFactory.class index 556eaf30..89c7e1a8 100644 Binary files a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$DeleteFtpUser_argsTupleSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$DeleteFtpUser_argsTupleSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$_Fields.class b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$_Fields.class index 27d37445..6bc97bee 100644 Binary files a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$_Fields.class and b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args$_Fields.class differ diff --git a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args.class b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args.class index 931447a4..5ad75395 100644 Binary files a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args.class and b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_args.class differ diff --git a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$DeleteFtpUser_resultStandardScheme.class b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$DeleteFtpUser_resultStandardScheme.class index cf9dbfe6..b768c50c 100644 Binary files a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$DeleteFtpUser_resultStandardScheme.class and b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$DeleteFtpUser_resultStandardScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$DeleteFtpUser_resultStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$DeleteFtpUser_resultStandardSchemeFactory.class index 2cd9e584..95ac9ed7 100644 Binary files a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$DeleteFtpUser_resultStandardSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$DeleteFtpUser_resultStandardSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$DeleteFtpUser_resultTupleScheme.class b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$DeleteFtpUser_resultTupleScheme.class index cdc8aad4..a661e9be 100644 Binary files a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$DeleteFtpUser_resultTupleScheme.class and b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$DeleteFtpUser_resultTupleScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$DeleteFtpUser_resultTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$DeleteFtpUser_resultTupleSchemeFactory.class index 11b43a51..e152687f 100644 Binary files a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$DeleteFtpUser_resultTupleSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$DeleteFtpUser_resultTupleSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$_Fields.class b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$_Fields.class index cb92fd55..c9b8cc91 100644 Binary files a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$_Fields.class and b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result$_Fields.class differ diff --git a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result.class b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result.class index e018e4fe..157e733b 100644 Binary files a/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result.class and b/Dozentenmodulserver/bin/server/Server$DeleteFtpUser_result.class differ diff --git a/Dozentenmodulserver/bin/server/Server$Iface.class b/Dozentenmodulserver/bin/server/Server$Iface.class index eb28aad2..05f32cf6 100644 Binary files a/Dozentenmodulserver/bin/server/Server$Iface.class and b/Dozentenmodulserver/bin/server/Server$Iface.class differ diff --git a/Dozentenmodulserver/bin/server/Server$Processor$DeleteFtpUser.class b/Dozentenmodulserver/bin/server/Server$Processor$DeleteFtpUser.class index 2de7e60c..21cd4f4f 100644 Binary files a/Dozentenmodulserver/bin/server/Server$Processor$DeleteFtpUser.class and b/Dozentenmodulserver/bin/server/Server$Processor$DeleteFtpUser.class differ diff --git a/Dozentenmodulserver/bin/server/Server$Processor$getAllOS.class b/Dozentenmodulserver/bin/server/Server$Processor$getAllOS.class index eabd6d26..97cbbb30 100644 Binary files a/Dozentenmodulserver/bin/server/Server$Processor$getAllOS.class and b/Dozentenmodulserver/bin/server/Server$Processor$getAllOS.class differ diff --git a/Dozentenmodulserver/bin/server/Server$Processor$getFtpUser.class b/Dozentenmodulserver/bin/server/Server$Processor$getFtpUser.class index 9977b3e0..8f67dcad 100644 Binary files a/Dozentenmodulserver/bin/server/Server$Processor$getFtpUser.class and b/Dozentenmodulserver/bin/server/Server$Processor$getFtpUser.class differ diff --git a/Dozentenmodulserver/bin/server/Server$Processor$getImageData.class b/Dozentenmodulserver/bin/server/Server$Processor$getImageData.class index 5de255e4..165dd64f 100644 Binary files a/Dozentenmodulserver/bin/server/Server$Processor$getImageData.class and b/Dozentenmodulserver/bin/server/Server$Processor$getImageData.class differ diff --git a/Dozentenmodulserver/bin/server/Server$Processor$getImageList.class b/Dozentenmodulserver/bin/server/Server$Processor$getImageList.class index 7fb5e299..5d3308ab 100644 Binary files a/Dozentenmodulserver/bin/server/Server$Processor$getImageList.class and b/Dozentenmodulserver/bin/server/Server$Processor$getImageList.class differ diff --git a/Dozentenmodulserver/bin/server/Server$Processor$getLectureData.class b/Dozentenmodulserver/bin/server/Server$Processor$getLectureData.class index 9a02fded..e84c352c 100644 Binary files a/Dozentenmodulserver/bin/server/Server$Processor$getLectureData.class and b/Dozentenmodulserver/bin/server/Server$Processor$getLectureData.class differ diff --git a/Dozentenmodulserver/bin/server/Server$Processor$getLectureList.class b/Dozentenmodulserver/bin/server/Server$Processor$getLectureList.class index 4dabdb80..fc399367 100644 Binary files a/Dozentenmodulserver/bin/server/Server$Processor$getLectureList.class and b/Dozentenmodulserver/bin/server/Server$Processor$getLectureList.class differ diff --git a/Dozentenmodulserver/bin/server/Server$Processor$getPathOfImage.class b/Dozentenmodulserver/bin/server/Server$Processor$getPathOfImage.class index a82e786f..d3d036d7 100644 Binary files a/Dozentenmodulserver/bin/server/Server$Processor$getPathOfImage.class and b/Dozentenmodulserver/bin/server/Server$Processor$getPathOfImage.class differ diff --git a/Dozentenmodulserver/bin/server/Server$Processor$getPersonData.class b/Dozentenmodulserver/bin/server/Server$Processor$getPersonData.class index 5ef9d012..0541fe06 100644 Binary files a/Dozentenmodulserver/bin/server/Server$Processor$getPersonData.class and b/Dozentenmodulserver/bin/server/Server$Processor$getPersonData.class differ diff --git a/Dozentenmodulserver/bin/server/Server$Processor$startFileCopy.class b/Dozentenmodulserver/bin/server/Server$Processor$startFileCopy.class index 03413b9a..34bfeaa8 100644 Binary files a/Dozentenmodulserver/bin/server/Server$Processor$startFileCopy.class and b/Dozentenmodulserver/bin/server/Server$Processor$startFileCopy.class differ diff --git a/Dozentenmodulserver/bin/server/Server$Processor$updateImageData.class b/Dozentenmodulserver/bin/server/Server$Processor$updateImageData.class index 246fd460..347ed304 100644 Binary files a/Dozentenmodulserver/bin/server/Server$Processor$updateImageData.class and b/Dozentenmodulserver/bin/server/Server$Processor$updateImageData.class differ diff --git a/Dozentenmodulserver/bin/server/Server$Processor$writeLecturedata.class b/Dozentenmodulserver/bin/server/Server$Processor$writeLecturedata.class index 1aab45dc..7299950c 100644 Binary files a/Dozentenmodulserver/bin/server/Server$Processor$writeLecturedata.class and b/Dozentenmodulserver/bin/server/Server$Processor$writeLecturedata.class differ diff --git a/Dozentenmodulserver/bin/server/Server$Processor$writeVLdata.class b/Dozentenmodulserver/bin/server/Server$Processor$writeVLdata.class index f052d73d..ba689b32 100644 Binary files a/Dozentenmodulserver/bin/server/Server$Processor$writeVLdata.class and b/Dozentenmodulserver/bin/server/Server$Processor$writeVLdata.class differ diff --git a/Dozentenmodulserver/bin/server/Server$Processor.class b/Dozentenmodulserver/bin/server/Server$Processor.class index 04396dea..63857ba9 100644 Binary files a/Dozentenmodulserver/bin/server/Server$Processor.class and b/Dozentenmodulserver/bin/server/Server$Processor.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getAllOS_args$_Fields.class b/Dozentenmodulserver/bin/server/Server$getAllOS_args$_Fields.class index 6ca6c959..7b73215e 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getAllOS_args$_Fields.class and b/Dozentenmodulserver/bin/server/Server$getAllOS_args$_Fields.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getAllOS_args$getAllOS_argsStandardScheme.class b/Dozentenmodulserver/bin/server/Server$getAllOS_args$getAllOS_argsStandardScheme.class index 015e3694..71beedac 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getAllOS_args$getAllOS_argsStandardScheme.class and b/Dozentenmodulserver/bin/server/Server$getAllOS_args$getAllOS_argsStandardScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getAllOS_args$getAllOS_argsStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getAllOS_args$getAllOS_argsStandardSchemeFactory.class index 7160425d..2967849f 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getAllOS_args$getAllOS_argsStandardSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$getAllOS_args$getAllOS_argsStandardSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getAllOS_args$getAllOS_argsTupleScheme.class b/Dozentenmodulserver/bin/server/Server$getAllOS_args$getAllOS_argsTupleScheme.class index 4f4cb1eb..f955ce30 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getAllOS_args$getAllOS_argsTupleScheme.class and b/Dozentenmodulserver/bin/server/Server$getAllOS_args$getAllOS_argsTupleScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getAllOS_args$getAllOS_argsTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getAllOS_args$getAllOS_argsTupleSchemeFactory.class index f6f53a12..481b2e69 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getAllOS_args$getAllOS_argsTupleSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$getAllOS_args$getAllOS_argsTupleSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getAllOS_args.class b/Dozentenmodulserver/bin/server/Server$getAllOS_args.class index dfbf7280..f231eb08 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getAllOS_args.class and b/Dozentenmodulserver/bin/server/Server$getAllOS_args.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getAllOS_result$_Fields.class b/Dozentenmodulserver/bin/server/Server$getAllOS_result$_Fields.class index 27ede07c..612e5846 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getAllOS_result$_Fields.class and b/Dozentenmodulserver/bin/server/Server$getAllOS_result$_Fields.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getAllOS_result$getAllOS_resultStandardScheme.class b/Dozentenmodulserver/bin/server/Server$getAllOS_result$getAllOS_resultStandardScheme.class index ed239233..9d677339 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getAllOS_result$getAllOS_resultStandardScheme.class and b/Dozentenmodulserver/bin/server/Server$getAllOS_result$getAllOS_resultStandardScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getAllOS_result$getAllOS_resultStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getAllOS_result$getAllOS_resultStandardSchemeFactory.class index 02aca422..2966b923 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getAllOS_result$getAllOS_resultStandardSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$getAllOS_result$getAllOS_resultStandardSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getAllOS_result$getAllOS_resultTupleScheme.class b/Dozentenmodulserver/bin/server/Server$getAllOS_result$getAllOS_resultTupleScheme.class index 66a755ea..8ac5fcf2 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getAllOS_result$getAllOS_resultTupleScheme.class and b/Dozentenmodulserver/bin/server/Server$getAllOS_result$getAllOS_resultTupleScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getAllOS_result$getAllOS_resultTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getAllOS_result$getAllOS_resultTupleSchemeFactory.class index 1cd12bbc..d8ff2753 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getAllOS_result$getAllOS_resultTupleSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$getAllOS_result$getAllOS_resultTupleSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getAllOS_result.class b/Dozentenmodulserver/bin/server/Server$getAllOS_result.class index c3e63a81..2c63b67b 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getAllOS_result.class and b/Dozentenmodulserver/bin/server/Server$getAllOS_result.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getFtpUser_args$_Fields.class b/Dozentenmodulserver/bin/server/Server$getFtpUser_args$_Fields.class index 08687831..87b0b5ec 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getFtpUser_args$_Fields.class and b/Dozentenmodulserver/bin/server/Server$getFtpUser_args$_Fields.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getFtpUser_args$getFtpUser_argsStandardScheme.class b/Dozentenmodulserver/bin/server/Server$getFtpUser_args$getFtpUser_argsStandardScheme.class index 6900c11e..e3b48cd7 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getFtpUser_args$getFtpUser_argsStandardScheme.class and b/Dozentenmodulserver/bin/server/Server$getFtpUser_args$getFtpUser_argsStandardScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getFtpUser_args$getFtpUser_argsStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getFtpUser_args$getFtpUser_argsStandardSchemeFactory.class index 8471e19a..adfc2c30 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getFtpUser_args$getFtpUser_argsStandardSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$getFtpUser_args$getFtpUser_argsStandardSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getFtpUser_args$getFtpUser_argsTupleScheme.class b/Dozentenmodulserver/bin/server/Server$getFtpUser_args$getFtpUser_argsTupleScheme.class index 489cc2b7..f2f46ae9 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getFtpUser_args$getFtpUser_argsTupleScheme.class and b/Dozentenmodulserver/bin/server/Server$getFtpUser_args$getFtpUser_argsTupleScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getFtpUser_args$getFtpUser_argsTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getFtpUser_args$getFtpUser_argsTupleSchemeFactory.class index c06b81df..902bb6be 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getFtpUser_args$getFtpUser_argsTupleSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$getFtpUser_args$getFtpUser_argsTupleSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getFtpUser_args.class b/Dozentenmodulserver/bin/server/Server$getFtpUser_args.class index 460a21e0..1d9c8217 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getFtpUser_args.class and b/Dozentenmodulserver/bin/server/Server$getFtpUser_args.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getFtpUser_result$_Fields.class b/Dozentenmodulserver/bin/server/Server$getFtpUser_result$_Fields.class index 053801c2..570ab02a 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getFtpUser_result$_Fields.class and b/Dozentenmodulserver/bin/server/Server$getFtpUser_result$_Fields.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getFtpUser_result$getFtpUser_resultStandardScheme.class b/Dozentenmodulserver/bin/server/Server$getFtpUser_result$getFtpUser_resultStandardScheme.class index 2a3d4b4b..fdc90d9c 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getFtpUser_result$getFtpUser_resultStandardScheme.class and b/Dozentenmodulserver/bin/server/Server$getFtpUser_result$getFtpUser_resultStandardScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getFtpUser_result$getFtpUser_resultStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getFtpUser_result$getFtpUser_resultStandardSchemeFactory.class index d62afc67..d3af2796 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getFtpUser_result$getFtpUser_resultStandardSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$getFtpUser_result$getFtpUser_resultStandardSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getFtpUser_result$getFtpUser_resultTupleScheme.class b/Dozentenmodulserver/bin/server/Server$getFtpUser_result$getFtpUser_resultTupleScheme.class index b040ec2c..0c8a55e2 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getFtpUser_result$getFtpUser_resultTupleScheme.class and b/Dozentenmodulserver/bin/server/Server$getFtpUser_result$getFtpUser_resultTupleScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getFtpUser_result$getFtpUser_resultTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getFtpUser_result$getFtpUser_resultTupleSchemeFactory.class index 13f727c9..76531e78 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getFtpUser_result$getFtpUser_resultTupleSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$getFtpUser_result$getFtpUser_resultTupleSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getFtpUser_result.class b/Dozentenmodulserver/bin/server/Server$getFtpUser_result.class index 33f444a5..e0012e4c 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getFtpUser_result.class and b/Dozentenmodulserver/bin/server/Server$getFtpUser_result.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getImageData_args$_Fields.class b/Dozentenmodulserver/bin/server/Server$getImageData_args$_Fields.class index 7c2651d8..41f876e0 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getImageData_args$_Fields.class and b/Dozentenmodulserver/bin/server/Server$getImageData_args$_Fields.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getImageData_args$getImageData_argsStandardScheme.class b/Dozentenmodulserver/bin/server/Server$getImageData_args$getImageData_argsStandardScheme.class index ce0f3afd..e9888d78 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getImageData_args$getImageData_argsStandardScheme.class and b/Dozentenmodulserver/bin/server/Server$getImageData_args$getImageData_argsStandardScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getImageData_args$getImageData_argsStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getImageData_args$getImageData_argsStandardSchemeFactory.class index d4c51a89..4328b3b9 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getImageData_args$getImageData_argsStandardSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$getImageData_args$getImageData_argsStandardSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getImageData_args$getImageData_argsTupleScheme.class b/Dozentenmodulserver/bin/server/Server$getImageData_args$getImageData_argsTupleScheme.class index 679ca840..8004f48d 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getImageData_args$getImageData_argsTupleScheme.class and b/Dozentenmodulserver/bin/server/Server$getImageData_args$getImageData_argsTupleScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getImageData_args$getImageData_argsTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getImageData_args$getImageData_argsTupleSchemeFactory.class index f9fd719e..a8ffb349 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getImageData_args$getImageData_argsTupleSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$getImageData_args$getImageData_argsTupleSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getImageData_args.class b/Dozentenmodulserver/bin/server/Server$getImageData_args.class index acd4f68d..89c1cd31 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getImageData_args.class and b/Dozentenmodulserver/bin/server/Server$getImageData_args.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getImageData_result$_Fields.class b/Dozentenmodulserver/bin/server/Server$getImageData_result$_Fields.class index 725ba93e..8b94a1eb 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getImageData_result$_Fields.class and b/Dozentenmodulserver/bin/server/Server$getImageData_result$_Fields.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getImageData_result$getImageData_resultStandardScheme.class b/Dozentenmodulserver/bin/server/Server$getImageData_result$getImageData_resultStandardScheme.class index d2be770f..a45896a3 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getImageData_result$getImageData_resultStandardScheme.class and b/Dozentenmodulserver/bin/server/Server$getImageData_result$getImageData_resultStandardScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getImageData_result$getImageData_resultStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getImageData_result$getImageData_resultStandardSchemeFactory.class index ea9e81dc..763dc6de 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getImageData_result$getImageData_resultStandardSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$getImageData_result$getImageData_resultStandardSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getImageData_result$getImageData_resultTupleScheme.class b/Dozentenmodulserver/bin/server/Server$getImageData_result$getImageData_resultTupleScheme.class index 503b38a7..e1279055 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getImageData_result$getImageData_resultTupleScheme.class and b/Dozentenmodulserver/bin/server/Server$getImageData_result$getImageData_resultTupleScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getImageData_result$getImageData_resultTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getImageData_result$getImageData_resultTupleSchemeFactory.class index 12802094..a638196a 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getImageData_result$getImageData_resultTupleSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$getImageData_result$getImageData_resultTupleSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getImageData_result.class b/Dozentenmodulserver/bin/server/Server$getImageData_result.class index 99bd6b42..3c27e25e 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getImageData_result.class and b/Dozentenmodulserver/bin/server/Server$getImageData_result.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getImageList_args$_Fields.class b/Dozentenmodulserver/bin/server/Server$getImageList_args$_Fields.class index 4f74e5a9..a6778b56 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getImageList_args$_Fields.class and b/Dozentenmodulserver/bin/server/Server$getImageList_args$_Fields.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getImageList_args$getImageList_argsStandardScheme.class b/Dozentenmodulserver/bin/server/Server$getImageList_args$getImageList_argsStandardScheme.class index 995c212e..4bfe9bf9 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getImageList_args$getImageList_argsStandardScheme.class and b/Dozentenmodulserver/bin/server/Server$getImageList_args$getImageList_argsStandardScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getImageList_args$getImageList_argsStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getImageList_args$getImageList_argsStandardSchemeFactory.class index ca102252..aae2c6e9 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getImageList_args$getImageList_argsStandardSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$getImageList_args$getImageList_argsStandardSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getImageList_args$getImageList_argsTupleScheme.class b/Dozentenmodulserver/bin/server/Server$getImageList_args$getImageList_argsTupleScheme.class index 57733f9b..cad9e80a 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getImageList_args$getImageList_argsTupleScheme.class and b/Dozentenmodulserver/bin/server/Server$getImageList_args$getImageList_argsTupleScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getImageList_args$getImageList_argsTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getImageList_args$getImageList_argsTupleSchemeFactory.class index e8e3fd64..2f34f5f5 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getImageList_args$getImageList_argsTupleSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$getImageList_args$getImageList_argsTupleSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getImageList_args.class b/Dozentenmodulserver/bin/server/Server$getImageList_args.class index 696a0c69..c435826b 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getImageList_args.class and b/Dozentenmodulserver/bin/server/Server$getImageList_args.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getImageList_result$_Fields.class b/Dozentenmodulserver/bin/server/Server$getImageList_result$_Fields.class index 9bfc6713..468055a6 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getImageList_result$_Fields.class and b/Dozentenmodulserver/bin/server/Server$getImageList_result$_Fields.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getImageList_result$getImageList_resultStandardScheme.class b/Dozentenmodulserver/bin/server/Server$getImageList_result$getImageList_resultStandardScheme.class index 383d1fdb..b1c81ab2 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getImageList_result$getImageList_resultStandardScheme.class and b/Dozentenmodulserver/bin/server/Server$getImageList_result$getImageList_resultStandardScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getImageList_result$getImageList_resultStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getImageList_result$getImageList_resultStandardSchemeFactory.class index 842b546c..040f5805 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getImageList_result$getImageList_resultStandardSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$getImageList_result$getImageList_resultStandardSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getImageList_result$getImageList_resultTupleScheme.class b/Dozentenmodulserver/bin/server/Server$getImageList_result$getImageList_resultTupleScheme.class index 82ca4144..9d8abb2c 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getImageList_result$getImageList_resultTupleScheme.class and b/Dozentenmodulserver/bin/server/Server$getImageList_result$getImageList_resultTupleScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getImageList_result$getImageList_resultTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getImageList_result$getImageList_resultTupleSchemeFactory.class index c8e0203b..eac7a5ab 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getImageList_result$getImageList_resultTupleSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$getImageList_result$getImageList_resultTupleSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getImageList_result.class b/Dozentenmodulserver/bin/server/Server$getImageList_result.class index 40d8375d..bdf465d0 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getImageList_result.class and b/Dozentenmodulserver/bin/server/Server$getImageList_result.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getLectureData_args$_Fields.class b/Dozentenmodulserver/bin/server/Server$getLectureData_args$_Fields.class index 1f7fed6c..8c4cef93 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getLectureData_args$_Fields.class and b/Dozentenmodulserver/bin/server/Server$getLectureData_args$_Fields.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getLectureData_args$getLectureData_argsStandardScheme.class b/Dozentenmodulserver/bin/server/Server$getLectureData_args$getLectureData_argsStandardScheme.class index 52b5adcb..844c3838 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getLectureData_args$getLectureData_argsStandardScheme.class and b/Dozentenmodulserver/bin/server/Server$getLectureData_args$getLectureData_argsStandardScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getLectureData_args$getLectureData_argsStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getLectureData_args$getLectureData_argsStandardSchemeFactory.class index 8c156360..5d964cfc 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getLectureData_args$getLectureData_argsStandardSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$getLectureData_args$getLectureData_argsStandardSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getLectureData_args$getLectureData_argsTupleScheme.class b/Dozentenmodulserver/bin/server/Server$getLectureData_args$getLectureData_argsTupleScheme.class index 20746edc..5275b211 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getLectureData_args$getLectureData_argsTupleScheme.class and b/Dozentenmodulserver/bin/server/Server$getLectureData_args$getLectureData_argsTupleScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getLectureData_args$getLectureData_argsTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getLectureData_args$getLectureData_argsTupleSchemeFactory.class index 0e35f900..a60340a0 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getLectureData_args$getLectureData_argsTupleSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$getLectureData_args$getLectureData_argsTupleSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getLectureData_args.class b/Dozentenmodulserver/bin/server/Server$getLectureData_args.class index 283e84cd..9303ce43 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getLectureData_args.class and b/Dozentenmodulserver/bin/server/Server$getLectureData_args.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getLectureData_result$_Fields.class b/Dozentenmodulserver/bin/server/Server$getLectureData_result$_Fields.class index c70bebcc..f7ffe53a 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getLectureData_result$_Fields.class and b/Dozentenmodulserver/bin/server/Server$getLectureData_result$_Fields.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getLectureData_result$getLectureData_resultStandardScheme.class b/Dozentenmodulserver/bin/server/Server$getLectureData_result$getLectureData_resultStandardScheme.class index 72570ea8..87d62265 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getLectureData_result$getLectureData_resultStandardScheme.class and b/Dozentenmodulserver/bin/server/Server$getLectureData_result$getLectureData_resultStandardScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getLectureData_result$getLectureData_resultStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getLectureData_result$getLectureData_resultStandardSchemeFactory.class index fd3565f8..805db647 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getLectureData_result$getLectureData_resultStandardSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$getLectureData_result$getLectureData_resultStandardSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getLectureData_result$getLectureData_resultTupleScheme.class b/Dozentenmodulserver/bin/server/Server$getLectureData_result$getLectureData_resultTupleScheme.class index 03b03af9..e1522627 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getLectureData_result$getLectureData_resultTupleScheme.class and b/Dozentenmodulserver/bin/server/Server$getLectureData_result$getLectureData_resultTupleScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getLectureData_result$getLectureData_resultTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getLectureData_result$getLectureData_resultTupleSchemeFactory.class index e9b03e3b..493431ea 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getLectureData_result$getLectureData_resultTupleSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$getLectureData_result$getLectureData_resultTupleSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getLectureData_result.class b/Dozentenmodulserver/bin/server/Server$getLectureData_result.class index b27b8c75..b5caedc5 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getLectureData_result.class and b/Dozentenmodulserver/bin/server/Server$getLectureData_result.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getLectureList_args$_Fields.class b/Dozentenmodulserver/bin/server/Server$getLectureList_args$_Fields.class index 80f3c989..eae1e659 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getLectureList_args$_Fields.class and b/Dozentenmodulserver/bin/server/Server$getLectureList_args$_Fields.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getLectureList_args$getLectureList_argsStandardScheme.class b/Dozentenmodulserver/bin/server/Server$getLectureList_args$getLectureList_argsStandardScheme.class index 6672fbdd..f04dd22b 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getLectureList_args$getLectureList_argsStandardScheme.class and b/Dozentenmodulserver/bin/server/Server$getLectureList_args$getLectureList_argsStandardScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getLectureList_args$getLectureList_argsStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getLectureList_args$getLectureList_argsStandardSchemeFactory.class index 070d47f4..32644d1e 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getLectureList_args$getLectureList_argsStandardSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$getLectureList_args$getLectureList_argsStandardSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getLectureList_args$getLectureList_argsTupleScheme.class b/Dozentenmodulserver/bin/server/Server$getLectureList_args$getLectureList_argsTupleScheme.class index cf3ad2d9..74a58705 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getLectureList_args$getLectureList_argsTupleScheme.class and b/Dozentenmodulserver/bin/server/Server$getLectureList_args$getLectureList_argsTupleScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getLectureList_args$getLectureList_argsTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getLectureList_args$getLectureList_argsTupleSchemeFactory.class index 315c18a6..50501fcb 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getLectureList_args$getLectureList_argsTupleSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$getLectureList_args$getLectureList_argsTupleSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getLectureList_args.class b/Dozentenmodulserver/bin/server/Server$getLectureList_args.class index 6a618405..8f1eb819 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getLectureList_args.class and b/Dozentenmodulserver/bin/server/Server$getLectureList_args.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getLectureList_result$_Fields.class b/Dozentenmodulserver/bin/server/Server$getLectureList_result$_Fields.class index d9c8edb8..1c5ac786 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getLectureList_result$_Fields.class and b/Dozentenmodulserver/bin/server/Server$getLectureList_result$_Fields.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getLectureList_result$getLectureList_resultStandardScheme.class b/Dozentenmodulserver/bin/server/Server$getLectureList_result$getLectureList_resultStandardScheme.class index c37fd524..2f089288 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getLectureList_result$getLectureList_resultStandardScheme.class and b/Dozentenmodulserver/bin/server/Server$getLectureList_result$getLectureList_resultStandardScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getLectureList_result$getLectureList_resultStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getLectureList_result$getLectureList_resultStandardSchemeFactory.class index 23208b4c..2164815f 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getLectureList_result$getLectureList_resultStandardSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$getLectureList_result$getLectureList_resultStandardSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getLectureList_result$getLectureList_resultTupleScheme.class b/Dozentenmodulserver/bin/server/Server$getLectureList_result$getLectureList_resultTupleScheme.class index 66fe7fd0..962cebc4 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getLectureList_result$getLectureList_resultTupleScheme.class and b/Dozentenmodulserver/bin/server/Server$getLectureList_result$getLectureList_resultTupleScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getLectureList_result$getLectureList_resultTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getLectureList_result$getLectureList_resultTupleSchemeFactory.class index 45f0b58e..220efabe 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getLectureList_result$getLectureList_resultTupleSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$getLectureList_result$getLectureList_resultTupleSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getLectureList_result.class b/Dozentenmodulserver/bin/server/Server$getLectureList_result.class index ddbe752a..ba7a6967 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getLectureList_result.class and b/Dozentenmodulserver/bin/server/Server$getLectureList_result.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$_Fields.class b/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$_Fields.class index 4a964b37..ca866ea1 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$_Fields.class and b/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$_Fields.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$getPathOfImage_argsStandardScheme.class b/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$getPathOfImage_argsStandardScheme.class index 463066e5..c7a2df7e 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$getPathOfImage_argsStandardScheme.class and b/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$getPathOfImage_argsStandardScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$getPathOfImage_argsStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$getPathOfImage_argsStandardSchemeFactory.class index 42324db3..92ccbfa8 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$getPathOfImage_argsStandardSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$getPathOfImage_argsStandardSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$getPathOfImage_argsTupleScheme.class b/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$getPathOfImage_argsTupleScheme.class index db7602b0..e18cc5c6 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$getPathOfImage_argsTupleScheme.class and b/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$getPathOfImage_argsTupleScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$getPathOfImage_argsTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$getPathOfImage_argsTupleSchemeFactory.class index 8b7cbc74..c77ab14c 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$getPathOfImage_argsTupleSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$getPathOfImage_args$getPathOfImage_argsTupleSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getPathOfImage_args.class b/Dozentenmodulserver/bin/server/Server$getPathOfImage_args.class index 2fe81853..a695a70f 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getPathOfImage_args.class and b/Dozentenmodulserver/bin/server/Server$getPathOfImage_args.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$_Fields.class b/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$_Fields.class index 059cd427..b739853c 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$_Fields.class and b/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$_Fields.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$getPathOfImage_resultStandardScheme.class b/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$getPathOfImage_resultStandardScheme.class index 26a9d75f..5b305be9 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$getPathOfImage_resultStandardScheme.class and b/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$getPathOfImage_resultStandardScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$getPathOfImage_resultStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$getPathOfImage_resultStandardSchemeFactory.class index 13198090..3643ff97 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$getPathOfImage_resultStandardSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$getPathOfImage_resultStandardSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$getPathOfImage_resultTupleScheme.class b/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$getPathOfImage_resultTupleScheme.class index 7fa62de2..70979f44 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$getPathOfImage_resultTupleScheme.class and b/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$getPathOfImage_resultTupleScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$getPathOfImage_resultTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$getPathOfImage_resultTupleSchemeFactory.class index 0927dae5..12bccee8 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$getPathOfImage_resultTupleSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$getPathOfImage_result$getPathOfImage_resultTupleSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getPathOfImage_result.class b/Dozentenmodulserver/bin/server/Server$getPathOfImage_result.class index 62e6eb80..7a56c3f6 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getPathOfImage_result.class and b/Dozentenmodulserver/bin/server/Server$getPathOfImage_result.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getPersonData_args$_Fields.class b/Dozentenmodulserver/bin/server/Server$getPersonData_args$_Fields.class index 50ca18bc..e0bef61e 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getPersonData_args$_Fields.class and b/Dozentenmodulserver/bin/server/Server$getPersonData_args$_Fields.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getPersonData_args$getPersonData_argsStandardScheme.class b/Dozentenmodulserver/bin/server/Server$getPersonData_args$getPersonData_argsStandardScheme.class index 6843971d..8ed69de7 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getPersonData_args$getPersonData_argsStandardScheme.class and b/Dozentenmodulserver/bin/server/Server$getPersonData_args$getPersonData_argsStandardScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getPersonData_args$getPersonData_argsStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getPersonData_args$getPersonData_argsStandardSchemeFactory.class index a8c2ba60..ee4cdb1b 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getPersonData_args$getPersonData_argsStandardSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$getPersonData_args$getPersonData_argsStandardSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getPersonData_args$getPersonData_argsTupleScheme.class b/Dozentenmodulserver/bin/server/Server$getPersonData_args$getPersonData_argsTupleScheme.class index 3eaf85d0..e42fb9fe 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getPersonData_args$getPersonData_argsTupleScheme.class and b/Dozentenmodulserver/bin/server/Server$getPersonData_args$getPersonData_argsTupleScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getPersonData_args$getPersonData_argsTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getPersonData_args$getPersonData_argsTupleSchemeFactory.class index ef66f43e..902aa8b0 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getPersonData_args$getPersonData_argsTupleSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$getPersonData_args$getPersonData_argsTupleSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getPersonData_args.class b/Dozentenmodulserver/bin/server/Server$getPersonData_args.class index 7248d646..b99b4f5c 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getPersonData_args.class and b/Dozentenmodulserver/bin/server/Server$getPersonData_args.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getPersonData_result$_Fields.class b/Dozentenmodulserver/bin/server/Server$getPersonData_result$_Fields.class index 1f3ad1e6..32ed417d 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getPersonData_result$_Fields.class and b/Dozentenmodulserver/bin/server/Server$getPersonData_result$_Fields.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getPersonData_result$getPersonData_resultStandardScheme.class b/Dozentenmodulserver/bin/server/Server$getPersonData_result$getPersonData_resultStandardScheme.class index 6664b81b..bf970859 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getPersonData_result$getPersonData_resultStandardScheme.class and b/Dozentenmodulserver/bin/server/Server$getPersonData_result$getPersonData_resultStandardScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getPersonData_result$getPersonData_resultStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getPersonData_result$getPersonData_resultStandardSchemeFactory.class index 5cd6c0f6..28dc0e7f 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getPersonData_result$getPersonData_resultStandardSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$getPersonData_result$getPersonData_resultStandardSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getPersonData_result$getPersonData_resultTupleScheme.class b/Dozentenmodulserver/bin/server/Server$getPersonData_result$getPersonData_resultTupleScheme.class index 8b57c223..0c436cea 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getPersonData_result$getPersonData_resultTupleScheme.class and b/Dozentenmodulserver/bin/server/Server$getPersonData_result$getPersonData_resultTupleScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getPersonData_result$getPersonData_resultTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$getPersonData_result$getPersonData_resultTupleSchemeFactory.class index 0e0bd95b..e2ddb42e 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getPersonData_result$getPersonData_resultTupleSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$getPersonData_result$getPersonData_resultTupleSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$getPersonData_result.class b/Dozentenmodulserver/bin/server/Server$getPersonData_result.class index de399737..56b63f61 100644 Binary files a/Dozentenmodulserver/bin/server/Server$getPersonData_result.class and b/Dozentenmodulserver/bin/server/Server$getPersonData_result.class differ diff --git a/Dozentenmodulserver/bin/server/Server$startFileCopy_args$_Fields.class b/Dozentenmodulserver/bin/server/Server$startFileCopy_args$_Fields.class index 2af962df..d655069e 100644 Binary files a/Dozentenmodulserver/bin/server/Server$startFileCopy_args$_Fields.class and b/Dozentenmodulserver/bin/server/Server$startFileCopy_args$_Fields.class differ diff --git a/Dozentenmodulserver/bin/server/Server$startFileCopy_args$startFileCopy_argsStandardScheme.class b/Dozentenmodulserver/bin/server/Server$startFileCopy_args$startFileCopy_argsStandardScheme.class index fca74504..c72853f2 100644 Binary files a/Dozentenmodulserver/bin/server/Server$startFileCopy_args$startFileCopy_argsStandardScheme.class and b/Dozentenmodulserver/bin/server/Server$startFileCopy_args$startFileCopy_argsStandardScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$startFileCopy_args$startFileCopy_argsStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$startFileCopy_args$startFileCopy_argsStandardSchemeFactory.class index fcc238e6..5ecee434 100644 Binary files a/Dozentenmodulserver/bin/server/Server$startFileCopy_args$startFileCopy_argsStandardSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$startFileCopy_args$startFileCopy_argsStandardSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$startFileCopy_args$startFileCopy_argsTupleScheme.class b/Dozentenmodulserver/bin/server/Server$startFileCopy_args$startFileCopy_argsTupleScheme.class index 857d17e9..cc8950c0 100644 Binary files a/Dozentenmodulserver/bin/server/Server$startFileCopy_args$startFileCopy_argsTupleScheme.class and b/Dozentenmodulserver/bin/server/Server$startFileCopy_args$startFileCopy_argsTupleScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$startFileCopy_args$startFileCopy_argsTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$startFileCopy_args$startFileCopy_argsTupleSchemeFactory.class index 469b541c..4d38cc49 100644 Binary files a/Dozentenmodulserver/bin/server/Server$startFileCopy_args$startFileCopy_argsTupleSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$startFileCopy_args$startFileCopy_argsTupleSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$startFileCopy_args.class b/Dozentenmodulserver/bin/server/Server$startFileCopy_args.class index b57174c7..de2f21d6 100644 Binary files a/Dozentenmodulserver/bin/server/Server$startFileCopy_args.class and b/Dozentenmodulserver/bin/server/Server$startFileCopy_args.class differ diff --git a/Dozentenmodulserver/bin/server/Server$startFileCopy_result$_Fields.class b/Dozentenmodulserver/bin/server/Server$startFileCopy_result$_Fields.class index 3d4edda7..a8f9d489 100644 Binary files a/Dozentenmodulserver/bin/server/Server$startFileCopy_result$_Fields.class and b/Dozentenmodulserver/bin/server/Server$startFileCopy_result$_Fields.class differ diff --git a/Dozentenmodulserver/bin/server/Server$startFileCopy_result$startFileCopy_resultStandardScheme.class b/Dozentenmodulserver/bin/server/Server$startFileCopy_result$startFileCopy_resultStandardScheme.class index af154f67..a4b99264 100644 Binary files a/Dozentenmodulserver/bin/server/Server$startFileCopy_result$startFileCopy_resultStandardScheme.class and b/Dozentenmodulserver/bin/server/Server$startFileCopy_result$startFileCopy_resultStandardScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$startFileCopy_result$startFileCopy_resultStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$startFileCopy_result$startFileCopy_resultStandardSchemeFactory.class index dc63fd6e..6692c8c9 100644 Binary files a/Dozentenmodulserver/bin/server/Server$startFileCopy_result$startFileCopy_resultStandardSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$startFileCopy_result$startFileCopy_resultStandardSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$startFileCopy_result$startFileCopy_resultTupleScheme.class b/Dozentenmodulserver/bin/server/Server$startFileCopy_result$startFileCopy_resultTupleScheme.class index da2111f7..139107e9 100644 Binary files a/Dozentenmodulserver/bin/server/Server$startFileCopy_result$startFileCopy_resultTupleScheme.class and b/Dozentenmodulserver/bin/server/Server$startFileCopy_result$startFileCopy_resultTupleScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$startFileCopy_result$startFileCopy_resultTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$startFileCopy_result$startFileCopy_resultTupleSchemeFactory.class index d66f5e51..ffa23c73 100644 Binary files a/Dozentenmodulserver/bin/server/Server$startFileCopy_result$startFileCopy_resultTupleSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$startFileCopy_result$startFileCopy_resultTupleSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$startFileCopy_result.class b/Dozentenmodulserver/bin/server/Server$startFileCopy_result.class index e85aa979..ba28b230 100644 Binary files a/Dozentenmodulserver/bin/server/Server$startFileCopy_result.class and b/Dozentenmodulserver/bin/server/Server$startFileCopy_result.class differ diff --git a/Dozentenmodulserver/bin/server/Server$updateImageData_args$_Fields.class b/Dozentenmodulserver/bin/server/Server$updateImageData_args$_Fields.class index c52c9653..66732eac 100644 Binary files a/Dozentenmodulserver/bin/server/Server$updateImageData_args$_Fields.class and b/Dozentenmodulserver/bin/server/Server$updateImageData_args$_Fields.class differ diff --git a/Dozentenmodulserver/bin/server/Server$updateImageData_args$updateImageData_argsStandardScheme.class b/Dozentenmodulserver/bin/server/Server$updateImageData_args$updateImageData_argsStandardScheme.class index 8c63e132..641b311c 100644 Binary files a/Dozentenmodulserver/bin/server/Server$updateImageData_args$updateImageData_argsStandardScheme.class and b/Dozentenmodulserver/bin/server/Server$updateImageData_args$updateImageData_argsStandardScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$updateImageData_args$updateImageData_argsStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$updateImageData_args$updateImageData_argsStandardSchemeFactory.class index bf239b0c..3dd15b3f 100644 Binary files a/Dozentenmodulserver/bin/server/Server$updateImageData_args$updateImageData_argsStandardSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$updateImageData_args$updateImageData_argsStandardSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$updateImageData_args$updateImageData_argsTupleScheme.class b/Dozentenmodulserver/bin/server/Server$updateImageData_args$updateImageData_argsTupleScheme.class index 43f786ca..15ba4550 100644 Binary files a/Dozentenmodulserver/bin/server/Server$updateImageData_args$updateImageData_argsTupleScheme.class and b/Dozentenmodulserver/bin/server/Server$updateImageData_args$updateImageData_argsTupleScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$updateImageData_args$updateImageData_argsTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$updateImageData_args$updateImageData_argsTupleSchemeFactory.class index 376f2267..7cdf9b67 100644 Binary files a/Dozentenmodulserver/bin/server/Server$updateImageData_args$updateImageData_argsTupleSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$updateImageData_args$updateImageData_argsTupleSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$updateImageData_args.class b/Dozentenmodulserver/bin/server/Server$updateImageData_args.class index a074025e..b8b39ace 100644 Binary files a/Dozentenmodulserver/bin/server/Server$updateImageData_args.class and b/Dozentenmodulserver/bin/server/Server$updateImageData_args.class differ diff --git a/Dozentenmodulserver/bin/server/Server$updateImageData_result$_Fields.class b/Dozentenmodulserver/bin/server/Server$updateImageData_result$_Fields.class index b3a524e8..fcdbec6a 100644 Binary files a/Dozentenmodulserver/bin/server/Server$updateImageData_result$_Fields.class and b/Dozentenmodulserver/bin/server/Server$updateImageData_result$_Fields.class differ diff --git a/Dozentenmodulserver/bin/server/Server$updateImageData_result$updateImageData_resultStandardScheme.class b/Dozentenmodulserver/bin/server/Server$updateImageData_result$updateImageData_resultStandardScheme.class index e7aee83f..97f6cd44 100644 Binary files a/Dozentenmodulserver/bin/server/Server$updateImageData_result$updateImageData_resultStandardScheme.class and b/Dozentenmodulserver/bin/server/Server$updateImageData_result$updateImageData_resultStandardScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$updateImageData_result$updateImageData_resultStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$updateImageData_result$updateImageData_resultStandardSchemeFactory.class index 139fab7b..20b0949c 100644 Binary files a/Dozentenmodulserver/bin/server/Server$updateImageData_result$updateImageData_resultStandardSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$updateImageData_result$updateImageData_resultStandardSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$updateImageData_result$updateImageData_resultTupleScheme.class b/Dozentenmodulserver/bin/server/Server$updateImageData_result$updateImageData_resultTupleScheme.class index 21bbe1a1..9833f07d 100644 Binary files a/Dozentenmodulserver/bin/server/Server$updateImageData_result$updateImageData_resultTupleScheme.class and b/Dozentenmodulserver/bin/server/Server$updateImageData_result$updateImageData_resultTupleScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$updateImageData_result$updateImageData_resultTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$updateImageData_result$updateImageData_resultTupleSchemeFactory.class index 03b49731..7899684d 100644 Binary files a/Dozentenmodulserver/bin/server/Server$updateImageData_result$updateImageData_resultTupleSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$updateImageData_result$updateImageData_resultTupleSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$updateImageData_result.class b/Dozentenmodulserver/bin/server/Server$updateImageData_result.class index 14733b7b..ffa75918 100644 Binary files a/Dozentenmodulserver/bin/server/Server$updateImageData_result.class and b/Dozentenmodulserver/bin/server/Server$updateImageData_result.class differ diff --git a/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$_Fields.class b/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$_Fields.class index 2ceee0bb..716a0d4e 100644 Binary files a/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$_Fields.class and b/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$_Fields.class differ diff --git a/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$writeLecturedata_argsStandardScheme.class b/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$writeLecturedata_argsStandardScheme.class index 99694335..13884360 100644 Binary files a/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$writeLecturedata_argsStandardScheme.class and b/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$writeLecturedata_argsStandardScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$writeLecturedata_argsStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$writeLecturedata_argsStandardSchemeFactory.class index f1cec65b..bfbc15f7 100644 Binary files a/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$writeLecturedata_argsStandardSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$writeLecturedata_argsStandardSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$writeLecturedata_argsTupleScheme.class b/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$writeLecturedata_argsTupleScheme.class index 51342fbb..e2d1ab15 100644 Binary files a/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$writeLecturedata_argsTupleScheme.class and b/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$writeLecturedata_argsTupleScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$writeLecturedata_argsTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$writeLecturedata_argsTupleSchemeFactory.class index be96de33..423e51e4 100644 Binary files a/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$writeLecturedata_argsTupleSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$writeLecturedata_args$writeLecturedata_argsTupleSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$writeLecturedata_args.class b/Dozentenmodulserver/bin/server/Server$writeLecturedata_args.class index ce5881df..3be543ee 100644 Binary files a/Dozentenmodulserver/bin/server/Server$writeLecturedata_args.class and b/Dozentenmodulserver/bin/server/Server$writeLecturedata_args.class differ diff --git a/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$_Fields.class b/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$_Fields.class index 16da1ff6..d8606602 100644 Binary files a/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$_Fields.class and b/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$_Fields.class differ diff --git a/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$writeLecturedata_resultStandardScheme.class b/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$writeLecturedata_resultStandardScheme.class index 25fa5593..4dfe8b54 100644 Binary files a/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$writeLecturedata_resultStandardScheme.class and b/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$writeLecturedata_resultStandardScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$writeLecturedata_resultStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$writeLecturedata_resultStandardSchemeFactory.class index 33fdab9f..d0b3667a 100644 Binary files a/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$writeLecturedata_resultStandardSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$writeLecturedata_resultStandardSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$writeLecturedata_resultTupleScheme.class b/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$writeLecturedata_resultTupleScheme.class index 9af08681..266bf38f 100644 Binary files a/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$writeLecturedata_resultTupleScheme.class and b/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$writeLecturedata_resultTupleScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$writeLecturedata_resultTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$writeLecturedata_resultTupleSchemeFactory.class index 275d7e49..3413a2d2 100644 Binary files a/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$writeLecturedata_resultTupleSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$writeLecturedata_result$writeLecturedata_resultTupleSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$writeLecturedata_result.class b/Dozentenmodulserver/bin/server/Server$writeLecturedata_result.class index e67720c5..c76b1bf7 100644 Binary files a/Dozentenmodulserver/bin/server/Server$writeLecturedata_result.class and b/Dozentenmodulserver/bin/server/Server$writeLecturedata_result.class differ diff --git a/Dozentenmodulserver/bin/server/Server$writeVLdata_args$_Fields.class b/Dozentenmodulserver/bin/server/Server$writeVLdata_args$_Fields.class index 6b6a7b29..c047df49 100644 Binary files a/Dozentenmodulserver/bin/server/Server$writeVLdata_args$_Fields.class and b/Dozentenmodulserver/bin/server/Server$writeVLdata_args$_Fields.class differ diff --git a/Dozentenmodulserver/bin/server/Server$writeVLdata_args$writeVLdata_argsStandardScheme.class b/Dozentenmodulserver/bin/server/Server$writeVLdata_args$writeVLdata_argsStandardScheme.class index 1dd2998a..4c3be70d 100644 Binary files a/Dozentenmodulserver/bin/server/Server$writeVLdata_args$writeVLdata_argsStandardScheme.class and b/Dozentenmodulserver/bin/server/Server$writeVLdata_args$writeVLdata_argsStandardScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$writeVLdata_args$writeVLdata_argsStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$writeVLdata_args$writeVLdata_argsStandardSchemeFactory.class index 350a5a96..8d48c65a 100644 Binary files a/Dozentenmodulserver/bin/server/Server$writeVLdata_args$writeVLdata_argsStandardSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$writeVLdata_args$writeVLdata_argsStandardSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$writeVLdata_args$writeVLdata_argsTupleScheme.class b/Dozentenmodulserver/bin/server/Server$writeVLdata_args$writeVLdata_argsTupleScheme.class index 221e201d..136dda20 100644 Binary files a/Dozentenmodulserver/bin/server/Server$writeVLdata_args$writeVLdata_argsTupleScheme.class and b/Dozentenmodulserver/bin/server/Server$writeVLdata_args$writeVLdata_argsTupleScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$writeVLdata_args$writeVLdata_argsTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$writeVLdata_args$writeVLdata_argsTupleSchemeFactory.class index 7651e4ca..dc021e2e 100644 Binary files a/Dozentenmodulserver/bin/server/Server$writeVLdata_args$writeVLdata_argsTupleSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$writeVLdata_args$writeVLdata_argsTupleSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$writeVLdata_args.class b/Dozentenmodulserver/bin/server/Server$writeVLdata_args.class index d1761095..c7d00f54 100644 Binary files a/Dozentenmodulserver/bin/server/Server$writeVLdata_args.class and b/Dozentenmodulserver/bin/server/Server$writeVLdata_args.class differ diff --git a/Dozentenmodulserver/bin/server/Server$writeVLdata_result$_Fields.class b/Dozentenmodulserver/bin/server/Server$writeVLdata_result$_Fields.class index 105a236a..e8a5625a 100644 Binary files a/Dozentenmodulserver/bin/server/Server$writeVLdata_result$_Fields.class and b/Dozentenmodulserver/bin/server/Server$writeVLdata_result$_Fields.class differ diff --git a/Dozentenmodulserver/bin/server/Server$writeVLdata_result$writeVLdata_resultStandardScheme.class b/Dozentenmodulserver/bin/server/Server$writeVLdata_result$writeVLdata_resultStandardScheme.class index 54dee1c0..5a855000 100644 Binary files a/Dozentenmodulserver/bin/server/Server$writeVLdata_result$writeVLdata_resultStandardScheme.class and b/Dozentenmodulserver/bin/server/Server$writeVLdata_result$writeVLdata_resultStandardScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$writeVLdata_result$writeVLdata_resultStandardSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$writeVLdata_result$writeVLdata_resultStandardSchemeFactory.class index d51dabd5..8261a71d 100644 Binary files a/Dozentenmodulserver/bin/server/Server$writeVLdata_result$writeVLdata_resultStandardSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$writeVLdata_result$writeVLdata_resultStandardSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$writeVLdata_result$writeVLdata_resultTupleScheme.class b/Dozentenmodulserver/bin/server/Server$writeVLdata_result$writeVLdata_resultTupleScheme.class index 0123218b..d31781c7 100644 Binary files a/Dozentenmodulserver/bin/server/Server$writeVLdata_result$writeVLdata_resultTupleScheme.class and b/Dozentenmodulserver/bin/server/Server$writeVLdata_result$writeVLdata_resultTupleScheme.class differ diff --git a/Dozentenmodulserver/bin/server/Server$writeVLdata_result$writeVLdata_resultTupleSchemeFactory.class b/Dozentenmodulserver/bin/server/Server$writeVLdata_result$writeVLdata_resultTupleSchemeFactory.class index 9b02f185..4205cfdc 100644 Binary files a/Dozentenmodulserver/bin/server/Server$writeVLdata_result$writeVLdata_resultTupleSchemeFactory.class and b/Dozentenmodulserver/bin/server/Server$writeVLdata_result$writeVLdata_resultTupleSchemeFactory.class differ diff --git a/Dozentenmodulserver/bin/server/Server$writeVLdata_result.class b/Dozentenmodulserver/bin/server/Server$writeVLdata_result.class index 5f22aaab..7b6a378e 100644 Binary files a/Dozentenmodulserver/bin/server/Server$writeVLdata_result.class and b/Dozentenmodulserver/bin/server/Server$writeVLdata_result.class differ diff --git a/Dozentenmodulserver/bin/server/ServerHandler.class b/Dozentenmodulserver/bin/server/ServerHandler.class index a04b90b8..a0493c4c 100644 Binary files a/Dozentenmodulserver/bin/server/ServerHandler.class and b/Dozentenmodulserver/bin/server/ServerHandler.class differ diff --git a/Dozentenmodulserver/bin/sql/SQL.class b/Dozentenmodulserver/bin/sql/SQL.class index ba53f127..602532c8 100644 Binary files a/Dozentenmodulserver/bin/sql/SQL.class and b/Dozentenmodulserver/bin/sql/SQL.class differ diff --git a/Dozentenmodulserver/src/server/Server.java b/Dozentenmodulserver/src/server/Server.java index 91afb099..7382e965 100644 --- a/Dozentenmodulserver/src/server/Server.java +++ b/Dozentenmodulserver/src/server/Server.java @@ -58,7 +58,7 @@ public class Server { public Map getImageData(String imageid, String imageversion) throws org.apache.thrift.TException; - public boolean updateImageData(String name, String newName, boolean license, boolean internet, long ram, long cpu, String id, String version) throws org.apache.thrift.TException; + public boolean updateImageData(String name, String newName, String image_path, boolean license, boolean internet, long ram, long cpu, String id, String version) throws org.apache.thrift.TException; public Map getLectureData(String lecturename) throws org.apache.thrift.TException; @@ -98,7 +98,7 @@ public class Server { public void getImageData(String imageid, String imageversion, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; - public void updateImageData(String name, String newName, boolean license, boolean internet, long ram, long cpu, String id, String version, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; + public void updateImageData(String name, String newName, String image_path, boolean license, boolean internet, long ram, long cpu, String id, String version, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; public void getLectureData(String lecturename, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException; @@ -411,17 +411,18 @@ public class Server { throw new org.apache.thrift.TApplicationException(org.apache.thrift.TApplicationException.MISSING_RESULT, "getImageData failed: unknown result"); } - public boolean updateImageData(String name, String newName, boolean license, boolean internet, long ram, long cpu, String id, String version) throws org.apache.thrift.TException + public boolean updateImageData(String name, String newName, String image_path, boolean license, boolean internet, long ram, long cpu, String id, String version) throws org.apache.thrift.TException { - send_updateImageData(name, newName, license, internet, ram, cpu, id, version); + send_updateImageData(name, newName, image_path, license, internet, ram, cpu, id, version); return recv_updateImageData(); } - public void send_updateImageData(String name, String newName, boolean license, boolean internet, long ram, long cpu, String id, String version) throws org.apache.thrift.TException + public void send_updateImageData(String name, String newName, String image_path, boolean license, boolean internet, long ram, long cpu, String id, String version) throws org.apache.thrift.TException { updateImageData_args args = new updateImageData_args(); args.setName(name); args.setNewName(newName); + args.setImage_path(image_path); args.setLicense(license); args.setInternet(internet); args.setRam(ram); @@ -1040,9 +1041,9 @@ public class Server { } } - public void updateImageData(String name, String newName, boolean license, boolean internet, long ram, long cpu, String id, String version, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { + public void updateImageData(String name, String newName, String image_path, boolean license, boolean internet, long ram, long cpu, String id, String version, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws org.apache.thrift.TException { checkReady(); - updateImageData_call method_call = new updateImageData_call(name, newName, license, internet, ram, cpu, id, version, resultHandler, this, ___protocolFactory, ___transport); + updateImageData_call method_call = new updateImageData_call(name, newName, image_path, license, internet, ram, cpu, id, version, resultHandler, this, ___protocolFactory, ___transport); this.___currentMethod = method_call; ___manager.call(method_call); } @@ -1050,16 +1051,18 @@ public class Server { public static class updateImageData_call extends org.apache.thrift.async.TAsyncMethodCall { private String name; private String newName; + private String image_path; private boolean license; private boolean internet; private long ram; private long cpu; private String id; private String version; - public updateImageData_call(String name, String newName, boolean license, boolean internet, long ram, long cpu, String id, String version, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { + public updateImageData_call(String name, String newName, String image_path, boolean license, boolean internet, long ram, long cpu, String id, String version, org.apache.thrift.async.AsyncMethodCallback resultHandler, org.apache.thrift.async.TAsyncClient client, org.apache.thrift.protocol.TProtocolFactory protocolFactory, org.apache.thrift.transport.TNonblockingTransport transport) throws org.apache.thrift.TException { super(client, protocolFactory, transport, resultHandler, false); this.name = name; this.newName = newName; + this.image_path = image_path; this.license = license; this.internet = internet; this.ram = ram; @@ -1073,6 +1076,7 @@ public class Server { updateImageData_args args = new updateImageData_args(); args.setName(name); args.setNewName(newName); + args.setImage_path(image_path); args.setLicense(license); args.setInternet(internet); args.setRam(ram); @@ -1615,7 +1619,7 @@ public class Server { public updateImageData_result getResult(I iface, updateImageData_args args) throws org.apache.thrift.TException { updateImageData_result result = new updateImageData_result(); - result.success = iface.updateImageData(args.name, args.newName, args.license, args.internet, args.ram, args.cpu, args.id, args.version); + result.success = iface.updateImageData(args.name, args.newName, args.image_path, args.license, args.internet, args.ram, args.cpu, args.id, args.version); result.setSuccessIsSet(true); return result; } @@ -2393,7 +2397,7 @@ public class Server { } public void start(I iface, updateImageData_args args, org.apache.thrift.async.AsyncMethodCallback resultHandler) throws TException { - iface.updateImageData(args.name, args.newName, args.license, args.internet, args.ram, args.cpu, args.id, args.version,resultHandler); + iface.updateImageData(args.name, args.newName, args.image_path, args.license, args.internet, args.ram, args.cpu, args.id, args.version,resultHandler); } } @@ -13115,12 +13119,13 @@ public class Server { private static final org.apache.thrift.protocol.TField NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("name", org.apache.thrift.protocol.TType.STRING, (short)-1); private static final org.apache.thrift.protocol.TField NEW_NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("newName", org.apache.thrift.protocol.TType.STRING, (short)-2); - private static final org.apache.thrift.protocol.TField LICENSE_FIELD_DESC = new org.apache.thrift.protocol.TField("license", org.apache.thrift.protocol.TType.BOOL, (short)-3); - private static final org.apache.thrift.protocol.TField INTERNET_FIELD_DESC = new org.apache.thrift.protocol.TField("internet", org.apache.thrift.protocol.TType.BOOL, (short)-4); - private static final org.apache.thrift.protocol.TField RAM_FIELD_DESC = new org.apache.thrift.protocol.TField("ram", org.apache.thrift.protocol.TType.I64, (short)-5); - private static final org.apache.thrift.protocol.TField CPU_FIELD_DESC = new org.apache.thrift.protocol.TField("cpu", org.apache.thrift.protocol.TType.I64, (short)-6); - private static final org.apache.thrift.protocol.TField ID_FIELD_DESC = new org.apache.thrift.protocol.TField("id", org.apache.thrift.protocol.TType.STRING, (short)-7); - private static final org.apache.thrift.protocol.TField VERSION_FIELD_DESC = new org.apache.thrift.protocol.TField("version", org.apache.thrift.protocol.TType.STRING, (short)-8); + private static final org.apache.thrift.protocol.TField IMAGE_PATH_FIELD_DESC = new org.apache.thrift.protocol.TField("image_path", org.apache.thrift.protocol.TType.STRING, (short)-3); + private static final org.apache.thrift.protocol.TField LICENSE_FIELD_DESC = new org.apache.thrift.protocol.TField("license", org.apache.thrift.protocol.TType.BOOL, (short)-4); + private static final org.apache.thrift.protocol.TField INTERNET_FIELD_DESC = new org.apache.thrift.protocol.TField("internet", org.apache.thrift.protocol.TType.BOOL, (short)-5); + private static final org.apache.thrift.protocol.TField RAM_FIELD_DESC = new org.apache.thrift.protocol.TField("ram", org.apache.thrift.protocol.TType.I64, (short)-6); + private static final org.apache.thrift.protocol.TField CPU_FIELD_DESC = new org.apache.thrift.protocol.TField("cpu", org.apache.thrift.protocol.TType.I64, (short)-7); + private static final org.apache.thrift.protocol.TField ID_FIELD_DESC = new org.apache.thrift.protocol.TField("id", org.apache.thrift.protocol.TType.STRING, (short)-8); + private static final org.apache.thrift.protocol.TField VERSION_FIELD_DESC = new org.apache.thrift.protocol.TField("version", org.apache.thrift.protocol.TType.STRING, (short)-9); private static final Map, SchemeFactory> schemes = new HashMap, SchemeFactory>(); static { @@ -13130,6 +13135,7 @@ public class Server { public String name; // required public String newName; // required + public String image_path; // required public boolean license; // required public boolean internet; // required public long ram; // required @@ -13141,12 +13147,13 @@ public class Server { public enum _Fields implements org.apache.thrift.TFieldIdEnum { NAME((short)-1, "name"), NEW_NAME((short)-2, "newName"), - LICENSE((short)-3, "license"), - INTERNET((short)-4, "internet"), - RAM((short)-5, "ram"), - CPU((short)-6, "cpu"), - ID((short)-7, "id"), - VERSION((short)-8, "version"); + IMAGE_PATH((short)-3, "image_path"), + LICENSE((short)-4, "license"), + INTERNET((short)-5, "internet"), + RAM((short)-6, "ram"), + CPU((short)-7, "cpu"), + ID((short)-8, "id"), + VERSION((short)-9, "version"); private static final Map byName = new HashMap(); @@ -13165,17 +13172,19 @@ public class Server { return NAME; case -2: // NEW_NAME return NEW_NAME; - case -3: // LICENSE + case -3: // IMAGE_PATH + return IMAGE_PATH; + case -4: // LICENSE return LICENSE; - case -4: // INTERNET + case -5: // INTERNET return INTERNET; - case -5: // RAM + case -6: // RAM return RAM; - case -6: // CPU + case -7: // CPU return CPU; - case -7: // ID + case -8: // ID return ID; - case -8: // VERSION + case -9: // VERSION return VERSION; default: return null; @@ -13229,6 +13238,8 @@ public class Server { new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); tmpMap.put(_Fields.NEW_NAME, new org.apache.thrift.meta_data.FieldMetaData("newName", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); + tmpMap.put(_Fields.IMAGE_PATH, new org.apache.thrift.meta_data.FieldMetaData("image_path", org.apache.thrift.TFieldRequirementType.DEFAULT, + new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); tmpMap.put(_Fields.LICENSE, new org.apache.thrift.meta_data.FieldMetaData("license", org.apache.thrift.TFieldRequirementType.DEFAULT, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL))); tmpMap.put(_Fields.INTERNET, new org.apache.thrift.meta_data.FieldMetaData("internet", org.apache.thrift.TFieldRequirementType.DEFAULT, @@ -13251,6 +13262,7 @@ public class Server { public updateImageData_args( String name, String newName, + String image_path, boolean license, boolean internet, long ram, @@ -13261,6 +13273,7 @@ public class Server { this(); this.name = name; this.newName = newName; + this.image_path = image_path; this.license = license; setLicenseIsSet(true); this.internet = internet; @@ -13284,6 +13297,9 @@ public class Server { if (other.isSetNewName()) { this.newName = other.newName; } + if (other.isSetImage_path()) { + this.image_path = other.image_path; + } this.license = other.license; this.internet = other.internet; this.ram = other.ram; @@ -13304,6 +13320,7 @@ public class Server { public void clear() { this.name = null; this.newName = null; + this.image_path = null; setLicenseIsSet(false); this.license = false; setInternetIsSet(false); @@ -13364,6 +13381,30 @@ public class Server { } } + public String getImage_path() { + return this.image_path; + } + + public updateImageData_args setImage_path(String image_path) { + this.image_path = image_path; + return this; + } + + public void unsetImage_path() { + this.image_path = null; + } + + /** Returns true if field image_path is set (has been assigned a value) and false otherwise */ + public boolean isSetImage_path() { + return this.image_path != null; + } + + public void setImage_pathIsSet(boolean value) { + if (!value) { + this.image_path = null; + } + } + public boolean isLicense() { return this.license; } @@ -13522,6 +13563,14 @@ public class Server { } break; + case IMAGE_PATH: + if (value == null) { + unsetImage_path(); + } else { + setImage_path((String)value); + } + break; + case LICENSE: if (value == null) { unsetLicense(); @@ -13581,6 +13630,9 @@ public class Server { case NEW_NAME: return getNewName(); + case IMAGE_PATH: + return getImage_path(); + case LICENSE: return Boolean.valueOf(isLicense()); @@ -13614,6 +13666,8 @@ public class Server { return isSetName(); case NEW_NAME: return isSetNewName(); + case IMAGE_PATH: + return isSetImage_path(); case LICENSE: return isSetLicense(); case INTERNET: @@ -13661,6 +13715,15 @@ public class Server { return false; } + boolean this_present_image_path = true && this.isSetImage_path(); + boolean that_present_image_path = true && that.isSetImage_path(); + if (this_present_image_path || that_present_image_path) { + if (!(this_present_image_path && that_present_image_path)) + return false; + if (!this.image_path.equals(that.image_path)) + return false; + } + boolean this_present_license = true; boolean that_present_license = true; if (this_present_license || that_present_license) { @@ -13751,6 +13814,16 @@ public class Server { return lastComparison; } } + lastComparison = Boolean.valueOf(isSetImage_path()).compareTo(other.isSetImage_path()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetImage_path()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.image_path, other.image_path); + if (lastComparison != 0) { + return lastComparison; + } + } lastComparison = Boolean.valueOf(isSetLicense()).compareTo(other.isSetLicense()); if (lastComparison != 0) { return lastComparison; @@ -13847,6 +13920,14 @@ public class Server { } first = false; if (!first) sb.append(", "); + sb.append("image_path:"); + if (this.image_path == null) { + sb.append("null"); + } else { + sb.append(this.image_path); + } + first = false; + if (!first) sb.append(", "); sb.append("license:"); sb.append(this.license); first = false; @@ -13939,7 +14020,15 @@ public class Server { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case -3: // LICENSE + case -3: // IMAGE_PATH + if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { + struct.image_path = iprot.readString(); + struct.setImage_pathIsSet(true); + } else { + org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; + case -4: // LICENSE if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) { struct.license = iprot.readBool(); struct.setLicenseIsSet(true); @@ -13947,7 +14036,7 @@ public class Server { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case -4: // INTERNET + case -5: // INTERNET if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) { struct.internet = iprot.readBool(); struct.setInternetIsSet(true); @@ -13955,7 +14044,7 @@ public class Server { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case -5: // RAM + case -6: // RAM if (schemeField.type == org.apache.thrift.protocol.TType.I64) { struct.ram = iprot.readI64(); struct.setRamIsSet(true); @@ -13963,7 +14052,7 @@ public class Server { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case -6: // CPU + case -7: // CPU if (schemeField.type == org.apache.thrift.protocol.TType.I64) { struct.cpu = iprot.readI64(); struct.setCpuIsSet(true); @@ -13971,7 +14060,7 @@ public class Server { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case -7: // ID + case -8: // ID if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.id = iprot.readString(); struct.setIdIsSet(true); @@ -13979,7 +14068,7 @@ public class Server { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case -8: // VERSION + case -9: // VERSION if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { struct.version = iprot.readString(); struct.setVersionIsSet(true); @@ -14024,6 +14113,11 @@ public class Server { oprot.writeFieldBegin(LICENSE_FIELD_DESC); oprot.writeBool(struct.license); oprot.writeFieldEnd(); + if (struct.image_path != null) { + oprot.writeFieldBegin(IMAGE_PATH_FIELD_DESC); + oprot.writeString(struct.image_path); + oprot.writeFieldEnd(); + } if (struct.newName != null) { oprot.writeFieldBegin(NEW_NAME_FIELD_DESC); oprot.writeString(struct.newName); @@ -14058,31 +14152,37 @@ public class Server { if (struct.isSetNewName()) { optionals.set(1); } - if (struct.isSetLicense()) { + if (struct.isSetImage_path()) { optionals.set(2); } - if (struct.isSetInternet()) { + if (struct.isSetLicense()) { optionals.set(3); } - if (struct.isSetRam()) { + if (struct.isSetInternet()) { optionals.set(4); } - if (struct.isSetCpu()) { + if (struct.isSetRam()) { optionals.set(5); } - if (struct.isSetId()) { + if (struct.isSetCpu()) { optionals.set(6); } - if (struct.isSetVersion()) { + if (struct.isSetId()) { optionals.set(7); } - oprot.writeBitSet(optionals, 8); + if (struct.isSetVersion()) { + optionals.set(8); + } + oprot.writeBitSet(optionals, 9); if (struct.isSetName()) { oprot.writeString(struct.name); } if (struct.isSetNewName()) { oprot.writeString(struct.newName); } + if (struct.isSetImage_path()) { + oprot.writeString(struct.image_path); + } if (struct.isSetLicense()) { oprot.writeBool(struct.license); } @@ -14106,7 +14206,7 @@ public class Server { @Override public void read(org.apache.thrift.protocol.TProtocol prot, updateImageData_args struct) throws org.apache.thrift.TException { TTupleProtocol iprot = (TTupleProtocol) prot; - BitSet incoming = iprot.readBitSet(8); + BitSet incoming = iprot.readBitSet(9); if (incoming.get(0)) { struct.name = iprot.readString(); struct.setNameIsSet(true); @@ -14116,26 +14216,30 @@ public class Server { struct.setNewNameIsSet(true); } if (incoming.get(2)) { + struct.image_path = iprot.readString(); + struct.setImage_pathIsSet(true); + } + if (incoming.get(3)) { struct.license = iprot.readBool(); struct.setLicenseIsSet(true); } - if (incoming.get(3)) { + if (incoming.get(4)) { struct.internet = iprot.readBool(); struct.setInternetIsSet(true); } - if (incoming.get(4)) { + if (incoming.get(5)) { struct.ram = iprot.readI64(); struct.setRamIsSet(true); } - if (incoming.get(5)) { + if (incoming.get(6)) { struct.cpu = iprot.readI64(); struct.setCpuIsSet(true); } - if (incoming.get(6)) { + if (incoming.get(7)) { struct.id = iprot.readString(); struct.setIdIsSet(true); } - if (incoming.get(7)) { + if (incoming.get(8)) { struct.version = iprot.readString(); struct.setVersionIsSet(true); } diff --git a/Dozentenmodulserver/src/server/ServerHandler.java b/Dozentenmodulserver/src/server/ServerHandler.java index 7c93422f..67514c39 100644 --- a/Dozentenmodulserver/src/server/ServerHandler.java +++ b/Dozentenmodulserver/src/server/ServerHandler.java @@ -87,9 +87,9 @@ public class ServerHandler implements Server.Iface { String Tel, String Fak, boolean license, boolean internet, long ram, long cpu, String imagePath) throws TException { - int pk_institution = sql.setInstitution(con, university); + String pk_institution = sql.setInstitution(con, university); - int pk_person = sql.setPerson(con, login, lastname, firstname, Mail, + String pk_person = sql.setPerson(con, login, lastname, firstname, Mail, new Date(), pk_institution); sql.setImageData(con, pk_person, license, internet, cpu, ram, @@ -177,18 +177,18 @@ public class ServerHandler implements Server.Iface { String imagename, String login, String firstname, String lastname, String university, String Mail, String Tel, String Fak) throws TException { - int pk_image = 0; + String pk_image = null; int imageversion = 0; - int pk_institution = sql.setInstitution(con, university); - int pk_person = sql.setPerson(con, login, lastname, firstname, Mail, + String pk_institution = sql.setInstitution(con, university); + String pk_person = sql.setPerson(con, login, lastname, firstname, Mail, new Date(), pk_institution); ResultSet image = sql.getImageIDandVersion(con, imagename); try { while (image.next()) { - pk_image = image.getInt("GUID_imageID"); + pk_image = image.getString("GUID_imageID"); imageversion = image.getInt("imageVersion"); } } catch (SQLException e) { @@ -282,10 +282,10 @@ public class ServerHandler implements Server.Iface { } @Override - public boolean updateImageData(String name, String newName, + public boolean updateImageData(String name, String newName, String image_path, boolean license, boolean internet, long ram, long cpu, String id, String version) throws TException { - sql.UpdateImageData(con, name, newName, license, internet, cpu, ram, + sql.UpdateImageData(con, name, newName,image_path, license, internet, cpu, ram, id, version); return false; } diff --git a/Dozentenmodulserver/src/sql/SQL.java b/Dozentenmodulserver/src/sql/SQL.java index 52cbefb9..a5eeb83e 100644 --- a/Dozentenmodulserver/src/sql/SQL.java +++ b/Dozentenmodulserver/src/sql/SQL.java @@ -6,6 +6,8 @@ import java.text.DateFormat; import java.text.SimpleDateFormat; import java.util.Date; import java.util.Random; +import java.util.UUID; + import org.apache.log4j.Logger; import server.BinaryListener; @@ -114,7 +116,7 @@ public class SQL { return null; } - public int setInstitution(Connection con, String university) { + public String setInstitution(Connection con, String university) { try { Statement stm = con.createStatement(); @@ -122,8 +124,8 @@ public class SQL { .executeQuery("SELECT * FROM bwLehrpool.m_institution where name like'" + university + "';"); if (ret.next() == false) { - Random rand = new Random(); - int id = rand.nextInt(); + + String id = UUID.randomUUID().toString(); stm.executeUpdate("INSERT INTO `bwLehrpool`.`m_institution`(`institutionID`,`name`)VALUES('" + id + "','" + university + "');"); con.commit(); @@ -131,9 +133,9 @@ public class SQL { .executeQuery("SELECT institutionID FROM bwLehrpool.m_institution WHERE name like '" + university + "';"); rs.next(); - return rs.getInt("institutionID"); + return rs.getString("institutionID"); } else { - return ret.getInt("institutionID"); + return ret.getString("institutionID"); } } catch (SQLException e) { @@ -141,11 +143,11 @@ public class SQL { log.info(new Date() + " - Failed to setInstitution."); e.printStackTrace(); } - return -1; + return "-1"; } - public int setPerson(Connection con, String login, String lastname, - String firstname, String mail, Date lastlogin, int Institution) { + public String setPerson(Connection con, String login, String lastname, + String firstname, String mail, Date lastlogin, String Institution) { DateFormat formatter = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss"); try { Statement stm = con.createStatement(); @@ -156,9 +158,10 @@ public class SQL { + "' and Vorname like '" + firstname + "';"); + if (ret.next() == false) { - Random rand = new Random(); - int id = rand.nextInt(); + + String id = UUID.randomUUID().toString(); stm.executeUpdate("INSERT INTO `bwLehrpool`.`m_user`(`userID`,`loginName`,`nachname`,`vorname`,`mail`,`lastLogin`,`institution`)VALUES('" + id + "','" @@ -182,9 +185,10 @@ public class SQL { + firstname + "';"); rs.next(); - return rs.getInt("userID"); + return rs.getString("userID"); } else { - return ret.getInt("userID"); + ret.first(); + return ret.getString("userID"); } } catch (SQLException e) { @@ -192,10 +196,10 @@ public class SQL { log.info(new Date() + " - Failed to setPerson."); e.printStackTrace(); } - return -1; + return "-1"; } - public boolean setImageData(Connection con, int pk_person, boolean license, + public boolean setImageData(Connection con, String pk_person, boolean license, boolean internet, long cpu, long ram, String imagename, String imagePath) { @@ -212,8 +216,8 @@ public class SQL { try { Statement stm = con.createStatement(); - Random random = new Random(); - int uid = random.nextInt(); + + String uid = UUID.randomUUID().toString(); stm.executeUpdate("INSERT INTO `bwLehrpool`.`m_VLData_imageInfo`(`GUID_imageID`,`imageVersion`,`image_name`,`image_path`,`image_lastCall`,`image_create_time`,`image_update_time`,`image_owner`,`image_change_by`,`rec_create_time`,`rec_change_time`,`rec_owner`,`rec_change_by`,`content_operatingSystem`,`status_isCompressed`,`status_isSecure`,`status_isOptimzed`,`status_isValid`,`status_isReady`,`status_isDeleted`,`status_isLastOfficialVersion`,`cond_hasLicenseRestriction`,`cond_hasInternetRestriction`,`cond_minRAM`,`cond_minCPUs`)VALUES('" + uid // GUID_imageID + "',1,'" // imageVersion @@ -316,7 +320,7 @@ public class SQL { return null; } - public int setLectureData(Connection con, int pk_person, int pk_image, + public int setLectureData(Connection con, String pk_person, String pk_image, int imageversion, String name, String desc, String shortdesc, String start, String end, boolean isactive) { @@ -328,8 +332,8 @@ public class SQL { } try { Statement stm = con.createStatement(); - Random random = new Random(); - int uid = random.nextInt(); + + String uid = UUID.randomUUID().toString(); stm.executeUpdate("INSERT INTO `bwLehrpool`.`m_VLData_lecture`(`lectureID`,`name`,`isActive`,`startTime`,`endTime`,`lastUsed`,`shortDescription`,`description`,`imageID`,`imageVersion`,`admin_createTime`,`admin_changeTime`,`admin_owner`,`admin_change_by`)VALUES('" + uid + "','" @@ -398,7 +402,7 @@ public class SQL { return null; } - public int UpdateImageData(Connection con, String name, String newName, + public int UpdateImageData(Connection con, String name, String newName,String image_path, boolean license, boolean internet, long cpu, long ram, String id, String version) { try { @@ -420,6 +424,8 @@ public class SQL { + newVersion + "',`image_name` = '" + newName + + "',`image_path` = '" + + image_path + "',`image_update_time` = '" + formatter.format(new Date()) + "',`rec_change_time` = '" diff --git a/Dozentenmodulserver/thrift/server.thrift b/Dozentenmodulserver/thrift/server.thrift index 662ec004..088ea8fb 100644 --- a/Dozentenmodulserver/thrift/server.thrift +++ b/Dozentenmodulserver/thrift/server.thrift @@ -44,7 +44,7 @@ service Server{ bool writeLecturedata(string name, string shortdesc, string desc,string startDate, string endDate, bool isActive, string imagename,string login,string firstname,string lastname, string university, string Mail, string Tel,string Fak), bool startFileCopy(string file), map getImageData(string imageid, string imageversion), - bool updateImageData(string name, string newName,bool license, bool internet, int ram,int cpu, string id, string version), + bool updateImageData(string name, string newName,string image_path,bool license, bool internet, int ram,int cpu, string id, string version), map getLectureData(string lecturename), bool deleteImageData(string id, string version), bool updateLecturedata(string name, string newName ,string shortdesc, string desc,string startDate, string endDate, bool isActive, string imagename,string firstname,string lastname, string university, string Mail, string Tel,string Fak, string id), -- cgit v1.2.3-55-g7522 From 87eabc4f21e81ecb16e4aca10b616eefa1823ac6 Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 8 May 2014 13:58:51 +0200 Subject: FAQ & OTRS --- .../bin/gui/image/CreateImageAllgemein_GUI$1.class | Bin 1008 -> 1008 bytes .../bin/gui/image/CreateImageAllgemein_GUI$2.class | Bin 847 -> 847 bytes .../bin/gui/image/CreateImageAllgemein_GUI$3.class | Bin 1166 -> 1166 bytes .../bin/gui/image/CreateImageAllgemein_GUI$4.class | Bin 1656 -> 1656 bytes .../bin/gui/image/CreateImageAllgemein_GUI.class | Bin 8273 -> 8422 bytes .../bin/gui/image/CreateImageTechnisch_GUI$1.class | Bin 758 -> 758 bytes .../bin/gui/image/CreateImageTechnisch_GUI$2.class | Bin 847 -> 847 bytes .../bin/gui/image/CreateImageTechnisch_GUI$3.class | Bin 1673 -> 1673 bytes .../bin/gui/image/CreateImageTechnisch_GUI$4.class | Bin 1667 -> 1667 bytes .../bin/gui/image/CreateImageTechnisch_GUI.class | Bin 8784 -> 8933 bytes Dozentenmodul/bin/gui/image/DeleteImage_GUI.class | Bin 12396 -> 12528 bytes .../bin/gui/image/EditImageAllgemein_GUI$1.class | Bin 867 -> 867 bytes .../bin/gui/image/EditImageAllgemein_GUI$2.class | Bin 956 -> 956 bytes .../bin/gui/image/EditImageAllgemein_GUI$3.class | Bin 1008 -> 1008 bytes .../bin/gui/image/EditImageAllgemein_GUI.class | Bin 9611 -> 9756 bytes .../bin/gui/image/EditImageTechnisch_GUI$1.class | Bin 746 -> 746 bytes .../bin/gui/image/EditImageTechnisch_GUI$2.class | Bin 835 -> 835 bytes .../bin/gui/image/EditImageTechnisch_GUI$3.class | Bin 1691 -> 1691 bytes .../bin/gui/image/EditImageTechnisch_GUI$4.class | Bin 1685 -> 1685 bytes .../bin/gui/image/EditImageTechnisch_GUI.class | Bin 8510 -> 8655 bytes .../bin/gui/image/FTPCreateUploader_GUI$1.class | Bin 792 -> 792 bytes .../bin/gui/image/FTPCreateUploader_GUI$3.class | Bin 1446 -> 1446 bytes .../bin/gui/image/FTPCreateUploader_GUI$4.class | Bin 1198 -> 1198 bytes .../bin/gui/image/FTPCreateUploader_GUI$6.class | Bin 2040 -> 2040 bytes .../bin/gui/image/FTPCreateUploader_GUI$7.class | Bin 2125 -> 2125 bytes .../bin/gui/image/FTPCreateUploader_GUI$8.class | Bin 1014 -> 1014 bytes .../bin/gui/image/FTPCreateUploader_GUI.class | Bin 12804 -> 13234 bytes .../bin/gui/image/FTPDownloader_GUI$1.class | Bin 1887 -> 1887 bytes .../bin/gui/image/FTPDownloader_GUI$2.class | Bin 1303 -> 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 2030 -> 1325 bytes .../bin/gui/image/FTPDownloader_GUI$6.class | Bin 972 -> 1324 bytes .../bin/gui/image/FTPDownloader_GUI.class | Bin 10352 -> 11061 bytes .../bin/gui/image/FTPEditUploader_GUI$1.class | Bin 782 -> 782 bytes .../bin/gui/image/FTPEditUploader_GUI$2.class | Bin 1301 -> 1301 bytes .../bin/gui/image/FTPEditUploader_GUI$3.class | Bin 1434 -> 1434 bytes .../bin/gui/image/FTPEditUploader_GUI$4.class | Bin 1186 -> 1186 bytes .../bin/gui/image/FTPEditUploader_GUI$5.class | Bin 799 -> 799 bytes .../bin/gui/image/FTPEditUploader_GUI$6.class | Bin 1836 -> 1836 bytes .../bin/gui/image/FTPEditUploader_GUI.class | Bin 12324 -> 12750 bytes .../bin/gui/image/SearchEditImage_GUI$1.class | Bin 1094 -> 1094 bytes .../bin/gui/image/SearchEditImage_GUI$3.class | Bin 951 -> 951 bytes .../bin/gui/image/SearchEditImage_GUI$7.class | Bin 1941 -> 1941 bytes .../bin/gui/image/SearchEditImage_GUI$9.class | Bin 2177 -> 2177 bytes .../bin/gui/image/SearchEditImage_GUI.class | Bin 12270 -> 12411 bytes .../bin/gui/image/SearchImage_GUI$1.class | Bin 1066 -> 1066 bytes .../bin/gui/image/SearchImage_GUI$2.class | Bin 1273 -> 1273 bytes .../bin/gui/image/SearchImage_GUI$3.class | Bin 927 -> 927 bytes .../bin/gui/image/SearchImage_GUI$4.class | Bin 1274 -> 1274 bytes .../bin/gui/image/SearchImage_GUI$5.class | Bin 914 -> 914 bytes .../bin/gui/image/SearchImage_GUI$6.class | Bin 1613 -> 1613 bytes .../bin/gui/image/SearchImage_GUI$7.class | Bin 1917 -> 1917 bytes .../bin/gui/image/SearchImage_GUI$8.class | Bin 956 -> 956 bytes Dozentenmodul/bin/gui/image/SearchImage_GUI.class | Bin 12060 -> 12192 bytes .../bin/gui/intro/BillOfRights_GUI$1.class | Bin 710 -> 710 bytes .../bin/gui/intro/BillOfRights_GUI$2.class | Bin 2231 -> 2231 bytes .../bin/gui/intro/BillOfRights_GUI$3.class | Bin 959 -> 959 bytes Dozentenmodul/bin/gui/intro/BillOfRights_GUI.class | Bin 10827 -> 11020 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 10545 -> 10734 bytes Dozentenmodul/bin/gui/intro/VmWareLink_GUI$1.class | Bin 695 -> 695 bytes Dozentenmodul/bin/gui/intro/VmWareLink_GUI$2.class | Bin 1629 -> 1629 bytes Dozentenmodul/bin/gui/intro/VmWareLink_GUI$3.class | Bin 2192 -> 2192 bytes Dozentenmodul/bin/gui/intro/VmWareLink_GUI$4.class | Bin 827 -> 827 bytes Dozentenmodul/bin/gui/intro/VmWareLink_GUI.class | Bin 5311 -> 5449 bytes .../gui/lecture/CreateLectureAllgemein_GUI$1.class | Bin 1034 -> 1034 bytes .../gui/lecture/CreateLectureAllgemein_GUI$2.class | Bin 869 -> 869 bytes .../gui/lecture/CreateLectureAllgemein_GUI$3.class | Bin 926 -> 926 bytes .../gui/lecture/CreateLectureAllgemein_GUI$4.class | Bin 923 -> 923 bytes .../gui/lecture/CreateLectureAllgemein_GUI$5.class | Bin 1922 -> 1922 bytes .../gui/lecture/CreateLectureAllgemein_GUI$6.class | Bin 3105 -> 3105 bytes .../gui/lecture/CreateLectureAllgemein_GUI.class | Bin 10819 -> 10976 bytes .../gui/lecture/EditLectureAllgemein_GUI$1.class | Bin 768 -> 768 bytes .../gui/lecture/EditLectureAllgemein_GUI$2.class | Bin 857 -> 857 bytes .../gui/lecture/EditLectureAllgemein_GUI$3.class | Bin 1892 -> 1892 bytes .../gui/lecture/EditLectureAllgemein_GUI$4.class | Bin 1951 -> 1951 bytes .../bin/gui/lecture/EditLectureAllgemein_GUI.class | Bin 10004 -> 10157 bytes .../lecture/ExtendedSearchForImages_GUI$1.class | Bin 786 -> 786 bytes .../lecture/ExtendedSearchForImages_GUI$2.class | Bin 937 -> 937 bytes .../lecture/ExtendedSearchForImages_GUI$3.class | Bin 931 -> 931 bytes .../gui/lecture/ExtendedSearchForImages_GUI.class | Bin 6505 -> 6724 bytes .../src/gui/image/CreateImageAllgemein_GUI.java | 35 +++++++++++ .../src/gui/image/CreateImageTechnisch_GUI.java | 37 +++++++++++ Dozentenmodul/src/gui/image/DeleteImage_GUI.java | 48 +++++++++----- .../src/gui/image/EditImageAllgemein_GUI.java | 36 +++++++++++ .../src/gui/image/EditImageTechnisch_GUI.java | 36 ++++++++++- .../src/gui/image/FTPCreateUploader_GUI.java | 37 ++++++++++- Dozentenmodul/src/gui/image/FTPDownloader_GUI.java | 70 ++++++++++++++++++--- .../src/gui/image/FTPEditUploader_GUI.java | 49 ++++++++++++++- .../src/gui/image/SearchEditImage_GUI.java | 36 +++++++++++ Dozentenmodul/src/gui/image/SearchImage_GUI.java | 36 +++++++++++ .../src/gui/image/SearchMethodLecture_GUI.java | 37 +++++++++++ Dozentenmodul/src/gui/intro/BillOfRights_GUI.java | 38 +++++++++++ Dozentenmodul/src/gui/intro/MainMenue_GUI.java | 38 +++++++++++ Dozentenmodul/src/gui/intro/VmWareLink_GUI.java | 40 +++++++++++- .../gui/lecture/CreateLectureAllgemein_GUI.java | 36 +++++++++++ .../src/gui/lecture/CreateLectureLink_GUI.java | 36 +++++++++++ .../src/gui/lecture/DeleteLecture_GUI.java | 37 +++++++++++ .../src/gui/lecture/EditLectureAllgemein_GUI.java | 37 +++++++++++ .../src/gui/lecture/EditLectureLink_GUI.java | 36 +++++++++++ .../src/gui/lecture/EditLectureSearch_GUI.java | 36 +++++++++++ .../gui/lecture/ExtendedSearchForImages_GUI.java | 40 ++++++++++++ .../src/gui/lecture/SearchLecture_GUI.java | 37 +++++++++++ Dozentenmodul/src/models/Links.java | 15 +++++ 114 files changed, 855 insertions(+), 28 deletions(-) create mode 100644 Dozentenmodul/src/models/Links.java (limited to 'Dozentenmodul/src/gui/image/EditImageAllgemein_GUI.java') diff --git a/Dozentenmodul/bin/gui/image/CreateImageAllgemein_GUI$1.class b/Dozentenmodul/bin/gui/image/CreateImageAllgemein_GUI$1.class index d5e68cc7..b6db4a44 100644 Binary files a/Dozentenmodul/bin/gui/image/CreateImageAllgemein_GUI$1.class and b/Dozentenmodul/bin/gui/image/CreateImageAllgemein_GUI$1.class differ diff --git a/Dozentenmodul/bin/gui/image/CreateImageAllgemein_GUI$2.class b/Dozentenmodul/bin/gui/image/CreateImageAllgemein_GUI$2.class index 35392672..192b81a6 100644 Binary files a/Dozentenmodul/bin/gui/image/CreateImageAllgemein_GUI$2.class and b/Dozentenmodul/bin/gui/image/CreateImageAllgemein_GUI$2.class differ diff --git a/Dozentenmodul/bin/gui/image/CreateImageAllgemein_GUI$3.class b/Dozentenmodul/bin/gui/image/CreateImageAllgemein_GUI$3.class index de93b267..b75c16b3 100644 Binary files a/Dozentenmodul/bin/gui/image/CreateImageAllgemein_GUI$3.class and b/Dozentenmodul/bin/gui/image/CreateImageAllgemein_GUI$3.class differ diff --git a/Dozentenmodul/bin/gui/image/CreateImageAllgemein_GUI$4.class b/Dozentenmodul/bin/gui/image/CreateImageAllgemein_GUI$4.class index be1e5801..c68ae652 100644 Binary files a/Dozentenmodul/bin/gui/image/CreateImageAllgemein_GUI$4.class and b/Dozentenmodul/bin/gui/image/CreateImageAllgemein_GUI$4.class differ diff --git a/Dozentenmodul/bin/gui/image/CreateImageAllgemein_GUI.class b/Dozentenmodul/bin/gui/image/CreateImageAllgemein_GUI.class index 0e5865b9..6460158f 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$1.class b/Dozentenmodul/bin/gui/image/CreateImageTechnisch_GUI$1.class index 04edeee9..1d67fe3e 100644 Binary files a/Dozentenmodul/bin/gui/image/CreateImageTechnisch_GUI$1.class and b/Dozentenmodul/bin/gui/image/CreateImageTechnisch_GUI$1.class differ diff --git a/Dozentenmodul/bin/gui/image/CreateImageTechnisch_GUI$2.class b/Dozentenmodul/bin/gui/image/CreateImageTechnisch_GUI$2.class index a88a21f5..9fc35b48 100644 Binary files a/Dozentenmodul/bin/gui/image/CreateImageTechnisch_GUI$2.class and b/Dozentenmodul/bin/gui/image/CreateImageTechnisch_GUI$2.class differ diff --git a/Dozentenmodul/bin/gui/image/CreateImageTechnisch_GUI$3.class b/Dozentenmodul/bin/gui/image/CreateImageTechnisch_GUI$3.class index 1ac1680a..4aedd907 100644 Binary files a/Dozentenmodul/bin/gui/image/CreateImageTechnisch_GUI$3.class and b/Dozentenmodul/bin/gui/image/CreateImageTechnisch_GUI$3.class differ diff --git a/Dozentenmodul/bin/gui/image/CreateImageTechnisch_GUI$4.class b/Dozentenmodul/bin/gui/image/CreateImageTechnisch_GUI$4.class index ac331f22..2c9cd712 100644 Binary files a/Dozentenmodul/bin/gui/image/CreateImageTechnisch_GUI$4.class and b/Dozentenmodul/bin/gui/image/CreateImageTechnisch_GUI$4.class differ diff --git a/Dozentenmodul/bin/gui/image/CreateImageTechnisch_GUI.class b/Dozentenmodul/bin/gui/image/CreateImageTechnisch_GUI.class index 6fa84ba9..82d24993 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 d7c2577d..567fc96b 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$1.class b/Dozentenmodul/bin/gui/image/EditImageAllgemein_GUI$1.class index 7692bcfb..538a8eb4 100644 Binary files a/Dozentenmodul/bin/gui/image/EditImageAllgemein_GUI$1.class and b/Dozentenmodul/bin/gui/image/EditImageAllgemein_GUI$1.class differ diff --git a/Dozentenmodul/bin/gui/image/EditImageAllgemein_GUI$2.class b/Dozentenmodul/bin/gui/image/EditImageAllgemein_GUI$2.class index 4b3d190a..6617ad6e 100644 Binary files a/Dozentenmodul/bin/gui/image/EditImageAllgemein_GUI$2.class and b/Dozentenmodul/bin/gui/image/EditImageAllgemein_GUI$2.class differ diff --git a/Dozentenmodul/bin/gui/image/EditImageAllgemein_GUI$3.class b/Dozentenmodul/bin/gui/image/EditImageAllgemein_GUI$3.class index a7677d8e..1a5a0fe5 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.class b/Dozentenmodul/bin/gui/image/EditImageAllgemein_GUI.class index 9ef38fa1..b2656782 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$1.class b/Dozentenmodul/bin/gui/image/EditImageTechnisch_GUI$1.class index 216e48c4..ba4c1b16 100644 Binary files a/Dozentenmodul/bin/gui/image/EditImageTechnisch_GUI$1.class and b/Dozentenmodul/bin/gui/image/EditImageTechnisch_GUI$1.class differ diff --git a/Dozentenmodul/bin/gui/image/EditImageTechnisch_GUI$2.class b/Dozentenmodul/bin/gui/image/EditImageTechnisch_GUI$2.class index d22c246d..9ec941b5 100644 Binary files a/Dozentenmodul/bin/gui/image/EditImageTechnisch_GUI$2.class and b/Dozentenmodul/bin/gui/image/EditImageTechnisch_GUI$2.class differ diff --git a/Dozentenmodul/bin/gui/image/EditImageTechnisch_GUI$3.class b/Dozentenmodul/bin/gui/image/EditImageTechnisch_GUI$3.class index 4edb101c..20b74c24 100644 Binary files a/Dozentenmodul/bin/gui/image/EditImageTechnisch_GUI$3.class and b/Dozentenmodul/bin/gui/image/EditImageTechnisch_GUI$3.class differ diff --git a/Dozentenmodul/bin/gui/image/EditImageTechnisch_GUI$4.class b/Dozentenmodul/bin/gui/image/EditImageTechnisch_GUI$4.class index b31208f2..77c79351 100644 Binary files a/Dozentenmodul/bin/gui/image/EditImageTechnisch_GUI$4.class and b/Dozentenmodul/bin/gui/image/EditImageTechnisch_GUI$4.class differ diff --git a/Dozentenmodul/bin/gui/image/EditImageTechnisch_GUI.class b/Dozentenmodul/bin/gui/image/EditImageTechnisch_GUI.class index 7b09a9c7..7253db83 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$1.class b/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$1.class index 34ef1b8c..353bafa4 100644 Binary files a/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$1.class and b/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$1.class differ diff --git a/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$3.class b/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$3.class index 20f615b4..94acbae9 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$4.class b/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$4.class index e0fabcc6..0081eba4 100644 Binary files a/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$4.class and b/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$4.class differ diff --git a/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$6.class b/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$6.class index 0d982996..9f6747a9 100644 Binary files a/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$6.class and b/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$6.class differ diff --git a/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$7.class b/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$7.class index 65c67d65..e013392a 100644 Binary files a/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$7.class and b/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$7.class differ diff --git a/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$8.class b/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$8.class index 79c3a835..3b3ec0ee 100644 Binary files a/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$8.class and b/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$8.class differ diff --git a/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI.class b/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI.class index 735ff875..7ec6679a 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$1.class b/Dozentenmodul/bin/gui/image/FTPDownloader_GUI$1.class index 1b6ed7d5..e2be756c 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 57505d9b..b8a6fad4 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 53ce9bf1..001d50ef 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 d72b7fd9..d345024c 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 a86cfda4..5a20444c 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 4ef7cd96..e6cb6231 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 d9f847f2..3a0bf56a 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$1.class b/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$1.class index a25d7157..56759209 100644 Binary files a/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$1.class and b/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$1.class differ diff --git a/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$2.class b/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$2.class index 55d72ee9..19ad69d7 100644 Binary files a/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$2.class and b/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$2.class differ diff --git a/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$3.class b/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$3.class index 23f71ee1..74aaef08 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$4.class b/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$4.class index dfb69143..23321e4e 100644 Binary files a/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$4.class and b/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$4.class differ diff --git a/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$5.class b/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$5.class index 87c0067c..aa1b5a70 100644 Binary files a/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$5.class and b/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$5.class differ diff --git a/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$6.class b/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$6.class index 563e41cb..3ee3ca66 100644 Binary files a/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$6.class and b/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$6.class differ diff --git a/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI.class b/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI.class index 8a8771d9..c3611ea8 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$1.class b/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$1.class index 89997bb5..885bcd1e 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$3.class b/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$3.class index 87bf6d5f..196208c4 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$7.class b/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$7.class index 35e33e48..cdf3cad7 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$9.class b/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$9.class index d058454e..5d6c601d 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 5713f420..7207fba7 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$1.class b/Dozentenmodul/bin/gui/image/SearchImage_GUI$1.class index a0172be7..4400254b 100644 Binary files a/Dozentenmodul/bin/gui/image/SearchImage_GUI$1.class and b/Dozentenmodul/bin/gui/image/SearchImage_GUI$1.class differ diff --git a/Dozentenmodul/bin/gui/image/SearchImage_GUI$2.class b/Dozentenmodul/bin/gui/image/SearchImage_GUI$2.class index ab7702e4..eca0e58d 100644 Binary files a/Dozentenmodul/bin/gui/image/SearchImage_GUI$2.class and b/Dozentenmodul/bin/gui/image/SearchImage_GUI$2.class differ diff --git a/Dozentenmodul/bin/gui/image/SearchImage_GUI$3.class b/Dozentenmodul/bin/gui/image/SearchImage_GUI$3.class index c868afe6..64a6e9c9 100644 Binary files a/Dozentenmodul/bin/gui/image/SearchImage_GUI$3.class and b/Dozentenmodul/bin/gui/image/SearchImage_GUI$3.class differ diff --git a/Dozentenmodul/bin/gui/image/SearchImage_GUI$4.class b/Dozentenmodul/bin/gui/image/SearchImage_GUI$4.class index 92fcc494..46b870e2 100644 Binary files a/Dozentenmodul/bin/gui/image/SearchImage_GUI$4.class and b/Dozentenmodul/bin/gui/image/SearchImage_GUI$4.class differ diff --git a/Dozentenmodul/bin/gui/image/SearchImage_GUI$5.class b/Dozentenmodul/bin/gui/image/SearchImage_GUI$5.class index f8d904d8..24a37378 100644 Binary files a/Dozentenmodul/bin/gui/image/SearchImage_GUI$5.class and b/Dozentenmodul/bin/gui/image/SearchImage_GUI$5.class differ diff --git a/Dozentenmodul/bin/gui/image/SearchImage_GUI$6.class b/Dozentenmodul/bin/gui/image/SearchImage_GUI$6.class index 5e1dc507..0908c65a 100644 Binary files a/Dozentenmodul/bin/gui/image/SearchImage_GUI$6.class and b/Dozentenmodul/bin/gui/image/SearchImage_GUI$6.class differ diff --git a/Dozentenmodul/bin/gui/image/SearchImage_GUI$7.class b/Dozentenmodul/bin/gui/image/SearchImage_GUI$7.class index 46fdf45d..88e9e10c 100644 Binary files a/Dozentenmodul/bin/gui/image/SearchImage_GUI$7.class and b/Dozentenmodul/bin/gui/image/SearchImage_GUI$7.class differ diff --git a/Dozentenmodul/bin/gui/image/SearchImage_GUI$8.class b/Dozentenmodul/bin/gui/image/SearchImage_GUI$8.class index 1e1dc0f3..95a953f3 100644 Binary files a/Dozentenmodul/bin/gui/image/SearchImage_GUI$8.class and b/Dozentenmodul/bin/gui/image/SearchImage_GUI$8.class differ diff --git a/Dozentenmodul/bin/gui/image/SearchImage_GUI.class b/Dozentenmodul/bin/gui/image/SearchImage_GUI.class index 39a39cf6..d7bc6bab 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$1.class b/Dozentenmodul/bin/gui/intro/BillOfRights_GUI$1.class index 70661228..7e083945 100644 Binary files a/Dozentenmodul/bin/gui/intro/BillOfRights_GUI$1.class and b/Dozentenmodul/bin/gui/intro/BillOfRights_GUI$1.class differ diff --git a/Dozentenmodul/bin/gui/intro/BillOfRights_GUI$2.class b/Dozentenmodul/bin/gui/intro/BillOfRights_GUI$2.class index a69337f6..34ba71c8 100644 Binary files a/Dozentenmodul/bin/gui/intro/BillOfRights_GUI$2.class and b/Dozentenmodul/bin/gui/intro/BillOfRights_GUI$2.class differ diff --git a/Dozentenmodul/bin/gui/intro/BillOfRights_GUI$3.class b/Dozentenmodul/bin/gui/intro/BillOfRights_GUI$3.class index 0d4bafa7..6608b6fa 100644 Binary files a/Dozentenmodul/bin/gui/intro/BillOfRights_GUI$3.class and b/Dozentenmodul/bin/gui/intro/BillOfRights_GUI$3.class differ diff --git a/Dozentenmodul/bin/gui/intro/BillOfRights_GUI.class b/Dozentenmodul/bin/gui/intro/BillOfRights_GUI.class index 84ebd55c..a7494fc1 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/MainMenue_GUI$1.class b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$1.class index 2891e710..ab46596e 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 bd12ec95..5d4f34b1 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 c964162e..94f25f6e 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 f2dd265c..ac807987 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 3ba22ff0..725c8726 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 c867b9d2..8a3d58a4 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 e4239a4e..0a07460d 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 fa189dbb..22272f1d 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 843f828c..989819df 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 a373ce86..fba829d8 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 c035deed..ba1ed4b3 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$1.class b/Dozentenmodul/bin/gui/intro/VmWareLink_GUI$1.class index 39963963..be8f1a48 100644 Binary files a/Dozentenmodul/bin/gui/intro/VmWareLink_GUI$1.class and b/Dozentenmodul/bin/gui/intro/VmWareLink_GUI$1.class differ diff --git a/Dozentenmodul/bin/gui/intro/VmWareLink_GUI$2.class b/Dozentenmodul/bin/gui/intro/VmWareLink_GUI$2.class index 3f17b0d6..0527987f 100644 Binary files a/Dozentenmodul/bin/gui/intro/VmWareLink_GUI$2.class and b/Dozentenmodul/bin/gui/intro/VmWareLink_GUI$2.class differ diff --git a/Dozentenmodul/bin/gui/intro/VmWareLink_GUI$3.class b/Dozentenmodul/bin/gui/intro/VmWareLink_GUI$3.class index c9b6e28a..a1ae48ca 100644 Binary files a/Dozentenmodul/bin/gui/intro/VmWareLink_GUI$3.class and b/Dozentenmodul/bin/gui/intro/VmWareLink_GUI$3.class differ diff --git a/Dozentenmodul/bin/gui/intro/VmWareLink_GUI$4.class b/Dozentenmodul/bin/gui/intro/VmWareLink_GUI$4.class index 3485b280..1a30bb2e 100644 Binary files a/Dozentenmodul/bin/gui/intro/VmWareLink_GUI$4.class and b/Dozentenmodul/bin/gui/intro/VmWareLink_GUI$4.class differ diff --git a/Dozentenmodul/bin/gui/intro/VmWareLink_GUI.class b/Dozentenmodul/bin/gui/intro/VmWareLink_GUI.class index 2cd12110..0b931e12 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$1.class b/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI$1.class index 9b994ec4..12d4c61f 100644 Binary files a/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI$1.class and b/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI$1.class differ diff --git a/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI$2.class b/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI$2.class index 6862545b..51b3d910 100644 Binary files a/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI$2.class and b/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI$2.class differ diff --git a/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI$3.class b/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI$3.class index d71d71d5..ceea662a 100644 Binary files a/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI$3.class and b/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI$3.class differ diff --git a/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI$4.class b/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI$4.class index 9fe72770..67922a25 100644 Binary files a/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI$4.class and b/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI$4.class differ diff --git a/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI$5.class b/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI$5.class index 09017e11..11cda571 100644 Binary files a/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI$5.class and b/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI$5.class differ diff --git a/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI$6.class b/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI$6.class index adcc7fd5..0759ddca 100644 Binary files a/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI$6.class and b/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI$6.class differ diff --git a/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI.class b/Dozentenmodul/bin/gui/lecture/CreateLectureAllgemein_GUI.class index 58677633..8f480656 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$1.class b/Dozentenmodul/bin/gui/lecture/EditLectureAllgemein_GUI$1.class index dd70f264..0c7b67a0 100644 Binary files a/Dozentenmodul/bin/gui/lecture/EditLectureAllgemein_GUI$1.class and b/Dozentenmodul/bin/gui/lecture/EditLectureAllgemein_GUI$1.class differ diff --git a/Dozentenmodul/bin/gui/lecture/EditLectureAllgemein_GUI$2.class b/Dozentenmodul/bin/gui/lecture/EditLectureAllgemein_GUI$2.class index 22209c73..09461d3a 100644 Binary files a/Dozentenmodul/bin/gui/lecture/EditLectureAllgemein_GUI$2.class and b/Dozentenmodul/bin/gui/lecture/EditLectureAllgemein_GUI$2.class differ diff --git a/Dozentenmodul/bin/gui/lecture/EditLectureAllgemein_GUI$3.class b/Dozentenmodul/bin/gui/lecture/EditLectureAllgemein_GUI$3.class index 808b6d99..a43a2ad6 100644 Binary files a/Dozentenmodul/bin/gui/lecture/EditLectureAllgemein_GUI$3.class and b/Dozentenmodul/bin/gui/lecture/EditLectureAllgemein_GUI$3.class differ diff --git a/Dozentenmodul/bin/gui/lecture/EditLectureAllgemein_GUI$4.class b/Dozentenmodul/bin/gui/lecture/EditLectureAllgemein_GUI$4.class index c412ac7b..e2bcac46 100644 Binary files a/Dozentenmodul/bin/gui/lecture/EditLectureAllgemein_GUI$4.class and b/Dozentenmodul/bin/gui/lecture/EditLectureAllgemein_GUI$4.class differ diff --git a/Dozentenmodul/bin/gui/lecture/EditLectureAllgemein_GUI.class b/Dozentenmodul/bin/gui/lecture/EditLectureAllgemein_GUI.class index 81bbec82..f5f80af3 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/bin/gui/lecture/ExtendedSearchForImages_GUI$1.class b/Dozentenmodul/bin/gui/lecture/ExtendedSearchForImages_GUI$1.class index 8ae5f63c..194553e1 100644 Binary files a/Dozentenmodul/bin/gui/lecture/ExtendedSearchForImages_GUI$1.class and b/Dozentenmodul/bin/gui/lecture/ExtendedSearchForImages_GUI$1.class differ diff --git a/Dozentenmodul/bin/gui/lecture/ExtendedSearchForImages_GUI$2.class b/Dozentenmodul/bin/gui/lecture/ExtendedSearchForImages_GUI$2.class index 79f4356c..beea9e15 100644 Binary files a/Dozentenmodul/bin/gui/lecture/ExtendedSearchForImages_GUI$2.class and b/Dozentenmodul/bin/gui/lecture/ExtendedSearchForImages_GUI$2.class differ diff --git a/Dozentenmodul/bin/gui/lecture/ExtendedSearchForImages_GUI$3.class b/Dozentenmodul/bin/gui/lecture/ExtendedSearchForImages_GUI$3.class index b6c8be8f..764ffbee 100644 Binary files a/Dozentenmodul/bin/gui/lecture/ExtendedSearchForImages_GUI$3.class and b/Dozentenmodul/bin/gui/lecture/ExtendedSearchForImages_GUI$3.class differ diff --git a/Dozentenmodul/bin/gui/lecture/ExtendedSearchForImages_GUI.class b/Dozentenmodul/bin/gui/lecture/ExtendedSearchForImages_GUI.class index 14d5f97e..c6169313 100644 Binary files a/Dozentenmodul/bin/gui/lecture/ExtendedSearchForImages_GUI.class and b/Dozentenmodul/bin/gui/lecture/ExtendedSearchForImages_GUI.class differ diff --git a/Dozentenmodul/src/gui/image/CreateImageAllgemein_GUI.java b/Dozentenmodul/src/gui/image/CreateImageAllgemein_GUI.java index f3b4d732..8fba3fb9 100644 --- a/Dozentenmodul/src/gui/image/CreateImageAllgemein_GUI.java +++ b/Dozentenmodul/src/gui/image/CreateImageAllgemein_GUI.java @@ -32,10 +32,12 @@ import javax.swing.border.TitledBorder; import javax.swing.JTextArea; import models.Image; +import models.Links; import models.person; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; +import java.io.IOException; @SuppressWarnings("serial") public class CreateImageAllgemein_GUI extends JFrame { @@ -298,9 +300,42 @@ public class CreateImageAllgemein_GUI extends JFrame { menuBar.add(mnNewMenu_1); JMenuItem mntmFaq = new JMenuItem("FAQ"); + mntmFaq.addMouseListener(new MouseAdapter() { + @Override + public void mouseClicked(MouseEvent arg0) { + + String faq; + + faq = Links.getFAQ(); + + try { + Runtime.getRuntime().exec( "rundll32 url.dll,FileProtocolHandler " + faq ); + } catch (IOException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } + }); + mnNewMenu_1.add(mntmFaq); JMenuItem mntmOtrs = new JMenuItem("OTRS"); + mntmOtrs.addMouseListener(new MouseAdapter() { + @Override + public void mouseClicked(MouseEvent e) { + String otrs; + + otrs = Links.getOTRS(); + + try { + Runtime.getRuntime().exec( "rundll32 url.dll,FileProtocolHandler " + otrs ); + } catch (IOException f) { + // TODO Auto-generated catch block + f.printStackTrace(); + } + + } + }); mnNewMenu_1.add(mntmOtrs); }//end main diff --git a/Dozentenmodul/src/gui/image/CreateImageTechnisch_GUI.java b/Dozentenmodul/src/gui/image/CreateImageTechnisch_GUI.java index cf71082c..f9cd20dd 100644 --- a/Dozentenmodul/src/gui/image/CreateImageTechnisch_GUI.java +++ b/Dozentenmodul/src/gui/image/CreateImageTechnisch_GUI.java @@ -30,12 +30,15 @@ import javax.swing.border.TitledBorder; import javax.swing.JTextArea; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; +import java.io.IOException; + import javax.swing.JRadioButton; import javax.swing.ButtonGroup; import javax.swing.JSpinner; import javax.swing.SpinnerNumberModel; import models.Image; +import models.Links; @SuppressWarnings("serial") public class CreateImageTechnisch_GUI extends JFrame { @@ -357,9 +360,43 @@ public class CreateImageTechnisch_GUI extends JFrame { menuBar.add(mnNewMenu_1); JMenuItem mntmFaq = new JMenuItem("FAQ"); + mntmFaq.addMouseListener(new MouseAdapter() { + @Override + public void mouseClicked(MouseEvent arg0) { + + String faq; + + faq = Links.getFAQ(); + + try { + Runtime.getRuntime().exec( "rundll32 url.dll,FileProtocolHandler " + faq ); + } catch (IOException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } + }); + mnNewMenu_1.add(mntmFaq); JMenuItem mntmOtrs = new JMenuItem("OTRS"); + mntmOtrs.addMouseListener(new MouseAdapter() { + @Override + public void mouseClicked(MouseEvent e) { + String otrs; + + otrs = Links.getOTRS(); + + try { + Runtime.getRuntime().exec( "rundll32 url.dll,FileProtocolHandler " + otrs ); + } catch (IOException f) { + // TODO Auto-generated catch block + f.printStackTrace(); + } + + } + }); + mnNewMenu_1.add(mntmOtrs); } diff --git a/Dozentenmodul/src/gui/image/DeleteImage_GUI.java b/Dozentenmodul/src/gui/image/DeleteImage_GUI.java index 9956f677..79e37076 100644 --- a/Dozentenmodul/src/gui/image/DeleteImage_GUI.java +++ b/Dozentenmodul/src/gui/image/DeleteImage_GUI.java @@ -17,6 +17,7 @@ import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; +import java.io.IOException; import java.util.Iterator; import java.util.List; import javax.swing.JButton; @@ -46,6 +47,8 @@ import javax.swing.event.ChangeListener; import javax.swing.table.DefaultTableModel; import javax.swing.table.TableModel; import javax.swing.table.TableRowSorter; + +import models.Links; import models.person; import org.apache.thrift.TException; @@ -456,20 +459,6 @@ public class DeleteImage_GUI extends JFrame { e.getCause()+"\n"+e.getMessage(), "Debug-Message", JOptionPane.ERROR_MESSAGE); } - // TODO --> client.deleteImageServer(imageid - // ,imageversion) - // das file ist aus der DB raus, aber ist noch - // auf dem Server als Datei hinterlegt. - // dieses muss auch gelöscht werden, um den - // festplattenlatz wieder frei zu geben. - // Hierzu könnte ein löschbefehl an die kommande - // zeile des server geschickt werden - // um das entsprechende file zu löschen. - // identifizieren über den image-namen!! - // z.B. FileUtils.moveFile(tmpFile, new - // File("141.79.128.102:/srv//openslx/nfs/temp/"+ - // tmpFile.getName())); - // FileUtils.ForceDelete (.. ); } else { @@ -535,9 +524,40 @@ public class DeleteImage_GUI extends JFrame { menuBar.add(mnNewMenu_1); JMenuItem mntmFaq = new JMenuItem("FAQ"); + mntmFaq.addMouseListener(new MouseAdapter() { + @Override + public void mousePressed(MouseEvent arg0) { + String faq; + + faq = Links.getFAQ(); + + try { + Runtime.getRuntime().exec( "rundll32 url.dll,FileProtocolHandler " + faq ); + } catch (IOException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } + }); mnNewMenu_1.add(mntmFaq); + JMenuItem mntmOtrs = new JMenuItem("OTRS"); + mntmOtrs.addMouseListener(new MouseAdapter() { + @Override + public void mousePressed(MouseEvent arg0) { + String otrs; + + otrs = Links.getOTRS(); + + try { + Runtime.getRuntime().exec( "rundll32 url.dll,FileProtocolHandler " + otrs ); + } catch (IOException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } + }); mnNewMenu_1.add(mntmOtrs); } diff --git a/Dozentenmodul/src/gui/image/EditImageAllgemein_GUI.java b/Dozentenmodul/src/gui/image/EditImageAllgemein_GUI.java index 0c50cc2b..8e928105 100644 --- a/Dozentenmodul/src/gui/image/EditImageAllgemein_GUI.java +++ b/Dozentenmodul/src/gui/image/EditImageAllgemein_GUI.java @@ -14,6 +14,7 @@ import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; +import java.io.IOException; import java.util.Map; import javax.swing.JButton; import javax.swing.JFrame; @@ -33,6 +34,7 @@ import javax.swing.border.EmptyBorder; import javax.swing.border.TitledBorder; import org.apache.thrift.TException; import models.Image; +import models.Links; import models.person; import server.Server.Client; import thrift.ThriftConnection; @@ -315,9 +317,43 @@ public class EditImageAllgemein_GUI extends JFrame { menuBar.add(mnNewMenu_1); JMenuItem mntmFaq = new JMenuItem("FAQ"); + mntmFaq.addMouseListener(new MouseAdapter() { + @Override + public void mouseClicked(MouseEvent arg0) { + + String faq; + + faq = Links.getFAQ(); + + try { + Runtime.getRuntime().exec( "rundll32 url.dll,FileProtocolHandler " + faq ); + } catch (IOException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } + }); + mnNewMenu_1.add(mntmFaq); JMenuItem mntmOtrs = new JMenuItem("OTRS"); + mntmOtrs.addMouseListener(new MouseAdapter() { + @Override + public void mouseClicked(MouseEvent e) { + String otrs; + + otrs = Links.getOTRS(); + + try { + Runtime.getRuntime().exec( "rundll32 url.dll,FileProtocolHandler " + otrs ); + } catch (IOException f) { + // TODO Auto-generated catch block + f.printStackTrace(); + } + + } + }); + mnNewMenu_1.add(mntmOtrs); // setFocusTraversalPolicy(new FocusTraversalOnArray(new // Component[]{getContentPane(), panel_2, lblNewLabel, diff --git a/Dozentenmodul/src/gui/image/EditImageTechnisch_GUI.java b/Dozentenmodul/src/gui/image/EditImageTechnisch_GUI.java index 631e3c2d..7636c946 100644 --- a/Dozentenmodul/src/gui/image/EditImageTechnisch_GUI.java +++ b/Dozentenmodul/src/gui/image/EditImageTechnisch_GUI.java @@ -14,6 +14,8 @@ import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; +import java.io.IOException; + import javax.swing.ButtonGroup; import javax.swing.JButton; import javax.swing.JFrame; @@ -33,6 +35,7 @@ import javax.swing.UnsupportedLookAndFeelException; import javax.swing.border.EmptyBorder; import javax.swing.border.TitledBorder; import models.Image; +import models.Links; @SuppressWarnings("serial") public class EditImageTechnisch_GUI extends JFrame { @@ -341,11 +344,42 @@ public class EditImageTechnisch_GUI extends JFrame { menuBar.add(mnNewMenu_1); JMenuItem mntmFaq = new JMenuItem("FAQ"); + mntmFaq.addMouseListener(new MouseAdapter() { + @Override + public void mouseClicked(MouseEvent arg0) { + + String faq; + + faq = Links.getFAQ(); + + try { + Runtime.getRuntime().exec( "rundll32 url.dll,FileProtocolHandler " + faq ); + } catch (IOException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } + }); mnNewMenu_1.add(mntmFaq); JMenuItem mntmOtrs = new JMenuItem("OTRS"); + mntmOtrs.addMouseListener(new MouseAdapter() { + @Override + public void mouseClicked(MouseEvent e) { + String otrs; + + otrs = Links.getOTRS(); + + try { + Runtime.getRuntime().exec( "rundll32 url.dll,FileProtocolHandler " + otrs ); + } catch (IOException f) { + // TODO Auto-generated catch block + f.printStackTrace(); + } + + } + }); mnNewMenu_1.add(mntmOtrs); } - } diff --git a/Dozentenmodul/src/gui/image/FTPCreateUploader_GUI.java b/Dozentenmodul/src/gui/image/FTPCreateUploader_GUI.java index 49fcf0d0..13c83d61 100644 --- a/Dozentenmodul/src/gui/image/FTPCreateUploader_GUI.java +++ b/Dozentenmodul/src/gui/image/FTPCreateUploader_GUI.java @@ -15,6 +15,7 @@ import java.awt.event.WindowEvent; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; import java.io.File; +import java.io.IOException; import java.text.DateFormat; import java.text.SimpleDateFormat; import java.util.Date; @@ -34,6 +35,7 @@ import javax.swing.UIManager; import javax.swing.UnsupportedLookAndFeelException; import javax.swing.border.EmptyBorder; import models.Image; +import models.Links; import models.person; import org.apache.thrift.TException; import server.Server.Client; @@ -41,6 +43,9 @@ import thrift.ThriftConnection; //import util.XMLCreator; import ftp.UploadTask; import gui.intro.MainMenue_GUI; +import javax.swing.JMenuItem; +import java.awt.event.MouseAdapter; +import java.awt.event.MouseEvent; @SuppressWarnings("serial") public class FTPCreateUploader_GUI extends JFrame implements @@ -378,9 +383,37 @@ public class FTPCreateUploader_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 mouseClicked(MouseEvent e) { + String otrs; + + otrs = Links.getOTRS(); + + try { + Runtime.getRuntime().exec( "rundll32 url.dll,FileProtocolHandler " + otrs ); + } catch (IOException f) { + // TODO Auto-generated catch block + f.printStackTrace(); + } - JMenu mnHillfe = new JMenu("Hillfe"); - menuBar.add(mnHillfe); + } + }); + + menu.add(menuItem); + + JMenuItem menuItem_1 = new JMenuItem("OTRS"); + menuItem_1.addMouseListener(new MouseAdapter() { + @Override + public void mouseClicked(MouseEvent e) { + } + }); + menu.add(menuItem_1); setVisible(true); } diff --git a/Dozentenmodul/src/gui/image/FTPDownloader_GUI.java b/Dozentenmodul/src/gui/image/FTPDownloader_GUI.java index ec92396b..fa164171 100644 --- a/Dozentenmodul/src/gui/image/FTPDownloader_GUI.java +++ b/Dozentenmodul/src/gui/image/FTPDownloader_GUI.java @@ -6,6 +6,8 @@ import java.awt.Dimension; import java.awt.FlowLayout; import java.awt.Toolkit; import java.io.File; +import java.io.IOException; + import javax.swing.JButton; import javax.swing.JFileChooser; import javax.swing.JFrame; @@ -31,10 +33,17 @@ import java.awt.Font; import javax.swing.JTextPane; import javax.swing.JSeparator; import models.Image; +import models.Links; + import org.apache.thrift.TException; import server.Server.Client; import server.User; import thrift.ThriftConnection; +import javax.swing.JMenuBar; +import javax.swing.JMenu; +import javax.swing.JMenuItem; +import java.awt.event.MouseAdapter; +import java.awt.event.MouseEvent; @SuppressWarnings("serial") public class FTPDownloader_GUI extends JFrame implements PropertyChangeListener { @@ -217,7 +226,7 @@ public class FTPDownloader_GUI extends JFrame implements PropertyChangeListener JPanel panel = new JPanel(); panel.setLayout(null); panel.setBackground(SystemColor.menu); - panel.setBounds(10, 11, 577, 57); + panel.setBounds(10, 24, 577, 57); contentPanel.add(panel); JLabel lblImageDownloader = new JLabel("Image Downloader"); @@ -233,29 +242,29 @@ public class FTPDownloader_GUI extends JFrame implements PropertyChangeListener panel.add(txtpnWhlenSieEinen); JSeparator separator = new JSeparator(); - separator.setBounds(0, 79, 597, 2); + separator.setBounds(0, 88, 597, 2); contentPanel.add(separator); JLabel label_1 = new JLabel("Hauptmen\u00FC"); label_1.setForeground(Color.BLUE); - label_1.setBounds(20, 88, 61, 20); + label_1.setBounds(20, 92, 61, 20); contentPanel.add(label_1); JLabel label_2 = new JLabel(">"); - label_2.setBounds(80, 91, 14, 14); + label_2.setBounds(80, 95, 14, 14); contentPanel.add(label_2); JLabel label_3 = new JLabel("VL-Image"); label_3.setForeground(Color.BLUE); - label_3.setBounds(91, 88, 46, 20); + label_3.setBounds(91, 92, 46, 20); contentPanel.add(label_3); JLabel label_4 = new JLabel(">"); - label_4.setBounds(139, 91, 14, 14); + label_4.setBounds(139, 95, 14, 14); contentPanel.add(label_4); JLabel label_5 = new JLabel("Neu/Bearbeiten"); - label_5.setBounds(149, 91, 108, 14); + label_5.setBounds(149, 95, 108, 14); contentPanel.add(label_5); JSeparator separator_1 = new JSeparator(); @@ -278,6 +287,53 @@ public class FTPDownloader_GUI extends JFrame implements PropertyChangeListener "Klicken Sie auf \"Fertigstellen\"."); lblKlickenSieAuf.setBounds(98, 423, 241, 14); contentPanel.add(lblKlickenSieAuf); + + JMenuBar menuBar = new JMenuBar(); + menuBar.setBounds(0, 0, 597, 21); + contentPanel.add(menuBar); + + JMenu menu = new JMenu("Hilfe"); + menuBar.add(menu); + + JMenuItem menuItem = new JMenuItem("FAQ"); + menuItem.addMouseListener(new MouseAdapter() { + @Override + public void mouseClicked(MouseEvent arg0) { + + String faq; + + faq = Links.getFAQ(); + + try { + Runtime.getRuntime().exec( "rundll32 url.dll,FileProtocolHandler " + faq ); + } catch (IOException 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 mouseClicked(MouseEvent e) { + String otrs; + + otrs = Links.getOTRS(); + + try { + Runtime.getRuntime().exec( "rundll32 url.dll,FileProtocolHandler " + otrs ); + } catch (IOException f) { + // TODO Auto-generated catch block + f.printStackTrace(); + } + + } + }); + + menu.add(menuItem_1); { JPanel buttonPane = new JPanel(); buttonPane.setBackground(UIManager.getColor("Button.background")); diff --git a/Dozentenmodul/src/gui/image/FTPEditUploader_GUI.java b/Dozentenmodul/src/gui/image/FTPEditUploader_GUI.java index 8d14458a..8b14dc4c 100644 --- a/Dozentenmodul/src/gui/image/FTPEditUploader_GUI.java +++ b/Dozentenmodul/src/gui/image/FTPEditUploader_GUI.java @@ -15,6 +15,7 @@ import java.awt.event.WindowEvent; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; import java.io.File; +import java.io.IOException; import java.text.DateFormat; import java.text.SimpleDateFormat; import java.util.Date; @@ -34,12 +35,16 @@ import javax.swing.UIManager; import javax.swing.UnsupportedLookAndFeelException; import javax.swing.border.EmptyBorder; import models.Image; +import models.Links; import models.person; import org.apache.thrift.TException; import server.Server.Client; import thrift.ThriftConnection; import ftp.UploadTask; import gui.intro.MainMenue_GUI; +import javax.swing.JMenuItem; +import java.awt.event.MouseAdapter; +import java.awt.event.MouseEvent; @SuppressWarnings("serial") public class FTPEditUploader_GUI extends JFrame implements @@ -366,9 +371,49 @@ 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 mouseClicked(MouseEvent arg0) { + + String faq; + + faq = Links.getFAQ(); + + try { + Runtime.getRuntime().exec( "rundll32 url.dll,FileProtocolHandler " + faq ); + } catch (IOException 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 mouseClicked(MouseEvent e) { + String otrs; + + otrs = Links.getOTRS(); + + try { + Runtime.getRuntime().exec( "rundll32 url.dll,FileProtocolHandler " + otrs ); + } catch (IOException f) { + // TODO Auto-generated catch block + f.printStackTrace(); + } + + } + }); - JMenu mnHillfe = new JMenu("Hillfe"); - menuBar.add(mnHillfe); + menu.add(menuItem_1); setVisible(true); } diff --git a/Dozentenmodul/src/gui/image/SearchEditImage_GUI.java b/Dozentenmodul/src/gui/image/SearchEditImage_GUI.java index 7c35bf00..1195b8a3 100644 --- a/Dozentenmodul/src/gui/image/SearchEditImage_GUI.java +++ b/Dozentenmodul/src/gui/image/SearchEditImage_GUI.java @@ -16,6 +16,7 @@ import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; +import java.io.IOException; import java.util.Iterator; import java.util.List; import javax.swing.JButton; @@ -45,6 +46,7 @@ import javax.swing.table.DefaultTableModel; import javax.swing.table.TableModel; import javax.swing.table.TableRowSorter; import models.Image; +import models.Links; import models.person; //import models.person; @@ -468,9 +470,43 @@ public class SearchEditImage_GUI extends JFrame { menuBar.add(mnNewMenu_1); JMenuItem mntmFaq = new JMenuItem("FAQ"); + mntmFaq.addMouseListener(new MouseAdapter() { + @Override + public void mouseClicked(MouseEvent arg0) { + + String faq; + + faq = Links.getFAQ(); + + try { + Runtime.getRuntime().exec( "rundll32 url.dll,FileProtocolHandler " + faq ); + } catch (IOException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } + }); + mnNewMenu_1.add(mntmFaq); JMenuItem mntmOtrs = new JMenuItem("OTRS"); + mntmOtrs.addMouseListener(new MouseAdapter() { + @Override + public void mouseClicked(MouseEvent e) { + String otrs; + + otrs = Links.getOTRS(); + + try { + Runtime.getRuntime().exec( "rundll32 url.dll,FileProtocolHandler " + otrs ); + } catch (IOException f) { + // TODO Auto-generated catch block + f.printStackTrace(); + } + + } + }); + mnNewMenu_1.add(mntmOtrs); } diff --git a/Dozentenmodul/src/gui/image/SearchImage_GUI.java b/Dozentenmodul/src/gui/image/SearchImage_GUI.java index 4e6e7046..735c6c99 100644 --- a/Dozentenmodul/src/gui/image/SearchImage_GUI.java +++ b/Dozentenmodul/src/gui/image/SearchImage_GUI.java @@ -16,6 +16,7 @@ import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; +import java.io.IOException; import java.util.Iterator; import java.util.List; import javax.swing.JButton; @@ -45,6 +46,7 @@ import javax.swing.table.DefaultTableModel; import javax.swing.table.TableModel; import javax.swing.table.TableRowSorter; import models.Image; +import models.Links; import models.person; //import models.person; @@ -423,9 +425,43 @@ public class SearchImage_GUI extends JFrame { menuBar.add(mnNewMenu_1); JMenuItem mntmFaq = new JMenuItem("FAQ"); + mntmFaq.addMouseListener(new MouseAdapter() { + @Override + public void mouseClicked(MouseEvent arg0) { + + String faq; + + faq = Links.getFAQ(); + + try { + Runtime.getRuntime().exec( "rundll32 url.dll,FileProtocolHandler " + faq ); + } catch (IOException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } + }); + mnNewMenu_1.add(mntmFaq); JMenuItem mntmOtrs = new JMenuItem("OTRS"); + mntmOtrs.addMouseListener(new MouseAdapter() { + @Override + public void mouseClicked(MouseEvent e) { + String otrs; + + otrs = Links.getOTRS(); + + try { + Runtime.getRuntime().exec( "rundll32 url.dll,FileProtocolHandler " + otrs ); + } catch (IOException f) { + // TODO Auto-generated catch block + f.printStackTrace(); + } + + } + }); + mnNewMenu_1.add(mntmOtrs); } diff --git a/Dozentenmodul/src/gui/image/SearchMethodLecture_GUI.java b/Dozentenmodul/src/gui/image/SearchMethodLecture_GUI.java index 49d7810b..065b3da7 100644 --- a/Dozentenmodul/src/gui/image/SearchMethodLecture_GUI.java +++ b/Dozentenmodul/src/gui/image/SearchMethodLecture_GUI.java @@ -14,6 +14,7 @@ import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; +import java.io.IOException; import javax.swing.ButtonGroup; import javax.swing.JButton; @@ -33,6 +34,8 @@ import javax.swing.UnsupportedLookAndFeelException; import javax.swing.border.EmptyBorder; import javax.swing.border.TitledBorder; +import models.Links; + @SuppressWarnings("serial") public class SearchMethodLecture_GUI extends JFrame { @@ -242,9 +245,43 @@ public class SearchMethodLecture_GUI extends JFrame { menuBar.add(mnNewMenu_1); JMenuItem mntmFaq = new JMenuItem("FAQ"); + mntmFaq.addMouseListener(new MouseAdapter() { + @Override + public void mouseClicked(MouseEvent arg0) { + + String faq; + + faq = Links.getFAQ(); + + try { + Runtime.getRuntime().exec( "rundll32 url.dll,FileProtocolHandler " + faq ); + } catch (IOException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } + }); + mnNewMenu_1.add(mntmFaq); JMenuItem mntmOtrs = new JMenuItem("OTRS"); + mntmOtrs.addMouseListener(new MouseAdapter() { + @Override + public void mouseClicked(MouseEvent e) { + String otrs; + + otrs = Links.getOTRS(); + + try { + Runtime.getRuntime().exec( "rundll32 url.dll,FileProtocolHandler " + otrs ); + } catch (IOException f) { + // TODO Auto-generated catch block + f.printStackTrace(); + } + + } + }); + mnNewMenu_1.add(mntmOtrs); } diff --git a/Dozentenmodul/src/gui/intro/BillOfRights_GUI.java b/Dozentenmodul/src/gui/intro/BillOfRights_GUI.java index 988a8b38..268acb14 100644 --- a/Dozentenmodul/src/gui/intro/BillOfRights_GUI.java +++ b/Dozentenmodul/src/gui/intro/BillOfRights_GUI.java @@ -33,8 +33,12 @@ import javax.swing.border.EmptyBorder; import javax.swing.event.ChangeEvent; import javax.swing.event.ChangeListener; +import models.Links; + import org.ini4j.InvalidFileFormatException; import org.ini4j.Wini; +import java.awt.event.MouseAdapter; +import java.awt.event.MouseEvent; @@ -189,9 +193,43 @@ public class BillOfRights_GUI extends JFrame { menuBar.add(mnNewMenu_1); JMenuItem mntmFaq = new JMenuItem("FAQ"); + mntmFaq.addMouseListener(new MouseAdapter() { + @Override + public void mouseClicked(MouseEvent arg0) { + + String faq; + + faq = Links.getFAQ(); + + try { + Runtime.getRuntime().exec( "rundll32 url.dll,FileProtocolHandler " + faq ); + } catch (IOException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } + }); + mnNewMenu_1.add(mntmFaq); JMenuItem mntmOtrs = new JMenuItem("OTRS"); + mntmOtrs.addMouseListener(new MouseAdapter() { + @Override + public void mouseClicked(MouseEvent e) { + String otrs; + + otrs = Links.getOTRS(); + + try { + Runtime.getRuntime().exec( "rundll32 url.dll,FileProtocolHandler " + otrs ); + } catch (IOException f) { + // TODO Auto-generated catch block + f.printStackTrace(); + } + + } + }); + mnNewMenu_1.add(mntmOtrs); diff --git a/Dozentenmodul/src/gui/intro/MainMenue_GUI.java b/Dozentenmodul/src/gui/intro/MainMenue_GUI.java index 4817e786..4e010f75 100644 --- a/Dozentenmodul/src/gui/intro/MainMenue_GUI.java +++ b/Dozentenmodul/src/gui/intro/MainMenue_GUI.java @@ -33,7 +33,11 @@ import java.awt.ScrollPane; import javax.swing.JTextArea; import javax.swing.ImageIcon; +import models.Links; import models.SessionData; +import java.awt.event.MouseAdapter; +import java.awt.event.MouseEvent; +import java.io.IOException; @SuppressWarnings("serial") public class MainMenue_GUI extends JFrame { @@ -407,9 +411,43 @@ public class MainMenue_GUI extends JFrame { menuBar.add(mnNewMenu_1); JMenuItem mntmFaq = new JMenuItem("FAQ"); + mntmFaq.addMouseListener(new MouseAdapter() { + @Override + public void mouseClicked(MouseEvent arg0) { + + String faq; + + faq = Links.getFAQ(); + + try { + Runtime.getRuntime().exec( "rundll32 url.dll,FileProtocolHandler " + faq ); + } catch (IOException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } + }); + mnNewMenu_1.add(mntmFaq); JMenuItem mntmOtrs = new JMenuItem("OTRS"); + mntmOtrs.addMouseListener(new MouseAdapter() { + @Override + public void mouseClicked(MouseEvent e) { + String otrs; + + otrs = Links.getOTRS(); + + try { + Runtime.getRuntime().exec( "rundll32 url.dll,FileProtocolHandler " + otrs ); + } catch (IOException f) { + // TODO Auto-generated catch block + f.printStackTrace(); + } + + } + }); + mnNewMenu_1.add(mntmOtrs); }// end main diff --git a/Dozentenmodul/src/gui/intro/VmWareLink_GUI.java b/Dozentenmodul/src/gui/intro/VmWareLink_GUI.java index 1c0a51c0..93300f3e 100644 --- a/Dozentenmodul/src/gui/intro/VmWareLink_GUI.java +++ b/Dozentenmodul/src/gui/intro/VmWareLink_GUI.java @@ -35,6 +35,8 @@ import javax.swing.JCheckBox; import javax.swing.event.ChangeListener; import javax.swing.event.ChangeEvent; +import models.Links; + import org.ini4j.InvalidFileFormatException; import org.ini4j.Wini; @@ -211,11 +213,45 @@ public class VmWareLink_GUI extends JFrame { menuBar.add(mnHilfe); { JMenuItem mntmFaq = new JMenuItem("FAQ"); + mntmFaq.addMouseListener(new MouseAdapter() { + @Override + public void mouseClicked(MouseEvent arg0) { + + String faq; + + faq = Links.getFAQ(); + + try { + Runtime.getRuntime().exec( "rundll32 url.dll,FileProtocolHandler " + faq ); + } catch (IOException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } + }); + mnHilfe.add(mntmFaq); } { - JMenuItem mntmHilfe = new JMenuItem("Hilfe"); - mnHilfe.add(mntmHilfe); + JMenuItem mntmOTRS = new JMenuItem("OTRS"); + mntmOTRS.addMouseListener(new MouseAdapter() { + @Override + public void mouseClicked(MouseEvent e) { + String otrs; + + otrs = Links.getOTRS(); + + try { + Runtime.getRuntime().exec( "rundll32 url.dll,FileProtocolHandler " + otrs ); + } catch (IOException f) { + // TODO Auto-generated catch block + f.printStackTrace(); + } + + } + }); + + mnHilfe.add(mntmOTRS); } } } diff --git a/Dozentenmodul/src/gui/lecture/CreateLectureAllgemein_GUI.java b/Dozentenmodul/src/gui/lecture/CreateLectureAllgemein_GUI.java index 02946571..3192da83 100644 --- a/Dozentenmodul/src/gui/lecture/CreateLectureAllgemein_GUI.java +++ b/Dozentenmodul/src/gui/lecture/CreateLectureAllgemein_GUI.java @@ -32,9 +32,11 @@ import javax.swing.border.EmptyBorder; import javax.swing.border.TitledBorder; import models.Image; import models.Lecture; +import models.Links; import models.person; import javax.swing.JTextArea; import java.awt.ScrollPane; +import java.io.IOException; import java.util.Calendar; import java.util.Date; @@ -491,9 +493,43 @@ public class CreateLectureAllgemein_GUI extends JFrame { menuBar.add(mnNewMenu_1); JMenuItem mntmFaq = new JMenuItem("FAQ"); + mntmFaq.addMouseListener(new MouseAdapter() { + @Override + public void mouseClicked(MouseEvent arg0) { + + String faq; + + faq = Links.getFAQ(); + + try { + Runtime.getRuntime().exec( "rundll32 url.dll,FileProtocolHandler " + faq ); + } catch (IOException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } + }); + mnNewMenu_1.add(mntmFaq); JMenuItem mntmOtrs = new JMenuItem("OTRS"); + mntmOtrs.addMouseListener(new MouseAdapter() { + @Override + public void mouseClicked(MouseEvent e) { + String otrs; + + otrs = Links.getOTRS(); + + try { + Runtime.getRuntime().exec( "rundll32 url.dll,FileProtocolHandler " + otrs ); + } catch (IOException f) { + // TODO Auto-generated catch block + f.printStackTrace(); + } + + } + }); + mnNewMenu_1.add(mntmOtrs); } diff --git a/Dozentenmodul/src/gui/lecture/CreateLectureLink_GUI.java b/Dozentenmodul/src/gui/lecture/CreateLectureLink_GUI.java index 285a4ff6..daec54ad 100644 --- a/Dozentenmodul/src/gui/lecture/CreateLectureLink_GUI.java +++ b/Dozentenmodul/src/gui/lecture/CreateLectureLink_GUI.java @@ -16,6 +16,7 @@ import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; +import java.io.IOException; import java.text.DateFormat; import java.text.SimpleDateFormat; import java.util.ArrayList; @@ -44,6 +45,7 @@ import javax.swing.border.EmptyBorder; import javax.swing.border.TitledBorder; import javax.swing.table.DefaultTableModel; import models.Lecture; +import models.Links; import models.person; import org.apache.thrift.TException; import server.Server.Client; @@ -457,9 +459,43 @@ public class CreateLectureLink_GUI extends JFrame { menuBar.add(mnNewMenu_1); JMenuItem mntmFaq = new JMenuItem("FAQ"); + mntmFaq.addMouseListener(new MouseAdapter() { + @Override + public void mouseClicked(MouseEvent arg0) { + + String faq; + + faq = Links.getFAQ(); + + try { + Runtime.getRuntime().exec( "rundll32 url.dll,FileProtocolHandler " + faq ); + } catch (IOException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } + }); + mnNewMenu_1.add(mntmFaq); JMenuItem mntmOtrs = new JMenuItem("OTRS"); + mntmOtrs.addMouseListener(new MouseAdapter() { + @Override + public void mouseClicked(MouseEvent e) { + String otrs; + + otrs = Links.getOTRS(); + + try { + Runtime.getRuntime().exec( "rundll32 url.dll,FileProtocolHandler " + otrs ); + } catch (IOException f) { + // TODO Auto-generated catch block + f.printStackTrace(); + } + + } + }); + mnNewMenu_1.add(mntmOtrs); } diff --git a/Dozentenmodul/src/gui/lecture/DeleteLecture_GUI.java b/Dozentenmodul/src/gui/lecture/DeleteLecture_GUI.java index 4c20c666..32110a9f 100644 --- a/Dozentenmodul/src/gui/lecture/DeleteLecture_GUI.java +++ b/Dozentenmodul/src/gui/lecture/DeleteLecture_GUI.java @@ -15,6 +15,7 @@ import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; +import java.io.IOException; import java.util.Iterator; import java.util.List; import javax.swing.JButton; @@ -43,6 +44,8 @@ import javax.swing.event.ChangeListener; import javax.swing.table.DefaultTableModel; import javax.swing.table.TableModel; import javax.swing.table.TableRowSorter; + +import models.Links; import models.person; import org.apache.thrift.TException; import server.Server.Client; @@ -410,9 +413,43 @@ public class DeleteLecture_GUI extends JFrame { menuBar.add(mnNewMenu_1); JMenuItem mntmFaq = new JMenuItem("FAQ"); + mntmFaq.addMouseListener(new MouseAdapter() { + @Override + public void mouseClicked(MouseEvent arg0) { + + String faq; + + faq = Links.getFAQ(); + + try { + Runtime.getRuntime().exec( "rundll32 url.dll,FileProtocolHandler " + faq ); + } catch (IOException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } + }); + mnNewMenu_1.add(mntmFaq); JMenuItem mntmOtrs = new JMenuItem("OTRS"); + mntmOtrs.addMouseListener(new MouseAdapter() { + @Override + public void mouseClicked(MouseEvent e) { + String otrs; + + otrs = Links.getOTRS(); + + try { + Runtime.getRuntime().exec( "rundll32 url.dll,FileProtocolHandler " + otrs ); + } catch (IOException f) { + // TODO Auto-generated catch block + f.printStackTrace(); + } + + } + }); + mnNewMenu_1.add(mntmOtrs); } diff --git a/Dozentenmodul/src/gui/lecture/EditLectureAllgemein_GUI.java b/Dozentenmodul/src/gui/lecture/EditLectureAllgemein_GUI.java index 348b1c77..0be23ee0 100644 --- a/Dozentenmodul/src/gui/lecture/EditLectureAllgemein_GUI.java +++ b/Dozentenmodul/src/gui/lecture/EditLectureAllgemein_GUI.java @@ -34,9 +34,12 @@ import javax.swing.border.TitledBorder; import models.Image; import models.Lecture; +import models.Links; import models.person; import javax.swing.JTextArea; import java.awt.ScrollPane; +import java.io.IOException; + import com.toedter.calendar.JDateChooser; import javax.swing.JRadioButton; import javax.swing.ButtonGroup; @@ -403,9 +406,43 @@ public class EditLectureAllgemein_GUI extends JFrame { menuBar.add(mnNewMenu_1); JMenuItem mntmFaq = new JMenuItem("FAQ"); + mntmFaq.addMouseListener(new MouseAdapter() { + @Override + public void mouseClicked(MouseEvent arg0) { + + String faq; + + faq = Links.getFAQ(); + + try { + Runtime.getRuntime().exec( "rundll32 url.dll,FileProtocolHandler " + faq ); + } catch (IOException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } + }); + mnNewMenu_1.add(mntmFaq); JMenuItem mntmOtrs = new JMenuItem("OTRS"); + mntmOtrs.addMouseListener(new MouseAdapter() { + @Override + public void mouseClicked(MouseEvent e) { + String otrs; + + otrs = Links.getOTRS(); + + try { + Runtime.getRuntime().exec( "rundll32 url.dll,FileProtocolHandler " + otrs ); + } catch (IOException f) { + // TODO Auto-generated catch block + f.printStackTrace(); + } + + } + }); + mnNewMenu_1.add(mntmOtrs); } diff --git a/Dozentenmodul/src/gui/lecture/EditLectureLink_GUI.java b/Dozentenmodul/src/gui/lecture/EditLectureLink_GUI.java index 4160f855..28447e0d 100644 --- a/Dozentenmodul/src/gui/lecture/EditLectureLink_GUI.java +++ b/Dozentenmodul/src/gui/lecture/EditLectureLink_GUI.java @@ -15,6 +15,7 @@ import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; +import java.io.IOException; import java.text.DateFormat; import java.text.SimpleDateFormat; import java.util.ArrayList; @@ -43,6 +44,7 @@ import javax.swing.border.EmptyBorder; import javax.swing.border.TitledBorder; import javax.swing.table.DefaultTableModel; import models.Lecture; +import models.Links; import models.person; import org.apache.thrift.TException; import server.Server.Client; @@ -439,9 +441,43 @@ public class EditLectureLink_GUI extends JFrame { menuBar.add(mnNewMenu_1); JMenuItem mntmFaq = new JMenuItem("FAQ"); + mntmFaq.addMouseListener(new MouseAdapter() { + @Override + public void mouseClicked(MouseEvent arg0) { + + String faq; + + faq = Links.getFAQ(); + + try { + Runtime.getRuntime().exec( "rundll32 url.dll,FileProtocolHandler " + faq ); + } catch (IOException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } + }); + mnNewMenu_1.add(mntmFaq); JMenuItem mntmOtrs = new JMenuItem("OTRS"); + mntmOtrs.addMouseListener(new MouseAdapter() { + @Override + public void mouseClicked(MouseEvent e) { + String otrs; + + otrs = Links.getOTRS(); + + try { + Runtime.getRuntime().exec( "rundll32 url.dll,FileProtocolHandler " + otrs ); + } catch (IOException f) { + // TODO Auto-generated catch block + f.printStackTrace(); + } + + } + }); + mnNewMenu_1.add(mntmOtrs); } diff --git a/Dozentenmodul/src/gui/lecture/EditLectureSearch_GUI.java b/Dozentenmodul/src/gui/lecture/EditLectureSearch_GUI.java index badcf86a..08a68f7f 100644 --- a/Dozentenmodul/src/gui/lecture/EditLectureSearch_GUI.java +++ b/Dozentenmodul/src/gui/lecture/EditLectureSearch_GUI.java @@ -15,6 +15,7 @@ import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; +import java.io.IOException; import java.text.DateFormat; import java.text.ParseException; import java.text.SimpleDateFormat; @@ -47,6 +48,7 @@ import javax.swing.table.DefaultTableModel; import javax.swing.table.TableModel; import javax.swing.table.TableRowSorter; import models.Lecture; +import models.Links; import models.person; import org.apache.thrift.TException; import server.Server.Client; @@ -469,9 +471,43 @@ public class EditLectureSearch_GUI extends JFrame { menuBar.add(mnNewMenu_1); JMenuItem mntmFaq = new JMenuItem("FAQ"); + mntmFaq.addMouseListener(new MouseAdapter() { + @Override + public void mouseClicked(MouseEvent arg0) { + + String faq; + + faq = Links.getFAQ(); + + try { + Runtime.getRuntime().exec( "rundll32 url.dll,FileProtocolHandler " + faq ); + } catch (IOException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } + }); + mnNewMenu_1.add(mntmFaq); JMenuItem mntmOtrs = new JMenuItem("OTRS"); + mntmOtrs.addMouseListener(new MouseAdapter() { + @Override + public void mouseClicked(MouseEvent e) { + String otrs; + + otrs = Links.getOTRS(); + + try { + Runtime.getRuntime().exec( "rundll32 url.dll,FileProtocolHandler " + otrs ); + } catch (IOException f) { + // TODO Auto-generated catch block + f.printStackTrace(); + } + + } + }); + mnNewMenu_1.add(mntmOtrs); } diff --git a/Dozentenmodul/src/gui/lecture/ExtendedSearchForImages_GUI.java b/Dozentenmodul/src/gui/lecture/ExtendedSearchForImages_GUI.java index 095ca7ef..cd417720 100644 --- a/Dozentenmodul/src/gui/lecture/ExtendedSearchForImages_GUI.java +++ b/Dozentenmodul/src/gui/lecture/ExtendedSearchForImages_GUI.java @@ -32,6 +32,12 @@ import javax.swing.UnsupportedLookAndFeelException; import javax.swing.border.EmptyBorder; import javax.swing.border.TitledBorder; +import models.Links; + +import java.awt.event.MouseAdapter; +import java.awt.event.MouseEvent; +import java.io.IOException; + @SuppressWarnings("serial") public class ExtendedSearchForImages_GUI extends JFrame { @@ -228,9 +234,43 @@ public class ExtendedSearchForImages_GUI extends JFrame { menuBar.add(mnNewMenu_1); JMenuItem mntmFaq = new JMenuItem("FAQ"); + mntmFaq.addMouseListener(new MouseAdapter() { + @Override + public void mouseClicked(MouseEvent arg0) { + + String faq; + + faq = Links.getFAQ(); + + try { + Runtime.getRuntime().exec( "rundll32 url.dll,FileProtocolHandler " + faq ); + } catch (IOException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } + }); + mnNewMenu_1.add(mntmFaq); JMenuItem mntmOtrs = new JMenuItem("OTRS"); + mntmOtrs.addMouseListener(new MouseAdapter() { + @Override + public void mouseClicked(MouseEvent e) { + String otrs; + + otrs = Links.getOTRS(); + + try { + Runtime.getRuntime().exec( "rundll32 url.dll,FileProtocolHandler " + otrs ); + } catch (IOException f) { + // TODO Auto-generated catch block + f.printStackTrace(); + } + + } + }); + mnNewMenu_1.add(mntmOtrs); } diff --git a/Dozentenmodul/src/gui/lecture/SearchLecture_GUI.java b/Dozentenmodul/src/gui/lecture/SearchLecture_GUI.java index 413f1084..a8c417fa 100644 --- a/Dozentenmodul/src/gui/lecture/SearchLecture_GUI.java +++ b/Dozentenmodul/src/gui/lecture/SearchLecture_GUI.java @@ -15,6 +15,7 @@ import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; +import java.io.IOException; import java.util.Iterator; import java.util.List; import javax.swing.JButton; @@ -42,6 +43,8 @@ import javax.swing.event.ChangeListener; import javax.swing.table.DefaultTableModel; import javax.swing.table.TableModel; import javax.swing.table.TableRowSorter; + +import models.Links; import models.person; import org.apache.thrift.TException; import server.Server.Client; @@ -359,9 +362,43 @@ public class SearchLecture_GUI extends JFrame { menuBar.add(mnNewMenu_1); JMenuItem mntmFaq = new JMenuItem("FAQ"); + mntmFaq.addMouseListener(new MouseAdapter() { + @Override + public void mouseClicked(MouseEvent arg0) { + + String faq; + + faq = Links.getFAQ(); + + try { + Runtime.getRuntime().exec( "rundll32 url.dll,FileProtocolHandler " + faq ); + } catch (IOException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } + }); + mnNewMenu_1.add(mntmFaq); JMenuItem mntmOtrs = new JMenuItem("OTRS"); + mntmOtrs.addMouseListener(new MouseAdapter() { + @Override + public void mouseClicked(MouseEvent e) { + String otrs; + + otrs = Links.getOTRS(); + + try { + Runtime.getRuntime().exec( "rundll32 url.dll,FileProtocolHandler " + otrs ); + } catch (IOException f) { + // TODO Auto-generated catch block + f.printStackTrace(); + } + + } + }); + mnNewMenu_1.add(mntmOtrs); } diff --git a/Dozentenmodul/src/models/Links.java b/Dozentenmodul/src/models/Links.java new file mode 100644 index 00000000..dba1771d --- /dev/null +++ b/Dozentenmodul/src/models/Links.java @@ -0,0 +1,15 @@ +package models; + +public class Links { + + private static String FAQ = "http://bwlehrpool.hs-offenburg.de/"; + private static String OTRS = "https://bwlehrpool-otrs.rz.hs-offenburg.de//otrs/customer.pl"; + + public static String getFAQ() { + return FAQ; + } + + public static String getOTRS() { + return OTRS; + } +} -- cgit v1.2.3-55-g7522 From 12b69856a4388107773b05b974667b580d18b53b Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 8 May 2014 14:10:30 +0200 Subject: faq otrs --- .../bin/gui/image/FTPCreateUploader_GUI$8.class | Bin 1348 -> 1351 bytes Dozentenmodul/bin/gui/image/FTPDownloader_GUI$5.class | Bin 1325 -> 1325 bytes Dozentenmodul/bin/gui/image/FTPDownloader_GUI$6.class | Bin 1324 -> 1327 bytes .../src/gui/image/CreateImageAllgemein_GUI.java | 4 ++-- .../src/gui/image/CreateImageTechnisch_GUI.java | 4 ++-- .../src/gui/image/EditImageAllgemein_GUI.java | 4 ++-- .../src/gui/image/EditImageTechnisch_GUI.java | 4 ++-- .../src/gui/image/FTPCreateUploader_GUI.java | 4 ++-- Dozentenmodul/src/gui/image/FTPDownloader_GUI.java | 4 ++-- Dozentenmodul/src/gui/image/FTPEditUploader_GUI.java | 4 ++-- Dozentenmodul/src/gui/image/SearchEditImage_GUI.java | 4 ++-- Dozentenmodul/src/gui/image/SearchImage_GUI.java | 4 ++-- .../src/gui/image/SearchMethodLecture_GUI.java | 4 ++-- Dozentenmodul/src/gui/intro/BillOfRights_GUI.java | 4 ++-- Dozentenmodul/src/gui/intro/MainMenue_GUI.java | 4 ++-- Dozentenmodul/src/gui/intro/VmWareLink_GUI.java | 4 ++-- .../src/gui/lecture/CreateLectureAllgemein_GUI.java | 4 ++-- .../src/gui/lecture/CreateLectureLink_GUI.java | 4 ++-- Dozentenmodul/src/gui/lecture/DeleteLecture_GUI.java | 4 ++-- .../src/gui/lecture/EditLectureAllgemein_GUI.java | 4 ++-- .../src/gui/lecture/EditLectureLink_GUI.java | 4 ++-- .../src/gui/lecture/EditLectureSearch_GUI.java | 4 ++-- .../src/gui/lecture/ExtendedSearchForImages_GUI.java | 4 ++-- Dozentenmodul/src/gui/lecture/SearchLecture_GUI.java | 4 ++-- 24 files changed, 42 insertions(+), 42 deletions(-) (limited to 'Dozentenmodul/src/gui/image/EditImageAllgemein_GUI.java') diff --git a/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$8.class b/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$8.class index faac5bc5..22538b35 100644 Binary files a/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$8.class and b/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$8.class differ diff --git a/Dozentenmodul/bin/gui/image/FTPDownloader_GUI$5.class b/Dozentenmodul/bin/gui/image/FTPDownloader_GUI$5.class index 5a20444c..aac529c9 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 e6cb6231..457d19d5 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/src/gui/image/CreateImageAllgemein_GUI.java b/Dozentenmodul/src/gui/image/CreateImageAllgemein_GUI.java index 8fba3fb9..faf95699 100644 --- a/Dozentenmodul/src/gui/image/CreateImageAllgemein_GUI.java +++ b/Dozentenmodul/src/gui/image/CreateImageAllgemein_GUI.java @@ -302,7 +302,7 @@ public class CreateImageAllgemein_GUI extends JFrame { JMenuItem mntmFaq = new JMenuItem("FAQ"); mntmFaq.addMouseListener(new MouseAdapter() { @Override - public void mouseClicked(MouseEvent arg0) { + public void mousePressed(MouseEvent arg0) { String faq; @@ -322,7 +322,7 @@ public class CreateImageAllgemein_GUI extends JFrame { JMenuItem mntmOtrs = new JMenuItem("OTRS"); mntmOtrs.addMouseListener(new MouseAdapter() { @Override - public void mouseClicked(MouseEvent e) { + public void mousePressed(MouseEvent arg0) { String otrs; otrs = Links.getOTRS(); diff --git a/Dozentenmodul/src/gui/image/CreateImageTechnisch_GUI.java b/Dozentenmodul/src/gui/image/CreateImageTechnisch_GUI.java index f9cd20dd..6add313b 100644 --- a/Dozentenmodul/src/gui/image/CreateImageTechnisch_GUI.java +++ b/Dozentenmodul/src/gui/image/CreateImageTechnisch_GUI.java @@ -362,7 +362,7 @@ public class CreateImageTechnisch_GUI extends JFrame { JMenuItem mntmFaq = new JMenuItem("FAQ"); mntmFaq.addMouseListener(new MouseAdapter() { @Override - public void mouseClicked(MouseEvent arg0) { + public void mousePressed(MouseEvent arg0) { String faq; @@ -382,7 +382,7 @@ public class CreateImageTechnisch_GUI extends JFrame { JMenuItem mntmOtrs = new JMenuItem("OTRS"); mntmOtrs.addMouseListener(new MouseAdapter() { @Override - public void mouseClicked(MouseEvent e) { + public void mousePressed(MouseEvent arg0) { String otrs; otrs = Links.getOTRS(); diff --git a/Dozentenmodul/src/gui/image/EditImageAllgemein_GUI.java b/Dozentenmodul/src/gui/image/EditImageAllgemein_GUI.java index 6725850b..49a97051 100644 --- a/Dozentenmodul/src/gui/image/EditImageAllgemein_GUI.java +++ b/Dozentenmodul/src/gui/image/EditImageAllgemein_GUI.java @@ -319,7 +319,7 @@ public class EditImageAllgemein_GUI extends JFrame { JMenuItem mntmFaq = new JMenuItem("FAQ"); mntmFaq.addMouseListener(new MouseAdapter() { @Override - public void mouseClicked(MouseEvent arg0) { + public void mousePressed(MouseEvent arg0) { String faq; @@ -339,7 +339,7 @@ public class EditImageAllgemein_GUI extends JFrame { JMenuItem mntmOtrs = new JMenuItem("OTRS"); mntmOtrs.addMouseListener(new MouseAdapter() { @Override - public void mouseClicked(MouseEvent e) { + public void mousePressed(MouseEvent arg0) { String otrs; otrs = Links.getOTRS(); diff --git a/Dozentenmodul/src/gui/image/EditImageTechnisch_GUI.java b/Dozentenmodul/src/gui/image/EditImageTechnisch_GUI.java index 7636c946..e8d0f5f8 100644 --- a/Dozentenmodul/src/gui/image/EditImageTechnisch_GUI.java +++ b/Dozentenmodul/src/gui/image/EditImageTechnisch_GUI.java @@ -346,7 +346,7 @@ public class EditImageTechnisch_GUI extends JFrame { JMenuItem mntmFaq = new JMenuItem("FAQ"); mntmFaq.addMouseListener(new MouseAdapter() { @Override - public void mouseClicked(MouseEvent arg0) { + public void mousePressed(MouseEvent arg0) { String faq; @@ -365,7 +365,7 @@ public class EditImageTechnisch_GUI extends JFrame { JMenuItem mntmOtrs = new JMenuItem("OTRS"); mntmOtrs.addMouseListener(new MouseAdapter() { @Override - public void mouseClicked(MouseEvent e) { + public void mousePressed(MouseEvent arg0) { String otrs; otrs = Links.getOTRS(); diff --git a/Dozentenmodul/src/gui/image/FTPCreateUploader_GUI.java b/Dozentenmodul/src/gui/image/FTPCreateUploader_GUI.java index 3a78e322..f36a4c5d 100644 --- a/Dozentenmodul/src/gui/image/FTPCreateUploader_GUI.java +++ b/Dozentenmodul/src/gui/image/FTPCreateUploader_GUI.java @@ -370,7 +370,7 @@ public class FTPCreateUploader_GUI extends JFrame implements JMenuItem menuItem = new JMenuItem("FAQ"); menuItem.addMouseListener(new MouseAdapter() { @Override - public void mouseClicked(MouseEvent e) { + public void mousePressed(MouseEvent arg0) { String otrs; otrs = Links.getOTRS(); @@ -390,7 +390,7 @@ public class FTPCreateUploader_GUI extends JFrame implements JMenuItem menuItem_1 = new JMenuItem("OTRS"); menuItem_1.addMouseListener(new MouseAdapter() { @Override - public void mouseClicked(MouseEvent e) { + public void mousePressed(MouseEvent arg0) { } }); menu.add(menuItem_1); diff --git a/Dozentenmodul/src/gui/image/FTPDownloader_GUI.java b/Dozentenmodul/src/gui/image/FTPDownloader_GUI.java index fa164171..671b2170 100644 --- a/Dozentenmodul/src/gui/image/FTPDownloader_GUI.java +++ b/Dozentenmodul/src/gui/image/FTPDownloader_GUI.java @@ -298,7 +298,7 @@ public class FTPDownloader_GUI extends JFrame implements PropertyChangeListener JMenuItem menuItem = new JMenuItem("FAQ"); menuItem.addMouseListener(new MouseAdapter() { @Override - public void mouseClicked(MouseEvent arg0) { + public void mousePressed(MouseEvent arg0) { String faq; @@ -318,7 +318,7 @@ public class FTPDownloader_GUI extends JFrame implements PropertyChangeListener JMenuItem menuItem_1 = new JMenuItem("OTRS"); menuItem_1.addMouseListener(new MouseAdapter() { @Override - public void mouseClicked(MouseEvent e) { + public void mousePressed(MouseEvent arg0) { String otrs; otrs = Links.getOTRS(); diff --git a/Dozentenmodul/src/gui/image/FTPEditUploader_GUI.java b/Dozentenmodul/src/gui/image/FTPEditUploader_GUI.java index 68bd4bb1..3c17a3e5 100644 --- a/Dozentenmodul/src/gui/image/FTPEditUploader_GUI.java +++ b/Dozentenmodul/src/gui/image/FTPEditUploader_GUI.java @@ -360,7 +360,7 @@ public class FTPEditUploader_GUI extends JFrame implements JMenuItem menuItem = new JMenuItem("FAQ"); menuItem.addMouseListener(new MouseAdapter() { @Override - public void mouseClicked(MouseEvent arg0) { + public void mousePressed(MouseEvent arg0) { String faq; @@ -380,7 +380,7 @@ public class FTPEditUploader_GUI extends JFrame implements JMenuItem menuItem_1 = new JMenuItem("OTRS"); menuItem_1.addMouseListener(new MouseAdapter() { @Override - public void mouseClicked(MouseEvent e) { + public void mousePressed(MouseEvent arg0) { String otrs; otrs = Links.getOTRS(); diff --git a/Dozentenmodul/src/gui/image/SearchEditImage_GUI.java b/Dozentenmodul/src/gui/image/SearchEditImage_GUI.java index 1195b8a3..b6ea90b4 100644 --- a/Dozentenmodul/src/gui/image/SearchEditImage_GUI.java +++ b/Dozentenmodul/src/gui/image/SearchEditImage_GUI.java @@ -472,7 +472,7 @@ public class SearchEditImage_GUI extends JFrame { JMenuItem mntmFaq = new JMenuItem("FAQ"); mntmFaq.addMouseListener(new MouseAdapter() { @Override - public void mouseClicked(MouseEvent arg0) { + public void mousePressed(MouseEvent arg0) { String faq; @@ -492,7 +492,7 @@ public class SearchEditImage_GUI extends JFrame { JMenuItem mntmOtrs = new JMenuItem("OTRS"); mntmOtrs.addMouseListener(new MouseAdapter() { @Override - public void mouseClicked(MouseEvent e) { + public void mousePressed(MouseEvent arg0) { String otrs; otrs = Links.getOTRS(); diff --git a/Dozentenmodul/src/gui/image/SearchImage_GUI.java b/Dozentenmodul/src/gui/image/SearchImage_GUI.java index 735c6c99..8fc7d164 100644 --- a/Dozentenmodul/src/gui/image/SearchImage_GUI.java +++ b/Dozentenmodul/src/gui/image/SearchImage_GUI.java @@ -427,7 +427,7 @@ public class SearchImage_GUI extends JFrame { JMenuItem mntmFaq = new JMenuItem("FAQ"); mntmFaq.addMouseListener(new MouseAdapter() { @Override - public void mouseClicked(MouseEvent arg0) { + public void mousePressed(MouseEvent arg0) { String faq; @@ -447,7 +447,7 @@ public class SearchImage_GUI extends JFrame { JMenuItem mntmOtrs = new JMenuItem("OTRS"); mntmOtrs.addMouseListener(new MouseAdapter() { @Override - public void mouseClicked(MouseEvent e) { + public void mousePressed(MouseEvent arg0) { String otrs; otrs = Links.getOTRS(); diff --git a/Dozentenmodul/src/gui/image/SearchMethodLecture_GUI.java b/Dozentenmodul/src/gui/image/SearchMethodLecture_GUI.java index 065b3da7..17b6ab59 100644 --- a/Dozentenmodul/src/gui/image/SearchMethodLecture_GUI.java +++ b/Dozentenmodul/src/gui/image/SearchMethodLecture_GUI.java @@ -247,7 +247,7 @@ public class SearchMethodLecture_GUI extends JFrame { JMenuItem mntmFaq = new JMenuItem("FAQ"); mntmFaq.addMouseListener(new MouseAdapter() { @Override - public void mouseClicked(MouseEvent arg0) { + public void mousePressed(MouseEvent arg0) { String faq; @@ -267,7 +267,7 @@ public class SearchMethodLecture_GUI extends JFrame { JMenuItem mntmOtrs = new JMenuItem("OTRS"); mntmOtrs.addMouseListener(new MouseAdapter() { @Override - public void mouseClicked(MouseEvent e) { + public void mousePressed(MouseEvent arg0) { String otrs; otrs = Links.getOTRS(); diff --git a/Dozentenmodul/src/gui/intro/BillOfRights_GUI.java b/Dozentenmodul/src/gui/intro/BillOfRights_GUI.java index 268acb14..c0a20379 100644 --- a/Dozentenmodul/src/gui/intro/BillOfRights_GUI.java +++ b/Dozentenmodul/src/gui/intro/BillOfRights_GUI.java @@ -195,7 +195,7 @@ public class BillOfRights_GUI extends JFrame { JMenuItem mntmFaq = new JMenuItem("FAQ"); mntmFaq.addMouseListener(new MouseAdapter() { @Override - public void mouseClicked(MouseEvent arg0) { + public void mousePressed(MouseEvent arg0) { String faq; @@ -215,7 +215,7 @@ public class BillOfRights_GUI extends JFrame { JMenuItem mntmOtrs = new JMenuItem("OTRS"); mntmOtrs.addMouseListener(new MouseAdapter() { @Override - public void mouseClicked(MouseEvent e) { + public void mousePressed(MouseEvent arg0) { String otrs; otrs = Links.getOTRS(); diff --git a/Dozentenmodul/src/gui/intro/MainMenue_GUI.java b/Dozentenmodul/src/gui/intro/MainMenue_GUI.java index 4e010f75..7d3d9cae 100644 --- a/Dozentenmodul/src/gui/intro/MainMenue_GUI.java +++ b/Dozentenmodul/src/gui/intro/MainMenue_GUI.java @@ -413,7 +413,7 @@ public class MainMenue_GUI extends JFrame { JMenuItem mntmFaq = new JMenuItem("FAQ"); mntmFaq.addMouseListener(new MouseAdapter() { @Override - public void mouseClicked(MouseEvent arg0) { + public void mousePressed(MouseEvent arg0) { String faq; @@ -433,7 +433,7 @@ public class MainMenue_GUI extends JFrame { JMenuItem mntmOtrs = new JMenuItem("OTRS"); mntmOtrs.addMouseListener(new MouseAdapter() { @Override - public void mouseClicked(MouseEvent e) { + public void mousePressed(MouseEvent arg0) { String otrs; otrs = Links.getOTRS(); diff --git a/Dozentenmodul/src/gui/intro/VmWareLink_GUI.java b/Dozentenmodul/src/gui/intro/VmWareLink_GUI.java index 93300f3e..c94586d8 100644 --- a/Dozentenmodul/src/gui/intro/VmWareLink_GUI.java +++ b/Dozentenmodul/src/gui/intro/VmWareLink_GUI.java @@ -215,7 +215,7 @@ public class VmWareLink_GUI extends JFrame { JMenuItem mntmFaq = new JMenuItem("FAQ"); mntmFaq.addMouseListener(new MouseAdapter() { @Override - public void mouseClicked(MouseEvent arg0) { + public void mousePressed(MouseEvent arg0) { String faq; @@ -236,7 +236,7 @@ public class VmWareLink_GUI extends JFrame { JMenuItem mntmOTRS = new JMenuItem("OTRS"); mntmOTRS.addMouseListener(new MouseAdapter() { @Override - public void mouseClicked(MouseEvent e) { + public void mousePressed(MouseEvent arg0) { String otrs; otrs = Links.getOTRS(); diff --git a/Dozentenmodul/src/gui/lecture/CreateLectureAllgemein_GUI.java b/Dozentenmodul/src/gui/lecture/CreateLectureAllgemein_GUI.java index 3192da83..55074482 100644 --- a/Dozentenmodul/src/gui/lecture/CreateLectureAllgemein_GUI.java +++ b/Dozentenmodul/src/gui/lecture/CreateLectureAllgemein_GUI.java @@ -495,7 +495,7 @@ public class CreateLectureAllgemein_GUI extends JFrame { JMenuItem mntmFaq = new JMenuItem("FAQ"); mntmFaq.addMouseListener(new MouseAdapter() { @Override - public void mouseClicked(MouseEvent arg0) { + public void mousePressed(MouseEvent arg0) { String faq; @@ -515,7 +515,7 @@ public class CreateLectureAllgemein_GUI extends JFrame { JMenuItem mntmOtrs = new JMenuItem("OTRS"); mntmOtrs.addMouseListener(new MouseAdapter() { @Override - public void mouseClicked(MouseEvent e) { + public void mousePressed(MouseEvent arg0) { String otrs; otrs = Links.getOTRS(); diff --git a/Dozentenmodul/src/gui/lecture/CreateLectureLink_GUI.java b/Dozentenmodul/src/gui/lecture/CreateLectureLink_GUI.java index daec54ad..62cebb22 100644 --- a/Dozentenmodul/src/gui/lecture/CreateLectureLink_GUI.java +++ b/Dozentenmodul/src/gui/lecture/CreateLectureLink_GUI.java @@ -461,7 +461,7 @@ public class CreateLectureLink_GUI extends JFrame { JMenuItem mntmFaq = new JMenuItem("FAQ"); mntmFaq.addMouseListener(new MouseAdapter() { @Override - public void mouseClicked(MouseEvent arg0) { + public void mousePressed(MouseEvent arg0) { String faq; @@ -481,7 +481,7 @@ public class CreateLectureLink_GUI extends JFrame { JMenuItem mntmOtrs = new JMenuItem("OTRS"); mntmOtrs.addMouseListener(new MouseAdapter() { @Override - public void mouseClicked(MouseEvent e) { + public void mousePressed(MouseEvent arg0) { String otrs; otrs = Links.getOTRS(); diff --git a/Dozentenmodul/src/gui/lecture/DeleteLecture_GUI.java b/Dozentenmodul/src/gui/lecture/DeleteLecture_GUI.java index 32110a9f..da30680c 100644 --- a/Dozentenmodul/src/gui/lecture/DeleteLecture_GUI.java +++ b/Dozentenmodul/src/gui/lecture/DeleteLecture_GUI.java @@ -415,7 +415,7 @@ public class DeleteLecture_GUI extends JFrame { JMenuItem mntmFaq = new JMenuItem("FAQ"); mntmFaq.addMouseListener(new MouseAdapter() { @Override - public void mouseClicked(MouseEvent arg0) { + public void mousePressed(MouseEvent arg0) { String faq; @@ -435,7 +435,7 @@ public class DeleteLecture_GUI extends JFrame { JMenuItem mntmOtrs = new JMenuItem("OTRS"); mntmOtrs.addMouseListener(new MouseAdapter() { @Override - public void mouseClicked(MouseEvent e) { + public void mousePressed(MouseEvent arg0) { String otrs; otrs = Links.getOTRS(); diff --git a/Dozentenmodul/src/gui/lecture/EditLectureAllgemein_GUI.java b/Dozentenmodul/src/gui/lecture/EditLectureAllgemein_GUI.java index cab588d9..67f86a13 100644 --- a/Dozentenmodul/src/gui/lecture/EditLectureAllgemein_GUI.java +++ b/Dozentenmodul/src/gui/lecture/EditLectureAllgemein_GUI.java @@ -410,7 +410,7 @@ public class EditLectureAllgemein_GUI extends JFrame { JMenuItem mntmFaq = new JMenuItem("FAQ"); mntmFaq.addMouseListener(new MouseAdapter() { @Override - public void mouseClicked(MouseEvent arg0) { + public void mousePressed(MouseEvent arg0) { String faq; @@ -430,7 +430,7 @@ public class EditLectureAllgemein_GUI extends JFrame { JMenuItem mntmOtrs = new JMenuItem("OTRS"); mntmOtrs.addMouseListener(new MouseAdapter() { @Override - public void mouseClicked(MouseEvent e) { + public void mousePressed(MouseEvent arg0) { String otrs; otrs = Links.getOTRS(); diff --git a/Dozentenmodul/src/gui/lecture/EditLectureLink_GUI.java b/Dozentenmodul/src/gui/lecture/EditLectureLink_GUI.java index bd69a2ac..fbbc56f3 100644 --- a/Dozentenmodul/src/gui/lecture/EditLectureLink_GUI.java +++ b/Dozentenmodul/src/gui/lecture/EditLectureLink_GUI.java @@ -452,7 +452,7 @@ public class EditLectureLink_GUI extends JFrame { JMenuItem mntmFaq = new JMenuItem("FAQ"); mntmFaq.addMouseListener(new MouseAdapter() { @Override - public void mouseClicked(MouseEvent arg0) { + public void mousePressed(MouseEvent arg0) { String faq; @@ -472,7 +472,7 @@ public class EditLectureLink_GUI extends JFrame { JMenuItem mntmOtrs = new JMenuItem("OTRS"); mntmOtrs.addMouseListener(new MouseAdapter() { @Override - public void mouseClicked(MouseEvent e) { + public void mousePressed(MouseEvent arg0) { String otrs; otrs = Links.getOTRS(); diff --git a/Dozentenmodul/src/gui/lecture/EditLectureSearch_GUI.java b/Dozentenmodul/src/gui/lecture/EditLectureSearch_GUI.java index 08a68f7f..7ca24016 100644 --- a/Dozentenmodul/src/gui/lecture/EditLectureSearch_GUI.java +++ b/Dozentenmodul/src/gui/lecture/EditLectureSearch_GUI.java @@ -473,7 +473,7 @@ public class EditLectureSearch_GUI extends JFrame { JMenuItem mntmFaq = new JMenuItem("FAQ"); mntmFaq.addMouseListener(new MouseAdapter() { @Override - public void mouseClicked(MouseEvent arg0) { + public void mousePressed(MouseEvent arg0) { String faq; @@ -493,7 +493,7 @@ public class EditLectureSearch_GUI extends JFrame { JMenuItem mntmOtrs = new JMenuItem("OTRS"); mntmOtrs.addMouseListener(new MouseAdapter() { @Override - public void mouseClicked(MouseEvent e) { + public void mousePressed(MouseEvent arg0) { String otrs; otrs = Links.getOTRS(); diff --git a/Dozentenmodul/src/gui/lecture/ExtendedSearchForImages_GUI.java b/Dozentenmodul/src/gui/lecture/ExtendedSearchForImages_GUI.java index cd417720..d818ddeb 100644 --- a/Dozentenmodul/src/gui/lecture/ExtendedSearchForImages_GUI.java +++ b/Dozentenmodul/src/gui/lecture/ExtendedSearchForImages_GUI.java @@ -236,7 +236,7 @@ public class ExtendedSearchForImages_GUI extends JFrame { JMenuItem mntmFaq = new JMenuItem("FAQ"); mntmFaq.addMouseListener(new MouseAdapter() { @Override - public void mouseClicked(MouseEvent arg0) { + public void mousePressed(MouseEvent arg0) { String faq; @@ -256,7 +256,7 @@ public class ExtendedSearchForImages_GUI extends JFrame { JMenuItem mntmOtrs = new JMenuItem("OTRS"); mntmOtrs.addMouseListener(new MouseAdapter() { @Override - public void mouseClicked(MouseEvent e) { + public void mousePressed(MouseEvent arg0) { String otrs; otrs = Links.getOTRS(); diff --git a/Dozentenmodul/src/gui/lecture/SearchLecture_GUI.java b/Dozentenmodul/src/gui/lecture/SearchLecture_GUI.java index a8c417fa..f54b048a 100644 --- a/Dozentenmodul/src/gui/lecture/SearchLecture_GUI.java +++ b/Dozentenmodul/src/gui/lecture/SearchLecture_GUI.java @@ -364,7 +364,7 @@ public class SearchLecture_GUI extends JFrame { JMenuItem mntmFaq = new JMenuItem("FAQ"); mntmFaq.addMouseListener(new MouseAdapter() { @Override - public void mouseClicked(MouseEvent arg0) { + public void mousePressed(MouseEvent arg0) { String faq; @@ -384,7 +384,7 @@ public class SearchLecture_GUI extends JFrame { JMenuItem mntmOtrs = new JMenuItem("OTRS"); mntmOtrs.addMouseListener(new MouseAdapter() { @Override - public void mouseClicked(MouseEvent e) { + public void mousePressed(MouseEvent arg0) { String otrs; otrs = Links.getOTRS(); -- cgit v1.2.3-55-g7522 From 32dff35f3cf3a74f62b64105fd57f7da0e2027dc Mon Sep 17 00:00:00 2001 From: Tobias Spitzer Date: Thu, 15 May 2014 11:17:06 +0200 Subject: Es wird nur noch eine Verbindung zum bwLehrpoolSuite Server geöffnet. --- Dozentenmodul/bin/gui/image/DeleteImage_GUI.class | Bin 12528 -> 12576 bytes .../bin/gui/image/EditImageAllgemein_GUI$2.class | Bin 956 -> 835 bytes .../bin/gui/image/EditImageAllgemein_GUI$3.class | Bin 1008 -> 887 bytes .../bin/gui/image/EditImageAllgemein_GUI.class | Bin 9756 -> 9804 bytes .../bin/gui/image/FTPCreateUploader_GUI$3.class | Bin 1446 -> 1446 bytes .../bin/gui/image/FTPCreateUploader_GUI$4.class | Bin 1198 -> 1198 bytes .../bin/gui/image/FTPCreateUploader_GUI$6.class | Bin 2125 -> 2001 bytes .../bin/gui/image/FTPCreateUploader_GUI$7.class | Bin 1014 -> 890 bytes .../bin/gui/image/FTPCreateUploader_GUI$8.class | Bin 1351 -> 1351 bytes .../bin/gui/image/FTPCreateUploader_GUI.class | Bin 13316 -> 13362 bytes .../bin/gui/image/FTPDownloader_GUI$1.class | Bin 1887 -> 1884 bytes Dozentenmodul/bin/gui/image/FTPDownloader_GUI.class | Bin 11146 -> 11192 bytes .../bin/gui/image/FTPEditUploader_GUI$3.class | Bin 1434 -> 1434 bytes .../bin/gui/image/FTPEditUploader_GUI$5.class | Bin 799 -> 799 bytes .../bin/gui/image/FTPEditUploader_GUI.class | Bin 12853 -> 12898 bytes .../bin/gui/image/SearchEditImage_GUI$3.class | Bin 951 -> 830 bytes .../bin/gui/image/SearchEditImage_GUI$7.class | Bin 1941 -> 1820 bytes .../bin/gui/image/SearchEditImage_GUI$9.class | Bin 2177 -> 2042 bytes .../bin/gui/image/SearchEditImage_GUI.class | Bin 12411 -> 12459 bytes Dozentenmodul/bin/gui/image/SearchImage_GUI$3.class | Bin 927 -> 806 bytes Dozentenmodul/bin/gui/image/SearchImage_GUI$5.class | Bin 914 -> 793 bytes Dozentenmodul/bin/gui/image/SearchImage_GUI$7.class | Bin 1917 -> 1796 bytes Dozentenmodul/bin/gui/image/SearchImage_GUI$8.class | Bin 956 -> 835 bytes Dozentenmodul/bin/gui/image/SearchImage_GUI.class | Bin 12192 -> 12240 bytes Dozentenmodul/bin/gui/intro/Login_GUI$1.class | Bin 1190 -> 1190 bytes Dozentenmodul/bin/gui/intro/Login_GUI$2.class | Bin 665 -> 665 bytes Dozentenmodul/bin/gui/intro/Login_GUI$4.class | Bin 677 -> 677 bytes Dozentenmodul/bin/gui/intro/Login_GUI.class | Bin 9626 -> 10031 bytes Dozentenmodul/bin/thrift/ThriftConnection.class | Bin 2326 -> 2326 bytes Dozentenmodul/src/gui/image/DeleteImage_GUI.java | 12 ++++++------ .../src/gui/image/EditImageAllgemein_GUI.java | 8 ++++---- .../src/gui/image/FTPCreateUploader_GUI.java | 9 +++++---- Dozentenmodul/src/gui/image/FTPDownloader_GUI.java | 10 +++++----- .../src/gui/image/FTPEditUploader_GUI.java | 7 ++++--- .../src/gui/image/SearchEditImage_GUI.java | 14 +++++++------- Dozentenmodul/src/gui/image/SearchImage_GUI.java | 10 +++++----- Dozentenmodul/src/gui/intro/Login_GUI.java | 11 +++++++++-- .../src/gui/lecture/CreateLectureLink_GUI.java | 7 ++++--- .../src/gui/lecture/DeleteLecture_GUI.java | 10 +++++----- .../src/gui/lecture/EditLectureLink_GUI.java | 8 +++++--- .../src/gui/lecture/EditLectureSearch_GUI.java | 10 +++++----- .../src/gui/lecture/SearchLecture_GUI.java | 8 ++++---- Dozentenmodul/src/models/Client.java | 19 +++++++++++++++++++ Dozentenmodul/src/thrift/ThriftConnection.java | 7 ++++++- 44 files changed, 93 insertions(+), 57 deletions(-) create mode 100644 Dozentenmodul/src/models/Client.java (limited to 'Dozentenmodul/src/gui/image/EditImageAllgemein_GUI.java') diff --git a/Dozentenmodul/bin/gui/image/DeleteImage_GUI.class b/Dozentenmodul/bin/gui/image/DeleteImage_GUI.class index 567fc96b..09814b8a 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$2.class b/Dozentenmodul/bin/gui/image/EditImageAllgemein_GUI$2.class index 6617ad6e..e3f2472b 100644 Binary files a/Dozentenmodul/bin/gui/image/EditImageAllgemein_GUI$2.class and b/Dozentenmodul/bin/gui/image/EditImageAllgemein_GUI$2.class differ diff --git a/Dozentenmodul/bin/gui/image/EditImageAllgemein_GUI$3.class b/Dozentenmodul/bin/gui/image/EditImageAllgemein_GUI$3.class index 1a5a0fe5..4acbdfaf 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.class b/Dozentenmodul/bin/gui/image/EditImageAllgemein_GUI.class index b2656782..042234c9 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 94acbae9..23d60d2f 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$4.class b/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$4.class index 0081eba4..03680a6f 100644 Binary files a/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$4.class and b/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$4.class differ diff --git a/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$6.class b/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$6.class index e20cfac9..21e46d35 100644 Binary files a/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$6.class and b/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$6.class differ diff --git a/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$7.class b/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$7.class index c9ed851b..214beaa8 100644 Binary files a/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$7.class and b/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$7.class differ diff --git a/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$8.class b/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$8.class index 22538b35..cc06860f 100644 Binary files a/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$8.class and b/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI$8.class differ diff --git a/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI.class b/Dozentenmodul/bin/gui/image/FTPCreateUploader_GUI.class index 704bd616..02cb7abd 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$1.class b/Dozentenmodul/bin/gui/image/FTPDownloader_GUI$1.class index 2053e90e..6267c626 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.class b/Dozentenmodul/bin/gui/image/FTPDownloader_GUI.class index a39211bb..45ca0eae 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 74aaef08..04c8b107 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$5.class b/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$5.class index aa1b5a70..a846427a 100644 Binary files a/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$5.class and b/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI$5.class differ diff --git a/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI.class b/Dozentenmodul/bin/gui/image/FTPEditUploader_GUI.class index 910cc1d1..bde5917c 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$3.class b/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$3.class index 196208c4..58a8dce5 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$7.class b/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$7.class index cdf3cad7..81f1d246 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$9.class b/Dozentenmodul/bin/gui/image/SearchEditImage_GUI$9.class index 5d6c601d..61318fe0 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 7207fba7..9fabf945 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$3.class b/Dozentenmodul/bin/gui/image/SearchImage_GUI$3.class index 64a6e9c9..c98d437a 100644 Binary files a/Dozentenmodul/bin/gui/image/SearchImage_GUI$3.class and b/Dozentenmodul/bin/gui/image/SearchImage_GUI$3.class differ diff --git a/Dozentenmodul/bin/gui/image/SearchImage_GUI$5.class b/Dozentenmodul/bin/gui/image/SearchImage_GUI$5.class index 24a37378..6c550b56 100644 Binary files a/Dozentenmodul/bin/gui/image/SearchImage_GUI$5.class and b/Dozentenmodul/bin/gui/image/SearchImage_GUI$5.class differ diff --git a/Dozentenmodul/bin/gui/image/SearchImage_GUI$7.class b/Dozentenmodul/bin/gui/image/SearchImage_GUI$7.class index 88e9e10c..033c3dda 100644 Binary files a/Dozentenmodul/bin/gui/image/SearchImage_GUI$7.class and b/Dozentenmodul/bin/gui/image/SearchImage_GUI$7.class differ diff --git a/Dozentenmodul/bin/gui/image/SearchImage_GUI$8.class b/Dozentenmodul/bin/gui/image/SearchImage_GUI$8.class index 95a953f3..245edb20 100644 Binary files a/Dozentenmodul/bin/gui/image/SearchImage_GUI$8.class and b/Dozentenmodul/bin/gui/image/SearchImage_GUI$8.class differ diff --git a/Dozentenmodul/bin/gui/image/SearchImage_GUI.class b/Dozentenmodul/bin/gui/image/SearchImage_GUI.class index d7bc6bab..13b9fe67 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/Login_GUI$1.class b/Dozentenmodul/bin/gui/intro/Login_GUI$1.class index 780e5fd1..3f9d2221 100644 Binary files a/Dozentenmodul/bin/gui/intro/Login_GUI$1.class and b/Dozentenmodul/bin/gui/intro/Login_GUI$1.class differ diff --git a/Dozentenmodul/bin/gui/intro/Login_GUI$2.class b/Dozentenmodul/bin/gui/intro/Login_GUI$2.class index 6ecad17e..570e91d4 100644 Binary files a/Dozentenmodul/bin/gui/intro/Login_GUI$2.class and b/Dozentenmodul/bin/gui/intro/Login_GUI$2.class differ diff --git a/Dozentenmodul/bin/gui/intro/Login_GUI$4.class b/Dozentenmodul/bin/gui/intro/Login_GUI$4.class index 6db87dc2..8d8f8918 100644 Binary files a/Dozentenmodul/bin/gui/intro/Login_GUI$4.class and b/Dozentenmodul/bin/gui/intro/Login_GUI$4.class differ diff --git a/Dozentenmodul/bin/gui/intro/Login_GUI.class b/Dozentenmodul/bin/gui/intro/Login_GUI.class index aff3176d..91b73e2a 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/thrift/ThriftConnection.class b/Dozentenmodul/bin/thrift/ThriftConnection.class index 40003a69..290acaad 100644 Binary files a/Dozentenmodul/bin/thrift/ThriftConnection.class and b/Dozentenmodul/bin/thrift/ThriftConnection.class differ diff --git a/Dozentenmodul/src/gui/image/DeleteImage_GUI.java b/Dozentenmodul/src/gui/image/DeleteImage_GUI.java index 79e37076..9fc4110d 100644 --- a/Dozentenmodul/src/gui/image/DeleteImage_GUI.java +++ b/Dozentenmodul/src/gui/image/DeleteImage_GUI.java @@ -70,8 +70,8 @@ public class DeleteImage_GUI extends JFrame { JTabbedPane tabbedPane; String[] titles = { "Image-Name", "Lizenzpflichtig", "OS", "Veranstaltung", "Verantwortlicher", "Letztes Update", "Schlagwort", "ID", "Version" }; - ThriftConnection con = new ThriftConnection(); - Client client = con.getThriftConnection(); + ThriftConnection con=new ThriftConnection(); + Client client = models.Client.clientcon.getClient(); final DefaultTableModel modelAll = new DefaultTableModel(titles, 0); final DefaultTableModel modelMyImages = new DefaultTableModel(titles, 0); final TableRowSorter rowSorterAll = new TableRowSorter( @@ -201,7 +201,7 @@ public class DeleteImage_GUI extends JFrame { @Override public void mouseClicked(MouseEvent arg0) { // Öffnet das Fenster Extended GUI - con.closeThriftConnection(); + ExtendedSearchForImages_GUI es = new ExtendedSearchForImages_GUI(); es.setVisible(true); } @@ -250,7 +250,7 @@ public class DeleteImage_GUI extends JFrame { @Override public void mouseClicked(MouseEvent arg0) { // Öffnet das Hauütmenü - con.closeThriftConnection(); + DeleteImage_GUI.this.setVisible(false); MainMenue_GUI main = new MainMenue_GUI(); main.setVisible(true); @@ -420,7 +420,7 @@ public class DeleteImage_GUI extends JFrame { // if (client.deleteImageServer(imageid // ,imageversion)) { - con.closeThriftConnection(); + DeleteImage_GUI di = new DeleteImage_GUI(); @@ -497,7 +497,7 @@ public class DeleteImage_GUI extends JFrame { okButton.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { // Öffnet das Hauptmenü - con.closeThriftConnection(); + MainMenue_GUI main = new MainMenue_GUI(); main.setVisible(true); dispose(); diff --git a/Dozentenmodul/src/gui/image/EditImageAllgemein_GUI.java b/Dozentenmodul/src/gui/image/EditImageAllgemein_GUI.java index 49a97051..a3c21ddf 100644 --- a/Dozentenmodul/src/gui/image/EditImageAllgemein_GUI.java +++ b/Dozentenmodul/src/gui/image/EditImageAllgemein_GUI.java @@ -50,7 +50,7 @@ public class EditImageAllgemein_GUI extends JFrame { private JTextField EMail; private JTextField imagename; ThriftConnection con = new ThriftConnection(); - Client client = con.getThriftConnection(); + Client client = models.Client.clientcon.getClient(); private JPanel panel_2; private JLabel lblNewLabel; private JTextPane txtpnBitteWhlenSie; @@ -221,7 +221,7 @@ public class EditImageAllgemein_GUI extends JFrame { 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); @@ -261,7 +261,7 @@ 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(); + SearchEditImage_GUI se = new SearchEditImage_GUI(); se.setVisible(true); dispose(); @@ -288,7 +288,7 @@ public class EditImageAllgemein_GUI extends JFrame { Image.image.setImagename(imagename.getText()); System.out.println("Changing name to:" + imagename.getText()+ "\nNewName is: "+Image.image.getNewName()); - con.closeThriftConnection(); + EditImageTechnisch_GUI ea = new EditImageTechnisch_GUI(); ea.setVisible(true); dispose(); diff --git a/Dozentenmodul/src/gui/image/FTPCreateUploader_GUI.java b/Dozentenmodul/src/gui/image/FTPCreateUploader_GUI.java index 8c14fa01..0643728f 100644 --- a/Dozentenmodul/src/gui/image/FTPCreateUploader_GUI.java +++ b/Dozentenmodul/src/gui/image/FTPCreateUploader_GUI.java @@ -73,8 +73,8 @@ public class FTPCreateUploader_GUI extends JFrame implements double speed; long bytesread; boolean taskrun = false; - ThriftConnection thrift = new ThriftConnection(); - Client client = thrift.getThriftConnection(); + ThriftConnection con = new ThriftConnection(); + Client client = models.Client.clientcon.getClient(); JButton finishButton = new JButton("Fertigstellen"); JButton btnUploadStarten = new JButton("Upload auf Server starten"); JButton btnZurck = new JButton("Zur\u00FCck"); @@ -115,6 +115,7 @@ public class FTPCreateUploader_GUI extends JFrame implements } task.cancel(true); } + con.closeThriftConnection(); System.exit(0); }// end window closing }); @@ -332,7 +333,7 @@ public class FTPCreateUploader_GUI extends JFrame implements if (taskrun == true) { try { client.DeleteFtpUser(user.userName); - thrift.closeThriftConnection(); + } catch (TException e1) { // TODO Auto-generated catch block e1.printStackTrace(); @@ -349,7 +350,7 @@ public class FTPCreateUploader_GUI extends JFrame implements btnZurck.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { dispose(); - thrift.closeThriftConnection(); + CreateImageTechnisch_GUI m = new CreateImageTechnisch_GUI(); m.setVisible(true); } diff --git a/Dozentenmodul/src/gui/image/FTPDownloader_GUI.java b/Dozentenmodul/src/gui/image/FTPDownloader_GUI.java index 1deb6cff..97a29849 100644 --- a/Dozentenmodul/src/gui/image/FTPDownloader_GUI.java +++ b/Dozentenmodul/src/gui/image/FTPDownloader_GUI.java @@ -70,8 +70,8 @@ public class FTPDownloader_GUI extends JFrame implements PropertyChangeListener long bytesread; JLabel labelZeit; boolean taskrun = false; - ThriftConnection thrift = new ThriftConnection(); - Client client = thrift.getThriftConnection(); + ThriftConnection con = new ThriftConnection(); + Client client = models.Client.clientcon.getClient(); JButton btnZurck = new JButton("Zur\u00FCck"); JButton btnDownloadStarten = new JButton("Download starten"); JButton btnMainMenu = new JButton("Hauptmen\u00FC"); @@ -87,7 +87,7 @@ public class FTPDownloader_GUI extends JFrame implements PropertyChangeListener if (taskrun == true) { try { client.DeleteFtpUser(user.userName); - thrift.closeThriftConnection(); + con.closeThriftConnection(); } catch (TException e1) { // TODO Auto-generated catch block e1.printStackTrace(); @@ -355,7 +355,7 @@ public class FTPDownloader_GUI extends JFrame implements PropertyChangeListener "Debug-Message", JOptionPane.ERROR_MESSAGE); } } - thrift.closeThriftConnection(); + SearchEditImage_GUI se = new SearchEditImage_GUI(); se.setVisible(true); dispose(); @@ -368,7 +368,7 @@ public class FTPDownloader_GUI extends JFrame implements PropertyChangeListener btnMainMenu.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent arg0) { - thrift.closeThriftConnection(); + MainMenue_GUI mm = new MainMenue_GUI(); mm.setVisible(true); dispose(); diff --git a/Dozentenmodul/src/gui/image/FTPEditUploader_GUI.java b/Dozentenmodul/src/gui/image/FTPEditUploader_GUI.java index 6b2e0d66..99fc034b 100644 --- a/Dozentenmodul/src/gui/image/FTPEditUploader_GUI.java +++ b/Dozentenmodul/src/gui/image/FTPEditUploader_GUI.java @@ -73,8 +73,8 @@ public class FTPEditUploader_GUI extends JFrame implements long bytesread; boolean taskrun = false; int progress = 0; - ThriftConnection thrift = new ThriftConnection(); - Client client = thrift.getThriftConnection(); + ThriftConnection con = new ThriftConnection(); + Client client = models.Client.clientcon.getClient(); JButton btnUploadStarten = new JButton("Upload auf Server starten"); JButton btnSpeicherortAuswhlen = new JButton("Image ausw\u00E4hlen"); JButton finishButton = new JButton("Fertigstellen"); @@ -113,6 +113,7 @@ public class FTPEditUploader_GUI extends JFrame implements } task.cancel(true); } + con.closeThriftConnection(); System.exit(0); }// end window closing }); @@ -334,7 +335,7 @@ public class FTPEditUploader_GUI extends JFrame implements } task.cancel(true); } - thrift.closeThriftConnection(); + } }); btnZurck.addActionListener(new ActionListener() { diff --git a/Dozentenmodul/src/gui/image/SearchEditImage_GUI.java b/Dozentenmodul/src/gui/image/SearchEditImage_GUI.java index b6ea90b4..ec1ceb8e 100644 --- a/Dozentenmodul/src/gui/image/SearchEditImage_GUI.java +++ b/Dozentenmodul/src/gui/image/SearchEditImage_GUI.java @@ -70,7 +70,7 @@ public class SearchEditImage_GUI extends JFrame { String[] titles = { "Image-Name", "Lizenzpflichtig", "OS", "Veranstaltung", "Verantwortlicher", "Letztes Update", "Schlagwort", "ID", "Version" }; ThriftConnection con = new ThriftConnection(); - Client client = con.getThriftConnection(); + Client client = models.Client.clientcon.getClient(); final DefaultTableModel modelAll = new DefaultTableModel(titles, 0); final DefaultTableModel modelMyImages = new DefaultTableModel(titles, 0); final TableRowSorter rowSorterAll = new TableRowSorter( @@ -191,7 +191,7 @@ public class SearchEditImage_GUI extends JFrame { @Override public void mouseClicked(MouseEvent arg0) { // Öffnet das Fenster Extended GUI - con.closeThriftConnection(); + ExtendedSearchForImages_GUI es = new ExtendedSearchForImages_GUI(); es.setVisible(true); } @@ -240,7 +240,7 @@ public class SearchEditImage_GUI extends JFrame { @Override public void mouseClicked(MouseEvent arg0) { // Öffnet das Hauütmenü - con.closeThriftConnection(); + SearchEditImage_GUI.this.setVisible(false); MainMenue_GUI main = new MainMenue_GUI(); main.setVisible(true); @@ -376,7 +376,7 @@ public class SearchEditImage_GUI extends JFrame { SearchEditImage_GUI.this.setVisible(false); FTPDownloader_GUI down = new FTPDownloader_GUI(); down.setVisible(true); - con.closeThriftConnection(); + } else { JOptionPane.showMessageDialog(null, @@ -398,7 +398,7 @@ public class SearchEditImage_GUI extends JFrame { okButton.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { // Öffnet das Hauptmenü - con.closeThriftConnection(); + MainMenue_GUI main = new MainMenue_GUI(); main.setVisible(true); dispose(); @@ -412,7 +412,7 @@ public class SearchEditImage_GUI extends JFrame { JButton cancelButton = new JButton("Weiter"); cancelButton.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { - con.closeThriftConnection(); + // check if user is in correct tab if (tabbedPane.getSelectedIndex() == 0) { @@ -434,7 +434,7 @@ public class SearchEditImage_GUI extends JFrame { 8).toString(); Image.image.setVersion(imageversion); - con.closeThriftConnection(); + EditImageAllgemein_GUI ea = new EditImageAllgemein_GUI(); ea.setVisible(true); dispose(); diff --git a/Dozentenmodul/src/gui/image/SearchImage_GUI.java b/Dozentenmodul/src/gui/image/SearchImage_GUI.java index 8fc7d164..73f0b9bb 100644 --- a/Dozentenmodul/src/gui/image/SearchImage_GUI.java +++ b/Dozentenmodul/src/gui/image/SearchImage_GUI.java @@ -70,7 +70,7 @@ public class SearchImage_GUI extends JFrame { String[] titles = { "Image-Name", "Lizenzpflichtig", "OS", "Veranstaltung", "Verantwortlicher", "Letztes Update", "Schlagwort", "ID", "Version" }; ThriftConnection con = new ThriftConnection(); - Client client = con.getThriftConnection(); + Client client = models.Client.clientcon.getClient(); final DefaultTableModel modelAll = new DefaultTableModel(titles, 0); final DefaultTableModel modelMyImages = new DefaultTableModel(titles, 0); final TableRowSorter rowSorterAll = new TableRowSorter( @@ -191,7 +191,7 @@ public class SearchImage_GUI extends JFrame { @Override public void mouseClicked(MouseEvent arg0) { // Öffnet das Fenster Extended GUI - con.closeThriftConnection(); + ExtendedSearchForImages_GUI es = new ExtendedSearchForImages_GUI(); es.setVisible(true); } @@ -240,7 +240,7 @@ public class SearchImage_GUI extends JFrame { @Override public void mouseClicked(MouseEvent arg0) { // Öffnet das Hauütmenü - con.closeThriftConnection(); + SearchImage_GUI.this.setVisible(false); MainMenue_GUI main = new MainMenue_GUI(); main.setVisible(true); @@ -376,7 +376,7 @@ public class SearchImage_GUI extends JFrame { SearchImage_GUI.this.setVisible(false); FTPDownloader_GUI down = new FTPDownloader_GUI(); down.setVisible(true); - con.closeThriftConnection(); + } else { JOptionPane.showMessageDialog(null, @@ -398,7 +398,7 @@ public class SearchImage_GUI extends JFrame { okButton.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { // Öffnet das Hauptmenü - con.closeThriftConnection(); + MainMenue_GUI main = new MainMenue_GUI(); main.setVisible(true); dispose(); diff --git a/Dozentenmodul/src/gui/intro/Login_GUI.java b/Dozentenmodul/src/gui/intro/Login_GUI.java index b30a33a7..b6249be0 100644 --- a/Dozentenmodul/src/gui/intro/Login_GUI.java +++ b/Dozentenmodul/src/gui/intro/Login_GUI.java @@ -29,6 +29,7 @@ import org.apache.thrift.TException; import org.ini4j.Wini; import thrift.MasterThriftConnection; import thrift.ImageServer.Client; +import thrift.ThriftConnection; import thrift.UserInfo; import config.config_file; import javax.swing.SwingConstants; @@ -207,7 +208,13 @@ public class Login_GUI extends JFrame { SessionData.session.setSessionID(result.sessionId); SessionData.session.setServerAdress(result.serverAddress); System.out.println("Satellit-Adresse: " + result.serverAddress); - + + //set connection to bwLehrpoolSuiteServer + ThriftConnection bwthrift=new ThriftConnection(); + server.Server.Client bwClient=bwthrift.getThriftConnection(); + models.Client.clientcon.setClient(bwClient); + + System.out .println("Konnte mich beim MasterServer authentifizieren. Meine Session-ID ist " + result.sessionId @@ -240,7 +247,7 @@ public class Login_GUI extends JFrame { person.verantwortlicher.setVorname(user.firstName); person.verantwortlicher.setEMail(user.eMail); person.verantwortlicher.setHochschule(hochschule); - + try { // Lege config File an und entscheide welches Fenster // als nächstes geöffnet wird diff --git a/Dozentenmodul/src/gui/lecture/CreateLectureLink_GUI.java b/Dozentenmodul/src/gui/lecture/CreateLectureLink_GUI.java index 62cebb22..610df2f3 100644 --- a/Dozentenmodul/src/gui/lecture/CreateLectureLink_GUI.java +++ b/Dozentenmodul/src/gui/lecture/CreateLectureLink_GUI.java @@ -68,7 +68,7 @@ public class CreateLectureLink_GUI extends JFrame { String[] titles = { "Image-Name", "Lizenzpflichtig", "OS", "Veranstaltung", "Verantwortlicher", "Letztes Update", "Schlagwort" }; ThriftConnection con = new ThriftConnection(); - Client client = con.getThriftConnection(); + Client client = models.Client.clientcon.getClient(); /** * Launch the application. @@ -90,6 +90,7 @@ public class CreateLectureLink_GUI extends JFrame { addWindowListener(new WindowAdapter() { @Override public void windowClosing(WindowEvent arg0) { + con.closeThriftConnection(); System.exit(0); } @@ -349,7 +350,7 @@ public class CreateLectureLink_GUI extends JFrame { JButton cancelButton = new JButton("Zur\u00FCck"); cancelButton.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { - con.closeThriftConnection(); + CreateLectureAllgemein_GUI eVAG = new CreateLectureAllgemein_GUI(); eVAG.setVisible(true); dispose(); @@ -420,7 +421,7 @@ public class CreateLectureLink_GUI extends JFrame { e1.getCause()+"\n"+e1.getMessage(), "Debug-Message", JOptionPane.ERROR_MESSAGE); } - con.closeThriftConnection(); + dispose(); } else { diff --git a/Dozentenmodul/src/gui/lecture/DeleteLecture_GUI.java b/Dozentenmodul/src/gui/lecture/DeleteLecture_GUI.java index da30680c..33192436 100644 --- a/Dozentenmodul/src/gui/lecture/DeleteLecture_GUI.java +++ b/Dozentenmodul/src/gui/lecture/DeleteLecture_GUI.java @@ -69,7 +69,7 @@ public class DeleteLecture_GUI extends JFrame { "Gültigkeitsdatum", "Aktiv", "Letzte Benutzung", "Verantwortlicher", "Image", "Schlagwort", "ID" }; ThriftConnection con = new ThriftConnection(); - Client client = con.getThriftConnection(); + Client client = models.Client.clientcon.getClient(); final DefaultTableModel modelAll = new DefaultTableModel(titles, 0); final DefaultTableModel modelMyLectures = new DefaultTableModel(titles, 0); final TableRowSorter rowSorterAll = new TableRowSorter( @@ -195,7 +195,7 @@ public class DeleteLecture_GUI extends JFrame { @Override public void mouseClicked(MouseEvent arg0) { // Öffnet das Fenster Extended GUI - con.closeThriftConnection(); + ExtendedSearchForImages_GUI es = new ExtendedSearchForImages_GUI(); es.setVisible(true); } @@ -210,7 +210,7 @@ public class DeleteLecture_GUI extends JFrame { @Override public void mouseClicked(MouseEvent arg0) { // Öffnet das Hauptmenü - con.closeThriftConnection(); + DeleteLecture_GUI.this.setVisible(false); MainMenue_GUI main = new MainMenue_GUI(); main.setVisible(true); @@ -350,7 +350,7 @@ public class DeleteLecture_GUI extends JFrame { if(client.deleteLecture(lectureID, person.verantwortlicher.getHochschule(),person.verantwortlicher.getUsername())){ System.out.println("Löschen erfolgreich"); //delete successful - con.closeThriftConnection(); + DeleteLecture_GUI dl = new DeleteLecture_GUI(); dl.setVisible(true); dispose(); @@ -386,7 +386,7 @@ public class DeleteLecture_GUI extends JFrame { btnBack.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { // Öffnet das Hauptmenü - con.closeThriftConnection(); + MainMenue_GUI main = new MainMenue_GUI(); main.setVisible(true); dispose(); diff --git a/Dozentenmodul/src/gui/lecture/EditLectureLink_GUI.java b/Dozentenmodul/src/gui/lecture/EditLectureLink_GUI.java index fbbc56f3..b0f30cd9 100644 --- a/Dozentenmodul/src/gui/lecture/EditLectureLink_GUI.java +++ b/Dozentenmodul/src/gui/lecture/EditLectureLink_GUI.java @@ -66,8 +66,8 @@ public class EditLectureLink_GUI extends JFrame { private JTextField textFieldName; String[] titles = { "Image-Name", "Lizenzpflichtig", "OS", "Veranstaltung", "Verantwortlicher", "Letztes Update", "Schlagwort", "ID", "Version" }; - ThriftConnection thrift = new ThriftConnection(); - Client client = thrift.getThriftConnection(); + ThriftConnection con = new ThriftConnection(); + Client client = models.Client.clientcon.getClient(); /** * Launch the application. @@ -89,6 +89,7 @@ public class EditLectureLink_GUI extends JFrame { addWindowListener(new WindowAdapter() { @Override public void windowClosing(WindowEvent arg0) { + con.closeThriftConnection(); System.exit(0); } }); @@ -417,7 +418,8 @@ public class EditLectureLink_GUI extends JFrame { JOptionPane.INFORMATION_MESSAGE); } - thrift.closeThriftConnection(); + + MainMenue_GUI m = new MainMenue_GUI(); m.setVisible(true); dispose(); diff --git a/Dozentenmodul/src/gui/lecture/EditLectureSearch_GUI.java b/Dozentenmodul/src/gui/lecture/EditLectureSearch_GUI.java index 7ca24016..6ce8897a 100644 --- a/Dozentenmodul/src/gui/lecture/EditLectureSearch_GUI.java +++ b/Dozentenmodul/src/gui/lecture/EditLectureSearch_GUI.java @@ -72,7 +72,7 @@ public class EditLectureSearch_GUI extends JFrame { "Gültigkeitsdatum", "Aktiv", "Letzte Benutzung", "Verantwortlicher", "Image", "Schlagwort", "ID" }; ThriftConnection con = new ThriftConnection(); - Client client = con.getThriftConnection(); + Client client = models.Client.clientcon.getClient(); final DefaultTableModel modelAll = new DefaultTableModel(titles, 0); final DefaultTableModel modelMyLectures = new DefaultTableModel(titles, 0); final TableRowSorter rowSorterAll = new TableRowSorter( @@ -196,7 +196,7 @@ public class EditLectureSearch_GUI extends JFrame { @Override public void mouseClicked(MouseEvent arg0) { // Öffnet das Fenster Extended GUI - con.closeThriftConnection(); + ExtendedSearchForImages_GUI es = new ExtendedSearchForImages_GUI(); es.setVisible(true); } @@ -211,7 +211,7 @@ public class EditLectureSearch_GUI extends JFrame { @Override public void mouseClicked(MouseEvent arg0) { // Öffnet das Hauptmenü - con.closeThriftConnection(); + EditLectureSearch_GUI.this.setVisible(false); MainMenue_GUI main = new MainMenue_GUI(); main.setVisible(true); @@ -339,7 +339,7 @@ public class EditLectureSearch_GUI extends JFrame { btnBack.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { // Öffnet das Hauptmenü - con.closeThriftConnection(); + MainMenue_GUI main = new MainMenue_GUI(); main.setVisible(true); dispose(); @@ -427,7 +427,7 @@ public class EditLectureSearch_GUI extends JFrame { Lecture.lecture.setActive(false); } - con.closeThriftConnection(); + // EditImageAllgemein_GUI ea=new // EditImageAllgemein_GUI(); EditLectureAllgemein_GUI el = new EditLectureAllgemein_GUI(); diff --git a/Dozentenmodul/src/gui/lecture/SearchLecture_GUI.java b/Dozentenmodul/src/gui/lecture/SearchLecture_GUI.java index f54b048a..d686f5f9 100644 --- a/Dozentenmodul/src/gui/lecture/SearchLecture_GUI.java +++ b/Dozentenmodul/src/gui/lecture/SearchLecture_GUI.java @@ -68,7 +68,7 @@ public class SearchLecture_GUI extends JFrame { "Gültigkeitsdatum", "Aktiv", "Letzte Benutzung", "Verantwortlicher", "Image", "Schlagwort", "ID" }; ThriftConnection con = new ThriftConnection(); - Client client = con.getThriftConnection(); + Client client = models.Client.clientcon.getClient(); final DefaultTableModel modelAll = new DefaultTableModel(titles, 0); final DefaultTableModel modelMyLectures = new DefaultTableModel(titles, 0); final TableRowSorter rowSorterAll = new TableRowSorter( @@ -192,7 +192,7 @@ public class SearchLecture_GUI extends JFrame { @Override public void mouseClicked(MouseEvent arg0) { // Öffnet das Fenster Extended GUI - con.closeThriftConnection(); + ExtendedSearchForImages_GUI es = new ExtendedSearchForImages_GUI(); es.setVisible(true); } @@ -207,7 +207,7 @@ public class SearchLecture_GUI extends JFrame { @Override public void mouseClicked(MouseEvent arg0) { // Öffnet das Hauptmenü - con.closeThriftConnection(); + SearchLecture_GUI.this.setVisible(false); MainMenue_GUI main = new MainMenue_GUI(); main.setVisible(true); @@ -335,7 +335,7 @@ public class SearchLecture_GUI extends JFrame { btnBack.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { // Öffnet das Hauptmenü - con.closeThriftConnection(); + MainMenue_GUI main = new MainMenue_GUI(); main.setVisible(true); dispose(); diff --git a/Dozentenmodul/src/models/Client.java b/Dozentenmodul/src/models/Client.java new file mode 100644 index 00000000..6dc587f1 --- /dev/null +++ b/Dozentenmodul/src/models/Client.java @@ -0,0 +1,19 @@ +package models; + +public class Client { + + private server.Server.Client client; + + public static Client clientcon=new Client(); + + public server.Server.Client getClient() { + return client; + } + + public void setClient(server.Server.Client client) { + this.client = client; + } + + + +} diff --git a/Dozentenmodul/src/thrift/ThriftConnection.java b/Dozentenmodul/src/thrift/ThriftConnection.java index 7652fbe7..dcd441bc 100644 --- a/Dozentenmodul/src/thrift/ThriftConnection.java +++ b/Dozentenmodul/src/thrift/ThriftConnection.java @@ -17,7 +17,11 @@ public class ThriftConnection { private String satAddress = ""+SessionData.session.getServerAdress(); final TTransport transport = new TSocket(satAddress, 9090); - //final TTransport transport = new TSocket("141.79.128.102", 9090); + + public ThriftConnection() { + // TODO Auto-generated constructor stub + } + public Client getThriftConnection() { @@ -34,6 +38,7 @@ public class ThriftConnection { } final TProtocol protocol = new TBinaryProtocol(transport); + final Server.Client client = new Server.Client(protocol); System.out.println("Verbindung zu "+satAddress+" wurde aufgebaut."); -- cgit v1.2.3-55-g7522 From 05d0298a14fdf6da24ed9ec0504c1f9b406e754c Mon Sep 17 00:00:00 2001 From: unknown Date: Sat, 17 May 2014 17:46:17 +0200 Subject: asdfdsgdfgdfh --- Dozentenmodul/bin/gui/image/DeleteImage_GUI.class | Bin 12528 -> 12528 bytes .../bin/gui/image/EditImageAllgemein_GUI$1.class | Bin 867 -> 867 bytes .../bin/gui/image/EditImageAllgemein_GUI$2.class | Bin 956 -> 956 bytes .../bin/gui/image/EditImageAllgemein_GUI$3.class | Bin 1008 -> 1008 bytes .../bin/gui/image/EditImageAllgemein_GUI.class | Bin 9756 -> 9756 bytes Dozentenmodul/src/config/config_file.java | 6 +- .../src/gui/image/CreateImageAllgemein_GUI.java | 10 +-- Dozentenmodul/src/gui/image/DeleteImage_GUI.java | 77 +++++++++++++++------ .../src/gui/image/EditImageAllgemein_GUI.java | 12 +++- 9 files changed, 75 insertions(+), 30 deletions(-) (limited to 'Dozentenmodul/src/gui/image/EditImageAllgemein_GUI.java') diff --git a/Dozentenmodul/bin/gui/image/DeleteImage_GUI.class b/Dozentenmodul/bin/gui/image/DeleteImage_GUI.class index 567fc96b..3bfdeb6a 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$1.class b/Dozentenmodul/bin/gui/image/EditImageAllgemein_GUI$1.class index 538a8eb4..960d3ed5 100644 Binary files a/Dozentenmodul/bin/gui/image/EditImageAllgemein_GUI$1.class and b/Dozentenmodul/bin/gui/image/EditImageAllgemein_GUI$1.class differ diff --git a/Dozentenmodul/bin/gui/image/EditImageAllgemein_GUI$2.class b/Dozentenmodul/bin/gui/image/EditImageAllgemein_GUI$2.class index 6617ad6e..f64d26ea 100644 Binary files a/Dozentenmodul/bin/gui/image/EditImageAllgemein_GUI$2.class and b/Dozentenmodul/bin/gui/image/EditImageAllgemein_GUI$2.class differ diff --git a/Dozentenmodul/bin/gui/image/EditImageAllgemein_GUI$3.class b/Dozentenmodul/bin/gui/image/EditImageAllgemein_GUI$3.class index 1a5a0fe5..b2ba6c76 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.class b/Dozentenmodul/bin/gui/image/EditImageAllgemein_GUI.class index b2656782..6f793527 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/src/config/config_file.java b/Dozentenmodul/src/config/config_file.java index de8f1483..5d59e22a 100644 --- a/Dozentenmodul/src/config/config_file.java +++ b/Dozentenmodul/src/config/config_file.java @@ -10,14 +10,14 @@ public class config_file { String config_file="C:\\Users\\"+System.getProperty("user.name")+"\\AppData\\Roaming\\bwLehrpoolSuite"; - //File für den Ordner erzeugen + //File fuer den Ordner erzeugen File config=new File(config_file); String file=config_file+"\\config.ini"; //ini File erzeugen File conf=new File(file); Wini ini; - //Prüfen ob Ordner schon existiert + //Pruefen ob Ordner schon existiert if(config.exists()==false) { //Wenn nicht erzeuge Ordner @@ -41,7 +41,7 @@ public class config_file { } else { - //Wenn Ordner schon existiert, prüfe ob Datei existiert + //Wenn Ordner schon existiert, pruefe ob Datei existiert if(conf.exists()==false) { //Wenn nicht, erzeuge diese diff --git a/Dozentenmodul/src/gui/image/CreateImageAllgemein_GUI.java b/Dozentenmodul/src/gui/image/CreateImageAllgemein_GUI.java index faf95699..e6623c46 100644 --- a/Dozentenmodul/src/gui/image/CreateImageAllgemein_GUI.java +++ b/Dozentenmodul/src/gui/image/CreateImageAllgemein_GUI.java @@ -65,7 +65,7 @@ public class CreateImageAllgemein_GUI extends JFrame { imagename.requestFocusInWindow(); } }); - //Verhindert das Vergrößern des Fensters + //Verhindert das Vergroessern des Fensters setResizable(false); try { @@ -188,7 +188,7 @@ public class CreateImageAllgemein_GUI extends JFrame { 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 zurück 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(); @@ -215,7 +215,7 @@ public class CreateImageAllgemein_GUI extends JFrame { lblHauptmen.addMouseListener(new MouseAdapter() { @Override public void mouseClicked(MouseEvent arg0) { - //Öffnet das Hauptmenü + //oeffnet das Hauptmenue CreateImageAllgemein_GUI.this.setVisible(false); MainMenue_GUI main=new MainMenue_GUI(); main.setVisible(true); @@ -264,7 +264,7 @@ public class CreateImageAllgemein_GUI extends JFrame { JButton continueButton = new JButton("Weiter"); continueButton.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { - //Prüft die Eingabe + //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 @@ -275,7 +275,7 @@ public class CreateImageAllgemein_GUI extends JFrame { } else{ JOptionPane.showMessageDialog(null, "Bitte geben Sie alle notwendigen Daten an!", - "Daten unvollständig", JOptionPane.INFORMATION_MESSAGE); + "Daten unvollst\u00e4ndig", JOptionPane.INFORMATION_MESSAGE); } } }); diff --git a/Dozentenmodul/src/gui/image/DeleteImage_GUI.java b/Dozentenmodul/src/gui/image/DeleteImage_GUI.java index 79e37076..2f88e339 100644 --- a/Dozentenmodul/src/gui/image/DeleteImage_GUI.java +++ b/Dozentenmodul/src/gui/image/DeleteImage_GUI.java @@ -3,6 +3,7 @@ package gui.image; import gui.intro.MainMenue_GUI; import gui.lecture.ExtendedSearchForImages_GUI; import java.awt.Color; +import java.awt.Desktop; import java.awt.Dimension; import java.awt.FlowLayout; import java.awt.Font; @@ -18,6 +19,8 @@ import java.awt.event.MouseEvent; import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; import java.io.IOException; +import java.net.URISyntaxException; +import java.net.URL; import java.util.Iterator; import java.util.List; import javax.swing.JButton; @@ -104,7 +107,7 @@ public class DeleteImage_GUI extends JFrame { System.exit(0); } }); - // Verhindert das Vergrößern Des Fensters + // Verhindert das Vergroessern Des Fensters setResizable(false); try { @@ -200,7 +203,7 @@ public class DeleteImage_GUI extends JFrame { lblErweiterteSuche.addMouseListener(new MouseAdapter() { @Override public void mouseClicked(MouseEvent arg0) { - // Öffnet das Fenster Extended GUI + // oeffnet das Fenster Extended GUI con.closeThriftConnection(); ExtendedSearchForImages_GUI es = new ExtendedSearchForImages_GUI(); es.setVisible(true); @@ -213,12 +216,12 @@ public class DeleteImage_GUI extends JFrame { comboBox = new JComboBox(); try { - // Holt sich eine Liste aller verfügbaren Betriebssysteme vom Server + // Holt sich eine Liste aller verf\u00FCgbaren Betriebssysteme vom Server List list = client.getAllOS(); - // Leeres Item hinzufügen + // Leeres Item hinzufuegen comboBox.addItem(""); for (int i = 0; i < list.size(); i++) { - // Hinzufügen der verfügbaren Betriebssysteme + // Hinzufuegen der verfuegbaren Betriebssysteme comboBox.addItem(list.get(i)); } } catch (TException e2) { @@ -228,12 +231,12 @@ public class DeleteImage_GUI extends JFrame { e2.getCause()+"\n"+e2.getMessage(), "Debug-Message", JOptionPane.ERROR_MESSAGE); } - // Registriert Auswahländerungen der Box + // Registriert Auswahlaenderungen der Box comboBox.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent arg0) { - // Prüft das die Auswahl nicht leer ist + // Prueft das die Auswahl nicht leer ist if (comboBox.getSelectedItem().toString() != "") { - // Filtert nach dem ausgewählten Betriebssystem + // Filtert nach dem ausgewaehlten Betriebssystem rowSorterAll.setRowFilter(RowFilter.regexFilter(comboBox .getSelectedItem().toString(), 2)); rowSorterMyImages.setRowFilter(RowFilter.regexFilter( @@ -249,7 +252,7 @@ public class DeleteImage_GUI extends JFrame { lblHauptmen.addMouseListener(new MouseAdapter() { @Override public void mouseClicked(MouseEvent arg0) { - // Öffnet das Hauütmenü + // oeffnet das Hauuetmenue con.closeThriftConnection(); DeleteImage_GUI.this.setVisible(false); MainMenue_GUI main = new MainMenue_GUI(); @@ -384,9 +387,9 @@ public class DeleteImage_GUI extends JFrame { if (tablemyImages.getSelectedRowCount() != 0) { - // frage, soll das selektierte Daten gelöscht werden? + // frage, soll das selektierte Daten geloescht werden? eingabe = JOptionPane.showConfirmDialog(null, - "Wollen Sie diese Daten löschen?", "Löschen?", + "Wollen Sie diese Daten l\u00f6schen?", "L\u00f6schen?", JOptionPane.YES_NO_OPTION); if (eingabe == JOptionPane.YES_OPTION) { @@ -404,7 +407,7 @@ public class DeleteImage_GUI extends JFrame { .toString(); // TODO - // Image darf nur gelöscht werden, wenn keine + // Image darf nur geloescht werden, wenn keine // Veranstaltung mehr auf das Image verweist. // Unbdingt abfragen! @@ -432,7 +435,7 @@ public class DeleteImage_GUI extends JFrame { * } else { * * JOptionPane.showConfirmDialog(null, - * "Löschen vom Server hat leider nicht geklappt!!" + * "Loeschen vom Server hat leider nicht geklappt!!" * , imageversion, * JOptionPane.OK_CANCEL_OPTION); } */ @@ -442,7 +445,7 @@ public class DeleteImage_GUI extends JFrame { JOptionPane .showConfirmDialog( null, - "Löschen von der DB hat leider nicht geklappt!!", + "L\u00f6schen von der DB hat leider nicht geklappt!!", "Fehler", JOptionPane.INFORMATION_MESSAGE); } @@ -463,7 +466,7 @@ public class DeleteImage_GUI extends JFrame { } else { JOptionPane.showMessageDialog(null, - "Image kann nicht gelöscht werden, da mindestens eine Veranstaltung mit diesem Image verlinkt ist.", + "Image kann nicht gel\u00f6scht werden, da mindestens eine Veranstaltung mit diesem Image verlinkt ist.", "Verlinkung vorhanden", JOptionPane.INFORMATION_MESSAGE); } } catch (TException e) { @@ -478,7 +481,7 @@ public class DeleteImage_GUI extends JFrame { } else { JOptionPane.showMessageDialog(null, - "Bitte wählen Sie ein eigenes Image aus", + "Bitte w\u00e4hlen Sie ein eigenes Image aus", "Message", JOptionPane.INFORMATION_MESSAGE); } @@ -496,7 +499,7 @@ public class DeleteImage_GUI extends JFrame { JButton okButton = new JButton("Zur\u00FCck"); okButton.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { - // Öffnet das Hauptmenü + // oeffnet das Hauptmen\u00FC con.closeThriftConnection(); MainMenue_GUI main = new MainMenue_GUI(); main.setVisible(true); @@ -528,14 +531,46 @@ public class DeleteImage_GUI extends JFrame { @Override public void mousePressed(MouseEvent arg0) { String faq; + // Desktop desktop = Desktop.getDesktop(); faq = Links.getFAQ(); try { - Runtime.getRuntime().exec( "rundll32 url.dll,FileProtocolHandler " + faq ); + // Runtime.getRuntime().exec( "rundll32 url.dll,FileProtocolHandler " + faq ); + + Desktop.getDesktop().browse(new URL(faq).toURI()); + + /* + if (os.indexOf( "win" ) >= 0) { + + // this doesn't support showing urls in the form of "page.html#nameLink" + rt.exec( "rundll32 url.dll,FileProtocolHandler " + url); + + } else if (os.indexOf( "mac" ) >= 0) { + + rt.exec( "open " + url); + + } else if (os.indexOf( "nix") >=0 || os.indexOf( "nux") >=0) { + + // Do a best guess on unix until we get a platform independent way + // Build a list of browsers to try, in this order. + String[] browsers = {"epiphany", "firefox", "mozilla", "konqueror", + "netscape","opera","links","lynx"}; + + // Build a command string which looks like "browser1 "url" || browser2 "url" ||..." + StringBuffer cmd = new StringBuffer(); + for (int i=0; i images; try { @@ -574,7 +609,7 @@ public class DeleteImage_GUI extends JFrame { int x = 0; while (i.hasNext()) { - // erzeuge Objekte für die Tabelle + // erzeuge Objekte f\u00FCr die Tabelle Object[] obj = { images.get(x).getImageName(), images.get(x).getLicenseRestriction(), images.get(x).getOsName(), @@ -583,7 +618,7 @@ public class DeleteImage_GUI extends JFrame { 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 + // F\u00FCge diese Objekte der Tabelle hinzu model.addRow(obj); x++; i.next(); diff --git a/Dozentenmodul/src/gui/image/EditImageAllgemein_GUI.java b/Dozentenmodul/src/gui/image/EditImageAllgemein_GUI.java index 49a97051..cef78545 100644 --- a/Dozentenmodul/src/gui/image/EditImageAllgemein_GUI.java +++ b/Dozentenmodul/src/gui/image/EditImageAllgemein_GUI.java @@ -3,6 +3,7 @@ package gui.image; import gui.intro.MainMenue_GUI; import java.awt.Color; +import java.awt.Desktop; import java.awt.Dimension; import java.awt.FlowLayout; import java.awt.Font; @@ -15,6 +16,8 @@ import java.awt.event.MouseEvent; import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; import java.io.IOException; +import java.net.URISyntaxException; +import java.net.URL; import java.util.Map; import javax.swing.JButton; import javax.swing.JFrame; @@ -326,10 +329,17 @@ public class EditImageAllgemein_GUI extends JFrame { faq = Links.getFAQ(); try { - Runtime.getRuntime().exec( "rundll32 url.dll,FileProtocolHandler " + faq ); + //Runtime.getRuntime().exec( "rundll32 url.dll,FileProtocolHandler " + faq ); + // desktop.browse(faq); + + Desktop.getDesktop().browse(new URL(faq).toURI()); + } catch (IOException e) { // TODO Auto-generated catch block e.printStackTrace(); + } catch (URISyntaxException e) { + // TODO Auto-generated catch block + e.printStackTrace(); } } }); -- cgit v1.2.3-55-g7522 From 9cca7c1254dfbb4bb01e2216cb2edcfd2911d56b Mon Sep 17 00:00:00 2001 From: unknown Date: Sat, 17 May 2014 18:22:25 +0200 Subject: ddd --- Dozentenmodul/bin/Models/person.class | Bin 2032 -> 2032 bytes Dozentenmodul/bin/gui/intro/MainMenue_GUI$5.class | Bin 1068 -> 1068 bytes Dozentenmodul/bin/gui/intro/MainMenue_GUI$9.class | Bin 1096 -> 1096 bytes Dozentenmodul/bin/models/person.class | Bin 2032 -> 2032 bytes Dozentenmodul/src/Models/person.java | 2 -- .../src/gui/image/CreateImageTechnisch_GUI.java | 2 +- Dozentenmodul/src/gui/image/DeleteImage_GUI.java | 6 ++-- .../src/gui/image/EditImageAllgemein_GUI.java | 10 +++--- .../src/gui/image/EditImageTechnisch_GUI.java | 8 ++--- .../src/gui/image/SearchEditImage_GUI.java | 34 +++++++++--------- Dozentenmodul/src/gui/image/SearchImage_GUI.java | 30 ++++++++-------- .../src/gui/image/SearchMethodLecture_GUI.java | 2 +- Dozentenmodul/src/gui/intro/BillOfRights_GUI.java | 2 +- Dozentenmodul/src/gui/intro/Login_GUI.java | 38 ++++++++++----------- Dozentenmodul/src/gui/intro/MainMenue_GUI.java | 20 +++++------ .../gui/lecture/CreateLectureAllgemein_GUI.java | 6 ++-- .../src/gui/lecture/CreateLectureLink_GUI.java | 6 ++-- .../src/gui/lecture/DeleteLecture_GUI.java | 24 ++++++------- .../src/gui/lecture/EditLectureLink_GUI.java | 6 ++-- .../src/gui/lecture/EditLectureSearch_GUI.java | 20 +++++------ .../src/gui/lecture/SearchLecture_GUI.java | 16 ++++----- Dozentenmodul/src/models/person.java | 2 -- .../src/thrift/MasterThriftConnection.java | 2 +- Dozentenmodul/src/thrift/ThriftConnection.java | 4 +-- 24 files changed, 118 insertions(+), 122 deletions(-) (limited to 'Dozentenmodul/src/gui/image/EditImageAllgemein_GUI.java') diff --git a/Dozentenmodul/bin/Models/person.class b/Dozentenmodul/bin/Models/person.class index cd28d135..36fa9761 100644 Binary files a/Dozentenmodul/bin/Models/person.class and b/Dozentenmodul/bin/Models/person.class differ diff --git a/Dozentenmodul/bin/gui/intro/MainMenue_GUI$5.class b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$5.class index 9f6b64d0..34afa967 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$9.class b/Dozentenmodul/bin/gui/intro/MainMenue_GUI$9.class index 3dc0bd94..5b26c8f5 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/models/person.class b/Dozentenmodul/bin/models/person.class index cd28d135..36fa9761 100644 Binary files a/Dozentenmodul/bin/models/person.class and b/Dozentenmodul/bin/models/person.class differ diff --git a/Dozentenmodul/src/Models/person.java b/Dozentenmodul/src/Models/person.java index fdb5e18a..67b6b84e 100644 --- a/Dozentenmodul/src/Models/person.java +++ b/Dozentenmodul/src/Models/person.java @@ -13,8 +13,6 @@ public class person{ private String Tel; private String Fakultaet; private boolean ischecked; - - //public static person verantowrtlicher=new person(); public static person verantwortlicher=new person(); diff --git a/Dozentenmodul/src/gui/image/CreateImageTechnisch_GUI.java b/Dozentenmodul/src/gui/image/CreateImageTechnisch_GUI.java index 6add313b..308ff3b7 100644 --- a/Dozentenmodul/src/gui/image/CreateImageTechnisch_GUI.java +++ b/Dozentenmodul/src/gui/image/CreateImageTechnisch_GUI.java @@ -172,7 +172,7 @@ public class CreateImageTechnisch_GUI extends JFrame { JPanel panel_2 = new JPanel(); panel_2.setLayout(null); - panel_2.setBorder(new TitledBorder(null, "Empfehlung bezüglich Ressourcen", TitledBorder.LEADING, TitledBorder.TOP, null, null)); + panel_2.setBorder(new TitledBorder(null, "Empfehlung bez\u00fcglich Ressourcen", TitledBorder.LEADING, TitledBorder.TOP, null, null)); panel_2.setBackground(SystemColor.menu); panel_2.setBounds(11, 196, 557, 338); contentPanel.add(panel_2); diff --git a/Dozentenmodul/src/gui/image/DeleteImage_GUI.java b/Dozentenmodul/src/gui/image/DeleteImage_GUI.java index 6d68db49..c2ae79d5 100644 --- a/Dozentenmodul/src/gui/image/DeleteImage_GUI.java +++ b/Dozentenmodul/src/gui/image/DeleteImage_GUI.java @@ -207,7 +207,7 @@ public class DeleteImage_GUI extends JFrame { // oeffnet das Fenster Extended GUI con.closeThriftConnection(); - // Öffnet das Fenster Extended GUI + // oeffnet das Fenster Extended GUI ExtendedSearchForImages_GUI es = new ExtendedSearchForImages_GUI(); es.setVisible(true); @@ -260,7 +260,7 @@ public class DeleteImage_GUI extends JFrame { // oeffnet das Hauuetmenue con.closeThriftConnection(); - // Öffnet das Hauütmenü + // oeffnet das Hauuetmenue DeleteImage_GUI.this.setVisible(false); MainMenue_GUI main = new MainMenue_GUI(); @@ -511,7 +511,7 @@ public class DeleteImage_GUI extends JFrame { // oeffnet das Hauptmen\u00FC con.closeThriftConnection(); - // Öffnet das Hauptmenü + // oeffnet das Hauptmenue MainMenue_GUI main = new MainMenue_GUI(); diff --git a/Dozentenmodul/src/gui/image/EditImageAllgemein_GUI.java b/Dozentenmodul/src/gui/image/EditImageAllgemein_GUI.java index 3addca31..c0ad0a06 100644 --- a/Dozentenmodul/src/gui/image/EditImageAllgemein_GUI.java +++ b/Dozentenmodul/src/gui/image/EditImageAllgemein_GUI.java @@ -73,7 +73,7 @@ public class EditImageAllgemein_GUI extends JFrame { System.exit(0); } }); - // Verhindert das vergrößern des Fensters + // Verhindert das vergroessern des Fensters setResizable(false); try { @@ -222,8 +222,8 @@ public class EditImageAllgemein_GUI extends JFrame { lblHauptmen.addMouseListener(new MouseAdapter() { @Override public void mouseClicked(MouseEvent arg0) { - // Durch den Klick auf Button Hauptmenpü wird dieses Fenster - // unsichtbar und das Hauptmenü sichtbar + // Durch den Klick auf Button Hauptmenpue wird dieses Fenster + // unsichtbar und das Hauptmenue sichtbar EditImageAllgemein_GUI.this.setVisible(false); MainMenue_GUI main = new MainMenue_GUI(); @@ -262,7 +262,7 @@ public class EditImageAllgemein_GUI extends JFrame { public void actionPerformed(ActionEvent e) { // Setzen der Eingabe im Model, dadurch bleiben die - // Daten bei einem erneuten Aufruf verfügbar + // Daten bei einem erneuten Aufruf verfuegbar // Image.image.setImagename(imagename.getText()); SearchEditImage_GUI se = new SearchEditImage_GUI(); @@ -282,7 +282,7 @@ public class EditImageAllgemein_GUI extends JFrame { if (imagename.getText().length() <= 0) { JOptionPane.showMessageDialog(null, "Bitte geben Sie einen Labornamen ein.", - "Daten nicht vollständig", + "Daten nicht vollst\u00e4ndig", JOptionPane.INFORMATION_MESSAGE); } else { diff --git a/Dozentenmodul/src/gui/image/EditImageTechnisch_GUI.java b/Dozentenmodul/src/gui/image/EditImageTechnisch_GUI.java index e8d0f5f8..1bbfa699 100644 --- a/Dozentenmodul/src/gui/image/EditImageTechnisch_GUI.java +++ b/Dozentenmodul/src/gui/image/EditImageTechnisch_GUI.java @@ -64,7 +64,7 @@ public class EditImageTechnisch_GUI extends JFrame { } }); - // Verhindert das Vergrößern des Fensters + // Verhindert das Vergroeßern des Fensters setResizable(false); try { @@ -195,7 +195,7 @@ public class EditImageTechnisch_GUI extends JFrame { JPanel panel_2 = new JPanel(); panel_2.setLayout(null); panel_2.setBorder(new TitledBorder(null, - "Empfehlung bezüglich Ressourcen", TitledBorder.LEADING, + "Empfehlung bez\u00fcglich Ressourcen", TitledBorder.LEADING, TitledBorder.TOP, null, null)); panel_2.setBackground(SystemColor.menu); panel_2.setBounds(10, 172, 557, 338); @@ -288,7 +288,7 @@ public class EditImageTechnisch_GUI extends JFrame { } else { Image.image.setLicensed(false); } - // Öffnet das vorherige Fenster + // oeffnet das vorherige Fenster EditImageAllgemein_GUI ei = new EditImageAllgemein_GUI(); ei.setVisible(true); dispose(); @@ -317,7 +317,7 @@ public class EditImageTechnisch_GUI extends JFrame { } else { Image.image.setLicensed(false); } - // Öffnet das nächste Fenster + // oeffnet das naechste Fenster FTPEditUploader_GUI ea = new FTPEditUploader_GUI(); ea.setVisible(true); dispose(); diff --git a/Dozentenmodul/src/gui/image/SearchEditImage_GUI.java b/Dozentenmodul/src/gui/image/SearchEditImage_GUI.java index ec1ceb8e..a810e1a6 100644 --- a/Dozentenmodul/src/gui/image/SearchEditImage_GUI.java +++ b/Dozentenmodul/src/gui/image/SearchEditImage_GUI.java @@ -96,7 +96,7 @@ public class SearchEditImage_GUI extends JFrame { textFieldName.requestFocusInWindow(); } }); - // Verhindert das Vergrößern Des Fensters + // Verhindert das Vergroessern Des Fensters setResizable(false); try { @@ -190,7 +190,7 @@ public class SearchEditImage_GUI extends JFrame { lblErweiterteSuche.addMouseListener(new MouseAdapter() { @Override public void mouseClicked(MouseEvent arg0) { - // Öffnet das Fenster Extended GUI + // oeffnet das Fenster Extended GUI ExtendedSearchForImages_GUI es = new ExtendedSearchForImages_GUI(); es.setVisible(true); @@ -203,12 +203,12 @@ public class SearchEditImage_GUI extends JFrame { comboBox = new JComboBox(); try { - // Holt sich eine Liste aller verfügbaren Betriebssysteme vom Server + // Holt sich eine Liste aller verfuegbaren Betriebssysteme vom Server List list = client.getAllOS(); - // Leeres Item hinzufügen + // Leeres Item hinzufuegen comboBox.addItem(""); for (int i = 0; i < list.size(); i++) { - // Hinzufügen der verfügbaren Betriebssysteme + // Hinzufuegen der verfuegbaren Betriebssysteme comboBox.addItem(list.get(i)); } } catch (TException e2) { @@ -218,12 +218,12 @@ public class SearchEditImage_GUI extends JFrame { e2.getCause()+"\n"+e2.getMessage(), "Debug-Message", JOptionPane.ERROR_MESSAGE); } - // Registriert Auswahländerungen der Box + // Registriert Auswahlaenderungen der Box comboBox.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent arg0) { - // Prüft das die Auswahl nicht leer ist + // Prueft das die Auswahl nicht leer ist if (comboBox.getSelectedItem().toString() != "") { - // Filtert nach dem ausgewählten Betriebssystem + // Filtert nach dem ausgewaehlten Betriebssystem rowSorterAll.setRowFilter(RowFilter.regexFilter(comboBox .getSelectedItem().toString(), 2)); rowSorterMyImages.setRowFilter(RowFilter.regexFilter( @@ -239,7 +239,7 @@ public class SearchEditImage_GUI extends JFrame { lblHauptmen.addMouseListener(new MouseAdapter() { @Override public void mouseClicked(MouseEvent arg0) { - // Öffnet das Hauütmenü + // oeffnet das Hauuetmenue SearchEditImage_GUI.this.setVisible(false); MainMenue_GUI main = new MainMenue_GUI(); @@ -360,7 +360,7 @@ public class SearchEditImage_GUI extends JFrame { JButton btnDownload = new JButton("Download"); btnDownload.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent arg0) { - // Öffnet den Downloader + // oeffnet den Downloader if (tablemyImages.getSelectedRow() != -1) { String imageid = modelMyImages.getValueAt( @@ -380,7 +380,7 @@ public class SearchEditImage_GUI extends JFrame { } else { JOptionPane.showMessageDialog(null, - "Bitte wählen Sie ein Image für den Download aus", + "Bitte w\u00e4hlen Sie ein Image f\u00fcr den Download aus", "Message", JOptionPane.INFORMATION_MESSAGE); } } @@ -397,7 +397,7 @@ public class SearchEditImage_GUI extends JFrame { JButton okButton = new JButton("Zur\u00FCck"); okButton.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { - // Öffnet das Hauptmenü + // oeffnet das Hauptmenue MainMenue_GUI main = new MainMenue_GUI(); main.setVisible(true); @@ -440,12 +440,12 @@ public class SearchEditImage_GUI extends JFrame { dispose(); } else { JOptionPane.showMessageDialog(null, - "Bitte wählen Sie ein Image aus.", + "Bitte w\u00e4hlen Sie ein Image aus.", "Image Auswahl", JOptionPane.INFORMATION_MESSAGE); }// end check if row is selected } else { JOptionPane.showMessageDialog(null, - "Bitte wählen Sie ein eigenes Image aus.", + "Bitte w\u00e4hlen Sie ein eigenes Image aus.", "Image Auswahl", JOptionPane.INFORMATION_MESSAGE); }//end check if correct tab is selected } @@ -511,7 +511,7 @@ public class SearchEditImage_GUI extends JFrame { } - // Initiale Beffülung eines Table models + // Initiale Beffuelung eines Table models public DefaultTableModel initTableModel(DefaultTableModel model) { List images; try { @@ -523,7 +523,7 @@ public class SearchEditImage_GUI extends JFrame { int x = 0; while (i.hasNext()) { - // erzeuge Objekte für die Tabelle + // erzeuge Objekte fuer die Tabelle Object[] obj = { images.get(x).getImageName(), images.get(x).getLicenseRestriction(), images.get(x).getOsName(), @@ -531,7 +531,7 @@ public class SearchEditImage_GUI extends JFrame { images.get(x).getUserData(), images.get(x).getUpdateTime(), "", images.get(x).id, images.get(x).getVersion() }; - // Füge diese Objekte der Tabelle hinzu + // Fuege diese Objekte der Tabelle hinzu model.addRow(obj); x++; i.next(); diff --git a/Dozentenmodul/src/gui/image/SearchImage_GUI.java b/Dozentenmodul/src/gui/image/SearchImage_GUI.java index 73f0b9bb..8fbf015c 100644 --- a/Dozentenmodul/src/gui/image/SearchImage_GUI.java +++ b/Dozentenmodul/src/gui/image/SearchImage_GUI.java @@ -96,7 +96,7 @@ public class SearchImage_GUI extends JFrame { textFieldName.requestFocusInWindow(); } }); - // Verhindert das Vergrößern Des Fensters + // Verhindert das Vergroessern Des Fensters setResizable(false); try { @@ -190,7 +190,7 @@ public class SearchImage_GUI extends JFrame { lblErweiterteSuche.addMouseListener(new MouseAdapter() { @Override public void mouseClicked(MouseEvent arg0) { - // Öffnet das Fenster Extended GUI + // oeffnet das Fenster Extended GUI ExtendedSearchForImages_GUI es = new ExtendedSearchForImages_GUI(); es.setVisible(true); @@ -203,12 +203,12 @@ public class SearchImage_GUI extends JFrame { comboBox = new JComboBox(); try { - // Holt sich eine Liste aller verfügbaren Betriebssysteme vom Server + // Holt sich eine Liste aller verfuegbaren Betriebssysteme vom Server List list = client.getAllOS(); - // Leeres Item hinzufügen + // Leeres Item hinzufuegen comboBox.addItem(""); for (int i = 0; i < list.size(); i++) { - // Hinzufügen der verfügbaren Betriebssysteme + // Hinzufuegen der verfuegbaren Betriebssysteme comboBox.addItem(list.get(i)); } } catch (TException e2) { @@ -218,12 +218,12 @@ public class SearchImage_GUI extends JFrame { e2.getCause()+"\n"+e2.getMessage(), "Debug-Message", JOptionPane.ERROR_MESSAGE); } - // Registriert Auswahländerungen der Box + // Registriert Auswahlaenderungen der Box comboBox.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent arg0) { - // Prüft das die Auswahl nicht leer ist + // Prueft das die Auswahl nicht leer ist if (comboBox.getSelectedItem().toString() != "") { - // Filtert nach dem ausgewählten Betriebssystem + // Filtert nach dem ausgewaehlten Betriebssystem rowSorterAll.setRowFilter(RowFilter.regexFilter(comboBox .getSelectedItem().toString(), 2)); rowSorterMyImages.setRowFilter(RowFilter.regexFilter( @@ -239,7 +239,7 @@ public class SearchImage_GUI extends JFrame { lblHauptmen.addMouseListener(new MouseAdapter() { @Override public void mouseClicked(MouseEvent arg0) { - // Öffnet das Hauütmenü + // oeffnet das Hauuetmenue SearchImage_GUI.this.setVisible(false); MainMenue_GUI main = new MainMenue_GUI(); @@ -360,7 +360,7 @@ public class SearchImage_GUI extends JFrame { JButton btnDownload = new JButton("Download"); btnDownload.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent arg0) { - // Öffnet den Downloader + // oeffnet den Downloader if (tablemyImages.getSelectedRow() != -1) { String imageid = modelMyImages.getValueAt( @@ -380,7 +380,7 @@ public class SearchImage_GUI extends JFrame { } else { JOptionPane.showMessageDialog(null, - "Bitte wählen Sie ein Image für den Download aus", + "Bitte w\u00e4hlen Sie ein Image f\u00fcr den Download aus", "Message", JOptionPane.INFORMATION_MESSAGE); } } @@ -397,7 +397,7 @@ public class SearchImage_GUI extends JFrame { JButton okButton = new JButton("Zur\u00FCck"); okButton.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { - // Öffnet das Hauptmenü + // oeffnet das Hauptmenue MainMenue_GUI main = new MainMenue_GUI(); main.setVisible(true); @@ -466,7 +466,7 @@ public class SearchImage_GUI extends JFrame { } - // Initiale Beffülung eines Table models + // Initiale Beffuelung eines Table models public DefaultTableModel initTableModel(DefaultTableModel model) { List images; try { @@ -478,7 +478,7 @@ public class SearchImage_GUI extends JFrame { int x = 0; while (i.hasNext()) { - // erzeuge Objekte für die Tabelle + // erzeuge Objekte fuer die Tabelle Object[] obj = { images.get(x).getImageName(), images.get(x).getLicenseRestriction(), images.get(x).getOsName(), @@ -486,7 +486,7 @@ public class SearchImage_GUI extends JFrame { images.get(x).getUserData(), images.get(x).getUpdateTime(), "", images.get(x).id, images.get(x).getVersion() }; - // Füge diese Objekte der Tabelle hinzu + // Fuege diese Objekte der Tabelle hinzu model.addRow(obj); x++; i.next(); diff --git a/Dozentenmodul/src/gui/image/SearchMethodLecture_GUI.java b/Dozentenmodul/src/gui/image/SearchMethodLecture_GUI.java index 17b6ab59..67472c17 100644 --- a/Dozentenmodul/src/gui/image/SearchMethodLecture_GUI.java +++ b/Dozentenmodul/src/gui/image/SearchMethodLecture_GUI.java @@ -114,7 +114,7 @@ public class SearchMethodLecture_GUI extends JFrame { JPanel panel_1 = new JPanel(); panel_1.setBackground(SystemColor.menu); panel_1.setBorder(new TitledBorder(null, - "Wählen Sie bitte die Suchmethode Ihrer Suche", + "W\u00e4hlen Sie bitte die Suchmethode Ihrer Suche", TitledBorder.LEADING, TitledBorder.TOP, null, null)); panel_1.setBounds(10, 36, 557, 369); contentPanel.add(panel_1); diff --git a/Dozentenmodul/src/gui/intro/BillOfRights_GUI.java b/Dozentenmodul/src/gui/intro/BillOfRights_GUI.java index c0a20379..fd1246bc 100644 --- a/Dozentenmodul/src/gui/intro/BillOfRights_GUI.java +++ b/Dozentenmodul/src/gui/intro/BillOfRights_GUI.java @@ -168,7 +168,7 @@ public class BillOfRights_GUI extends JFrame { chckbxAkzeptieren = new JCheckBox("Ja, ich akzeptiere die Vereinbarung. Benachrichtigung nicht mehr anzeigen."); chckbxAkzeptieren.addChangeListener(new ChangeListener() { public void stateChanged(ChangeEvent arg0) { - //Beim Akzeptieren der Bestätigung wird der Weiter-Button verfügbar gemacht + //Beim Akzeptieren der Bestaetigung wird der Weiter-Button verfuegbar gemacht if(chckbxAkzeptieren.isSelected()==true) { diff --git a/Dozentenmodul/src/gui/intro/Login_GUI.java b/Dozentenmodul/src/gui/intro/Login_GUI.java index b6249be0..34469617 100644 --- a/Dozentenmodul/src/gui/intro/Login_GUI.java +++ b/Dozentenmodul/src/gui/intro/Login_GUI.java @@ -55,7 +55,7 @@ public class Login_GUI extends JFrame { EventQueue.invokeLater(new Runnable() { public void run() { try { - // Prüfe und Erzeuge gegebenfalls Config + // Pruefe und Erzeuge gegebenfalls Config config_file cf = new config_file(); boolean conf = cf.createConfig(); if (conf == true) { @@ -88,7 +88,7 @@ public class Login_GUI extends JFrame { } }); - // Fenster darf nicht vergrößert werden + // Fenster darf nicht vergroessert werden setResizable(false); try { @@ -104,9 +104,9 @@ public class Login_GUI extends JFrame { } // Titel des Fensters setzen setTitle("Dozentenmodul *Prototyp*"); - // Aktion die beim Schließen durchgeführt werden soll + // Aktion die beim Schliessen durchgefuehrt werden soll setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); - // Größe des Fensters definieren + // Groesse des Fensters definieren Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize(); int top = (screenSize.height - 400) / 2; int left = (screenSize.width - 603) / 2; @@ -120,9 +120,9 @@ public class Login_GUI extends JFrame { setContentPane(contentPane); // Layout setzen contentPane.setLayout(null); - // Label für das Logo erzeugen + // Label fuer das Logo erzeugen JLabel imgLabel = new JLabel(); - // Größe und Position des Logos festelegen + // Groesse und Position des Logos festelegen imgLabel.setBounds(150, 11, 350, 142); // Pfadangabe des Logos @@ -131,15 +131,15 @@ public class Login_GUI extends JFrame { // Skalierung des Logos Image scaled = icon.getImage().getScaledInstance(270, 64, 0); imgLabel.setIcon(new ImageIcon(scaled)); - // Hinzufügen des Logos in das Fenster + // Hinzufuegen des Logos in das Fenster contentPane.add(imgLabel); - // Erzeugen und Hinzufügen des Labels + // Erzeugen und Hinzufuegen des Labels JLabel LabelUser = new JLabel("bwIDM-Benutzername:"); LabelUser.setBounds(111, 164, 134, 20); contentPane.add(LabelUser); - // Erzeugen und Hinzufügen des Textfeldes + // Erzeugen und Hinzufuegen des Textfeldes lblusername = new JTextField(); lblusername .setToolTipText("Bitte geben Sie Ihren bwIDM-Benutzernamen ein."); @@ -152,12 +152,12 @@ public class Login_GUI extends JFrame { contentPane.add(lblusername); lblusername.setColumns(10); - // Erzeugen und Hinzufügen des Labels + // Erzeugen und Hinzufuegen des Labels JLabel LabelPass = new JLabel("bwIDM-Passwort:"); LabelPass.setBounds(111, 195, 134, 20); contentPane.add(LabelPass); - // Erzeugen, Hinzufügen und definierung der Aktion des Buttons + // Erzeugen, Hinzufuegen und definierung der Aktion des Buttons JButton BtnLogin = new JButton("Login"); BtnLogin.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent arg0) { @@ -168,7 +168,7 @@ public class Login_GUI extends JFrame { BtnLogin.setBounds(292, 244, 237, 23); contentPane.add(BtnLogin); - // Erzeugen und Hinzufügen des Passwortfeldes + // Erzeugen und Hinzufuegen des Passwortfeldes lblpass = new JPasswordField(); lblpass.setToolTipText("Bitte geben Sie Ihr bwIDM-Passwort ein."); lblpass.addActionListener(new ActionListener() { @@ -218,7 +218,7 @@ public class Login_GUI extends JFrame { System.out .println("Konnte mich beim MasterServer authentifizieren. Meine Session-ID ist " + result.sessionId - + ", mein Token für den Satelliten " + + ", mein Token f\u00fcr den Satelliten " + result.authToken); if (login == true) { @@ -250,23 +250,23 @@ public class Login_GUI extends JFrame { try { // Lege config File an und entscheide welches Fenster - // als nächstes geöffnet wird + // als naechstes geoeffnet wird Wini ini = new Wini( new File( "C:\\Users\\" + System.getProperty("user.name") + "\\AppData\\Roaming\\bwLehrpoolSuite\\config.ini")); - // Prüfe ob Bills Of Rights schon akzeptiert wurden, + // Pruefe ob Bills Of Rights schon akzeptiert wurden, // wenn // nicht zeige diese an if (ini.get("main", "BillOfRights", boolean.class) == false) { // Erstellen einer Instanz der Aktionsauswahl BillOfRights_GUI re = new BillOfRights_GUI(); re.setVisible(true); - // Schließen des Fensters nach erfolgreichen Login + // Schliessen des Fensters nach erfolgreichen Login setVisible(false); } else { - // Prüfe ob die Links zu vmware angezeigt werden + // Pruefe ob die Links zu vmware angezeigt werden // sollen if (ini.get("main", "vmware", boolean.class) == false) { VmWareLink_GUI vm = new VmWareLink_GUI(); @@ -274,7 +274,7 @@ public class Login_GUI extends JFrame { setVisible(false); } else { - // Öffne das Hauptmenü + // oeffne das Hauptmenue MainMenue_GUI main = new MainMenue_GUI(); main.setVisible(true); setVisible(false); @@ -308,7 +308,7 @@ public class Login_GUI extends JFrame { JOptionPane .showMessageDialog( null, - "Benutzeranmeldung fehlgeschlagen: Bitte Benutzername und Passwort überprüfen.", + "Benutzeranmeldung fehlgeschlagen: Bitte Benutzername und Passwort \u00fcberpr\u00fcfen.", "Anmeldung fehlgeschlagen", JOptionPane.ERROR_MESSAGE); e.printStackTrace(); diff --git a/Dozentenmodul/src/gui/intro/MainMenue_GUI.java b/Dozentenmodul/src/gui/intro/MainMenue_GUI.java index 41254bea..401cbda0 100644 --- a/Dozentenmodul/src/gui/intro/MainMenue_GUI.java +++ b/Dozentenmodul/src/gui/intro/MainMenue_GUI.java @@ -157,7 +157,7 @@ public class MainMenue_GUI extends JFrame { JPanel panelDesc = new JPanel(); panelDesc.setLayout(null); panelDesc.setBorder(new TitledBorder(UIManager - .getBorder("TitledBorder.border"), "Erklärung", + .getBorder("TitledBorder.border"), "Erkl\u00e4rung", TitledBorder.LEADING, TitledBorder.TOP, null, null)); panelDesc.setBackground(SystemColor.menu); panelDesc.setBounds(290, 146, 270, 170); @@ -172,7 +172,7 @@ public class MainMenue_GUI extends JFrame { txtDesc.setBackground(SystemColor.menu); scrollPaneDesc.add(txtDesc); // Pro AUswahl - txtDesc.setText("Legen Sie ein neues Image an und laden Sie anschließend die passende .vmdk-Datei hoch. Ein Image (wenn auch von einem anderen Dozenten) ist die Voraussetzung für eine Veranstaltung."); + txtDesc.setText("Legen Sie ein neues Image an und laden Sie anschlie\u00dfend die passende .vmdk-Datei hoch. Ein Image (wenn auch von einem anderen Dozenten) ist die Voraussetzung f\u00fcr eine Veranstaltung."); panelDesc.add(scrollPaneDesc); JPanel panelVeranstaltung = new JPanel(); @@ -238,11 +238,11 @@ public class MainMenue_GUI extends JFrame { panelNews.add(scrollPaneNews); /* - * Funktion Texte für das Klicken der RadioButtons + * Funktion Texte f\u00fcr das Klicken der RadioButtons */ rdbtnImageNew.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent arg0) { - descNewImage = "Legen Sie ein neues Image an und laden Sie anschließend die passende .vmdk-Datei hoch. Ein Image (wenn auch von einem anderen Dozenten) ist die Voraussetzung für eine Veranstaltung."; + descNewImage = "Legen Sie ein neues Image an und laden Sie anschlie\u00dfend die passende .vmdk-Datei hoch. Ein Image (wenn auch von einem anderen Dozenten) ist die Voraussetzung f\u00fcr eine Veranstaltung."; txtDesc.setText(descNewImage); } }); @@ -254,19 +254,19 @@ public class MainMenue_GUI extends JFrame { }); rdbtnImageDelete.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { - descDeleteImage = "Suchen Sie alte und nicht mehr benötigte Images und löschen Sie diese."; + descDeleteImage = "Suchen Sie alte und nicht mehr ben\u00f6tigte Images und l\u00f6schen Sie diese."; txtDesc.setText(descDeleteImage); } }); rdbtnImageSearchDownload.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { - descSearchImage = "Suchen Sie nach bestimmten Images oder verschaffen Sie sich einen Überblick über alle verfügbaren Images. Sie können gewünschte Images umgehend herunterladen."; + descSearchImage = "Suchen Sie nach bestimmten Images oder verschaffen Sie sich einen \u00fcberblick \u00fcber alle verf\u00fcgbaren Images. Sie k\u00f6nnen gew\u00fcnschte Images umgehend herunterladen."; txtDesc.setText(descSearchImage); } }); rdbtnLectureNew.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { - descNewLecture = "Legen Sie eine neue Veranstaltung an und verknüpfen Sie diese mit einem bereits vorhandenem Image. Ihre neue Veranstaltung kann auch auf dem Image eines anderen Dozenten beruhen."; + descNewLecture = "Legen Sie eine neue Veranstaltung an und verkn\u00fcpfen Sie diese mit einem bereits vorhandenem Image. Ihre neue Veranstaltung kann auch auf dem Image eines anderen Dozenten beruhen."; txtDesc.setText(descNewLecture); } }); @@ -278,13 +278,13 @@ public class MainMenue_GUI extends JFrame { }); rdbtnLectureDelete.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { - descDeleteLecture = "Suchen und löschen Sie eine Veranstaltung. Das hiermit verbundene Image bleibt erhalten."; + descDeleteLecture = "Suchen und l\u00f6schen Sie eine Veranstaltung. Das hiermit verbundene Image bleibt erhalten."; txtDesc.setText(descDeleteLecture); } }); rdbtnLectureSearch.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { - descSearchLecture = "Suchen Sie nach bestimmten Veranstaltungen oder verschaffen Sie sich einen Überblick über alle verfügbaren Veranstaltungen. Eventuell gibt es bereits etwas passendes für Ihre Vorlesung."; + descSearchLecture = "Suchen Sie nach bestimmten Veranstaltungen oder verschaffen Sie sich einen \u00fcberblick \u00fcber alle verf\u00fcgbaren Veranstaltungen. Eventuell gibt es bereits etwas passendes f\u00fcr Ihre Vorlesung."; txtDesc.setText(descSearchLecture); } }); @@ -293,7 +293,7 @@ public class MainMenue_GUI extends JFrame { */ JLabel lblGrafik = new JLabel(""); - // ToolTipp für Grafik + // ToolTipp fuer Grafik lblGrafik .setToolTipText("" + "Ein virtuelles Labor besteht immer aus den beiden Komponenten
" diff --git a/Dozentenmodul/src/gui/lecture/CreateLectureAllgemein_GUI.java b/Dozentenmodul/src/gui/lecture/CreateLectureAllgemein_GUI.java index 55074482..21d84e2a 100644 --- a/Dozentenmodul/src/gui/lecture/CreateLectureAllgemein_GUI.java +++ b/Dozentenmodul/src/gui/lecture/CreateLectureAllgemein_GUI.java @@ -398,7 +398,7 @@ public class CreateLectureAllgemein_GUI extends JFrame { JOptionPane .showMessageDialog( null, - "Das End-Datum liegt vor dem Start-Datum. Bitte ändern.", + "Das End-Datum liegt vor dem Start-Datum. Bitte \u00e4ndern.", "Datum fehlerhaft", JOptionPane.INFORMATION_MESSAGE); } else { @@ -419,7 +419,7 @@ public class CreateLectureAllgemein_GUI extends JFrame { // bereit isDateMaxLifeTimeCorrect = true; } - // Prüfen ob alles eingegeben wurde + // Pruefen ob alles eingegeben wurde if (txtFldVeranstaltungsname.getText().isEmpty() == true || description.getText().isEmpty() == true) { // mind 1 Textfeld ist leer @@ -441,7 +441,7 @@ public class CreateLectureAllgemein_GUI extends JFrame { } else { Lecture.lecture.setActive(false); } - // Prüfe ob alle Eingaben korrekt sind, dann mache + // Pruefe ob alle Eingaben korrekt sind, dann mache // weiter if (isAllInformationReady == true && isDateMaxLifeTimeCorrect == true diff --git a/Dozentenmodul/src/gui/lecture/CreateLectureLink_GUI.java b/Dozentenmodul/src/gui/lecture/CreateLectureLink_GUI.java index ac923dca..ff19ed13 100644 --- a/Dozentenmodul/src/gui/lecture/CreateLectureLink_GUI.java +++ b/Dozentenmodul/src/gui/lecture/CreateLectureLink_GUI.java @@ -402,10 +402,10 @@ public class CreateLectureLink_GUI extends JFrame { JOptionPane .showMessageDialog( null, - "Ihre Veranstaltung wurde erfolgreich angelegt. Sie kehren nun zum Hauptmenü zurück.", + "Ihre Veranstaltung wurde erfolgreich angelegt. Sie kehren nun zum Hauptmen\u00fc zur\u00fcck.", "Veranstaltung angelegt", JOptionPane.INFORMATION_MESSAGE); - // zurück zum Menü + // zurueck zum Menue MainMenue_GUI m = new MainMenue_GUI(); m.setVisible(true); } catch (TException e1) { @@ -427,7 +427,7 @@ public class CreateLectureLink_GUI extends JFrame { } else { // nothing selected JOptionPane.showMessageDialog(null, - "Bitte wählen Sie ein Image aus.", + "Bitte w\u00e4hlen Sie ein Image aus.", "Image Auswahl", JOptionPane.INFORMATION_MESSAGE); } diff --git a/Dozentenmodul/src/gui/lecture/DeleteLecture_GUI.java b/Dozentenmodul/src/gui/lecture/DeleteLecture_GUI.java index 33192436..ec27b4f5 100644 --- a/Dozentenmodul/src/gui/lecture/DeleteLecture_GUI.java +++ b/Dozentenmodul/src/gui/lecture/DeleteLecture_GUI.java @@ -66,7 +66,7 @@ public class DeleteLecture_GUI extends JFrame { private JTextField textFieldName; JTabbedPane tabbedPane; String[] titles = { "Veranstaltungsname", "Beschreibung", - "Gültigkeitsdatum", "Aktiv", "Letzte Benutzung", + "G\u00fcltigkeitsdatum", "Aktiv", "Letzte Benutzung", "Verantwortlicher", "Image", "Schlagwort", "ID" }; ThriftConnection con = new ThriftConnection(); Client client = models.Client.clientcon.getClient(); @@ -103,7 +103,7 @@ public class DeleteLecture_GUI extends JFrame { System.exit(0); } }); - // Verhindert das Vergrößern Des Fensters + // Verhindert das Vergroessern Des Fensters setResizable(false); try { @@ -194,7 +194,7 @@ public class DeleteLecture_GUI extends JFrame { lblErweiterteSuche.addMouseListener(new MouseAdapter() { @Override public void mouseClicked(MouseEvent arg0) { - // Öffnet das Fenster Extended GUI + // oeffnet das Fenster Extended GUI ExtendedSearchForImages_GUI es = new ExtendedSearchForImages_GUI(); es.setVisible(true); @@ -209,7 +209,7 @@ public class DeleteLecture_GUI extends JFrame { lblHauptmen.addMouseListener(new MouseAdapter() { @Override public void mouseClicked(MouseEvent arg0) { - // Öffnet das Hauptmenü + // oeffnet das Hauptmenue DeleteLecture_GUI.this.setVisible(false); MainMenue_GUI main = new MainMenue_GUI(); @@ -339,16 +339,16 @@ public class DeleteLecture_GUI extends JFrame { //a row is selected //ask for confirmation eingabe = JOptionPane.showConfirmDialog(null, - "Wollen Sie diese Daten löschen?", "Löschen?", + "Wollen Sie diese Daten l\u00f6schen?", "L\u00f6schen?", JOptionPane.YES_NO_OPTION); if (eingabe == JOptionPane.YES_OPTION) { //user has confirmed deletion, now get the ID of the selected lecture lectureID = modelMyLectures.getValueAt(tablemyLectures.convertColumnIndexToModel(tablemyLectures.getSelectedRow()), 8).toString(); - System.out.println("Lösche Lecture "+lectureID); + System.out.println("L\u00f6sche Lecture "+lectureID); try { if(client.deleteLecture(lectureID, person.verantwortlicher.getHochschule(),person.verantwortlicher.getUsername())){ - System.out.println("Löschen erfolgreich"); + System.out.println("L\u00f6schen erfolgreich"); //delete successful DeleteLecture_GUI dl = new DeleteLecture_GUI(); @@ -359,7 +359,7 @@ public class DeleteLecture_GUI extends JFrame { JOptionPane .showMessageDialog( null, - "Löschen aus Datenbank fehlgeschlagen.", + "L\u00f6schen aus Datenbank fehlgeschlagen.", "Fehler", JOptionPane.INFORMATION_MESSAGE); } @@ -385,7 +385,7 @@ public class DeleteLecture_GUI extends JFrame { JButton btnBack = new JButton("Zur\u00FCck"); btnBack.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { - // Öffnet das Hauptmenü + // oeffnet das Hauptmenue MainMenue_GUI main = new MainMenue_GUI(); main.setVisible(true); @@ -454,7 +454,7 @@ public class DeleteLecture_GUI extends JFrame { } - // Initiale Beffülung eines Table models + // Initiale Beffuelung eines Table models public DefaultTableModel initTableModel(DefaultTableModel model) { List lectures; try { @@ -465,7 +465,7 @@ public class DeleteLecture_GUI extends JFrame { int x = 0; while (i.hasNext()) { - // erzeuge Objekte für die Tabelle + // erzeuge Objekte fuer die Tabelle Object[] obj = { lectures.get(x).lecturename, lectures.get(x).desc, @@ -474,7 +474,7 @@ public class DeleteLecture_GUI extends JFrame { lectures.get(x).isActive, lectures.get(x).lastused, lectures.get(x).username, " ", lectures.get(x).imagename, lectures.get(x).id }; - // Füge diese Objekte der Tabelle hinzu + // Fuege diese Objekte der Tabelle hinzu model.addRow(obj); x++; i.next(); diff --git a/Dozentenmodul/src/gui/lecture/EditLectureLink_GUI.java b/Dozentenmodul/src/gui/lecture/EditLectureLink_GUI.java index 97fdcdda..1f3e395d 100644 --- a/Dozentenmodul/src/gui/lecture/EditLectureLink_GUI.java +++ b/Dozentenmodul/src/gui/lecture/EditLectureLink_GUI.java @@ -357,7 +357,7 @@ public class EditLectureLink_GUI extends JFrame { } { JButton cancelButton = new JButton( - "Veranstaltung ändern und abschlie\u00DFen"); + "Veranstaltung \u00e4ndern und abschlie\u00DFen"); cancelButton.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { @@ -401,7 +401,7 @@ public class EditLectureLink_GUI extends JFrame { JOptionPane .showMessageDialog( null, - "Ihre Veranstaltung wurde erfolgreich angelegt. Sie kehren nun zum Hauptmenü zurück.", + "Ihre Veranstaltung wurde erfolgreich angelegt. Sie kehren nun zum Hauptmen\u00fc zur\u00fcck.", "Veranstaltung angelegt", JOptionPane.INFORMATION_MESSAGE); @@ -413,7 +413,7 @@ public class EditLectureLink_GUI extends JFrame { } else { // nothing selected JOptionPane.showMessageDialog(null, - "Bitte wählen Sie ein Image aus.", + "Bitte w\u00e4hlen Sie ein Image aus.", "Image Auswahl", JOptionPane.INFORMATION_MESSAGE); diff --git a/Dozentenmodul/src/gui/lecture/EditLectureSearch_GUI.java b/Dozentenmodul/src/gui/lecture/EditLectureSearch_GUI.java index 6ce8897a..a57b126e 100644 --- a/Dozentenmodul/src/gui/lecture/EditLectureSearch_GUI.java +++ b/Dozentenmodul/src/gui/lecture/EditLectureSearch_GUI.java @@ -69,7 +69,7 @@ public class EditLectureSearch_GUI extends JFrame { private JTextField textFieldName; JTabbedPane tabbedPane; String[] titles = { "Veranstaltungsname", "Beschreibung", - "Gültigkeitsdatum", "Aktiv", "Letzte Benutzung", + "G\u00fcltigkeitsdatum", "Aktiv", "Letzte Benutzung", "Verantwortlicher", "Image", "Schlagwort", "ID" }; ThriftConnection con = new ThriftConnection(); Client client = models.Client.clientcon.getClient(); @@ -105,7 +105,7 @@ public class EditLectureSearch_GUI extends JFrame { System.exit(0); } }); - // Verhindert das Vergrößern Des Fensters + // Verhindert das Vergroessern Des Fensters setResizable(false); try { @@ -195,7 +195,7 @@ public class EditLectureSearch_GUI extends JFrame { lblErweiterteSuche.addMouseListener(new MouseAdapter() { @Override public void mouseClicked(MouseEvent arg0) { - // Öffnet das Fenster Extended GUI + // oeffnet das Fenster Extended GUI ExtendedSearchForImages_GUI es = new ExtendedSearchForImages_GUI(); es.setVisible(true); @@ -210,7 +210,7 @@ public class EditLectureSearch_GUI extends JFrame { lblHauptmen.addMouseListener(new MouseAdapter() { @Override public void mouseClicked(MouseEvent arg0) { - // Öffnet das Hauptmenü + // oeffnet das Hauptmenue EditLectureSearch_GUI.this.setVisible(false); MainMenue_GUI main = new MainMenue_GUI(); @@ -338,7 +338,7 @@ public class EditLectureSearch_GUI extends JFrame { JButton btnBack = new JButton("Zur\u00FCck"); btnBack.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { - // Öffnet das Hauptmenü + // oeffnet das Hauptmenue MainMenue_GUI main = new MainMenue_GUI(); main.setVisible(true); @@ -437,14 +437,14 @@ public class EditLectureSearch_GUI extends JFrame { JOptionPane .showMessageDialog( null, - "Bitte wählen Sie ein eigenes Image aus", + "Bitte w\u00f4hlen Sie ein eigenes Image aus", "Message", JOptionPane.INFORMATION_MESSAGE); } } else { // nothing selected JOptionPane.showMessageDialog(null, - "Bitte wählen Sie ein Image aus.", + "Bitte w\u00f4hlen Sie ein Image aus.", "Image Auswahl", JOptionPane.INFORMATION_MESSAGE); }// end check if a row is selected @@ -512,7 +512,7 @@ public class EditLectureSearch_GUI extends JFrame { } - // Initiale Beffülung eines Table models + // Initiale Beffuelung eines Table models public DefaultTableModel initTableModel(DefaultTableModel model) { List lectures; try { @@ -523,7 +523,7 @@ public class EditLectureSearch_GUI extends JFrame { int x = 0; while (i.hasNext()) { - // erzeuge Objekte für die Tabelle + // erzeuge Objekte fuer die Tabelle Object[] obj = { lectures.get(x).lecturename, lectures.get(x).desc, @@ -532,7 +532,7 @@ public class EditLectureSearch_GUI extends JFrame { lectures.get(x).isActive, lectures.get(x).lastused, lectures.get(x).username, " ", lectures.get(x).imagename, lectures.get(x).id }; - // Füge diese Objekte der Tabelle hinzu + // Fuege diese Objekte der Tabelle hinzu model.addRow(obj); x++; i.next(); diff --git a/Dozentenmodul/src/gui/lecture/SearchLecture_GUI.java b/Dozentenmodul/src/gui/lecture/SearchLecture_GUI.java index d686f5f9..31bb1605 100644 --- a/Dozentenmodul/src/gui/lecture/SearchLecture_GUI.java +++ b/Dozentenmodul/src/gui/lecture/SearchLecture_GUI.java @@ -65,7 +65,7 @@ public class SearchLecture_GUI extends JFrame { private JTextField textFieldName; JTabbedPane tabbedPane; String[] titles = { "Veranstaltungsname", "Beschreibung", - "Gültigkeitsdatum", "Aktiv", "Letzte Benutzung", + "G\u00fcltigkeitsdatum", "Aktiv", "Letzte Benutzung", "Verantwortlicher", "Image", "Schlagwort", "ID" }; ThriftConnection con = new ThriftConnection(); Client client = models.Client.clientcon.getClient(); @@ -101,7 +101,7 @@ public class SearchLecture_GUI extends JFrame { System.exit(0); } }); - // Verhindert das Vergrößern Des Fensters + // Verhindert das Vergroessern Des Fensters setResizable(false); try { @@ -191,7 +191,7 @@ public class SearchLecture_GUI extends JFrame { lblErweiterteSuche.addMouseListener(new MouseAdapter() { @Override public void mouseClicked(MouseEvent arg0) { - // Öffnet das Fenster Extended GUI + // oeffnet das Fenster Extended GUI ExtendedSearchForImages_GUI es = new ExtendedSearchForImages_GUI(); es.setVisible(true); @@ -206,7 +206,7 @@ public class SearchLecture_GUI extends JFrame { lblHauptmen.addMouseListener(new MouseAdapter() { @Override public void mouseClicked(MouseEvent arg0) { - // Öffnet das Hauptmenü + // oeffnet das Hauptmenue SearchLecture_GUI.this.setVisible(false); MainMenue_GUI main = new MainMenue_GUI(); @@ -334,7 +334,7 @@ public class SearchLecture_GUI extends JFrame { JButton btnBack = new JButton("Zur\u00FCck"); btnBack.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { - // Öffnet das Hauptmenü + // oeffnet das Hauptmenue MainMenue_GUI main = new MainMenue_GUI(); main.setVisible(true); @@ -403,7 +403,7 @@ public class SearchLecture_GUI extends JFrame { } - // Initiale Beffülung eines Table models + // Initiale Beffuelung eines Table models public DefaultTableModel initTableModel(DefaultTableModel model) { List lectures; try { @@ -414,7 +414,7 @@ public class SearchLecture_GUI extends JFrame { int x = 0; while (i.hasNext()) { - // erzeuge Objekte für die Tabelle + // erzeuge Objekte fuer die Tabelle Object[] obj = { lectures.get(x).lecturename, lectures.get(x).desc, @@ -423,7 +423,7 @@ public class SearchLecture_GUI extends JFrame { lectures.get(x).isActive, lectures.get(x).lastused, lectures.get(x).username, " ", lectures.get(x).imagename, lectures.get(x).id }; - // Füge diese Objekte der Tabelle hinzu + // Fuege diese Objekte der Tabelle hinzu model.addRow(obj); x++; i.next(); diff --git a/Dozentenmodul/src/models/person.java b/Dozentenmodul/src/models/person.java index fdb5e18a..67b6b84e 100644 --- a/Dozentenmodul/src/models/person.java +++ b/Dozentenmodul/src/models/person.java @@ -13,8 +13,6 @@ public class person{ private String Tel; private String Fakultaet; private boolean ischecked; - - //public static person verantowrtlicher=new person(); public static person verantwortlicher=new person(); diff --git a/Dozentenmodul/src/thrift/MasterThriftConnection.java b/Dozentenmodul/src/thrift/MasterThriftConnection.java index 24d034f2..760b8bd0 100644 --- a/Dozentenmodul/src/thrift/MasterThriftConnection.java +++ b/Dozentenmodul/src/thrift/MasterThriftConnection.java @@ -23,7 +23,7 @@ public class MasterThriftConnection { try { transport.open(); } catch (TTransportException e) { - System.out.println("Keine Verbindung möglich!"); + System.out.println("Keine Verbindung m\u00f6glich!"); JOptionPane.showMessageDialog(null, e.getCause()+"\n"+e.getMessage(), "Debug-Message", JOptionPane.ERROR_MESSAGE); diff --git a/Dozentenmodul/src/thrift/ThriftConnection.java b/Dozentenmodul/src/thrift/ThriftConnection.java index dcd441bc..3eec5d25 100644 --- a/Dozentenmodul/src/thrift/ThriftConnection.java +++ b/Dozentenmodul/src/thrift/ThriftConnection.java @@ -28,12 +28,12 @@ public class ThriftConnection { try { transport.open(); } catch (TTransportException e) { - System.out.println("Keine Verbindung möglich! Satellit="+satAddress); + System.out.println("Keine Verbindung m\u00f6glich! Satellit="+satAddress); e.printStackTrace(); JOptionPane.showMessageDialog(null, e.getCause()+"\n"+e.getMessage(), "Debug-Message", JOptionPane.ERROR_MESSAGE); - //System.out.println("Keine Verbindung möglich! Satellit="); + //System.out.println("Keine Verbindung moeglich! Satellit="); return null; } -- cgit v1.2.3-55-g7522