summaryrefslogtreecommitdiffstats
path: root/Dozentenmodul/src/gui/image/SearchEditImage_GUI.java
diff options
context:
space:
mode:
authorMichael Wilson2014-09-03 16:41:24 +0200
committerMichael Wilson2014-09-03 16:41:24 +0200
commitf66b6dc7b7363b195e737a741563dfda888baac0 (patch)
treedef293806a4e6bf9b8e11ad181827a9669ad06f2 /Dozentenmodul/src/gui/image/SearchEditImage_GUI.java
parentMerge branch 'master' of ssh://git.openslx.org/openslx-ng/tutor-module (diff)
downloadtutor-module-f66b6dc7b7363b195e737a741563dfda888baac0.tar.gz
tutor-module-f66b6dc7b7363b195e737a741563dfda888baac0.tar.xz
tutor-module-f66b6dc7b7363b195e737a741563dfda888baac0.zip
-Vorbereitungen für Rechte
-Logging für Anlegen der config.ini
Diffstat (limited to 'Dozentenmodul/src/gui/image/SearchEditImage_GUI.java')
-rw-r--r--Dozentenmodul/src/gui/image/SearchEditImage_GUI.java14
1 files changed, 7 insertions, 7 deletions
diff --git a/Dozentenmodul/src/gui/image/SearchEditImage_GUI.java b/Dozentenmodul/src/gui/image/SearchEditImage_GUI.java
index 00a39e8e..3ba6033d 100644
--- a/Dozentenmodul/src/gui/image/SearchEditImage_GUI.java
+++ b/Dozentenmodul/src/gui/image/SearchEditImage_GUI.java
@@ -92,8 +92,8 @@ public class SearchEditImage_GUI extends JFrame {
boolean activeSearch = false;
private JTextField textFieldName;
JTabbedPane tabbedPane;
- String[] titles = { "Name", "Lizenzpflichtig", "OS", "Veranstaltung",
- "Verantwortlicher", "Letztes Update", "ID", "Version", "Template" };
+ String[] titles = { "Name", "Lizenzpflichtig", "OS", "Veranstaltung","Verantwortlicher", "Letztes Update", "ID", "Version", "Template" };
+ //String[] titles = { "Name", "Lizenzpflichtig", "OS", "Verantwortlicher", "Letztes Update", "ID", "Version", "Template" };
ThriftConnection con = new ThriftConnection();
Client client = models.Client.clientcon.getClient();
final DefaultTableModel modelAll = new DefaultTableModel(titles, 0) {
@@ -947,8 +947,8 @@ public class SearchEditImage_GUI extends JFrame {
images = client.getImageList();
Iterator<server.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()) {
@@ -982,14 +982,14 @@ public class SearchEditImage_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"));
labelUpdate.setText(out.format(in.parse(res.get("lastupdate"))));
labelVerantwortlicher.setText(res.get("owner"));
- labelWeitereVerantwortliche.setText("Noch nicht Verf�gbar");
+ labelWeitereVerantwortliche.setText("Noch nicht Verf\u00fcgbar");
if (res.get("template").equals("true")) {
labelVorlage.setText("Ja");
} else {