diff options
| author | Nino Breuer | 2014-10-31 13:22:00 +0100 |
|---|---|---|
| committer | Nino Breuer | 2014-10-31 13:22:00 +0100 |
| commit | 9651efdcb9bbd4720071063b074d2e22c503bac8 (patch) | |
| tree | b561f67647b3c9453339925d714fc8be4188c2dc /dozentenmodul/src/main/java | |
| parent | implemented äääääh template filter (diff) | |
| parent | -allowed 3 special chars in image name (diff) | |
| download | tutor-module-9651efdcb9bbd4720071063b074d2e22c503bac8.tar.gz tutor-module-9651efdcb9bbd4720071063b074d2e22c503bac8.tar.xz tutor-module-9651efdcb9bbd4720071063b074d2e22c503bac8.zip | |
Merge branch 'master' of ssh://git.openslx.org/openslx-ng/tutor-module
Diffstat (limited to 'dozentenmodul/src/main/java')
4 files changed, 60 insertions, 11 deletions
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; diff --git a/dozentenmodul/src/main/java/gui/image/SearchImage_GUI.java b/dozentenmodul/src/main/java/gui/image/SearchImage_GUI.java index ce40ee7b..bcc1775d 100644 --- a/dozentenmodul/src/main/java/gui/image/SearchImage_GUI.java +++ b/dozentenmodul/src/main/java/gui/image/SearchImage_GUI.java @@ -187,7 +187,7 @@ public class SearchImage_GUI extends JFrame { public void windowOpened(WindowEvent arg0) {
initTableModel(modelAll);
initTableModel(modelMyImages);
- initTableModel(modelPublicVorlagen);
+ initTableModelTemplates(modelPublicVorlagen);
// auszublendende Angaben
// 1=Lizenzpflichtig
@@ -1018,6 +1018,53 @@ public class SearchImage_GUI extends JFrame { }
return model;
}
+
+
+ // Initiale Beffuelung eines Table models
+ public DefaultTableModel initTableModelTemplates(DefaultTableModel model) {
+ List<server.generated.Image> images;
+ try {
+ // Hole eine Liste der Images
+ images = client.getImageListAllTemplates();
+
+ Iterator<server.generated.Image> 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/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() { 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; } |