diff options
| -rw-r--r-- | Dozentenmodul/bin/config/config_file.class | bin | 1692 -> 1812 bytes | |||
| -rw-r--r-- | Dozentenmodul/bin/gui/image/DeleteImage_GUI.class | bin | 12384 -> 12081 bytes | |||
| -rw-r--r-- | Dozentenmodul/bin/gui/intro/Login_GUI.class | bin | 9515 -> 10505 bytes | |||
| -rw-r--r-- | Dozentenmodul/src/config/config_file.java | 4 | ||||
| -rw-r--r-- | Dozentenmodul/src/gui/image/DeleteImage_GUI.java | 22 | ||||
| -rw-r--r-- | Dozentenmodul/src/gui/intro/Login_GUI.java | 48 | ||||
| -rw-r--r-- | Dozentenmodulserver/bin/util/XMLCreator.class | bin | 7561 -> 7564 bytes | |||
| -rw-r--r-- | Dozentenmodulserver/src/server/ServerHandler.java | 2 |
8 files changed, 54 insertions, 22 deletions
diff --git a/Dozentenmodul/bin/config/config_file.class b/Dozentenmodul/bin/config/config_file.class Binary files differindex 9e074954..07f04540 100644 --- a/Dozentenmodul/bin/config/config_file.class +++ b/Dozentenmodul/bin/config/config_file.class diff --git a/Dozentenmodul/bin/gui/image/DeleteImage_GUI.class b/Dozentenmodul/bin/gui/image/DeleteImage_GUI.class Binary files differindex f0fa6420..83b33784 100644 --- a/Dozentenmodul/bin/gui/image/DeleteImage_GUI.class +++ b/Dozentenmodul/bin/gui/image/DeleteImage_GUI.class diff --git a/Dozentenmodul/bin/gui/intro/Login_GUI.class b/Dozentenmodul/bin/gui/intro/Login_GUI.class Binary files differindex 3200efe5..ae51b2f1 100644 --- a/Dozentenmodul/bin/gui/intro/Login_GUI.class +++ b/Dozentenmodul/bin/gui/intro/Login_GUI.class diff --git a/Dozentenmodul/src/config/config_file.java b/Dozentenmodul/src/config/config_file.java index 5d59e22a..e8746a1f 100644 --- a/Dozentenmodul/src/config/config_file.java +++ b/Dozentenmodul/src/config/config_file.java @@ -33,6 +33,8 @@ public class config_file { //Schreibe Config ini.put("main", "BillOfRights",false); ini.put("main", "vmware", false); + ini.put("main", "Benutzername speichern", false); + ini.put("main", "Benutzername", ""); ini.store(); return true; @@ -53,6 +55,8 @@ public class config_file { //Schreibe Konfig in File ini.put("main", "BillOfRights",false); ini.put("main", "vmware", false); + ini.put("main", "Benutzername speichern", false); + ini.put("main", "Benutzername", ""); ini.store(); return true; diff --git a/Dozentenmodul/src/gui/image/DeleteImage_GUI.java b/Dozentenmodul/src/gui/image/DeleteImage_GUI.java index 156bfa44..38c16214 100644 --- a/Dozentenmodul/src/gui/image/DeleteImage_GUI.java +++ b/Dozentenmodul/src/gui/image/DeleteImage_GUI.java @@ -73,7 +73,7 @@ public class DeleteImage_GUI extends JFrame { private JTextField textFieldName; JTabbedPane tabbedPane; boolean activeSearch=false; - String[] titles = { "Image-Name", "Lizenzpflichtig", "OS", "Veranstaltung", + String[] titles = { "Name", "Lizenzpflichtig", "OS", "Veranstaltung", "Verantwortlicher", "Letztes Update", "ID", "Version","Template" }; ThriftConnection con = new ThriftConnection(); Client client = models.Client.clientcon.getClient(); @@ -115,6 +115,7 @@ public class DeleteImage_GUI extends JFrame { initTableModel(modelAll); initTableModel(modelMyImages); initTableModel(modelPublicVorlagen); + tableAllImages.getColumnModel().getColumn(1).setPreferredWidth(0); textFieldName.requestFocusInWindow(); } }); @@ -363,7 +364,7 @@ public class DeleteImage_GUI extends JFrame { tablePublicVorlagen.getColumnModel().getColumn(5).sizeWidthToFit(); tablePublicVorlagen.setRowSorter(rowSorterPublicVorlagen); scrollPanePublicVorlagen.setViewportView(tablePublicVorlagen); - tabbedPane.addTab("\u00D6ffentliche Vorlagen", null, + tabbedPane.addTab("Vorlagen", null, scrollPanePublicVorlagen, null); JScrollPane scrollPaneAllImages = new JScrollPane(); @@ -381,24 +382,9 @@ public class DeleteImage_GUI extends JFrame { tabbedPane.addTab("Alle", null, scrollPaneAllImages, null); scrollPaneCoopImages.setViewportView(tableCoopImages); - tabbedPane.addTab("Kooperative Images", null, scrollPaneCoopImages, + tabbedPane.addTab("bwLehrpool", null, scrollPaneCoopImages, null); tabbedPane.setEnabledAt(3, false); - - JScrollPane scrollPanePublicImages = new JScrollPane(); - JTable tablePublicImages = new JTable(); - tablePublicImages.setSelectionMode(ListSelectionModel.SINGLE_SELECTION); - tablePublicImages.setModel(model); - tablePublicImages.getColumnModel().getColumn(1).sizeWidthToFit(); - tablePublicImages.getColumnModel().getColumn(2).sizeWidthToFit(); - tablePublicImages.getColumnModel().getColumn(3).sizeWidthToFit(); - tablePublicImages.getColumnModel().getColumn(4).sizeWidthToFit(); - tablePublicImages.getColumnModel().getColumn(5).sizeWidthToFit(); - - scrollPanePublicImages.setViewportView(tablePublicImages); - tabbedPane.addTab("\u00D6ffentliche Images", null, - scrollPanePublicImages, null); - tabbedPane.setEnabledAt(4, false); JButton btnDelete = new JButton("L\u00F6schen"); diff --git a/Dozentenmodul/src/gui/intro/Login_GUI.java b/Dozentenmodul/src/gui/intro/Login_GUI.java index a3c070b3..3e47fc1b 100644 --- a/Dozentenmodul/src/gui/intro/Login_GUI.java +++ b/Dozentenmodul/src/gui/intro/Login_GUI.java @@ -28,6 +28,7 @@ import models.SessionData; import models.person; import org.apache.thrift.TException; +import org.ini4j.InvalidFileFormatException; import org.ini4j.Wini; import thrift.ImageServer.Client; @@ -36,6 +37,7 @@ import thrift.ThriftConnection; import thrift.UserInfo; import util.GuiOrganizer; import config.config_file; +import javax.swing.JCheckBox; @SuppressWarnings("serial") public class Login_GUI extends JFrame { @@ -50,7 +52,8 @@ public class Login_GUI extends JFrame { MasterThriftConnection thrift; Client client; String token; - + JCheckBox chckbxBenutzernameSpeichern; + /** * Launch the application. */ @@ -136,6 +139,10 @@ public class Login_GUI extends JFrame { imgLabel.setIcon(new ImageIcon(scaled)); // Hinzufuegen des Logos in das Fenster contentPane.add(imgLabel); + + chckbxBenutzernameSpeichern = new JCheckBox("Benutzername speichern"); + chckbxBenutzernameSpeichern.setBounds(292, 222, 237, 23); + contentPane.add(chckbxBenutzernameSpeichern); // Erzeugen und Hinzufuegen des Labels JLabel LabelUser = new JLabel("bwIDM-Benutzername:"); @@ -146,6 +153,28 @@ public class Login_GUI extends JFrame { lblusername = new JTextField(); lblusername .setToolTipText("Bitte geben Sie Ihren bwIDM-Benutzernamen ein."); + try { + Wini ini = new Wini( + new File( + "C:\\Users\\" + + System.getProperty("user.name") + + "\\AppData\\Roaming\\bwLehrpoolSuite\\config.ini")); + if(ini.get("main", "Benutzername").isEmpty()){ + + }else{ + lblusername.setText(ini.get("main", "Benutzername").toString()); + } + + if(ini.get("main", "Benutzername speichern", Boolean.class)==true){ + chckbxBenutzernameSpeichern.setSelected(true); + } + } catch (InvalidFileFormatException e1) { + // TODO Auto-generated catch block + e1.printStackTrace(); + } catch (IOException e1) { + // TODO Auto-generated catch block + e1.printStackTrace(); + } lblusername.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent arg0) { performLogin(); @@ -164,11 +193,12 @@ public class Login_GUI extends JFrame { JButton BtnLogin = new JButton("Login"); BtnLogin.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent arg0) { + performLogin(); }// end actionPerformed }); - BtnLogin.setBounds(292, 244, 237, 23); + BtnLogin.setBounds(292, 252, 237, 23); contentPane.add(BtnLogin); // Erzeugen und Hinzufuegen des Passwortfeldes @@ -185,6 +215,8 @@ public class Login_GUI extends JFrame { lblConnectionInfo.setHorizontalAlignment(SwingConstants.LEFT); lblConnectionInfo.setBounds(292, 290, 237, 20); contentPane.add(lblConnectionInfo); + + //GuiOrganizer.centerGUI(this); }// end LoginGUI() @@ -198,6 +230,7 @@ public class Login_GUI extends JFrame { thrift.SessionData result = null; try { + login = true; String passText = new String(lblpass.getPassword()); // check if client has received a connection with information or a @@ -249,6 +282,16 @@ public class Login_GUI extends JFrame { "C:\\Users\\" + System.getProperty("user.name") + "\\AppData\\Roaming\\bwLehrpoolSuite\\config.ini")); + if(chckbxBenutzernameSpeichern.isSelected()){ + ini.put("main", "Benutzername", lblusername.getText()); + ini.put("main", "Benutzername speichern", true); + ini.store(); + } + else{ + ini.put("main", "Benutzername", ""); + ini.put("main", "Benutzername speichern", false); + ini.store(); + } // Pruefe ob Bills Of Rights schon akzeptiert wurden, // wenn // nicht zeige diese an @@ -334,5 +377,4 @@ public class Login_GUI extends JFrame { return isClientReturnedCorrectly; }// end checkServerConnection() - }// end class diff --git a/Dozentenmodulserver/bin/util/XMLCreator.class b/Dozentenmodulserver/bin/util/XMLCreator.class Binary files differindex 6d7673fb..04ba5197 100644 --- a/Dozentenmodulserver/bin/util/XMLCreator.class +++ b/Dozentenmodulserver/bin/util/XMLCreator.class diff --git a/Dozentenmodulserver/src/server/ServerHandler.java b/Dozentenmodulserver/src/server/ServerHandler.java index 84022089..b70f9c74 100644 --- a/Dozentenmodulserver/src/server/ServerHandler.java +++ b/Dozentenmodulserver/src/server/ServerHandler.java @@ -392,7 +392,7 @@ public class ServerHandler implements Server.Iface { try { String path = Configuration.config.getAbsolute_path() - + "temp/" + + "prod/" + map.get("date") .substring(0, map.get("date").length() - 2) + "_" + hs + "_" + user + "_" + map.get("name") + ".xml"; |