From f9904d9a361d139ab3fe14f099b341fcc6cc1b63 Mon Sep 17 00:00:00 2001 From: Michael Wilson Date: Tue, 18 Nov 2014 13:26:57 +0100 Subject: • Beim Bearbeiten eines Image oder einer Veranstaltung wurde bisher der aktuell eingeloggte Benutzer immer neu als Verantwortlicher eingetragen --> Der Verantwortliche ändert sich nun nicht mehr und wird korrekt angezeigt --- dozentenmodulserver/src/main/java/sql/SQL.java | 208 ++++++++++++++++++------- 1 file changed, 151 insertions(+), 57 deletions(-) (limited to 'dozentenmodulserver/src/main/java/sql') diff --git a/dozentenmodulserver/src/main/java/sql/SQL.java b/dozentenmodulserver/src/main/java/sql/SQL.java index 10afee96..dd40c774 100644 --- a/dozentenmodulserver/src/main/java/sql/SQL.java +++ b/dozentenmodulserver/src/main/java/sql/SQL.java @@ -36,7 +36,7 @@ public class SQL { Class.forName("com.mysql.jdbc.Driver").newInstance(); } catch (InstantiationException | IllegalAccessException | ClassNotFoundException e) { - // TODO Auto-generated catch block + e.printStackTrace(); } try { @@ -48,7 +48,7 @@ public class SQL { return con; } catch (SQLException e) { - // TODO Auto-generated catch block + log.info("Failed to return connection to Client."); e.printStackTrace(); } @@ -78,7 +78,7 @@ public class SQL { + "."); return ret; } catch (SQLException e) { - // TODO Auto-generated catch block + log.info("Failed to writeFTPUser."); e.printStackTrace(); } @@ -113,7 +113,7 @@ public class SQL { log.info("FTPUser " + user + " deleted."); return ret; } catch (SQLException e) { - // TODO Auto-generated catch block + log.info("Failed to DeleteUser."); e.printStackTrace(); } @@ -136,7 +136,7 @@ public class SQL { return rs; } catch (SQLException e) { - // TODO Auto-generated catch block + log.info("Failed to getImage."); e.printStackTrace(); } @@ -177,7 +177,7 @@ public class SQL { return path; } catch (SQLException e) { - // TODO Auto-generated catch block + log.info("Failed to getPathOfImage."); e.printStackTrace(); } @@ -251,7 +251,7 @@ public class SQL { } } catch (SQLException e) { - // TODO Auto-generated catch block + log.info("Failed to setInstitution."); e.printStackTrace(); } @@ -378,7 +378,7 @@ public class SQL { } } catch (SQLException e) { - // TODO Auto-generated catch block + log.info("Failed to setPerson."); e.printStackTrace(); } @@ -507,7 +507,7 @@ public class SQL { //con.commit(); con.close(); } catch (SQLException e) { - // TODO Auto-generated catch block + log.info("Failed to setImageData."); e.printStackTrace(); } @@ -563,7 +563,7 @@ public class SQL { } con.close(); } catch (SQLException e) { - // TODO Auto-generated catch block + e.printStackTrace(); } return list; @@ -618,7 +618,7 @@ public class SQL { } con.close(); } catch (SQLException e) { - // TODO Auto-generated catch block + e.printStackTrace(); } return list; @@ -661,7 +661,7 @@ public class SQL { } con.close(); } catch (SQLException e) { - // TODO Auto-generated catch block + e.printStackTrace(); } return list; @@ -722,7 +722,7 @@ public class SQL { } con.close(); } catch (SQLException e) { - // TODO Auto-generated catch block + e.printStackTrace(); } return list; @@ -779,7 +779,7 @@ public class SQL { } con.close(); } catch (SQLException e) { - // TODO Auto-generated catch block + e.printStackTrace(); } return list; @@ -824,7 +824,7 @@ public class SQL { } con.close(); } catch (SQLException e) { - // TODO Auto-generated catch block + e.printStackTrace(); } return list; @@ -870,7 +870,7 @@ public class SQL { con.close(); return list; } catch (SQLException e) { - // TODO Auto-generated catch block + log.info("Failed to getLectureListPermissionRead."); e.printStackTrace(); } @@ -920,7 +920,7 @@ public class SQL { con.close(); return list; } catch (SQLException e) { - // TODO Auto-generated catch block + log.info("Failed to getLectureListPermissionWrite."); e.printStackTrace(); } @@ -969,7 +969,7 @@ public class SQL { con.close(); return list; } catch (SQLException e) { - // TODO Auto-generated catch block + log.info("Failed to getLectureListPermissionAdmin."); e.printStackTrace(); } @@ -1005,7 +1005,7 @@ public class SQL { con.close(); return list; } catch (SQLException e) { - // TODO Auto-generated catch block + log.info("Failed to getLectureList."); e.printStackTrace(); } @@ -1030,7 +1030,7 @@ public class SQL { return list; } catch (SQLException e) { - // TODO Auto-generated catch block + log.info("Failed to getAllOS."); e.printStackTrace(); } @@ -1081,15 +1081,104 @@ public class SQL { con.close(); return map; } catch (SQLException e) { - // TODO Auto-generated catch block + log.info("Failed to getPersonData."); e.printStackTrace(); } return null; - } + }//end getPersonData + + + + + public Map getPersonData(String userID) { + Map map = new HashMap(); + try { + Connection con = getConnection(); + String sql = "SELECT userID, loginName, Nachname, Vorname, mail, m_institution.name as institution FROM bwLehrpool.m_user, m_institution WHERE userID=? AND m_user.institution=m_institution.institutionID;"; + + PreparedStatement prest = con.prepareStatement(sql); + prest.setString(1, userID); + + ResultSet rs = prest.executeQuery(); + con.commit(); + while (rs.next()) + { + map.put("userID", rs.getString("userID")); + map.put("loginName", rs.getString("loginName")); + map.put("Nachname", rs.getString("Nachname")); + map.put("Vorname", rs.getString("Vorname")); + map.put("mail", rs.getString("mail")); + map.put("institution", rs.getString("institution")); + + } + con.close(); + return map; + } catch (SQLException e) { + log.info("Failed to getPersonData with userID='"+userID+"'."); + e.printStackTrace(); + } + return null; + }//end getPersonData + + + + public Map getItemOwner(String itemID) { + + Map map = new HashMap(); + Connection con = getConnection(); + PreparedStatement prest; + String userID; + + try { + //find out if the itemID belongs to an image + String sql = "SELECT image_owner FROM bwLehrpool.m_VLData_imageInfo WHERE GUID_imageID=?;"; + prest = con.prepareStatement(sql); + prest.setString(1, itemID); + + ResultSet rs = prest.executeQuery(); + while (rs.next()){ + map.put("userID",rs.getString("image_owner")); + } + + //if map is empty, then itemID does not belong to an image -> must be a lecture + if(map.isEmpty()==true){ + //check if itemID belongs to a lecture + sql = "SELECT admin_owner FROM bwLehrpool.m_VLData_lecture WHERE lectureID=?;"; + prest = con.prepareStatement(sql); + prest.setString(1, itemID); + + rs = prest.executeQuery(); + while(rs.next()){ + map.put("userID", rs.getString("admin_owner")); + } + } + + //if map is still empty, then the itemID could not be found + if(map.isEmpty()==true){ + log.error("ERROR: getItemOwner could not find the item with the ID '"+itemID+"'."); + } else { + + //now that we have the userID for this item, get the user information and put it in the map + userID = map.get("userID"); //extract the userID + map = getPersonData(userID); //get all the rest of his information + + //return this map with all the infos + return map; + + } + + } catch (SQLException e) { + e.printStackTrace(); + } + + //something went horribly wrong... + return null; + }//end getItemOwner + @@ -1191,7 +1280,7 @@ public class SQL { //con.commit(); con.close(); } catch (SQLException e) { - // TODO Auto-generated catch block + log.info("Failed to setLectureData."); e.printStackTrace(); } @@ -1229,7 +1318,7 @@ public class SQL { con.close(); return map; } catch (SQLException e) { - // TODO Auto-generated catch block + log.info("Failed to getImageIDandVersion."); e.printStackTrace(); } @@ -1284,7 +1373,7 @@ public class SQL { con.close(); return map; } catch (SQLException e) { - // TODO Auto-generated catch block + log.info("Failed to getImageData."); e.printStackTrace(); } @@ -1437,7 +1526,7 @@ public class SQL { con.close(); return 0; } catch (SQLException e) { - // TODO Auto-generated catch block + log.info("Failed to UpdateImageData."); e.printStackTrace(); } @@ -1475,7 +1564,7 @@ public class SQL { return true; } catch (SQLException e) { - // TODO Auto-generated catch block + log.info("Failed to deleteImage and permissions."); e.printStackTrace(); } @@ -1556,7 +1645,7 @@ public class SQL { log.info("Succeeded to updateLectureData."); } catch (SQLException e) { - // TODO Auto-generated catch block + log.info("Failed to updateLectureData."); e.printStackTrace(); } @@ -1586,7 +1675,7 @@ public class SQL { return ret; } catch (SQLException e) { - // TODO Auto-generated catch block + log.info("Failed to execute method connectedToLecture."); e.printStackTrace(); } @@ -1619,7 +1708,7 @@ public class SQL { con.close(); return true; } catch (SQLException e) { - // TODO Auto-generated catch block + log.info("Failed to deleteLecture and permissions."); e.printStackTrace(); } @@ -1663,7 +1752,7 @@ public class SQL { return path; } catch (SQLException e) { - // TODO Auto-generated catch block + log.info("Failed to getFile."); e.printStackTrace(); } @@ -1698,7 +1787,7 @@ public class SQL { return map; } catch (SQLException e) { - // TODO Auto-generated catch block + log.info("Failed to getDeleteXMLData."); e.printStackTrace(); } @@ -1733,7 +1822,7 @@ public class SQL { log.info("Succesfully updated image path"); return 0; } catch (SQLException e) { - // TODO Auto-generated catch block + log.info("Failed to UpdateImagePath."); e.printStackTrace(); } @@ -1755,7 +1844,7 @@ public class SQL { return list; } catch (SQLException e) { - // TODO Auto-generated catch block + log.info("Failed to getAllUniversities."); e.printStackTrace(); } @@ -1788,7 +1877,7 @@ public class SQL { return pkos; } catch (SQLException e) { - // TODO Auto-generated catch block + log.info("Failed to getOSpk."); e.printStackTrace(); } @@ -1821,7 +1910,7 @@ public class SQL { return os; } catch (SQLException e) { - // TODO Auto-generated catch block + log.info("Failed to getOS."); e.printStackTrace(); } @@ -1859,7 +1948,7 @@ public class SQL { con.close(); return map; } catch (SQLException e) { - // TODO Auto-generated catch block + log.info("Failed to getLectureData."); e.printStackTrace(); } @@ -1896,7 +1985,7 @@ public class SQL { con.close(); } catch (SQLException e) { - // TODO Auto-generated catch block + e.printStackTrace(); } @@ -1928,7 +2017,7 @@ public class SQL { return rs.getInt("roleID"); } catch (SQLException e) { - // TODO Auto-generated catch block + log.info("Failed to getRoleID."); e.printStackTrace(); } @@ -1958,7 +2047,7 @@ public class SQL { con.close(); return id; } catch (SQLException e) { - // TODO Auto-generated catch block + log.info("Failed to LectureID."); e.printStackTrace(); } @@ -1980,7 +2069,7 @@ public class SQL { try { stm = con.createStatement(); } catch (SQLException e) { - // TODO Auto-generated catch block + e.printStackTrace(); } String query = "SELECT userID, Nachname, Vorname, mail FROM m_user WHERE userID NOT IN ('" @@ -1994,7 +2083,7 @@ public class SQL { try { res = stm.executeQuery(query); } catch (SQLException e1) { - // TODO Auto-generated catch block + e1.printStackTrace(); } @@ -2008,7 +2097,7 @@ public class SQL { false, false)); } } catch (SQLException e) { - // TODO Auto-generated catch block + e.printStackTrace(); } return list; @@ -2034,7 +2123,7 @@ public class SQL { try { stm = con.createStatement(); } catch (SQLException e) { - // TODO Auto-generated catch block + e.printStackTrace(); } try { @@ -2067,7 +2156,7 @@ public class SQL { + imageID + "' AND pmi.userID=u.userID ORDER BY u.Nachname ASC;");*/ } catch (SQLException e) { - // TODO Auto-generated catch block + e.printStackTrace(); } try { @@ -2108,7 +2197,7 @@ public class SQL { // System.out.println(res.getString("Nachname")+" "+Boolean.parseBoolean(res.getString("image_read"))+" "+Boolean.parseBoolean(res.getString("image_write"))+" "+Boolean.parseBoolean(res.getString("image_admin"))); } } catch (SQLException e) { - // TODO Auto-generated catch block + e.printStackTrace(); } return list; @@ -2150,7 +2239,7 @@ public class SQL { "FROM bwLehrpool.pm_VLData_lecture pml, bwLehrpool.m_user u WHERE pml.userID!='"+userID+"' AND pml.lectureID='"+lectureID+"' AND pml.userID=u.userID ORDER BY u.Nachname ASC;"); */ } catch (SQLException e) { - // TODO Auto-generated catch block + e.printStackTrace(); } try { @@ -2195,7 +2284,7 @@ public class SQL { // System.out.println(res.getString("Nachname")+" "+Boolean.parseBoolean(res.getString("image_read"))+" "+Boolean.parseBoolean(res.getString("image_write"))+" "+Boolean.parseBoolean(res.getString("image_admin"))); } } catch (SQLException e) { - // TODO Auto-generated catch block + e.printStackTrace(); } return list; @@ -2251,7 +2340,7 @@ public class SQL { con.close(); } catch (SQLException e) { - // TODO Auto-generated catch block + log.info("Failed to setImageRights."); e.printStackTrace(); } @@ -2304,7 +2393,7 @@ public class SQL { log.info("Written additional image rights."); } catch (SQLException e) { - // TODO Auto-generated catch block + e.printStackTrace(); log.info("Failed to write additional image rights."); } @@ -2349,7 +2438,7 @@ public class SQL { log.info("Written lecture rights for " + pk_lecture); con.close(); } catch (SQLException e) { - // TODO Auto-generated catch block + log.info("Failed to setLectureRights."); e.printStackTrace(); } @@ -2397,7 +2486,7 @@ public class SQL { log.info("Written additional lecture rights for '" + userID + "'."); } catch (SQLException e) { - // TODO Auto-generated catch block + e.printStackTrace(); log.info("Failed to write additional lecture rights."); } @@ -2425,7 +2514,7 @@ public class SQL { prest.executeUpdate(); } catch (SQLException e) { - // TODO Auto-generated catch block + e.printStackTrace(); } @@ -2437,7 +2526,7 @@ public class SQL { con.commit(); } catch (SQLException e) { - // TODO Auto-generated catch block + e.printStackTrace(); } }// end deleteAllAdditionalImagePermissions @@ -2471,7 +2560,7 @@ public class SQL { con.commit(); } catch (SQLException e) { - // TODO Auto-generated catch block + e.printStackTrace(); } }// end deleteAllAdditionalImagePermissions @@ -2504,7 +2593,7 @@ public class SQL { } } catch (SQLException e) { - // TODO Auto-generated catch block + e.printStackTrace(); } @@ -2534,13 +2623,18 @@ public class SQL { return rs.getString("name") + " " + rs.getString("architecture") + " bit"; } catch (SQLException e) { - // TODO Auto-generated catch block + e.printStackTrace(); } return null; } + + + + + }// end class -- cgit v1.2.3-55-g7522 From 626a66929d5fcb78c99e6fbe281600205efd2152 Mon Sep 17 00:00:00 2001 From: Michael Wilson Date: Tue, 18 Nov 2014 14:35:41 +0100 Subject: • Ausgaben an sinnvollen gekürzt bzw. erweitert --- .../java/gui/image/CreateImageAllgemein_GUI.java | 14 +- .../java/gui/image/CreateImageTechnisch_GUI.java | 2 +- .../src/main/java/gui/image/DeleteImage_GUI.java | 34 +-- .../java/gui/image/EditImageAllgemein_GUI.java | 14 +- .../java/gui/image/EditImageTechnisch_GUI.java | 13 +- .../main/java/gui/image/FTPCreateUploader_GUI.java | 20 +- .../main/java/gui/image/FTPEditDownloader_GUI.java | 2 +- .../main/java/gui/image/FTPEditUploader_GUI.java | 35 +-- .../java/gui/image/PermissionCreateImage_GUI.java | 44 ++-- .../java/gui/image/PermissionEditImage_GUI.java | 33 +-- .../main/java/gui/image/SearchEditImage_GUI.java | 17 +- .../src/main/java/gui/image/SearchImage_GUI.java | 19 +- .../main/java/gui/intro/ListAllOtherUsers_GUI.java | 13 +- .../src/main/java/gui/intro/Login_GUI.java | 8 +- .../src/main/java/gui/intro/MainMenue_GUI.java | 7 - .../src/main/java/gui/intro/VmWareLink_GUI.java | 12 +- .../gui/lecture/CreateLectureAllgemein_GUI.java | 6 +- .../java/gui/lecture/CreateLectureLink_GUI.java | 45 ++-- .../main/java/gui/lecture/DeleteLecture_GUI.java | 249 +++++++++------------ .../main/java/gui/lecture/EditLectureLink_GUI.java | 20 +- .../java/gui/lecture/EditLectureSearch_GUI.java | 213 +++++++++--------- .../gui/lecture/PermissionCreateLecture_GUI.java | 57 ++--- .../gui/lecture/PermissionEditLecture_GUI.java | 75 +++---- .../main/java/gui/lecture/SearchLecture_GUI.java | 20 +- .../src/main/java/server/ServerHandler.java | 25 +-- dozentenmodulserver/src/main/java/sql/SQL.java | 15 +- 26 files changed, 475 insertions(+), 537 deletions(-) (limited to 'dozentenmodulserver/src/main/java/sql') diff --git a/dozentenmodul/src/main/java/gui/image/CreateImageAllgemein_GUI.java b/dozentenmodul/src/main/java/gui/image/CreateImageAllgemein_GUI.java index 41dd1057..e40a2a1e 100644 --- a/dozentenmodul/src/main/java/gui/image/CreateImageAllgemein_GUI.java +++ b/dozentenmodul/src/main/java/gui/image/CreateImageAllgemein_GUI.java @@ -95,7 +95,7 @@ public class CreateImageAllgemein_GUI extends JFrame { UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName()); } catch (ClassNotFoundException | InstantiationException | IllegalAccessException | UnsupportedLookAndFeelException e) { - LOGGER.error("Setting look and feel from system failed."); + //LOGGER.error("Setting look and feel from system failed."); e.printStackTrace(); JOptionPane.showMessageDialog(c, "Konnte das Farbschema des Systems nicht ĂĽbernehmen.", "Debug-Message", @@ -332,10 +332,10 @@ public class CreateImageAllgemein_GUI extends JFrame { Image.image.setImagename(imagename.getText()); Image.image.setDesc(textAreadesc.getText()); - LOGGER.info("Alle Eingaben in Ordnung. Imagename= \"" - + Image.image.getImagename() - + "\", Imagebeschreibung=\"" - + Image.image.getDesc()+"\""); + //LOGGER.info("Alle Eingaben in Ordnung. Imagename= \"" + // + Image.image.getImagename() + // + "\", Imagebeschreibung=\"" + // + Image.image.getDesc()+"\""); // Zeige nächsten Schritt an CreateImageTechnisch_GUI ea = new CreateImageTechnisch_GUI(c); @@ -439,7 +439,7 @@ public class CreateImageAllgemein_GUI extends JFrame { || Hochschule.getText().isEmpty() || EMail.getText().isEmpty()) { // missing some fields - LOGGER.info("Form has missing fields, warning user."); + //LOGGER.info("Form has missing fields, warning user."); JOptionPane.showMessageDialog(c, "Bitte geben Sie alle notwendigen Daten an!", "Daten unvollständig", @@ -451,7 +451,7 @@ public class CreateImageAllgemein_GUI extends JFrame { // x2B= "+" x2C="-" x3A=":" x5F="_" // if (!imagename.getText().trim().matches("[a-zA-Z0-9\\x2B\\x2D\\x3A\\x5F]+")) { - LOGGER.info("Image name not alpha-numerical, warn user."); + //LOGGER.info("Image name not alpha-numerical, warn user."); JOptionPane.showMessageDialog( c, "Der Imagename darf nur aus Buchstaben, Zahlen und den Zeichen + - _ : bestehen.", diff --git a/dozentenmodul/src/main/java/gui/image/CreateImageTechnisch_GUI.java b/dozentenmodul/src/main/java/gui/image/CreateImageTechnisch_GUI.java index 4508f128..b77f93ea 100644 --- a/dozentenmodul/src/main/java/gui/image/CreateImageTechnisch_GUI.java +++ b/dozentenmodul/src/main/java/gui/image/CreateImageTechnisch_GUI.java @@ -326,7 +326,7 @@ public class CreateImageTechnisch_GUI extends JFrame { Image.image.setCpu(Integer.valueOf(spinnerCPU.getValue().toString()).intValue()); Image.image.setRam(Integer.valueOf(spinnerRam.getValue().toString()).intValue()); Image.image.setOS(comboBox.getSelectedItem().toString()); - LOGGER.info("Betriebssystem: "+Image.image.getOS()+", istVorlage: "+Image.image.isVorlage()+", Lizenzpflichtig: "+Image.image.isLicensed()+", Internetsperre: "+Image.image.isInternet()+", CPU: "+Image.image.getCpu()+", RAM: "+Image.image.getRam()); + //LOGGER.info("Betriebssystem: "+Image.image.getOS()+", istVorlage: "+Image.image.isVorlage()+", Lizenzpflichtig: "+Image.image.isLicensed()+", Internetsperre: "+Image.image.isInternet()+", CPU: "+Image.image.getCpu()+", RAM: "+Image.image.getRam()); PermissionCreateImage_GUI ea=new PermissionCreateImage_GUI(c); ea.setVisible(true); dispose(); diff --git a/dozentenmodul/src/main/java/gui/image/DeleteImage_GUI.java b/dozentenmodul/src/main/java/gui/image/DeleteImage_GUI.java index e3f482e2..cb74f76f 100644 --- a/dozentenmodul/src/main/java/gui/image/DeleteImage_GUI.java +++ b/dozentenmodul/src/main/java/gui/image/DeleteImage_GUI.java @@ -59,6 +59,7 @@ import javax.swing.table.TableRowSorter; import models.Links; import models.person; +import org.apache.log4j.Logger; import org.apache.thrift.TException; import server.generated.Server.Client; @@ -69,6 +70,9 @@ import javax.swing.JTextArea; @SuppressWarnings("serial") public class DeleteImage_GUI extends JFrame { + + private final static Logger LOGGER = Logger + .getLogger(FTPCreateUploader_GUI.class); private final JPanel contentPanel = new JPanel(); JLabel labelName; @@ -212,7 +216,7 @@ public class DeleteImage_GUI extends JFrame { UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName()); } catch (ClassNotFoundException | InstantiationException | IllegalAccessException | UnsupportedLookAndFeelException e) { - // TODO Auto-generated catch block + e.printStackTrace(); } // Setzt den Fenstertitel @@ -320,7 +324,7 @@ public class DeleteImage_GUI extends JFrame { comboBox.addItem(list.get(i)); } } catch (TException e2) { - // TODO Auto-generated catch block + e2.printStackTrace(); JOptionPane.showMessageDialog(c, e2.getCause() + "\n" + e2.getStackTrace(), "Debug-Message", @@ -421,7 +425,6 @@ public class DeleteImage_GUI extends JFrame { .getSelectedRow()), 7) .toString(); - // TODO // Image darf nur geloescht werden, wenn keine // Veranstaltung mehr auf das Image verweist. // Unbdingt abfragen! @@ -432,26 +435,26 @@ public class DeleteImage_GUI extends JFrame { try { client.deleteImageServer(imageid, imageversion); - if (client.deleteImageData(imageid, - imageversion)) { - // if (client.deleteImageServer(imageid - // ,imageversion)) { + if (client.deleteImageData(imageid,imageversion)) { + + LOGGER.info("Image '"+imageid+"' erfolgreich gelöscht."); DeleteImage_GUI di = new DeleteImage_GUI(c); di.setVisible(true); dispose(); } else { + LOGGER.info("Image '"+imageid+"' konnte nicht gelöscht werden."); JOptionPane .showConfirmDialog( c, - "Löschen von der DB hat leider nicht geklappt!!", + "Image konnte nicht gelöscht werden.", "Fehler", JOptionPane.INFORMATION_MESSAGE); } } catch (HeadlessException e) { - // TODO Auto-generated catch block + e.printStackTrace(); JOptionPane.showMessageDialog( c, @@ -460,7 +463,7 @@ public class DeleteImage_GUI extends JFrame { "Debug-Message", JOptionPane.ERROR_MESSAGE); } catch (TException e) { - // TODO Auto-generated catch block + e.printStackTrace(); JOptionPane.showMessageDialog( c, @@ -471,6 +474,7 @@ public class DeleteImage_GUI extends JFrame { } } else { + LOGGER.info("Image '"+imageid+"' konnte nicht gelöscht werden, da mindestens eine Veranstaltung mit diesem Image verlinkt ist."); JOptionPane .showMessageDialog( @@ -480,7 +484,7 @@ public class DeleteImage_GUI extends JFrame { JOptionPane.INFORMATION_MESSAGE); } } catch (TException e) { - // TODO Auto-generated catch block + e.printStackTrace(); JOptionPane.showMessageDialog(c, e.getCause() + "\n" + e.getStackTrace(), @@ -710,7 +714,7 @@ public class DeleteImage_GUI extends JFrame { open.openWebpage(windows); } catch (URISyntaxException e) { - // TODO Auto-generated catch block + e.printStackTrace(); } } @@ -731,7 +735,7 @@ public class DeleteImage_GUI extends JFrame { open.openWebpage(windows); } catch (URISyntaxException e) { - // TODO Auto-generated catch block + e.printStackTrace(); } @@ -802,7 +806,7 @@ public class DeleteImage_GUI extends JFrame { return model; } catch (TException | ParseException e1) { - // TODO Auto-generated catch block + e1.printStackTrace(); JOptionPane.showMessageDialog(c, e1.getCause() + "\n" + e1.getStackTrace(), "Debug-Message", @@ -860,7 +864,7 @@ public class DeleteImage_GUI extends JFrame { labelVersion.setText(res.get("version")); textAreadesc.setText(res.get("desc")); } catch (TException | ParseException e1) { - // TODO Auto-generated catch block + e1.printStackTrace(); } } diff --git a/dozentenmodul/src/main/java/gui/image/EditImageAllgemein_GUI.java b/dozentenmodul/src/main/java/gui/image/EditImageAllgemein_GUI.java index 28dae62b..89548a9b 100644 --- a/dozentenmodul/src/main/java/gui/image/EditImageAllgemein_GUI.java +++ b/dozentenmodul/src/main/java/gui/image/EditImageAllgemein_GUI.java @@ -340,12 +340,12 @@ public class EditImageAllgemein_GUI extends JFrame { Image.image.setImagename(imagename.getText()); Image.image.setDesc(textAreadesc.getText()); // Info - LOGGER.info("Alle Eingaben in Ordnung. Imagename= \"" - + Image.image.getImagename() - + ", NewImageName=\"" - + Image.image.getNewName() - + "\", Imagebeschreibung=\"" - + Image.image.getDesc()+"\""); + //LOGGER.info("Alle Eingaben in Ordnung. Imagename= \"" + // + Image.image.getImagename() + // + ", NewImageName=\"" + // + Image.image.getNewName() + // + "\", Imagebeschreibung=\"" + // + Image.image.getDesc()+"\""); EditImageTechnisch_GUI ea = new EditImageTechnisch_GUI(c); @@ -451,7 +451,7 @@ public class EditImageAllgemein_GUI extends JFrame { } else { Image.image.setLicensed(true); } - LOGGER.debug(map.get("template")); + //LOGGER.debug(map.get("template")); if (map.get("template").equals("false")) { Image.image.setVorlage(false); } else { diff --git a/dozentenmodul/src/main/java/gui/image/EditImageTechnisch_GUI.java b/dozentenmodul/src/main/java/gui/image/EditImageTechnisch_GUI.java index a273d7cc..a3422be9 100644 --- a/dozentenmodul/src/main/java/gui/image/EditImageTechnisch_GUI.java +++ b/dozentenmodul/src/main/java/gui/image/EditImageTechnisch_GUI.java @@ -347,12 +347,13 @@ public class EditImageTechnisch_GUI extends JFrame { //System.out.println("OS bei Klick auf Weiter: "+Image.image.getOS()); - LOGGER.info("OS: " + Image.image.getOS() + - ", Vorlage: " + Image.image.isVorlage() + - ", Lizenzpflichtig: " + Image.image.isLicensed() + - ", Internetsperre: " + Image.image.isInternet() + - ", CPU: " + Image.image.getCpu() + - ", RAM: " + Image.image.getRam()); + //LOGGER.info("OS: " + Image.image.getOS() + + // ", Vorlage: " + Image.image.isVorlage() + + // ", Lizenzpflichtig: " + Image.image.isLicensed() + + // ", Internetsperre: " + Image.image.isInternet() + + // ", CPU: " + Image.image.getCpu() + + // ", RAM: " + Image.image.getRam()); + // oeffnet das naechste Fenster PermissionEditImage_GUI ea=new PermissionEditImage_GUI(c); ea.setVisible(true); diff --git a/dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java b/dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java index 66819a80..a2656a61 100644 --- a/dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java +++ b/dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java @@ -63,8 +63,7 @@ public class FTPCreateUploader_GUI extends JFrame implements /** * Logger instance for this class. */ - private final static Logger LOGGER = Logger - .getLogger(FTPCreateUploader_GUI.class); + private final static Logger LOGGER = Logger.getLogger(FTPCreateUploader_GUI.class); @SuppressWarnings("unused") @@ -397,10 +396,12 @@ public class FTPCreateUploader_GUI extends JFrame implements //save data boolean success = writeData(); if(success==true){ + LOGGER.info("Neues Image '"+Image.image.getImagename()+"' erfolgreich gespeichert."); JOptionPane.showMessageDialog(c, "Die Daten wurden erfolgreich gespeichert.", "Daten gespeichert", JOptionPane.INFORMATION_MESSAGE); } else { + LOGGER.info("Neues Image '"+Image.image.getImagename()+"' konnte nicht gespeichert werden."); JOptionPane.showMessageDialog(c, "Die Daten konnten nicht gespeichert werden.", "Fehler", JOptionPane.ERROR_MESSAGE); @@ -574,9 +575,10 @@ public class FTPCreateUploader_GUI extends JFrame implements try { LOGGER.info("Getting FTP User..."); user = client.getFtpUser(); - LOGGER.debug("FTP name: " + user.userName); - LOGGER.debug("FTP path: " + user.path); - LOGGER.debug("FTP pass: " + user.password); + LOGGER.info("Received FTP user."); + //LOGGER.debug("FTP name: " + user.userName); + //LOGGER.debug("FTP path: " + user.path); + //LOGGER.debug("FTP pass: " + user.password); } catch (TException e) { // TODO Auto-generated catch block LOGGER.error("Konnte vom Satellit keinen FTP-User erhalten!"); @@ -587,10 +589,10 @@ public class FTPCreateUploader_GUI extends JFrame implements } DateFormat formatter = new SimpleDateFormat("yyyMMddHHmmss"); - LOGGER.info("Setting new name: " + formatter.format(new Date()) + "_" - + person.verantwortlicher.getHochschule() + "_" - + person.verantwortlicher.getUsername() + "_" - + Image.image.getImagename() + ".vmdk"); + //LOGGER.info("Setting new name: " + formatter.format(new Date()) + "_" + // + person.verantwortlicher.getHochschule() + "_" + // + person.verantwortlicher.getUsername() + "_" + // + Image.image.getImagename() + ".vmdk"); Image.image.setNewName(formatter.format(new Date()) + "_" + person.verantwortlicher.getHochschule() + "_" + person.verantwortlicher.getUsername() + "_" diff --git a/dozentenmodul/src/main/java/gui/image/FTPEditDownloader_GUI.java b/dozentenmodul/src/main/java/gui/image/FTPEditDownloader_GUI.java index 5cd9d8f9..00ef5f8a 100644 --- a/dozentenmodul/src/main/java/gui/image/FTPEditDownloader_GUI.java +++ b/dozentenmodul/src/main/java/gui/image/FTPEditDownloader_GUI.java @@ -414,7 +414,7 @@ public class FTPEditDownloader_GUI extends JFrame implements isAborted = true; // set flag try { client.DeleteFtpUser(user.userName); - LOGGER.info("Deleted FTP user."); + LOGGER.info("FTP user deleted."); } catch (TException e1) { // TODO Auto-generated catch block e1.printStackTrace(); diff --git a/dozentenmodul/src/main/java/gui/image/FTPEditUploader_GUI.java b/dozentenmodul/src/main/java/gui/image/FTPEditUploader_GUI.java index 348828fe..34f8c7f0 100644 --- a/dozentenmodul/src/main/java/gui/image/FTPEditUploader_GUI.java +++ b/dozentenmodul/src/main/java/gui/image/FTPEditUploader_GUI.java @@ -345,7 +345,7 @@ public class FTPEditUploader_GUI extends JFrame implements isAborted = true; // set flag try { client.DeleteFtpUser(user.userName); - LOGGER.info("Deleted FTP user."); + LOGGER.info("FTP user deleted."); } catch (TException e1) { e1.printStackTrace(); } @@ -375,6 +375,7 @@ public class FTPEditUploader_GUI extends JFrame implements // save data boolean success = updateData(); if (success == true) { + LOGGER.info("Bearbeitetes Image '"+Image.image.getImagename()+"' erfolgreich gespeichert."); JOptionPane .showMessageDialog( c, @@ -382,6 +383,7 @@ public class FTPEditUploader_GUI extends JFrame implements "Ă„nderungen gespeichert", JOptionPane.INFORMATION_MESSAGE); } else { + LOGGER.error("Bearbeitetes Image '"+Image.image.getImagename()+"' konnte nicht gespeichert werden."); JOptionPane .showMessageDialog( c, @@ -551,11 +553,12 @@ public class FTPEditUploader_GUI extends JFrame implements btnUploadStarten.setText("Bitte warten"); try { - LOGGER.info("Getting FTP-User..."); + //LOGGER.info("Getting FTP-User..."); user = client.getFtpUser(); - LOGGER.debug("FTP name: " + user.userName); - LOGGER.debug("FTP path: " + user.path); - LOGGER.debug("FTP pass: " + user.password); + LOGGER.info("Received FTP user."); + //LOGGER.debug("FTP name: " + user.userName); + //LOGGER.debug("FTP path: " + user.path); + //LOGGER.debug("FTP pass: " + user.password); } catch (TException e) { e.printStackTrace(); JOptionPane.showMessageDialog(c, @@ -566,12 +569,12 @@ public class FTPEditUploader_GUI extends JFrame implements // set new file name and path only when uploading a new file. else use // old filename and path - LOGGER.info("Getting imagePath: "+Image.image.getImagepath()); - LOGGER.info("Getting old 'newName': "+Image.image.getNewName()); - LOGGER.info("Setting new File-Name: " + formatter.format(new Date()) + "_" - + person.verantwortlicher.getHochschule() + "_" - + person.verantwortlicher.getUsername() + "_" - + Image.image.getImagename() + ".vmdk"); + //LOGGER.info("Getting imagePath: "+Image.image.getImagepath()); + //LOGGER.info("Getting old 'newName': "+Image.image.getNewName()); + //LOGGER.info("Setting new File-Name: " + formatter.format(new Date()) + "_" + // + person.verantwortlicher.getHochschule() + "_" + // + person.verantwortlicher.getUsername() + "_" + // + Image.image.getImagename() + ".vmdk"); Image.image.setNewName(formatter.format(new Date()) + "_" + person.verantwortlicher.getHochschule() + "_" + person.verantwortlicher.getUsername() + "_" @@ -646,13 +649,13 @@ public class FTPEditUploader_GUI extends JFrame implements public boolean updateData() { try { - LOGGER.debug("NewFileName: " + Image.image.getNewName()); - LOGGER.debug("ImageName: " + Image.image.getImagename()); + //LOGGER.debug("NewFileName: " + Image.image.getNewName()); + //LOGGER.debug("ImageName: " + Image.image.getImagename()); //if a new file has been uploaded and new filename is set if (Image.image.getNewName() != null) { - LOGGER.debug("(NOT NULL) new FileName is '"+Image.image.getNewName()+"', imagepath=" - + Image.image.getImagepath()); + // LOGGER.debug("(NOT NULL) new FileName is '"+Image.image.getNewName()+"', imagepath=" + // + Image.image.getImagepath()); client.updateImageData( Image.image.getImagename(), Image.image.getImagename(), @@ -674,7 +677,7 @@ public class FTPEditUploader_GUI extends JFrame implements } } else { //no new file uploaded and old file name stays - LOGGER.debug("(NULL) newName is '"+Image.image.getNewName()+"', imagepath="+ Image.image.getImagepath()); + //LOGGER.debug("(NULL) newName is '"+Image.image.getNewName()+"', imagepath="+ Image.image.getImagepath()); client.updateImageData( Image.image.getImagename(), diff --git a/dozentenmodul/src/main/java/gui/image/PermissionCreateImage_GUI.java b/dozentenmodul/src/main/java/gui/image/PermissionCreateImage_GUI.java index 70fd2025..371841d4 100644 --- a/dozentenmodul/src/main/java/gui/image/PermissionCreateImage_GUI.java +++ b/dozentenmodul/src/main/java/gui/image/PermissionCreateImage_GUI.java @@ -57,7 +57,6 @@ import models.RightsManagement; import models.person; import org.apache.log4j.Logger; -import org.apache.thrift.TException; import server.generated.Person; import server.generated.Server.Client; @@ -200,7 +199,7 @@ public class PermissionCreateImage_GUI extends JFrame { // if new session, get values for table from database -> initialiting users if (RightsManagement.rightsManagement.getPermittedUserList().size() <= 0) { - System.out.println("Loading data from db"); + //System.out.println("Loading data from db"); //do nothing /*try { @@ -237,11 +236,11 @@ public class PermissionCreateImage_GUI extends JFrame { }*/ } else // read from model { - System.out.println("reading from model"); - System.out - .println("RightsManagement.rightsManagement.getPermittedUserList().size() = " - + RightsManagement.rightsManagement - .getPermittedUserList().size()); + //System.out.println("reading from model"); + //System.out + // .println("RightsManagement.rightsManagement.getPermittedUserList().size() = " + // + RightsManagement.rightsManagement + // .getPermittedUserList().size()); List listt = RightsManagement.rightsManagement .getPermittedUserList(); @@ -259,10 +258,11 @@ public class PermissionCreateImage_GUI extends JFrame { temp.isImageAdmin(), // Admin temp.getUserID() // userID }; - System.out.println("Processing: " + temp.getName() + ", " - + temp.getVorname() + ", " + temp.isImageRead() + ", " - + temp.isImageWrite() + ", " + temp.isImageLinkAllowed() + ", " - + temp.isImageAdmin() + ", " + temp.getUserID()); + //System.out.println("Processing: " + temp.getName() + ", " + // + temp.getVorname() + ", " + temp.isImageRead() + ", " + // + temp.isImageWrite() + ", " + temp.isImageLinkAllowed() + ", " + // + temp.isImageAdmin() + ", " + temp.getUserID()); + // Fuege diese Objekte der Tabelle hinzu model.addRow(obj); x++; @@ -334,11 +334,11 @@ public class PermissionCreateImage_GUI extends JFrame { // delete selected users from table int[] deletableRows= table.getSelectedRows(); int pointerCorrection=0; //after deleting a row, the length of selected rows is reduced by 1. This pointer counts the already deleted rows and correct the offset of i - LOGGER.info("deletabelRows.length="+deletableRows.length); + //LOGGER.info("deletabelRows.length="+deletableRows.length); for (int i=0; i list = new ArrayList(); @@ -679,7 +679,7 @@ public class PermissionCreateImage_GUI extends JFrame { // get values from table and save the checkbox values if (map == null) - System.out.println("Error: map is null"); + //System.out.println("Error: map is null"); // for (int i = 0; i < map.size(); i++) { for (int i = 0; i < table.getRowCount(); i++) { @@ -716,12 +716,12 @@ public class PermissionCreateImage_GUI extends JFrame { } } - System.out.println("Setting list information.\tTable size: " - + table.getRowCount() + "\t List length (=selected users): " - + list.size()); - for (int y = 0; y < list.size(); y++) { - System.out.println("" + list.get(y).getName()); - } + //System.out.println("Setting list information.\tTable size: " + // + table.getRowCount() + "\t List length (=selected users): " + // + list.size()); + //for (int y = 0; y < list.size(); y++) { + // System.out.println("" + list.get(y).getName()); + //} RightsManagement.rightsManagement.setPermittedUserList(list); }// end saveTableToList() diff --git a/dozentenmodul/src/main/java/gui/image/PermissionEditImage_GUI.java b/dozentenmodul/src/main/java/gui/image/PermissionEditImage_GUI.java index 88a63883..1cb5d26a 100644 --- a/dozentenmodul/src/main/java/gui/image/PermissionEditImage_GUI.java +++ b/dozentenmodul/src/main/java/gui/image/PermissionEditImage_GUI.java @@ -188,7 +188,7 @@ public class PermissionEditImage_GUI extends JFrame { // if new session, get values for table from database if (RightsManagement.rightsManagement.getPermittedUserList().size() <= 0) { - System.out.println("Loading data from db"); + //System.out.println("Loading data from db"); try { map = client.getPermissionForUserAndImage(person.verantwortlicher.getUserID(), Image.image.getImageId()); @@ -208,7 +208,7 @@ public class PermissionEditImage_GUI extends JFrame { (boolean)map.get(x).isImage_admin(), // Admin map.get(x).getUserID() // userID }; - System.out.println(map.get(x).isImage_read()+"gfhfxg"); + //System.out.println(map.get(x).isImage_read()+"gfhfxg"); // Fuege diese Objekte der Tabelle hinzu model.addRow(obj); @@ -223,11 +223,11 @@ public class PermissionEditImage_GUI extends JFrame { } } else // read from model { - System.out.println("reading from model"); - System.out - .println("RightsManagement.rightsManagement.getPermittedUserList().size() = " - + RightsManagement.rightsManagement - .getPermittedUserList().size()); + //System.out.println("reading from model"); + //System.out + // .println("RightsManagement.rightsManagement.getPermittedUserList().size() = " + // + RightsManagement.rightsManagement + // .getPermittedUserList().size()); List listt = RightsManagement.rightsManagement .getPermittedUserList(); @@ -246,10 +246,11 @@ public class PermissionEditImage_GUI extends JFrame { temp.isImageAdmin(), // Admin temp.getUserID() // userID }; - System.out.println("Processing: " + temp.getName() + ", " - + temp.getVorname() + ", " + temp.isImageRead() + ", " - + temp.isImageWrite() + ", " + temp.isImageLinkAllowed() + ", " - + temp.isImageAdmin() + ", " + temp.getUserID()); + //System.out.println("Processing: " + temp.getName() + ", " + // + temp.getVorname() + ", " + temp.isImageRead() + ", " + // + temp.isImageWrite() + ", " + temp.isImageLinkAllowed() + ", " + // + temp.isImageAdmin() + ", " + temp.getUserID()); + // Fuege diese Objekte der Tabelle hinzu model.addRow(obj); x++; @@ -337,11 +338,11 @@ public class PermissionEditImage_GUI extends JFrame { // delete selected users from table int[] deletableRows= table.getSelectedRows(); int pointerCorrection=0; //after deleting a row, the length of selected rows is reduced by 1. This pointer counts the already deleted rows and correct the offset of i - LOGGER.info("deletabelRows.length="+deletableRows.length); + //LOGGER.info("deletabelRows.length="+deletableRows.length); for (int i=0; i list = new ArrayList(); @@ -565,7 +566,7 @@ public class PermissionEditImage_GUI extends JFrame { // get values from table and save the checkbox values if (map == null) - System.out.println("Error: map is null"); + //System.out.println("Error: map is null"); // for (int i = 0; i < map.size(); i++) { for (int i = 0; i < table.getRowCount(); i++) { diff --git a/dozentenmodul/src/main/java/gui/image/SearchEditImage_GUI.java b/dozentenmodul/src/main/java/gui/image/SearchEditImage_GUI.java index 197068e8..0c9099c0 100644 --- a/dozentenmodul/src/main/java/gui/image/SearchEditImage_GUI.java +++ b/dozentenmodul/src/main/java/gui/image/SearchEditImage_GUI.java @@ -734,29 +734,24 @@ public class SearchEditImage_GUI extends JFrame { // Initiale Beffuelung eines Table models public DefaultTableModel initTableModel(DefaultTableModel model) { - LOGGER.debug("trying to init table first time... in: searcheditimage_gui"); + //LOGGER.debug("trying to init table first time... in: searcheditimage_gui"); List images; try { // Hole eine Liste der passenden Images images = client.getImageListPermissionWrite(person.verantwortlicher .getUserID()); - //System.out.println("User is: " - // + person.verantwortlicher.getUserID()); - // images = client.getImageList(person.verantwortlicher.getUserID(), - // requiredPermission); Iterator i = images.iterator(); SimpleDateFormat in = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); SimpleDateFormat out = new SimpleDateFormat("dd.MM.yyyy HH:mm:ss"); int x = 0; - //System.out.println("Imagesize is: "+images.size()); while (i.hasNext()) { // erzeuge Objekte fuer die Tabelle - LOGGER.debug("Image last updated on: " - + images.get(x).updateTime); - LOGGER.debug("Image name: " + images.get(x).getImageName()); + //LOGGER.debug("Image last updated on: " + // + images.get(x).updateTime); + //LOGGER.debug("Image name: " + images.get(x).getImageName()); Object[] obj = { images.get(x).getImageName(), images.get(x).getLicenseRestriction(), @@ -772,11 +767,11 @@ public class SearchEditImage_GUI extends JFrame { // Fuege diese Objekte der Tabelle hinzu model.addRow(obj); - LOGGER.info("Counting model.getRowCount(): "+model.getRowCount()); + //LOGGER.info("Counting model.getRowCount(): "+model.getRowCount()); x++; i.next(); } - LOGGER.info("Finished counting crap, mo"+model.getRowCount()); + //LOGGER.info("Finished counting crap, mo"+model.getRowCount()); return model; } catch (TException | ParseException e1) { diff --git a/dozentenmodul/src/main/java/gui/image/SearchImage_GUI.java b/dozentenmodul/src/main/java/gui/image/SearchImage_GUI.java index 050b81d8..ba57605f 100644 --- a/dozentenmodul/src/main/java/gui/image/SearchImage_GUI.java +++ b/dozentenmodul/src/main/java/gui/image/SearchImage_GUI.java @@ -47,8 +47,6 @@ import javax.swing.UIManager; import javax.swing.UnsupportedLookAndFeelException; import javax.swing.border.EmptyBorder; import javax.swing.border.TitledBorder; -import javax.swing.event.ChangeEvent; -import javax.swing.event.ChangeListener; import javax.swing.event.ListSelectionEvent; import javax.swing.event.ListSelectionListener; import javax.swing.table.DefaultTableModel; @@ -64,7 +62,6 @@ import org.apache.thrift.TException; import server.generated.Server.Client; import thrift.ThriftConnection; - import util.OpenLinks; @SuppressWarnings("serial") @@ -257,7 +254,7 @@ public class SearchImage_GUI extends JFrame { UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName()); } catch (ClassNotFoundException | InstantiationException | IllegalAccessException | UnsupportedLookAndFeelException e) { - // TODO Auto-generated catch block + e.printStackTrace(); } // Setzt den Fenstertitel @@ -394,7 +391,7 @@ public class SearchImage_GUI extends JFrame { comboBox.addItem(list.get(i)); } } catch (TException e2) { - // TODO Auto-generated catch block + e2.printStackTrace(); JOptionPane.showMessageDialog(c, e2.getCause() + "\n" + e2.getStackTrace(), "Debug-Message", @@ -916,7 +913,7 @@ public class SearchImage_GUI extends JFrame { open.openWebpage(windows); } catch (URISyntaxException e) { - // TODO Auto-generated catch block + e.printStackTrace(); } } @@ -937,7 +934,7 @@ public class SearchImage_GUI extends JFrame { open.openWebpage(windows); } catch (URISyntaxException e) { - // TODO Auto-generated catch block + e.printStackTrace(); } @@ -1002,7 +999,7 @@ public class SearchImage_GUI extends JFrame { return model; } catch (TException | ParseException e1) { - // TODO Auto-generated catch block + e1.printStackTrace(); JOptionPane.showMessageDialog(c, e1.getCause() + "\n" + e1.getStackTrace(), "Debug-Message", @@ -1048,7 +1045,7 @@ public class SearchImage_GUI extends JFrame { return model; } catch (TException | ParseException e1) { - // TODO Auto-generated catch block + e1.printStackTrace(); JOptionPane.showMessageDialog(c, e1.getCause() + "\n" + e1.getStackTrace(), "Debug-Message", @@ -1093,7 +1090,7 @@ public class SearchImage_GUI extends JFrame { return model; } catch (TException | ParseException e1) { - // TODO Auto-generated catch block + e1.printStackTrace(); JOptionPane.showMessageDialog(c, e1.getCause() + "\n" + e1.getStackTrace(), "Debug-Message", @@ -1165,7 +1162,7 @@ public class SearchImage_GUI extends JFrame { labelWeitereVerantwortliche.setToolTipText(labelWeitereVerantwortliche.getText()); } catch (TException | ParseException e1) { - // TODO Auto-generated catch block + e1.printStackTrace(); } } diff --git a/dozentenmodul/src/main/java/gui/intro/ListAllOtherUsers_GUI.java b/dozentenmodul/src/main/java/gui/intro/ListAllOtherUsers_GUI.java index 6d7c5ef3..4c24e035 100644 --- a/dozentenmodul/src/main/java/gui/intro/ListAllOtherUsers_GUI.java +++ b/dozentenmodul/src/main/java/gui/intro/ListAllOtherUsers_GUI.java @@ -276,11 +276,6 @@ public class ListAllOtherUsers_GUI extends JFrame { model.addRow(obj); } - System.out.println("Info in row(" - + pos - + ") is=" - + tableUsers.getValueAt(selectedRows[pos], - 0)); pos++;// next selected row } }// end if @@ -368,21 +363,17 @@ public class ListAllOtherUsers_GUI extends JFrame { // get users from db which are not in listed in the permission yet public void initTableContent() { - LOGGER.info("Getting list of all other users from server"); + //LOGGER.info("Getting list of all other users from server"); try { //set users which are NOT to be listed in table //logged on user - System.out.println("adding value'"+ person.verantwortlicher.getUserID()); user.add(0, person.verantwortlicher.getUserID()); //users already in table for(int y=0; y rowSorterAll = new - // TableRowSorter( - // modelAll); + final TableRowSorter rowSorterMyImages = new TableRowSorter( modelMyImages); - // final TableRowSorter rowSorterPublicVorlagen = new - // TableRowSorter( - // modelPublicVorlagen); + RowFilter rf = null; List> filters = new ArrayList>(2); @@ -157,13 +149,11 @@ public class CreateLectureLink_GUI extends JFrame { public void windowOpened(WindowEvent arg0) { try { initTableModel(modelMyImages); - //initTableModel(modelAll); - //initTableModel(modelPublicVorlagen); + } catch (TException e) { - // TODO Auto-generated catch block + e.printStackTrace(); } catch (ParseException e) { - // TODO Auto-generated catch block e.printStackTrace(); } @@ -201,7 +191,7 @@ public class CreateLectureLink_GUI extends JFrame { UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName()); } catch (ClassNotFoundException | InstantiationException | IllegalAccessException | UnsupportedLookAndFeelException e) { - // TODO Auto-generated catch block + e.printStackTrace(); } setTitle("bwLehrpool Suite - Veranstaltung erzeugen"); @@ -298,7 +288,7 @@ public class CreateLectureLink_GUI extends JFrame { comboBox.addItem(list.get(i)); } } catch (TException e) { - // TODO Auto-generated catch block + e.printStackTrace(); JOptionPane.showMessageDialog(c, e.getCause() + "\n" + e.getStackTrace(), "Debug-Message", @@ -381,12 +371,13 @@ public class CreateLectureLink_GUI extends JFrame { .getSelectedRow()), 7) .toString(); try { + //write the image data to the information fields on the right writeImageData(imageid, version); } catch (TException e1) { - // TODO Auto-generated catch block + e1.printStackTrace(); } catch (ParseException e1) { - // TODO Auto-generated catch block + e1.printStackTrace(); } } @@ -476,7 +467,7 @@ public class CreateLectureLink_GUI extends JFrame { //set rights for additional users for(int i=0; i< RightsManagement.rightsManagement.getPermittedUserList().size(); i++){ - System.out.println("Writing additional rights for user "+RightsManagement.rightsManagement.getPermittedUserList().get(i).getUserID()+", User "+(i+1)+"/"+RightsManagement.rightsManagement.getPermittedUserList().size()); + //System.out.println("Writing additional rights for user "+RightsManagement.rightsManagement.getPermittedUserList().get(i).getUserID()+", User "+(i+1)+"/"+RightsManagement.rightsManagement.getPermittedUserList().size()); client.writeAdditionalLectureRights( Lecture.lecture.getName(), RightsManagement.rightsManagement.getPermittedUserList().get(i).getUserID(), @@ -487,6 +478,7 @@ public class CreateLectureLink_GUI extends JFrame { }//end for + LOGGER.info("Veranstaltung '"+Lecture.lecture.getName()+"' wurde erfolgreich angelegt."); JOptionPane .showMessageDialog( @@ -498,7 +490,8 @@ public class CreateLectureLink_GUI extends JFrame { MainMenue_GUI m = new MainMenue_GUI(c); m.setVisible(true); } catch (TException e1) { - // TODO Auto-generated catch block + LOGGER.error("Veranstaltung '"+Lecture.lecture.getName()+"' konnte nicht angelegt werden."); + e1.printStackTrace(); JOptionPane .showMessageDialog( @@ -680,7 +673,7 @@ public class CreateLectureLink_GUI extends JFrame { open.openWebpage(windows); } catch (URISyntaxException e) { - // TODO Auto-generated catch block + e.printStackTrace(); } } @@ -701,7 +694,7 @@ public class CreateLectureLink_GUI extends JFrame { open.openWebpage(windows); } catch (URISyntaxException e) { - // TODO Auto-generated catch block + e.printStackTrace(); } diff --git a/dozentenmodul/src/main/java/gui/lecture/DeleteLecture_GUI.java b/dozentenmodul/src/main/java/gui/lecture/DeleteLecture_GUI.java index 685f3a81..44e0c4f5 100644 --- a/dozentenmodul/src/main/java/gui/lecture/DeleteLecture_GUI.java +++ b/dozentenmodul/src/main/java/gui/lecture/DeleteLecture_GUI.java @@ -90,9 +90,7 @@ public class DeleteLecture_GUI extends JFrame { Client client = models.Client.clientcon.getClient(); final DefaultTableModel modelMyLectures = new DefaultTableModel(titles, 0); - - final TableRowSorter rowSorterMyLectures = new TableRowSorter( modelMyLectures); private JButton button; @@ -105,18 +103,19 @@ public class DeleteLecture_GUI extends JFrame { + "Sie können die Veranstaltungen hier löschen. Alternativ werden veraltete Einträge irgendwann automatisch gelöscht.
" + "Veraltet bedeutet, dass Veranstaltungen, die drei Monate lang nicht augerufen wurden, vorerst deaktiviert werden." + ""; - + RowFilter rf = null; - List> filters = new ArrayList>(2); + List> filters = new ArrayList>( + 2); /** * Create the dialog. */ public DeleteLecture_GUI(Component formerGUI) { - + filters.add(RowFilter.regexFilter(".", 0)); rf = RowFilter.orFilter(filters); - + addWindowListener(new WindowAdapter() { @Override public void windowClosing(WindowEvent arg0) { @@ -130,10 +129,10 @@ public class DeleteLecture_GUI extends JFrame { textFieldName.requestFocusInWindow(); try { initTableModel(modelMyLectures); - //initTableModel(modelAll); + // initTableModel(modelAll); } catch (ParseException e) { - // TODO Auto-generated catch block + e.printStackTrace(); } @@ -163,7 +162,6 @@ public class DeleteLecture_GUI extends JFrame { tablemyLectures.getColumnModel().getColumn(8).setMinWidth(0); tablemyLectures.getColumnModel().getColumn(8).setMaxWidth(0); - } }); // Verhindert das Vergroessern Des Fensters @@ -174,7 +172,7 @@ public class DeleteLecture_GUI extends JFrame { UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName()); } catch (ClassNotFoundException | InstantiationException | IllegalAccessException | UnsupportedLookAndFeelException e) { - // TODO Auto-generated catch block + e.printStackTrace(); } // Setzt den Fenstertitel @@ -232,29 +230,31 @@ public class DeleteLecture_GUI extends JFrame { // Textfield eingabe auslesen String stext = textFieldName.getText(); // Wenn Textfield nicht leer - if (stext != "") - { + if (stext != "") { activeSearch = true; // Filtere nach der Eingabe - filters.clear(); - filters.add(RowFilter.regexFilter("(?i)"+stext, 0)); //case insensitive - filters.add(RowFilter.regexFilter("(?i)"+stext, 1)); //case insensitive + filters.clear(); + filters.add(RowFilter.regexFilter("(?i)" + stext, 0)); // case + // insensitive + filters.add(RowFilter.regexFilter("(?i)" + stext, 1)); // case + // insensitive rf = RowFilter.orFilter(filters); rowSorterMyLectures.setRowFilter(rf); - } - else - { + } else { activeSearch = false; filters.clear(); - filters.add(RowFilter.regexFilter(".", 0)); //case insensitive, filter for anything + filters.add(RowFilter.regexFilter(".", 0)); // case + // insensitive, + // filter for + // anything rf = RowFilter.orFilter(filters); rowSorterMyLectures.setRowFilter(rf); } - + tablemyLectures.clearSelection(); - + resetLectureInfo(); } }); @@ -301,28 +301,27 @@ public class DeleteLecture_GUI extends JFrame { tablemyLectures.getSelectionModel().addListSelectionListener( new ListSelectionListener() { public void valueChanged(ListSelectionEvent e) { - - if(tablemyLectures.getSelectedRow() != -1) - { - String imageid = modelMyLectures.getValueAt( - tablemyLectures - .convertRowIndexToModel(tablemyLectures - .getSelectedRow()), 8) - .toString(); - try { - writeLectureData(imageid); - } catch (TException e1) { - // TODO Auto-generated catch block - e1.printStackTrace(); - } catch (ParseException e1) { - // TODO Auto-generated catch block - e1.printStackTrace(); + if (tablemyLectures.getSelectedRow() != -1) { + String imageid = modelMyLectures + .getValueAt( + tablemyLectures + .convertRowIndexToModel(tablemyLectures + .getSelectedRow()), + 8).toString(); + + try { + writeLectureData(imageid); + } catch (TException e1) { + + e1.printStackTrace(); + } catch (ParseException e1) { + + e1.printStackTrace(); + } } } - } - - + }); tablemyLectures.setModel(modelMyLectures); @@ -334,103 +333,67 @@ public class DeleteLecture_GUI extends JFrame { tablemyLectures.setRowSorter(rowSorterMyLectures); scrollPaneMyImage.setViewportView(tablemyLectures); - - button = new JButton("Löschen"); - button.setBounds(442, 495, 118, 23); - contentPanel.add(button); - button.addActionListener(new ActionListener() { - public void actionPerformed(ActionEvent e) { - String lectureID = ""; - int eingabe; - String username = person.verantwortlicher.getName() + " " - + person.verantwortlicher.getVorname(); - // check if a row is selected - if (tablemyLectures.getSelectedRowCount() != 0) { - // a row is selected - // ask for confirmation - eingabe = JOptionPane.showConfirmDialog(c, - "Wollen Sie diese Daten löschen?", "Löschen?", - 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(); - LOGGER.info("Lösche Veranstaltung: " + lectureID); - try { - if (client.deleteLecture(lectureID, - person.verantwortlicher.getHochschule(), - person.verantwortlicher.getUsername())) { - LOGGER.info("Löschen erfolgreich."); - // delete successful - - DeleteLecture_GUI dl = new DeleteLecture_GUI(c); - dl.setVisible(true); - dispose(); - } else { - // delete not successful - LOGGER.error("Konnte Veranstaltung '" - + lectureID - + "' nicht aus der Datenbank löschen!"); - JOptionPane - .showMessageDialog( - c, - "Löschen der Veranstaltung aus der Datenbank fehlgeschlagen.", - "Fehler", - JOptionPane.INFORMATION_MESSAGE); - } - } catch (TException e1) { - // TODO Auto-generated catch block - e1.printStackTrace(); - }// end delete - }// end ask for confirmation - - }// end check if a row is selected - /* - * else if (tableAllLectures.getSelectedRowCount() !=0 && - * tableAllLectures - * .getValueAt(tableAllLectures.getSelectedRow(), - * 5).toString().equals(username)){ //a row is selected //ask - * for confirmation eingabe = - * JOptionPane.showConfirmDialog(null, - * "Wollen Sie diese Daten löschen?", "Löschen?", - * JOptionPane.YES_NO_OPTION); - * - * if (eingabe == JOptionPane.YES_OPTION) { //user has confirmed - * deletion, now get the ID of the selected lecture lectureID = - * tableAllLectures - * .getValueAt(tableAllLectures.convertColumnIndexToModel - * (tableAllLectures.getSelectedRow()), 8).toString(); - * LOGGER.info("Lösche Veranstaltung: "+lectureID); try { - * if(client.deleteLecture(lectureID, - * person.verantwortlicher.getHochschule - * (),person.verantwortlicher.getUsername())){ - * LOGGER.info("Löschen erfolgreich."); //delete successful - * - * DeleteLecture_GUI dl = new DeleteLecture_GUI(); - * dl.setVisible(true); dispose(); } else { //delete not - * successful LOGGER.error("Konnte Veranstaltung '" + lectureID - * + "' nicht aus der Datenbank löschen!"); JOptionPane - * .showMessageDialog( null, - * "Löschen aus Datenbank fehlgeschlagen.", "Fehler", - * JOptionPane.INFORMATION_MESSAGE); } } catch (TException e1) { - * // TODO Auto-generated catch block e1.printStackTrace(); - * }//end delete }//end ask for confirmation - * - * } else { //end check if a row is selected JOptionPane - * .showMessageDialog( null, - * "Bitte wählen Sie ein eigenes Image aus.", "Message", - * JOptionPane.INFORMATION_MESSAGE); } - */ + button = new JButton("Löschen"); + button.setBounds(442, 495, 118, 23); + contentPanel.add(button); + button.addActionListener(new ActionListener() { + public void actionPerformed(ActionEvent e) { - } - }); + String lectureID = ""; + int eingabe; + String username = person.verantwortlicher.getName() + " " + + person.verantwortlicher.getVorname(); + // check if a row is selected + if (tablemyLectures.getSelectedRowCount() != 0) { + // a row is selected + // ask for confirmation + eingabe = JOptionPane.showConfirmDialog(c, + "Wollen Sie diese Daten löschen?", "Löschen?", + 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(); + // LOGGER.info("Lösche Veranstaltung: " + lectureID); + try { + if (client.deleteLecture(lectureID, + person.verantwortlicher.getHochschule(), + person.verantwortlicher.getUsername())) { + + // delete successful + LOGGER.info("Veranstaltung erfolgreich '"+lectureID+"' gelöscht."); + + DeleteLecture_GUI dl = new DeleteLecture_GUI(c); + dl.setVisible(true); + dispose(); + } else { + // delete not successful + LOGGER.error("Konnte Veranstaltung '" + + lectureID + + "' nicht aus der Datenbank löschen!"); + JOptionPane + .showMessageDialog( + c, + "Löschen der Veranstaltung aus der Datenbank fehlgeschlagen.", + "Fehler", + JOptionPane.INFORMATION_MESSAGE); + } + } catch (TException e1) { + + e1.printStackTrace(); + }// end delete + }// end ask for confirmation + + }// end check if a row is selected + } + }); { JPanel buttonPane = new JPanel(); buttonPane.setBounds(0, 640, 826, 33); @@ -573,7 +536,7 @@ public class DeleteLecture_GUI extends JFrame { open.openWebpage(windows); } catch (URISyntaxException e) { - // TODO Auto-generated catch block + e.printStackTrace(); } } @@ -594,7 +557,7 @@ public class DeleteLecture_GUI extends JFrame { open.openWebpage(windows); } catch (URISyntaxException e) { - // TODO Auto-generated catch block + e.printStackTrace(); } @@ -651,8 +614,7 @@ public class DeleteLecture_GUI extends JFrame { lectures.get(x).isActive, out.format(in.parse(lectures.get(x).lastused)), lectures.get(x).username, lectures.get(x).imagename, - " ", lectures.get(x).id, - }; + " ", lectures.get(x).id, }; // Fuege diese Objekte der Tabelle hinzu model.addRow(obj); x++; @@ -662,14 +624,15 @@ public class DeleteLecture_GUI extends JFrame { return model; } catch (TException e1) { - // TODO Auto-generated catch block + e1.printStackTrace(); } return model; } - + private void resetLectureInfo() { - //reset the detailed information on the right hand side when changing search string + // reset the detailed information on the right hand side when changing + // search string labelName.setText(""); labelVerantwortlicher.setText(""); @@ -699,4 +662,4 @@ public class DeleteLecture_GUI extends JFrame { labelimageversion.setText(res.get("imageversion")); } -}//end class +}// end class diff --git a/dozentenmodul/src/main/java/gui/lecture/EditLectureLink_GUI.java b/dozentenmodul/src/main/java/gui/lecture/EditLectureLink_GUI.java index 929f9b2d..9339e663 100644 --- a/dozentenmodul/src/main/java/gui/lecture/EditLectureLink_GUI.java +++ b/dozentenmodul/src/main/java/gui/lecture/EditLectureLink_GUI.java @@ -163,10 +163,10 @@ public class EditLectureLink_GUI extends JFrame { //initTableModel(modelPublicVorlagen); initTableModelTemplates(modelPublicVorlagen); } catch (TException e) { - // TODO Auto-generated catch block + e.printStackTrace(); } catch (ParseException e) { - // TODO Auto-generated catch block + e.printStackTrace(); } @@ -242,7 +242,7 @@ public class EditLectureLink_GUI extends JFrame { UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName()); } catch (ClassNotFoundException | InstantiationException | IllegalAccessException | UnsupportedLookAndFeelException e) { - // TODO Auto-generated catch block + e.printStackTrace(); } setTitle("bwLehrpool Suite - Veranstaltung bearbeiten"); @@ -375,7 +375,7 @@ public class EditLectureLink_GUI extends JFrame { comboBox.addItem(list.get(i)); } } catch (TException e2) { - // TODO Auto-generated catch block + e2.printStackTrace(); } comboBox.addActionListener(new ActionListener() { @@ -697,7 +697,7 @@ public class EditLectureLink_GUI extends JFrame { MainMenue_GUI m = new MainMenue_GUI(c); m.setVisible(true); } catch (TException e1) { - // TODO Auto-generated catch block + e1.printStackTrace(); JOptionPane .showMessageDialog( @@ -808,7 +808,7 @@ public class EditLectureLink_GUI extends JFrame { MainMenue_GUI m = new MainMenue_GUI(c); m.setVisible(true); } catch (TException e1) { - // TODO Auto-generated catch block + e1.printStackTrace(); JOptionPane .showMessageDialog( @@ -916,7 +916,7 @@ public class EditLectureLink_GUI extends JFrame { MainMenue_GUI m = new MainMenue_GUI(c); m.setVisible(true); } catch (TException e1) { - // TODO Auto-generated catch block + e1.printStackTrace(); JOptionPane .showMessageDialog( @@ -1100,7 +1100,7 @@ public class EditLectureLink_GUI extends JFrame { open.openWebpage(windows); } catch (URISyntaxException e) { - // TODO Auto-generated catch block + e.printStackTrace(); } } @@ -1121,7 +1121,7 @@ public class EditLectureLink_GUI extends JFrame { open.openWebpage(windows); } catch (URISyntaxException e) { - // TODO Auto-generated catch block + e.printStackTrace(); } @@ -1274,7 +1274,7 @@ public class EditLectureLink_GUI extends JFrame { labelVersion.setText(res.get("version")); textAreadesc.setText(res.get("desc")); } catch (TException | ParseException e1) { - // TODO Auto-generated catch block + e1.printStackTrace(); } } diff --git a/dozentenmodul/src/main/java/gui/lecture/EditLectureSearch_GUI.java b/dozentenmodul/src/main/java/gui/lecture/EditLectureSearch_GUI.java index b6cb5f10..9867afd7 100644 --- a/dozentenmodul/src/main/java/gui/lecture/EditLectureSearch_GUI.java +++ b/dozentenmodul/src/main/java/gui/lecture/EditLectureSearch_GUI.java @@ -89,38 +89,32 @@ public class EditLectureSearch_GUI extends JFrame { "Verantwortlicher", "Image", "Schlagwort", "ID" }; ThriftConnection con = new ThriftConnection(); Client client = models.Client.clientcon.getClient(); - private static final String HELP_MESSAGE = "
" + - "Suchen Sie hier Ihre Veranstaltungen und wählen Sie sie für weitere Schritte aus.
" + - "Klicken Sie anschließend auf \"Weiter\", um die Details der Veranstaltung sowie die Berechtigungen zu ändern." + - "
"; - - /*final DefaultTableModel modelAll = new DefaultTableModel(titles, 0) { - public boolean isCellEditable(int rowIndex, int mColIndex) { - return false; - } - };*/ + private static final String HELP_MESSAGE = "
" + + "Suchen Sie hier Ihre Veranstaltungen und wählen Sie sie für weitere Schritte aus.
" + + "Klicken Sie anschließend auf \"Weiter\", um die Details der Veranstaltung sowie die Berechtigungen zu ändern." + + "
"; + final DefaultTableModel modelMyLectures = new DefaultTableModel(titles, 0) { public boolean isCellEditable(int rowIndex, int mColIndex) { return false; } }; - /*final TableRowSorter rowSorterAll = new TableRowSorter( - modelAll);*/ - + final TableRowSorter rowSorterMyLectures = new TableRowSorter( modelMyLectures); - + RowFilter rf = null; - List> filters = new ArrayList>(2); + List> filters = new ArrayList>( + 2); /** * Create the dialog. */ public EditLectureSearch_GUI(Component formerGUI) { - + filters.add(RowFilter.regexFilter(".", 0)); rf = RowFilter.orFilter(filters); - + addWindowListener(new WindowAdapter() { @Override public void windowClosing(WindowEvent arg0) { @@ -134,10 +128,10 @@ public class EditLectureSearch_GUI extends JFrame { textFieldName.requestFocusInWindow(); try { initTableModel(modelMyLectures); - //initTableModel(modelAll); + // initTableModel(modelAll); } catch (ParseException e) { - + e.printStackTrace(); } @@ -177,7 +171,7 @@ public class EditLectureSearch_GUI extends JFrame { UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName()); } catch (ClassNotFoundException | InstantiationException | IllegalAccessException | UnsupportedLookAndFeelException e) { - + e.printStackTrace(); } // Setzt den Fenstertitel @@ -234,31 +228,32 @@ public class EditLectureSearch_GUI extends JFrame { // Textfield eingabe auslesen String stext = textFieldName.getText(); // Wenn Textfield nicht leer - if (stext != "") - { + if (stext != "") { activeSearch = true; // Filtere nach der Eingabe - filters.clear(); - filters.add(RowFilter.regexFilter("(?i)"+stext, 0)); //case insensitive - filters.add(RowFilter.regexFilter("(?i)"+stext, 1)); //case insensitive + filters.clear(); + filters.add(RowFilter.regexFilter("(?i)" + stext, 0)); // case + // insensitive + filters.add(RowFilter.regexFilter("(?i)" + stext, 1)); // case + // insensitive rf = RowFilter.orFilter(filters); rowSorterMyLectures.setRowFilter(rf); - - } - else - { + } else { activeSearch = false; activeSearch = false; filters.clear(); - filters.add(RowFilter.regexFilter(".", 0)); //case insensitive, filter for anything + filters.add(RowFilter.regexFilter(".", 0)); // case + // insensitive, + // filter for + // anything rf = RowFilter.orFilter(filters); rowSorterMyLectures.setRowFilter(rf); - + } tablemyLectures.clearSelection(); - + resetLectureInfo(); } }); @@ -298,52 +293,54 @@ public class EditLectureSearch_GUI extends JFrame { JLabel lblNewLabel_1 = new JLabel("Bearbeiten"); lblNewLabel_1.setBounds(166, 11, 155, 14); contentPanel.add(lblNewLabel_1); - - JScrollPane scrollPaneMyImage = new JScrollPane(); - scrollPaneMyImage.setBounds(10, 120, 552, 369); - contentPanel.add(scrollPaneMyImage); - tablemyLectures = new JTable(); - tablemyLectures.getSelectionModel().addListSelectionListener( - new ListSelectionListener() { - public void valueChanged(ListSelectionEvent e) { - - if(tablemyLectures.getSelectedRow() != -1) - { - String lectureid = modelMyLectures.getValueAt( - tablemyLectures - .convertRowIndexToModel(tablemyLectures - .getSelectedRow()), 8) - .toString(); - - try { - - //write the values into the information pane on the right hand side - writeLectureData(lectureid); - - //fill the itemOwnder model with information from selected item - setItemOwnerInformation(lectureid); - - } catch (TException e1) { - - e1.printStackTrace(); - } catch (ParseException e1) { - - e1.printStackTrace(); - } - } + + JScrollPane scrollPaneMyImage = new JScrollPane(); + scrollPaneMyImage.setBounds(10, 120, 552, 369); + contentPanel.add(scrollPaneMyImage); + tablemyLectures = new JTable(); + tablemyLectures.getSelectionModel().addListSelectionListener( + new ListSelectionListener() { + public void valueChanged(ListSelectionEvent e) { + + if (tablemyLectures.getSelectedRow() != -1) { + String lectureid = modelMyLectures + .getValueAt( + tablemyLectures + .convertRowIndexToModel(tablemyLectures + .getSelectedRow()), + 8).toString(); + + try { + + // write the values into the information pane on + // the right hand side + writeLectureData(lectureid); + + // fill the itemOwnder model with information + // from selected item + setItemOwnerInformation(lectureid); + + } catch (TException e1) { + + e1.printStackTrace(); + } catch (ParseException e1) { + + e1.printStackTrace(); } - - }); - tablemyLectures.setModel(modelMyLectures); - - tablemyLectures.getColumnModel().getColumn(1).sizeWidthToFit(); - tablemyLectures.getColumnModel().getColumn(2).sizeWidthToFit(); - tablemyLectures.getColumnModel().getColumn(3).sizeWidthToFit(); - tablemyLectures.getColumnModel().getColumn(4).sizeWidthToFit(); - tablemyLectures.getColumnModel().getColumn(5).sizeWidthToFit(); - tablemyLectures.setRowSorter(rowSorterMyLectures); - - scrollPaneMyImage.setViewportView(tablemyLectures); + } + } + + }); + tablemyLectures.setModel(modelMyLectures); + + tablemyLectures.getColumnModel().getColumn(1).sizeWidthToFit(); + tablemyLectures.getColumnModel().getColumn(2).sizeWidthToFit(); + tablemyLectures.getColumnModel().getColumn(3).sizeWidthToFit(); + tablemyLectures.getColumnModel().getColumn(4).sizeWidthToFit(); + tablemyLectures.getColumnModel().getColumn(5).sizeWidthToFit(); + tablemyLectures.setRowSorter(rowSorterMyLectures); + + scrollPaneMyImage.setViewportView(tablemyLectures); { JPanel buttonPane = new JPanel(); buttonPane.setBounds(0, 640, 826, 33); @@ -363,7 +360,7 @@ public class EditLectureSearch_GUI extends JFrame { }); btnBack.setActionCommand("OK"); buttonPane.add(btnBack); - //getRootPane().setDefaultButton(btnBack); + // getRootPane().setDefaultButton(btnBack); } { JButton btnContinue = new JButton("Weiter"); @@ -422,7 +419,7 @@ public class EditLectureSearch_GUI extends JFrame { enddate = out.format(in.parse(enddate)); startdate = out.format(in.parse(startdate)); } catch (ParseException e2) { - + e2.printStackTrace(); } @@ -435,7 +432,7 @@ public class EditLectureSearch_GUI extends JFrame { Lecture.lecture.setStartdate(df .parse(startdate)); } catch (ParseException e1) { - + e1.printStackTrace(); } if (modelMyLectures @@ -451,11 +448,12 @@ public class EditLectureSearch_GUI extends JFrame { // EditImageAllgemein_GUI ea=new // EditImageAllgemein_GUI(); - EditLectureAllgemein_GUI el = new EditLectureAllgemein_GUI(c); + EditLectureAllgemein_GUI el = new EditLectureAllgemein_GUI( + c); el.setVisible(true); dispose(); } - + } // end action }); @@ -584,7 +582,7 @@ public class EditLectureSearch_GUI extends JFrame { open.openWebpage(windows); } catch (URISyntaxException e) { - + e.printStackTrace(); } } @@ -605,7 +603,7 @@ public class EditLectureSearch_GUI extends JFrame { open.openWebpage(windows); } catch (URISyntaxException e) { - + e.printStackTrace(); } @@ -622,18 +620,19 @@ public class EditLectureSearch_GUI extends JFrame { }); mnNewMenu_1.add(mntmAbout); - JMenu mnNewMenu_Info = new JMenu("Info"); mnNewMenu_Info.addMouseListener(new MouseAdapter() { @Override public void mouseClicked(MouseEvent arg0) { - JOptionPane.showMessageDialog(c, HELP_MESSAGE, "Hilfe zu dieser Oberfläche", JOptionPane.INFORMATION_MESSAGE); + JOptionPane.showMessageDialog(c, HELP_MESSAGE, + "Hilfe zu dieser Oberfläche", + JOptionPane.INFORMATION_MESSAGE); } }); menuBar.add(mnNewMenu_Info); - + c = this; - + } // Initiale Beffuelung eines Table models @@ -642,8 +641,10 @@ public class EditLectureSearch_GUI extends JFrame { List lectures; try { // Hole eine Liste der erlaubten Images für die diese Person - //lectures = client.getLectureList(); - lectures = client.getLectureListPermissionWrite(person.verantwortlicher.getUserID()); + // lectures = client.getLectureList(); + lectures = client + .getLectureListPermissionWrite(person.verantwortlicher + .getUserID()); Iterator i = lectures.iterator(); SimpleDateFormat in = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); SimpleDateFormat out = new SimpleDateFormat("dd.MM.yyyy HH:mm:ss"); @@ -671,14 +672,15 @@ public class EditLectureSearch_GUI extends JFrame { return model; } catch (TException e1) { - + e1.printStackTrace(); } return model; } - + private void resetLectureInfo() { - //reset the detailed information on the right hand side when changing search string + // reset the detailed information on the right hand side when changing + // search string labelName.setText(""); labelVerantwortlicher.setText(""); @@ -707,29 +709,26 @@ public class EditLectureSearch_GUI extends JFrame { res.get("imagepath").indexOf("/") + 1)); labelimageversion.setText(res.get("imageversion")); - }//end writeLectureData - - public void setItemOwnerInformation(String lectureid){ + }// end writeLectureData + + public void setItemOwnerInformation(String lectureid) { Map map = new HashMap(); - + try { - //get values from server and set them in model - map=client.getItemOwner(lectureid); - + // get values from server and set them in model + map = client.getItemOwner(lectureid); + ItemOwner.itemOwner.setUserID(map.get("userID")); ItemOwner.itemOwner.setUsername(map.get("loginName")); ItemOwner.itemOwner.setNachname(map.get("Nachname")); ItemOwner.itemOwner.setVorname(map.get("Vorname")); ItemOwner.itemOwner.setEmail(map.get("mail")); ItemOwner.itemOwner.setHochschule(map.get("institution")); - - - + } catch (TException e) { e.printStackTrace(); } - - }//end setItemInformation - -}//end class + }// end setItemInformation + +}// end class diff --git a/dozentenmodul/src/main/java/gui/lecture/PermissionCreateLecture_GUI.java b/dozentenmodul/src/main/java/gui/lecture/PermissionCreateLecture_GUI.java index 8ddd4e81..6d6f238f 100644 --- a/dozentenmodul/src/main/java/gui/lecture/PermissionCreateLecture_GUI.java +++ b/dozentenmodul/src/main/java/gui/lecture/PermissionCreateLecture_GUI.java @@ -193,15 +193,15 @@ public class PermissionCreateLecture_GUI extends JFrame { // if new session, get values for table from database if (RightsManagement.rightsManagement.getPermittedUserList().size() <= 0) { - System.out.println("Loading data from db"); + //System.out.println("Loading data from db"); } else // read from model { - System.out.println("reading from model"); - System.out - .println("RightsManagement.rightsManagement.getPermittedUserList().size() = " - + RightsManagement.rightsManagement - .getPermittedUserList().size()); + //System.out.println("reading from model"); + //System.out + // .println("RightsManagement.rightsManagement.getPermittedUserList().size() = " + // + RightsManagement.rightsManagement + // .getPermittedUserList().size()); List listt = RightsManagement.rightsManagement .getPermittedUserList(); @@ -219,10 +219,11 @@ public class PermissionCreateLecture_GUI extends JFrame { temp.isLecture_admin(), // Admin temp.getUserID() // userID }; - System.out.println("Processing: " + temp.getName() + ", " - + temp.getVorname() + ", " + temp.isLecture_read() - + ", " + temp.isLecture_write() + ", " - + temp.isLecture_admin() + ", " + temp.getUserID()); + //System.out.println("Processing: " + temp.getName() + ", " + // + temp.getVorname() + ", " + temp.isLecture_read() + // + ", " + temp.isLecture_write() + ", " + // + temp.isLecture_admin() + ", " + temp.getUserID()); + // Fuege diese Objekte der Tabelle hinzu model.addRow(obj); x++; @@ -231,8 +232,8 @@ public class PermissionCreateLecture_GUI extends JFrame { // table wird hier nie initialisiert und ist entsprechend null - if (tablePermittedUsers == null) - LOGGER.error("NPE incoming..."); + //if (tablePermittedUsers == null) + // LOGGER.error("NPE incoming..."); TableColumn tc1 = tablePermittedUsers.getColumnModel().getColumn(1); tc1.setCellEditor(tablePermittedUsers.getDefaultEditor(Boolean.class)); tc1.setCellRenderer(tablePermittedUsers @@ -372,13 +373,13 @@ public class PermissionCreateLecture_GUI extends JFrame { // This pointer counts the already // deleted rows and correct the // offset of i - LOGGER.info("deletabelRows.length=" + deletableRows.length); + //LOGGER.info("deletabelRows.length=" + deletableRows.length); for (int i = 0; i < deletableRows.length; i++) { - LOGGER.info("Deleting rowCount[" + i - + "], tableRow number " - + deletableRows[i - pointerCorrection]); + //LOGGER.info("Deleting rowCount[" + i + // + "], tableRow number " + // + deletableRows[i - pointerCorrection]); model.removeRow(deletableRows[i - pointerCorrection]); pointerCorrection++; } @@ -453,7 +454,7 @@ public class PermissionCreateLecture_GUI extends JFrame { for (int i = 0; i < tablePermittedUsers.getRowCount(); i++) { checkIntegrity(i); // check integrity of each line // again - System.out.println("in auto-correct"); + //System.out.println("in auto-correct"); } saveTableToList(); @@ -626,7 +627,7 @@ public class PermissionCreateLecture_GUI extends JFrame { // save the entered rights into the model and prepare them to be written to // the database private void saveTableToList() { - System.out.println("Saving Table to List"); + //System.out.println("Saving Table to List"); List list = new ArrayList(); @@ -641,13 +642,13 @@ public class PermissionCreateLecture_GUI extends JFrame { seperatorIndex = tablePermittedUsers.getModel().getValueAt(i, 0) .toString().indexOf(","); - LOGGER.info(tablePermittedUsers.getModel().getValueAt(i, 4) - .toString() +" (userID)\t"+ Boolean.parseBoolean(tablePermittedUsers - .getModel().getValueAt(i, 3).toString())+"(admin)\t"+Boolean.parseBoolean(tablePermittedUsers - .getModel().getValueAt(i, 2).toString())+"(write)\t"+Boolean.parseBoolean(tablePermittedUsers - .getModel().getValueAt(i, 1).toString())+"(read)\t"+tablePermittedUsers.getModel().getValueAt(i, 0) - .toString().substring(0, seperatorIndex)+"(Nachname)\t"+tablePermittedUsers.getModel().getValueAt(i, 0) - .toString().substring(seperatorIndex + 2)+"(Vorname)"); + //LOGGER.info(tablePermittedUsers.getModel().getValueAt(i, 4) + // .toString() +" (userID)\t"+ Boolean.parseBoolean(tablePermittedUsers + // .getModel().getValueAt(i, 3).toString())+"(admin)\t"+Boolean.parseBoolean(tablePermittedUsers + // .getModel().getValueAt(i, 2).toString())+"(write)\t"+Boolean.parseBoolean(tablePermittedUsers + // .getModel().getValueAt(i, 1).toString())+"(read)\t"+tablePermittedUsers.getModel().getValueAt(i, 0) + // .toString().substring(0, seperatorIndex)+"(Nachname)\t"+tablePermittedUsers.getModel().getValueAt(i, 0) + // .toString().substring(seperatorIndex + 2)+"(Vorname)"); temp.setUserID(tablePermittedUsers.getModel().getValueAt(i, 4) .toString()); // get @@ -676,9 +677,9 @@ public class PermissionCreateLecture_GUI extends JFrame { } } - for (int y = 0; y < list.size(); y++) { - System.out.println("" + list.get(y).getName()); - } + //for (int y = 0; y < list.size(); y++) { + // System.out.println("" + list.get(y).getName()); + //} RightsManagement.rightsManagement.setPermittedUserList(list); }// end saveTableToList() diff --git a/dozentenmodul/src/main/java/gui/lecture/PermissionEditLecture_GUI.java b/dozentenmodul/src/main/java/gui/lecture/PermissionEditLecture_GUI.java index e8dd5608..5857942c 100644 --- a/dozentenmodul/src/main/java/gui/lecture/PermissionEditLecture_GUI.java +++ b/dozentenmodul/src/main/java/gui/lecture/PermissionEditLecture_GUI.java @@ -116,7 +116,7 @@ public class PermissionEditLecture_GUI extends JFrame { UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName()); } catch (ClassNotFoundException | InstantiationException | IllegalAccessException | UnsupportedLookAndFeelException e) { - // TODO Auto-generated catch block + e.printStackTrace(); } setTitle("bwLehrpool Suite - Berechtigungen"); @@ -220,7 +220,7 @@ public class PermissionEditLecture_GUI extends JFrame { // if new session, get values for table from database if (RightsManagement.rightsManagement.getPermittedUserList().size() <= 0) { - System.out.println("Loading data from db"); + //System.out.println("Loading data from db"); try { map = client.getPermissionForUserAndLecture( @@ -250,16 +250,13 @@ public class PermissionEditLecture_GUI extends JFrame { } } catch (TException e1) { - // TODO Auto-generated catch block + e1.printStackTrace(); } } else // read from model { - System.out.println("reading from model"); - System.out - .println("RightsManagement.rightsManagement.getPermittedUserList().size() = " - + RightsManagement.rightsManagement - .getPermittedUserList().size()); + //System.out.println("reading from model"); + //System.out.println("RightsManagement.rightsManagement.getPermittedUserList().size() = "+ RightsManagement.rightsManagement.getPermittedUserList().size()); List listt = RightsManagement.rightsManagement .getPermittedUserList(); @@ -277,10 +274,10 @@ public class PermissionEditLecture_GUI extends JFrame { temp.isLecture_admin(), // Admin temp.getUserID() // userID }; - System.out.println("Processing: " + temp.getName() + ", " - + temp.getVorname() + ", " + temp.isLecture_read() - + ", " + temp.isLecture_write() + ", " - + temp.isLecture_admin() + ", " + temp.getUserID()); + //System.out.println("Processing: " + temp.getName() + ", " + // + temp.getVorname() + ", " + temp.isLecture_read() + // + ", " + temp.isLecture_write() + ", " + // + temp.isLecture_admin() + ", " + temp.getUserID()); // Fuege diese Objekte der Tabelle hinzu model.addRow(obj); x++; @@ -337,13 +334,13 @@ public class PermissionEditLecture_GUI extends JFrame { // This pointer counts the already // deleted rows and correct the // offset of i - LOGGER.info("deletabelRows.length=" + deletableRows.length); + //LOGGER.info("deletabelRows.length=" + deletableRows.length); for (int i = 0; i < deletableRows.length; i++) { - LOGGER.info("Deleting rowCount[" + i - + "], tableRow number " - + deletableRows[i - pointerCorrection]); + //LOGGER.info("Deleting rowCount[" + i + // + "], tableRow number " + // + deletableRows[i - pointerCorrection]); model.removeRow(deletableRows[i - pointerCorrection]); pointerCorrection++; } @@ -449,7 +446,7 @@ public class PermissionEditLecture_GUI extends JFrame { for (int i = 0; i < table.getRowCount(); i++) { checkIntegrity(i); // check integrity of each line // again - System.out.println("in auto-correct"); + //System.out.println("in auto-correct"); } saveTableToList(); @@ -510,7 +507,7 @@ public class PermissionEditLecture_GUI extends JFrame { open.openWebpage(windows); } catch (URISyntaxException e) { - // TODO Auto-generated catch block + e.printStackTrace(); } } @@ -531,7 +528,7 @@ public class PermissionEditLecture_GUI extends JFrame { open.openWebpage(windows); } catch (URISyntaxException e) { - // TODO Auto-generated catch block + e.printStackTrace(); } @@ -590,7 +587,7 @@ public class PermissionEditLecture_GUI extends JFrame { // save the entered rights into the model and prepare them to be written to // the database private void saveTableToList() { - System.out.println("Saving Table to List"); + //System.out.println("Saving Table to List"); List list = new ArrayList(); @@ -605,22 +602,22 @@ public class PermissionEditLecture_GUI extends JFrame { seperatorIndex = table.getModel().getValueAt(i, 0).toString() .indexOf(","); - LOGGER.info(table.getModel().getValueAt(i, 4).toString() - + " (userID)\t" - + Boolean.parseBoolean(table.getModel().getValueAt(i, 3) - .toString()) - + "(admin)\t" - + Boolean.parseBoolean(table.getModel().getValueAt(i, 2) - .toString()) - + "(write)\t" - + Boolean.parseBoolean(table.getModel().getValueAt(i, 1) - .toString()) - + "(read)\t" - + table.getModel().getValueAt(i, 0).toString() - .substring(0, seperatorIndex) - + "(Nachname)\t" - + table.getModel().getValueAt(i, 0).toString() - .substring(seperatorIndex + 2) + "(Vorname)"); + //LOGGER.info(table.getModel().getValueAt(i, 4).toString() + // + " (userID)\t" + // + Boolean.parseBoolean(table.getModel().getValueAt(i, 3) + // .toString()) + // + "(admin)\t" + // + Boolean.parseBoolean(table.getModel().getValueAt(i, 2) + // .toString()) + // + "(write)\t" + // + Boolean.parseBoolean(table.getModel().getValueAt(i, 1) + // .toString()) + // + "(read)\t" + // + table.getModel().getValueAt(i, 0).toString() + // .substring(0, seperatorIndex) + // + "(Nachname)\t" + // + table.getModel().getValueAt(i, 0).toString() + // .substring(seperatorIndex + 2) + "(Vorname)"); temp.setUserID(table.getModel().getValueAt(i, 4).toString()); // get // userID @@ -648,9 +645,9 @@ public class PermissionEditLecture_GUI extends JFrame { } } - for (int y = 0; y < list.size(); y++) { - System.out.println("" + list.get(y).getName()); - } + //for (int y = 0; y < list.size(); y++) { + // System.out.println("" + list.get(y).getName()); + //} RightsManagement.rightsManagement.setPermittedUserList(list); }// end saveTableToList() diff --git a/dozentenmodul/src/main/java/gui/lecture/SearchLecture_GUI.java b/dozentenmodul/src/main/java/gui/lecture/SearchLecture_GUI.java index 09e5f116..e0149877 100644 --- a/dozentenmodul/src/main/java/gui/lecture/SearchLecture_GUI.java +++ b/dozentenmodul/src/main/java/gui/lecture/SearchLecture_GUI.java @@ -135,7 +135,7 @@ public class SearchLecture_GUI extends JFrame { initTableModelAll(modelAll); } catch (ParseException e) { - // TODO Auto-generated catch block + e.printStackTrace(); } tablemyLectures.getColumnModel().getColumn(1).setWidth(0); @@ -184,7 +184,7 @@ public class SearchLecture_GUI extends JFrame { UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName()); } catch (ClassNotFoundException | InstantiationException | IllegalAccessException | UnsupportedLookAndFeelException e) { - // TODO Auto-generated catch block + e.printStackTrace(); } // Setzt den Fenstertitel @@ -341,10 +341,10 @@ public class SearchLecture_GUI extends JFrame { try { writeLectureData(imageid); } catch (TException e1) { - // TODO Auto-generated catch block + e1.printStackTrace(); } catch (ParseException e1) { - // TODO Auto-generated catch block + e1.printStackTrace(); } } @@ -375,10 +375,10 @@ public class SearchLecture_GUI extends JFrame { try { writeLectureData(imageid); } catch (TException e1) { - // TODO Auto-generated catch block + e1.printStackTrace(); } catch (ParseException e1) { - // TODO Auto-generated catch block + e1.printStackTrace(); } } @@ -547,7 +547,7 @@ public class SearchLecture_GUI extends JFrame { open.openWebpage(windows); } catch (URISyntaxException e) { - // TODO Auto-generated catch block + e.printStackTrace(); } } @@ -570,7 +570,7 @@ public class SearchLecture_GUI extends JFrame { open.openWebpage(windows); } catch (URISyntaxException e) { - // TODO Auto-generated catch block + e.printStackTrace(); } @@ -622,7 +622,7 @@ public class SearchLecture_GUI extends JFrame { return model; } catch (TException e1) { - // TODO Auto-generated catch block + e1.printStackTrace(); } return model; @@ -659,7 +659,7 @@ public class SearchLecture_GUI extends JFrame { return model; } catch (TException e1) { - // TODO Auto-generated catch block + e1.printStackTrace(); } return model; diff --git a/dozentenmodulserver/src/main/java/server/ServerHandler.java b/dozentenmodulserver/src/main/java/server/ServerHandler.java index 5676339a..7770834b 100644 --- a/dozentenmodulserver/src/main/java/server/ServerHandler.java +++ b/dozentenmodulserver/src/main/java/server/ServerHandler.java @@ -306,8 +306,7 @@ public class ServerHandler implements Server.Iface { @Override public Map getImageData(String imageid, String imageversion) throws TException { - log.info("returning ImageData: " - + sql.getImageData(imageid, imageversion).size() + "items."); + //log.info("returning ImageData: "+ sql.getImageData(imageid, imageversion).size() + "items."); return sql.getImageData(imageid, imageversion); } @@ -334,26 +333,26 @@ public class ServerHandler implements Server.Iface { @Override public List getLectureList() throws TException { - log.info("returning LectureList"); + //log.info("returning LectureList"); return sql.getLectureList(); } @Override public List getLectureListPermissionRead(String userID) { - log.info("returning LectureListRead"); + //log.info("returning LectureListRead"); return sql.getLectureListPermissionRead(userID); }// end getLectureListPermissionRead @Override public List getLectureListPermissionWrite(String userID) { - log.info("returning LectureListWrite"); + //log.info("returning LectureListWrite"); return sql.getLectureListPermissionWrite(userID); }// end getLectureListPermissionRead @Override public List getLectureListPermissionAdmin(String userID) { - log.info("returning LectureListAdmin"); + //log.info("returning LectureListAdmin"); return sql.getLectureListPermissionAdmin(userID); }// end getLectureListPermissionRead @@ -394,7 +393,7 @@ public class ServerHandler implements Server.Iface { throws TException { String stringFile = sql.getFile(imageid, imageversion); - log.info(new Date() + " - File to Delete: " + stringFile); + log.info("File to Delete: " + stringFile); File tmpFile = new File(Configuration.config.getAbsolute_path() + stringFile); @@ -405,7 +404,7 @@ public class ServerHandler implements Server.Iface { return true; } catch (IOException e) { - log.info(new Date() + " - Failed to execute deleteImageServer."); + log.info("Failed to execute deleteImageServer."); e.printStackTrace(); } @@ -444,7 +443,7 @@ public class ServerHandler implements Server.Iface { File xmlFile = new File(path); FileUtils.forceDelete(xmlFile); } catch (IOException e) { - log.info(new Date() + " - Failed to execute deleteLecture"); + log.info("Failed to execute deleteLecture."); e.printStackTrace(); } @@ -464,7 +463,7 @@ public class ServerHandler implements Server.Iface { @Override public Map getLectureData(String lectureid) throws TException { - log.info("returning LectureData"); + //log.info("returning LectureData"); return sql.getLectureData(lectureid); } @@ -543,7 +542,7 @@ public class ServerHandler implements Server.Iface { linkallowed); } - log.info("written image rights"); + log.info("Written image rights"); return true; } @@ -609,7 +608,7 @@ public class ServerHandler implements Server.Iface { sql.writeAdditionalImageRights(imageID, userID, isRead, isWrite, isLinkAllowed, isAdmin); - log.info("written additional image rights for " + userID); + log.info("Written additional image rights for " + userID); return success; } @@ -621,7 +620,7 @@ public class ServerHandler implements Server.Iface { sql.writeAdditionalLectureRights(lectureID, userID, isRead, isWrite, isAdmin); - log.info("written additional lecture rights for "+ userID); + log.info("Written additional lecture rights for "+ userID); return true; } diff --git a/dozentenmodulserver/src/main/java/sql/SQL.java b/dozentenmodulserver/src/main/java/sql/SQL.java index dd40c774..4334f854 100644 --- a/dozentenmodulserver/src/main/java/sql/SQL.java +++ b/dozentenmodulserver/src/main/java/sql/SQL.java @@ -114,7 +114,7 @@ public class SQL { return ret; } catch (SQLException e) { - log.info("Failed to DeleteUser."); + log.info("Failed to DeleteUser "+user+"."); e.printStackTrace(); } return -1; @@ -1159,7 +1159,7 @@ public class SQL { //if map is still empty, then the itemID could not be found if(map.isEmpty()==true){ - log.error("ERROR: getItemOwner could not find the item with the ID '"+itemID+"'."); + log.error("Failed to getItemOwner for item '"+itemID+"'."); } else { //now that we have the userID for this item, get the user information and put it in the map @@ -1642,7 +1642,7 @@ public class SQL { prest.executeUpdate(); con.commit(); con.close(); - log.info("Succeeded to updateLectureData."); + //log.info("Succeeded to updateLectureData."); } catch (SQLException e) { @@ -1819,7 +1819,7 @@ public class SQL { con.commit(); con.close(); - log.info("Succesfully updated image path"); + //log.info("Succesfully updated image path"); return 0; } catch (SQLException e) { @@ -2048,7 +2048,7 @@ public class SQL { return id; } catch (SQLException e) { - log.info("Failed to LectureID."); + log.info("Failed to getLectureID."); e.printStackTrace(); } return id; @@ -2390,7 +2390,7 @@ public class SQL { con.commit(); con.close(); - log.info("Written additional image rights."); + //log.info("Written additional image rights."); } catch (SQLException e) { @@ -2483,8 +2483,7 @@ public class SQL { con.commit(); con.close(); - log.info("Written additional lecture rights for '" - + userID + "'."); + //log.info("Written additional lecture rights for '"+ userID + "'."); } catch (SQLException e) { e.printStackTrace(); -- cgit v1.2.3-55-g7522 From 4c6f92de02c0e5b2c325e7bcec5f4db90ff7ccb6 Mon Sep 17 00:00:00 2001 From: Michael Wilson Date: Tue, 18 Nov 2014 14:38:02 +0100 Subject: - --- dozentenmodulserver/src/main/java/sql/SQL.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'dozentenmodulserver/src/main/java/sql') diff --git a/dozentenmodulserver/src/main/java/sql/SQL.java b/dozentenmodulserver/src/main/java/sql/SQL.java index 4334f854..2bef919a 100644 --- a/dozentenmodulserver/src/main/java/sql/SQL.java +++ b/dozentenmodulserver/src/main/java/sql/SQL.java @@ -2435,7 +2435,7 @@ public class SQL { + read + "','" + write + "','" + admin + "');"); */ con.commit(); - log.info("Written lecture rights for " + pk_lecture); + log.info("Written lecture rights for lecture '" + pk_lecture+"'."); con.close(); } catch (SQLException e) { -- cgit v1.2.3-55-g7522