From 16cadcd0c0d9ea752b9e9a16f9bd390ecbe81e26 Mon Sep 17 00:00:00 2001 From: Nino Breuer Date: Thu, 30 Oct 2014 09:58:59 +0100 Subject: • added full text search in earch search-gui • fixed bug: arrayIndexOutOfBounds (several classes) • fixed bug: failed to update image data • changed text examples • fixed bug: any image has been shown as template when changing value of search bar (each direction) --- dozentenmodul/src/main/java/gui/image/CreateImageAllgemein_GUI.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'dozentenmodul/src/main/java/gui/image/CreateImageAllgemein_GUI.java') diff --git a/dozentenmodul/src/main/java/gui/image/CreateImageAllgemein_GUI.java b/dozentenmodul/src/main/java/gui/image/CreateImageAllgemein_GUI.java index 26b40619..a9dc23ab 100644 --- a/dozentenmodul/src/main/java/gui/image/CreateImageAllgemein_GUI.java +++ b/dozentenmodul/src/main/java/gui/image/CreateImageAllgemein_GUI.java @@ -227,7 +227,7 @@ public class CreateImageAllgemein_GUI extends JFrame { txtrGebenSieBitte.setLineWrap(true); txtrGebenSieBitte.setFont(new Font("Tahoma", Font.PLAIN, 12)); txtrGebenSieBitte - .setText("Geben Sie bitte einen sprechenden Namen für das Image an.\r\nDieser soll jedoch recht allgemein gehalten werden.\r\nBeispiel: \"Programmieren\", nicht \"Programmieren 1\""); + .setText("Geben Sie bitte einen sprechenden Namen für das Image an.\r\nDieser soll jedoch recht allgemein gehalten werden.\r\nBeispiel: \"Programmieren\", nicht \"Java Wintersemester bei...\""); txtrGebenSieBitte.setBounds(145, 48, 350, 49); panel_1.add(txtrGebenSieBitte); -- cgit v1.2.3-55-g7522 From 5e266f7ace9dc5e7ea1f8eaf96b4f717285ade8b Mon Sep 17 00:00:00 2001 From: Michael Wilson Date: Thu, 30 Oct 2014 17:51:11 +0100 Subject: Fixed all date formats to 24h format in complete program --- .../src/main/java/gui/image/CreateImageAllgemein_GUI.java | 2 +- dozentenmodul/src/main/java/gui/image/DeleteImage_GUI.java | 8 ++++---- .../src/main/java/gui/image/FTPCreateUploader_GUI.java | 2 +- .../src/main/java/gui/image/FTPEditUploader_GUI.java | 2 +- .../src/main/java/gui/lecture/CreateLectureLink_GUI.java | 8 ++++---- .../src/main/java/gui/lecture/EditLectureLink_GUI.java | 14 +++++++------- dozentenmodulserver/src/main/java/sql/SQL.java | 10 +++++----- 7 files changed, 23 insertions(+), 23 deletions(-) (limited to 'dozentenmodul/src/main/java/gui/image/CreateImageAllgemein_GUI.java') diff --git a/dozentenmodul/src/main/java/gui/image/CreateImageAllgemein_GUI.java b/dozentenmodul/src/main/java/gui/image/CreateImageAllgemein_GUI.java index a9dc23ab..8a750117 100644 --- a/dozentenmodul/src/main/java/gui/image/CreateImageAllgemein_GUI.java +++ b/dozentenmodul/src/main/java/gui/image/CreateImageAllgemein_GUI.java @@ -449,7 +449,7 @@ public class CreateImageAllgemein_GUI extends JFrame { // only allow letter from alphabet and numbers for the image name if (!imagename.getText().matches("[a-zA-Z0-9]+")) { - LOGGER.info("Image name not alpha-numerical, warning user."); + LOGGER.info("Image name not alpha-numerical, warn user."); JOptionPane.showMessageDialog( c, "Der Imagename darf keine Leer- oder Sonderzeichen enthalten.", diff --git a/dozentenmodul/src/main/java/gui/image/DeleteImage_GUI.java b/dozentenmodul/src/main/java/gui/image/DeleteImage_GUI.java index e3104902..e3f482e2 100644 --- a/dozentenmodul/src/main/java/gui/image/DeleteImage_GUI.java +++ b/dozentenmodul/src/main/java/gui/image/DeleteImage_GUI.java @@ -774,8 +774,8 @@ public class DeleteImage_GUI extends JFrame { System.out.println("Size of image list="+images.size()); int x = 0; - SimpleDateFormat in = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss"); - SimpleDateFormat out = new SimpleDateFormat("dd.MM.yyyy hh:mm:ss"); + SimpleDateFormat in = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + SimpleDateFormat out = new SimpleDateFormat("dd.MM.yyyy HH:mm:ss"); while (i.hasNext()) { // erzeuge Objekte fuer die Tabelle @@ -831,8 +831,8 @@ public class DeleteImage_GUI extends JFrame { public void writeImageData(String id, String version) { try { - SimpleDateFormat in = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss"); - SimpleDateFormat out = new SimpleDateFormat("dd.MM.yyyy hh:mm:ss"); + SimpleDateFormat in = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + SimpleDateFormat out = new SimpleDateFormat("dd.MM.yyyy HH:mm:ss"); Map res = client.getImageData(id, version); labelName.setText(res.get("name")); labelOS.setText(res.get("os")); diff --git a/dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java b/dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java index 8db64f4f..b1c7efb0 100644 --- a/dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java +++ b/dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java @@ -574,7 +574,7 @@ public class FTPCreateUploader_GUI extends JFrame implements "Konnte vom Satellit keinen FTP-User erhalten!", "Debug-Message", JOptionPane.ERROR_MESSAGE); } - DateFormat formatter = new SimpleDateFormat("yyyMMddhhmmss"); + DateFormat formatter = new SimpleDateFormat("yyyMMddHHmmss"); LOGGER.info("Setting new name: " + formatter.format(new Date()) + "_" + person.verantwortlicher.getHochschule() + "_" diff --git a/dozentenmodul/src/main/java/gui/image/FTPEditUploader_GUI.java b/dozentenmodul/src/main/java/gui/image/FTPEditUploader_GUI.java index 369bf110..c27e6a04 100644 --- a/dozentenmodul/src/main/java/gui/image/FTPEditUploader_GUI.java +++ b/dozentenmodul/src/main/java/gui/image/FTPEditUploader_GUI.java @@ -566,7 +566,7 @@ public class FTPEditUploader_GUI extends JFrame implements "Konnte vom Satelliten keine FTP-User erhalten!", "Debug-Message", JOptionPane.ERROR_MESSAGE); } - DateFormat formatter = new SimpleDateFormat("yyyMMddhhmmss"); + DateFormat formatter = new SimpleDateFormat("yyyMMddHHmmss"); LOGGER.info("Setting new Name: " + formatter.format(new Date()) + "_" + person.verantwortlicher.getHochschule() + "_" diff --git a/dozentenmodul/src/main/java/gui/lecture/CreateLectureLink_GUI.java b/dozentenmodul/src/main/java/gui/lecture/CreateLectureLink_GUI.java index ba45cb92..f2377585 100644 --- a/dozentenmodul/src/main/java/gui/lecture/CreateLectureLink_GUI.java +++ b/dozentenmodul/src/main/java/gui/lecture/CreateLectureLink_GUI.java @@ -744,8 +744,8 @@ public class CreateLectureLink_GUI extends JFrame { .getUserID()); Iterator i = images.iterator(); - SimpleDateFormat in = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss"); - SimpleDateFormat out = new SimpleDateFormat("dd.MM.yyyy hh:mm:ss"); + SimpleDateFormat in = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + SimpleDateFormat out = new SimpleDateFormat("dd.MM.yyyy HH:mm:ss"); int x = 0; while (i.hasNext()) { @@ -790,8 +790,8 @@ public class CreateLectureLink_GUI extends JFrame { public void writeImageData(String id, String version) throws TException, ParseException { - SimpleDateFormat in = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss"); - SimpleDateFormat out = new SimpleDateFormat("dd.MM.yyyy hh:mm:ss"); + SimpleDateFormat in = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + SimpleDateFormat out = new SimpleDateFormat("dd.MM.yyyy HH:mm:ss"); Map res = client.getImageData(id, version); labelName.setText(res.get("name")); labelOS.setText(res.get("os")); diff --git a/dozentenmodul/src/main/java/gui/lecture/EditLectureLink_GUI.java b/dozentenmodul/src/main/java/gui/lecture/EditLectureLink_GUI.java index da6e5ce6..18c7ac14 100644 --- a/dozentenmodul/src/main/java/gui/lecture/EditLectureLink_GUI.java +++ b/dozentenmodul/src/main/java/gui/lecture/EditLectureLink_GUI.java @@ -551,7 +551,7 @@ public class EditLectureLink_GUI extends JFrame { .toString(); try { DateFormat formatter = new SimpleDateFormat( - "yyyy-MM-dd hh:mm:ss"); + "yyyy-MM-dd HH:mm:ss"); // update the lecture client.updateLecturedata( @@ -670,7 +670,7 @@ public class EditLectureLink_GUI extends JFrame { .toString(); try { DateFormat formatter = new SimpleDateFormat( - "yyyy-MM-dd hh:mm:ss"); + "yyyy-MM-dd HH:mm:ss"); client.updateLecturedata( Lecture.lecture.getName(), Lecture.lecture.getNewName(), @@ -780,7 +780,7 @@ public class EditLectureLink_GUI extends JFrame { .toString(); try { DateFormat formatter = new SimpleDateFormat( - "yyyy-MM-dd hh:mm:ss"); + "yyyy-MM-dd HH:mm:ss"); client.updateLecturedata( Lecture.lecture.getName(), Lecture.lecture.getNewName(), @@ -1107,8 +1107,8 @@ public class EditLectureLink_GUI extends JFrame { .getUserID()); Iterator i = images.iterator(); - SimpleDateFormat in = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss"); - SimpleDateFormat out = new SimpleDateFormat("dd.MM.yyyy hh:mm:ss"); + SimpleDateFormat in = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + SimpleDateFormat out = new SimpleDateFormat("dd.MM.yyyy HH:mm:ss"); int x = 0; while (i.hasNext()) { @@ -1133,8 +1133,8 @@ public class EditLectureLink_GUI extends JFrame { public void writeImageData(String id, String version) { try { - SimpleDateFormat in = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss"); - SimpleDateFormat out = new SimpleDateFormat("dd.MM.yyyy hh:mm:ss"); + SimpleDateFormat in = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + SimpleDateFormat out = new SimpleDateFormat("dd.MM.yyyy HH:mm:ss"); Map res = client.getImageData(id, version); labelName.setText(res.get("name")); labelOS.setText(res.get("os")); diff --git a/dozentenmodulserver/src/main/java/sql/SQL.java b/dozentenmodulserver/src/main/java/sql/SQL.java index 4f6321eb..e79cf159 100644 --- a/dozentenmodulserver/src/main/java/sql/SQL.java +++ b/dozentenmodulserver/src/main/java/sql/SQL.java @@ -181,7 +181,7 @@ public class SQL { public String setPerson(String login, String lastname, String firstname, String mail, Date lastlogin, String Institution) { - DateFormat formatter = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss"); + DateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); try { Connection con = getConnection(); Statement stm = con.createStatement(); @@ -242,7 +242,7 @@ public class SQL { String desc, String imagePath, long filesize, String shareMode, String pk_os) { - DateFormat formatter = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss"); + DateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); int internet_bol = 0; int license_bol = 0; @@ -672,7 +672,7 @@ public class SQL { int imageversion, String name, String desc, String shortdesc, String start, String end, boolean isactive) { - DateFormat formatter = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss"); + DateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); int active_bol = 0; if (isactive == true) { @@ -790,7 +790,7 @@ public class SQL { long filesize, String shareMode, String ospk) { try { Connection con = getConnection(); - DateFormat formatter = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss"); + DateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); Statement stm = con.createStatement(); int newVersion = Integer.parseInt(version) + 1; @@ -903,7 +903,7 @@ public class SQL { String name, String newName, String desc, String shortdesc, String start, String end, boolean isactive, String id) { - DateFormat formatter = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss"); + DateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); int active_bol = 0; if (isactive == true) { -- cgit v1.2.3-55-g7522 From fa0553ec9ebe377fcbabe7e196744fe91c1bb7e7 Mon Sep 17 00:00:00 2001 From: Michael Wilson Date: Fri, 31 Oct 2014 11:30:07 +0100 Subject: -allowed 3 special chars in image name --- .../src/main/java/gui/image/CreateImageAllgemein_GUI.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'dozentenmodul/src/main/java/gui/image/CreateImageAllgemein_GUI.java') diff --git a/dozentenmodul/src/main/java/gui/image/CreateImageAllgemein_GUI.java b/dozentenmodul/src/main/java/gui/image/CreateImageAllgemein_GUI.java index 8a750117..41dd1057 100644 --- a/dozentenmodul/src/main/java/gui/image/CreateImageAllgemein_GUI.java +++ b/dozentenmodul/src/main/java/gui/image/CreateImageAllgemein_GUI.java @@ -447,12 +447,14 @@ public class CreateImageAllgemein_GUI extends JFrame { return false; } - // only allow letter from alphabet and numbers for the image name - if (!imagename.getText().matches("[a-zA-Z0-9]+")) { + // only allow letter from alphabet and numbers for the image name and certain special chars + // 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."); JOptionPane.showMessageDialog( c, - "Der Imagename darf keine Leer- oder Sonderzeichen enthalten.", + "Der Imagename darf nur aus Buchstaben, Zahlen und den Zeichen + - _ : bestehen.", "Unerlaubte Zeichen", JOptionPane.ERROR_MESSAGE); return false; -- cgit v1.2.3-55-g7522