diff options
| author | Michael Wilson | 2014-11-20 19:10:10 +0100 |
|---|---|---|
| committer | Michael Wilson | 2014-11-20 19:10:10 +0100 |
| commit | c067221e05dcf17d6b86772b1135640d14cfcd28 (patch) | |
| tree | 42a1dcac2c293fc5a8e2eefb85289ad6ff70a065 /dozentenmodul/src/main/java/gui/image/EditImageAllgemein_GUI.java | |
| parent | Lists now have the functionality to show complete lists, when role=="Admin" (diff) | |
| parent | • replaced getText() with getText().trim() (diff) | |
| download | tutor-module-c067221e05dcf17d6b86772b1135640d14cfcd28.tar.gz tutor-module-c067221e05dcf17d6b86772b1135640d14cfcd28.tar.xz tutor-module-c067221e05dcf17d6b86772b1135640d14cfcd28.zip | |
Merge branch 'master' of ssh://git.openslx.org/openslx-ng/tutor-module
Diffstat (limited to 'dozentenmodul/src/main/java/gui/image/EditImageAllgemein_GUI.java')
| -rw-r--r-- | dozentenmodul/src/main/java/gui/image/EditImageAllgemein_GUI.java | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/dozentenmodul/src/main/java/gui/image/EditImageAllgemein_GUI.java b/dozentenmodul/src/main/java/gui/image/EditImageAllgemein_GUI.java index 89548a9b..a848c805 100644 --- a/dozentenmodul/src/main/java/gui/image/EditImageAllgemein_GUI.java +++ b/dozentenmodul/src/main/java/gui/image/EditImageAllgemein_GUI.java @@ -317,7 +317,7 @@ public class EditImageAllgemein_GUI extends JFrame { // Setzen der Eingabe im Model, dadurch bleiben die // Daten bei einem erneuten Aufruf verfuegbar - // Image.image.setImagename(imagename.getText()); + // Image.image.setImagename(imagename.getText().trim()); SearchEditImage_GUI se = new SearchEditImage_GUI(c); se.setVisible(true); @@ -337,8 +337,8 @@ public class EditImageAllgemein_GUI extends JFrame { if (checkContent() == true && checkNameIsLettersOrNumbers() == true && descriptionLenghtOK()== true) { // setze Namen, egal ob alt oder nicht - Image.image.setImagename(imagename.getText()); - Image.image.setDesc(textAreadesc.getText()); + Image.image.setImagename(imagename.getText().trim()); + Image.image.setDesc(textAreadesc.getText().trim()); // Info //LOGGER.info("Alle Eingaben in Ordnung. Imagename= \"" // + Image.image.getImagename() @@ -485,7 +485,7 @@ public class EditImageAllgemein_GUI extends JFrame { nameIsOK = false; //only allow letter from alphabet and nothing else - if (imagename.getText().matches("[a-zA-Z0-9\\x2B\\x2D\\x3A\\x5F]+")) { + if (imagename.getText().trim().matches("[a-zA-Z0-9\\x2B\\x2D\\x3A\\x5F]+")) { nameIsOK = true; } else { JOptionPane @@ -503,12 +503,12 @@ public class EditImageAllgemein_GUI extends JFrame { textfieldsHaveContent=false; //check if any textfield is empty - if(imagename.getText().isEmpty() == false - && textAreadesc.getText().isEmpty() == false - && Vorname.getText().isEmpty() == false - && Nachname.getText().isEmpty() == false - && Hochschule.getText().isEmpty() == false - && EMail.getText().isEmpty() == false) { + if(imagename.getText().trim().isEmpty() == false + && textAreadesc.getText().trim().isEmpty() == false + && Vorname.getText().trim().isEmpty() == false + && Nachname.getText().trim().isEmpty() == false + && Hochschule.getText().trim().isEmpty() == false + && EMail.getText().trim().isEmpty() == false) { //all textfields have content textfieldsHaveContent = true; } else { @@ -527,11 +527,11 @@ public class EditImageAllgemein_GUI extends JFrame { descriptionLengthOK=false; //max length is 254 chars - if (textAreadesc.getText().length() >= MAX_DESCRIPTION_LENGTH) { + if (textAreadesc.getText().trim().length() >= MAX_DESCRIPTION_LENGTH) { descriptionLengthOK=false; 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); }else { |