diff options
| author | Tobias Spitzer | 2014-08-22 10:04:47 +0200 |
|---|---|---|
| committer | Tobias Spitzer | 2014-08-22 10:04:47 +0200 |
| commit | f1ae15cabfb0efdbefee91f889fffdcaa04b1574 (patch) | |
| tree | 96d4b896c1307450d651d133ca295387fb174905 /Dozentenmodul | |
| parent | Neue Suchfenster (diff) | |
| parent | Zahlen sind im Imagenamen erlaubt (diff) | |
| download | tutor-module-f1ae15cabfb0efdbefee91f889fffdcaa04b1574.tar.gz tutor-module-f1ae15cabfb0efdbefee91f889fffdcaa04b1574.tar.xz tutor-module-f1ae15cabfb0efdbefee91f889fffdcaa04b1574.zip | |
Merge branch 'master' of git.openslx.org:openslx-ng/tutor-module
Conflicts:
Dozentenmodul/bin/gui/image/DeleteImage_GUI.class
Dozentenmodul/bin/gui/image/SearchEditImage_GUI.class
Dozentenmodul/bin/gui/image/SearchImage_GUI.class
fds
Diffstat (limited to 'Dozentenmodul')
| -rw-r--r-- | Dozentenmodul/bin/gui/image/CreateImageAllgemein_GUI.class | bin | 9384 -> 9383 bytes | |||
| -rw-r--r-- | Dozentenmodul/bin/gui/image/EditImageAllgemein_GUI.class | bin | 11695 -> 11694 bytes | |||
| -rw-r--r-- | Dozentenmodul/src/gui/image/CreateImageAllgemein_GUI.java | 18 | ||||
| -rw-r--r-- | Dozentenmodul/src/gui/image/EditImageAllgemein_GUI.java | 16 |
4 files changed, 17 insertions, 17 deletions
diff --git a/Dozentenmodul/bin/gui/image/CreateImageAllgemein_GUI.class b/Dozentenmodul/bin/gui/image/CreateImageAllgemein_GUI.class Binary files differindex b616cb4f..7a06b18d 100644 --- a/Dozentenmodul/bin/gui/image/CreateImageAllgemein_GUI.class +++ b/Dozentenmodul/bin/gui/image/CreateImageAllgemein_GUI.class diff --git a/Dozentenmodul/bin/gui/image/EditImageAllgemein_GUI.class b/Dozentenmodul/bin/gui/image/EditImageAllgemein_GUI.class Binary files differindex f5c529eb..c2666cee 100644 --- a/Dozentenmodul/bin/gui/image/EditImageAllgemein_GUI.class +++ b/Dozentenmodul/bin/gui/image/EditImageAllgemein_GUI.class diff --git a/Dozentenmodul/src/gui/image/CreateImageAllgemein_GUI.java b/Dozentenmodul/src/gui/image/CreateImageAllgemein_GUI.java index dea44e97..106fee58 100644 --- a/Dozentenmodul/src/gui/image/CreateImageAllgemein_GUI.java +++ b/Dozentenmodul/src/gui/image/CreateImageAllgemein_GUI.java @@ -52,7 +52,7 @@ public class CreateImageAllgemein_GUI extends JFrame { private JTextField imagename; private JTextArea textAreadesc; boolean textfieldsHaveContent = false; //no textfield is empty - boolean nameIsLettersOnly = false; //imagename only contains letters + boolean nameIsOK = false; //imagename only contains letters /** @@ -288,7 +288,7 @@ public class CreateImageAllgemein_GUI extends JFrame { continueButton.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { // Prueft die Eingabe und leitet weiter zur naechsten Seite - if (checkContent() == true && checkNameIsLettersOnly() == true) { + if (checkContent() == true && checkNameIsLettersOrNumbers() == true) { // Schreibt die Daten in das Model Image.image.setImagename(imagename.getText()); Image.image.setDesc(textAreadesc.getText()); @@ -376,12 +376,12 @@ public class CreateImageAllgemein_GUI extends JFrame { }// end main - public boolean checkNameIsLettersOnly() { - nameIsLettersOnly = false; + public boolean checkNameIsLettersOrNumbers() { + nameIsOK = false; - //only allow letter from alphabet and nothing else - if (imagename.getText().matches("[a-zA-Z]+")) { - nameIsLettersOnly = true; + //only allow letter from alphabet and numbers + if (imagename.getText().matches("[a-zA-Z0-9]+")) { + nameIsOK = true; } else { JOptionPane .showMessageDialog( @@ -391,8 +391,8 @@ public class CreateImageAllgemein_GUI extends JFrame { JOptionPane.INFORMATION_MESSAGE); }// if - return nameIsLettersOnly; - }// end nameIsLettersOnly + return nameIsOK; + }// end nameIsOK public boolean checkContent(){ textfieldsHaveContent=false; diff --git a/Dozentenmodul/src/gui/image/EditImageAllgemein_GUI.java b/Dozentenmodul/src/gui/image/EditImageAllgemein_GUI.java index 35b6e930..f1ebcd98 100644 --- a/Dozentenmodul/src/gui/image/EditImageAllgemein_GUI.java +++ b/Dozentenmodul/src/gui/image/EditImageAllgemein_GUI.java @@ -66,7 +66,7 @@ public class EditImageAllgemein_GUI extends JFrame { private JButton backButton; private JButton okButton; boolean textfieldsHaveContent = false; //no textfield is empty - boolean nameIsLettersOnly = false; //imagename only contains letters + boolean nameIsOK = false; //imagename only contains letters /** * Create the dialog. @@ -298,7 +298,7 @@ public class EditImageAllgemein_GUI extends JFrame { okButton.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent arg0) { // check is textfield is empty - if (checkContent() == true && checkNameIsLettersOnly() == true) { + if (checkContent() == true && checkNameIsLettersOrNumbers() == true) { // setze Namen, egal ob alt oder nicht Image.image.setImagename(imagename.getText()); @@ -445,12 +445,12 @@ public class EditImageAllgemein_GUI extends JFrame { } }//end initData() - public boolean checkNameIsLettersOnly() { - nameIsLettersOnly = false; + public boolean checkNameIsLettersOrNumbers() { + nameIsOK = false; //only allow letter from alphabet and nothing else - if (imagename.getText().matches("[a-zA-Z]+")) { - nameIsLettersOnly = true; + if (imagename.getText().matches("[a-zA-Z0-9]+")) { + nameIsOK = true; } else { JOptionPane .showMessageDialog( @@ -460,8 +460,8 @@ public class EditImageAllgemein_GUI extends JFrame { JOptionPane.INFORMATION_MESSAGE); }// if - return nameIsLettersOnly; - }// end nameIsLettersOnly + return nameIsOK; + }// end nameIsOK public boolean checkContent(){ textfieldsHaveContent=false; |