From 664164ce9bd94f363aff220a1a8b696989438b66 Mon Sep 17 00:00:00 2001 From: Michael Wilson Date: Fri, 31 Oct 2014 10:01:06 +0100 Subject: -image templates are now listed a such, independently of the logged in user -Lectures can now be connected to image templates --- .../src/main/java/gui/image/SearchImage_GUI.java | 49 +++++++++++++++++++++- .../java/gui/lecture/CreateLectureLink_GUI.java | 2 +- 2 files changed, 49 insertions(+), 2 deletions(-) (limited to 'dozentenmodul/src/main/java/gui') diff --git a/dozentenmodul/src/main/java/gui/image/SearchImage_GUI.java b/dozentenmodul/src/main/java/gui/image/SearchImage_GUI.java index afbbbab2..aaa6f9e8 100644 --- a/dozentenmodul/src/main/java/gui/image/SearchImage_GUI.java +++ b/dozentenmodul/src/main/java/gui/image/SearchImage_GUI.java @@ -168,7 +168,7 @@ public class SearchImage_GUI extends JFrame { public void windowOpened(WindowEvent arg0) { initTableModel(modelAll); initTableModel(modelMyImages); - initTableModel(modelPublicVorlagen); + initTableModelTemplates(modelPublicVorlagen); // auszublendende Angaben // 1=Lizenzpflichtig @@ -971,6 +971,53 @@ public class SearchImage_GUI extends JFrame { } return model; } + + + // Initiale Beffuelung eines Table models + public DefaultTableModel initTableModelTemplates(DefaultTableModel model) { + List images; + try { + // Hole eine Liste der Images + images = client.getImageListAllTemplates(); + + 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; + + while (i.hasNext()) { + // erzeuge Objekte fuer die Tabelle + Object[] obj = { images.get(x).getImageName(), + images.get(x).getLicenseRestriction(), + images.get(x).getOsName(), + images.get(x).getLectureName(), + images.get(x).getUserData(), + out.format(in.parse(images.get(x).updateTime)), + images.get(x).id, images.get(x).getVersion(), + images.get(x).getIsTemplate(), + images.get(x).getDescription()}; + // Fuege diese Objekte der Tabelle hinzu + model.addRow(obj); + x++; + i.next(); + + } + + return model; + } catch (TException | ParseException e1) { + // TODO Auto-generated catch block + e1.printStackTrace(); + JOptionPane.showMessageDialog(c, + e1.getCause() + "\n" + e1.getStackTrace(), "Debug-Message", + JOptionPane.ERROR_MESSAGE); + } + return model; + }// end initTableModelTemplates + + + + + private void resetImageInfo() { diff --git a/dozentenmodul/src/main/java/gui/lecture/CreateLectureLink_GUI.java b/dozentenmodul/src/main/java/gui/lecture/CreateLectureLink_GUI.java index f2377585..25c59fa7 100644 --- a/dozentenmodul/src/main/java/gui/lecture/CreateLectureLink_GUI.java +++ b/dozentenmodul/src/main/java/gui/lecture/CreateLectureLink_GUI.java @@ -765,7 +765,7 @@ public class CreateLectureLink_GUI extends JFrame { i.next(); } - + return model; } -- cgit v1.2.3-55-g7522 From 134fe12c4519c8c5e3212c6a3ffb44dd0770b61b Mon Sep 17 00:00:00 2001 From: Michael Wilson Date: Fri, 31 Oct 2014 10:12:50 +0100 Subject: // --- dozentenmodul/src/main/java/gui/intro/MainMenue_GUI.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'dozentenmodul/src/main/java/gui') diff --git a/dozentenmodul/src/main/java/gui/intro/MainMenue_GUI.java b/dozentenmodul/src/main/java/gui/intro/MainMenue_GUI.java index fd95bd8d..fbef707b 100644 --- a/dozentenmodul/src/main/java/gui/intro/MainMenue_GUI.java +++ b/dozentenmodul/src/main/java/gui/intro/MainMenue_GUI.java @@ -594,12 +594,12 @@ public class MainMenue_GUI extends JFrame { }// end if else // always print rights information - LOGGER.info("Rights: (r, w, cp, a, la) = (" - + GUIRights.rights.getRead() + ", " - + GUIRights.rights.getWrite() + ", " - + GUIRights.rights.getChangePermission() + ", " - + GUIRights.rights.getAdmin() + ", " - + GUIRights.rights.getLinkAllowed() + ")"); + //LOGGER.info("Rights: (r, w, cp, a, la) = (" + // + GUIRights.rights.getRead() + ", " + // + GUIRights.rights.getWrite() + ", " + // + GUIRights.rights.getChangePermission() + ", " + // + GUIRights.rights.getAdmin() + ", " + // + GUIRights.rights.getLinkAllowed() + ")"); }// end setRoleRights public void setCorrectRadioButton() { -- 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') 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