diff options
| author | Michael Wilson | 2014-08-22 09:54:02 +0200 |
|---|---|---|
| committer | Michael Wilson | 2014-08-22 09:54:02 +0200 |
| commit | 16413f72e6170983d7a32b974ea52f09fddddefe (patch) | |
| tree | 653a862d106e74b52d321414103f3a7d2a1110b0 /Dozentenmodul/src | |
| parent | Deleted dead code and show version number in server log file (diff) | |
| download | tutor-module-16413f72e6170983d7a32b974ea52f09fddddefe.tar.gz tutor-module-16413f72e6170983d7a32b974ea52f09fddddefe.tar.xz tutor-module-16413f72e6170983d7a32b974ea52f09fddddefe.zip | |
Zahlen sind im Imagenamen erlaubt
Diffstat (limited to 'Dozentenmodul/src')
| -rw-r--r-- | Dozentenmodul/src/gui/image/CreateImageAllgemein_GUI.java | 18 | ||||
| -rw-r--r-- | Dozentenmodul/src/gui/image/EditImageAllgemein_GUI.java | 16 |
2 files changed, 17 insertions, 17 deletions
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; |