Fixed all date formats to 24h format in complete program

6 files changed, 18 insertions, 18 deletions

diff --git a/dozentenmodul/src/main/java/gui/image/CreateImageAllgemein_GUI.java b/dozentenmodul/src/main/java/gui/image/CreateImageAllgemein_GUI.java
index a9dc23ab..8a750117 100644
--- a/dozentenmodul/src/main/java/gui/image/CreateImageAllgemein_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/CreateImageAllgemein_GUI.java
@@ -449,7 +449,7 @@ public class CreateImageAllgemein_GUI extends JFrame {
 
 		// only allow letter from alphabet and numbers for the image name
 		if (!imagename.getText().matches("[a-zA-Z0-9]+")) {
-			LOGGER.info("Image name not alpha-numerical, warning user.");
+			LOGGER.info("Image name not alpha-numerical, warn user.");
 			JOptionPane.showMessageDialog(
 							c,
 							"Der Imagename darf keine Leer- oder Sonderzeichen enthalten.",
diff --git a/dozentenmodul/src/main/java/gui/image/DeleteImage_GUI.java b/dozentenmodul/src/main/java/gui/image/DeleteImage_GUI.java
index e3104902..e3f482e2 100644
--- a/dozentenmodul/src/main/java/gui/image/DeleteImage_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/DeleteImage_GUI.java
@@ -774,8 +774,8 @@ public class DeleteImage_GUI extends JFrame {
 			System.out.println("Size of image list="+images.size());
 			
 			int x = 0;
-			SimpleDateFormat in = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
-			SimpleDateFormat out = new SimpleDateFormat("dd.MM.yyyy hh:mm:ss");
+			SimpleDateFormat in = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+			SimpleDateFormat out = new SimpleDateFormat("dd.MM.yyyy HH:mm:ss");
 			
 			while (i.hasNext()) {
 				// erzeuge Objekte fuer die Tabelle
@@ -831,8 +831,8 @@ public class DeleteImage_GUI extends JFrame {
 
 	public void writeImageData(String id, String version) {
 		try {
-			SimpleDateFormat in = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
-			SimpleDateFormat out = new SimpleDateFormat("dd.MM.yyyy hh:mm:ss");
+			SimpleDateFormat in = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+			SimpleDateFormat out = new SimpleDateFormat("dd.MM.yyyy HH:mm:ss");
 			Map<String, String> res = client.getImageData(id, version);
 			labelName.setText(res.get("name"));
 			labelOS.setText(res.get("os"));
diff --git a/dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java b/dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java
index 8db64f4f..b1c7efb0 100644
--- a/dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/FTPCreateUploader_GUI.java
@@ -574,7 +574,7 @@ public class FTPCreateUploader_GUI extends JFrame implements
 					"Konnte vom Satellit keinen FTP-User erhalten!",
 					"Debug-Message", JOptionPane.ERROR_MESSAGE);
 		}
-		DateFormat formatter = new SimpleDateFormat("yyyMMddhhmmss");
+		DateFormat formatter = new SimpleDateFormat("yyyMMddHHmmss");
 
 		LOGGER.info("Setting new name: " + formatter.format(new Date()) + "_"
 				+ person.verantwortlicher.getHochschule() + "_"
diff --git a/dozentenmodul/src/main/java/gui/image/FTPEditUploader_GUI.java b/dozentenmodul/src/main/java/gui/image/FTPEditUploader_GUI.java
index 369bf110..c27e6a04 100644
--- a/dozentenmodul/src/main/java/gui/image/FTPEditUploader_GUI.java
+++ b/dozentenmodul/src/main/java/gui/image/FTPEditUploader_GUI.java
@@ -566,7 +566,7 @@ public class FTPEditUploader_GUI extends JFrame implements
 					"Konnte vom Satelliten keine FTP-User erhalten!",
 					"Debug-Message", JOptionPane.ERROR_MESSAGE);
 		}
-		DateFormat formatter = new SimpleDateFormat("yyyMMddhhmmss");
+		DateFormat formatter = new SimpleDateFormat("yyyMMddHHmmss");
 
 		LOGGER.info("Setting new Name: " + formatter.format(new Date()) + "_"
 				+ person.verantwortlicher.getHochschule() + "_"
diff --git a/dozentenmodul/src/main/java/gui/lecture/CreateLectureLink_GUI.java b/dozentenmodul/src/main/java/gui/lecture/CreateLectureLink_GUI.java
index ba45cb92..f2377585 100644
--- a/dozentenmodul/src/main/java/gui/lecture/CreateLectureLink_GUI.java
+++ b/dozentenmodul/src/main/java/gui/lecture/CreateLectureLink_GUI.java
@@ -744,8 +744,8 @@ public class CreateLectureLink_GUI extends JFrame {
 				.getUserID());
 
 		Iterator<server.generated.Image> i = images.iterator();
-		SimpleDateFormat in = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
-		SimpleDateFormat out = new SimpleDateFormat("dd.MM.yyyy hh:mm:ss");
+		SimpleDateFormat in = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+		SimpleDateFormat out = new SimpleDateFormat("dd.MM.yyyy HH:mm:ss");
 		int x = 0;
 
 		while (i.hasNext()) {
@@ -790,8 +790,8 @@ public class CreateLectureLink_GUI extends JFrame {
 	public void writeImageData(String id, String version) throws TException,
 			ParseException {
 
-		SimpleDateFormat in = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
-		SimpleDateFormat out = new SimpleDateFormat("dd.MM.yyyy hh:mm:ss");
+		SimpleDateFormat in = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+		SimpleDateFormat out = new SimpleDateFormat("dd.MM.yyyy HH:mm:ss");
 		Map<String, String> res = client.getImageData(id, version);
 		labelName.setText(res.get("name"));
 		labelOS.setText(res.get("os"));
diff --git a/dozentenmodul/src/main/java/gui/lecture/EditLectureLink_GUI.java b/dozentenmodul/src/main/java/gui/lecture/EditLectureLink_GUI.java
index da6e5ce6..18c7ac14 100644
--- a/dozentenmodul/src/main/java/gui/lecture/EditLectureLink_GUI.java
+++ b/dozentenmodul/src/main/java/gui/lecture/EditLectureLink_GUI.java
@@ -551,7 +551,7 @@ public class EditLectureLink_GUI extends JFrame {
 									.toString();
 							try {
 								DateFormat formatter = new SimpleDateFormat(
-										"yyyy-MM-dd hh:mm:ss");
+										"yyyy-MM-dd HH:mm:ss");
 
 								// update the lecture
 								client.updateLecturedata(
@@ -670,7 +670,7 @@ public class EditLectureLink_GUI extends JFrame {
 									.toString();
 							try {
 								DateFormat formatter = new SimpleDateFormat(
-										"yyyy-MM-dd hh:mm:ss");
+										"yyyy-MM-dd HH:mm:ss");
 								client.updateLecturedata(
 										Lecture.lecture.getName(),
 										Lecture.lecture.getNewName(),
@@ -780,7 +780,7 @@ public class EditLectureLink_GUI extends JFrame {
 									.toString();
 							try {
 								DateFormat formatter = new SimpleDateFormat(
-										"yyyy-MM-dd hh:mm:ss");
+										"yyyy-MM-dd HH:mm:ss");
 								client.updateLecturedata(
 										Lecture.lecture.getName(),
 										Lecture.lecture.getNewName(),
@@ -1107,8 +1107,8 @@ public class EditLectureLink_GUI extends JFrame {
 				.getUserID());
 
 		Iterator<server.generated.Image> i = images.iterator();
-		SimpleDateFormat in = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
-		SimpleDateFormat out = new SimpleDateFormat("dd.MM.yyyy hh:mm:ss");
+		SimpleDateFormat in = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+		SimpleDateFormat out = new SimpleDateFormat("dd.MM.yyyy HH:mm:ss");
 		int x = 0;
 
 		while (i.hasNext()) {
@@ -1133,8 +1133,8 @@ public class EditLectureLink_GUI extends JFrame {
 
 	public void writeImageData(String id, String version) {
 		try {
-			SimpleDateFormat in = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
-			SimpleDateFormat out = new SimpleDateFormat("dd.MM.yyyy hh:mm:ss");
+			SimpleDateFormat in = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+			SimpleDateFormat out = new SimpleDateFormat("dd.MM.yyyy HH:mm:ss");
 			Map<String, String> res = client.getImageData(id, version);
 			labelName.setText(res.get("name"));
 			labelOS.setText(res.get("os"));