From f66b6dc7b7363b195e737a741563dfda888baac0 Mon Sep 17 00:00:00 2001 From: Michael Wilson Date: Wed, 3 Sep 2014 16:41:24 +0200 Subject: -Vorbereitungen für Rechte -Logging für Anlegen der config.ini --- Dozentenmodul/src/gui/image/SearchEditImage_GUI.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'Dozentenmodul/src/gui/image/SearchEditImage_GUI.java') 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 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 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 { -- cgit v1.2.3-55-g7522