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