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

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;