diff options
Diffstat (limited to 'dozentenmodul/src/main/java/gui/image/CreateImageAllgemein_GUI.java')
| -rw-r--r-- | dozentenmodul/src/main/java/gui/image/CreateImageAllgemein_GUI.java | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/dozentenmodul/src/main/java/gui/image/CreateImageAllgemein_GUI.java b/dozentenmodul/src/main/java/gui/image/CreateImageAllgemein_GUI.java index e40a2a1e..5d72fc36 100644 --- a/dozentenmodul/src/main/java/gui/image/CreateImageAllgemein_GUI.java +++ b/dozentenmodul/src/main/java/gui/image/CreateImageAllgemein_GUI.java @@ -312,8 +312,8 @@ public class CreateImageAllgemein_GUI extends JFrame { JButton backButton = new JButton("Zurück"); backButton.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { - Image.image.setImagename(imagename.getText()); - Image.image.setDesc(textAreadesc.getText()); + Image.image.setImagename(imagename.getText().trim()); + Image.image.setDesc(textAreadesc.getText().trim()); MainMenue_GUI sr = new MainMenue_GUI(c); sr.setVisible(true); dispose(); @@ -329,8 +329,8 @@ public class CreateImageAllgemein_GUI extends JFrame { // Prüfe Eingabe if (validateContent()) { // Schreibt die Daten in das Model - Image.image.setImagename(imagename.getText()); - Image.image.setDesc(textAreadesc.getText()); + Image.image.setImagename(imagename.getText().trim()); + Image.image.setDesc(textAreadesc.getText().trim()); //LOGGER.info("Alle Eingaben in Ordnung. Imagename= \"" // + Image.image.getImagename() @@ -432,12 +432,12 @@ public class CreateImageAllgemein_GUI extends JFrame { */ private boolean validateContent() { // check if any text field is empty - if (imagename.getText().isEmpty() - || textAreadesc.getText().isEmpty() - || Vorname.getText().isEmpty() - || Nachname.getText().isEmpty() - || Hochschule.getText().isEmpty() - || EMail.getText().isEmpty()) { + if (imagename.getText().trim().isEmpty() + || textAreadesc.getText().trim().isEmpty() + || Vorname.getText().trim().isEmpty() + || Nachname.getText().trim().isEmpty() + || Hochschule.getText().trim().isEmpty() + || EMail.getText().trim().isEmpty()) { // missing some fields //LOGGER.info("Form has missing fields, warning user."); JOptionPane.showMessageDialog(c, @@ -450,7 +450,7 @@ public class CreateImageAllgemein_GUI extends JFrame { // 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]+")) { + if (!imagename.getText().trim().trim().matches("[a-zA-Z0-9\\x2B\\x2D\\x3A\\x5F]+")) { //LOGGER.info("Image name not alpha-numerical, warn user."); JOptionPane.showMessageDialog( c, @@ -461,9 +461,9 @@ public class CreateImageAllgemein_GUI extends JFrame { } // max length for image description is 254 chars - if (textAreadesc.getText().length() >= MAX_DESCRIPTION_LENGTH) { + if (textAreadesc.getText().trim().length() >= MAX_DESCRIPTION_LENGTH) { JOptionPane.showMessageDialog(c, - "Die Beschreibung darf max 254 Zeichen enthalten. Aktuell enthält sie "+textAreadesc.getText().length()+".", + "Die Beschreibung darf max 254 Zeichen enthalten. Aktuell enthält sie "+textAreadesc.getText().trim().length()+".", "Beschreibung zu umfangreich", JOptionPane.ERROR_MESSAGE); return false; |