This is an automated email from the git hooks/post-receive script. New commit to branch feature/sync in repository jtimer. See https://gitlab.nuiton.org/chorem/jtimer.git commit 2d14fcefe71c28ec733b4a2ce396c7afa54890b9 Author: servantie <servantie.c@gmail.com> Date: Wed Jul 20 10:13:26 2016 +0200 date format in jtable display + width of cells --- .../jtimer/ui/report/TimerTaskSyncInfoEditor.java | 38 +++++++++++++++++++++- .../resources/TimerTaskSyncInfoEditor.properties | 2 +- .../TimerTaskSyncInfoEditor_fr.properties | 2 +- 3 files changed, 39 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/chorem/jtimer/ui/report/TimerTaskSyncInfoEditor.java b/src/main/java/org/chorem/jtimer/ui/report/TimerTaskSyncInfoEditor.java index 6e67b42..96cb74c 100644 --- a/src/main/java/org/chorem/jtimer/ui/report/TimerTaskSyncInfoEditor.java +++ b/src/main/java/org/chorem/jtimer/ui/report/TimerTaskSyncInfoEditor.java @@ -29,16 +29,20 @@ import java.awt.Dimension; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.text.DateFormat; +import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.Calendar; import java.util.Date; import java.util.List; +import java.util.Locale; import javax.swing.JButton; import javax.swing.JComponent; import javax.swing.JOptionPane; import javax.swing.JPanel; import javax.swing.JTable; import javax.swing.table.AbstractTableModel; +import javax.swing.table.DefaultTableCellRenderer; +import javax.swing.table.TableColumnModel; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.chorem.jtimer.data.TimerCore; @@ -99,7 +103,6 @@ public class TimerTaskSyncInfoEditor extends FrameView implements ActionListener this.core = core; this.task = task; timezone = "+01:00"; - df = new SimpleDateFormat("dd/MM/yy HH:mm:ss"); setComponent(getMainComponent()); } @@ -119,6 +122,15 @@ public class TimerTaskSyncInfoEditor extends FrameView implements ActionListener urlJTable = new JTable(new SyncInfoTableModel()); + //try to have coherent width of columns + TableColumnModel tableColModel = urlJTable.getColumnModel(); + tableColModel.getColumn(0).setPreferredWidth(200); + tableColModel.getColumn(1).setPreferredWidth(40); + tableColModel.getColumn(2).setPreferredWidth(60); + tableColModel.getColumn(3).setPreferredWidth(200); + //render the date properly + tableColModel.getColumn(3).setCellRenderer(new DateRenderer()); + //add the headers and the table @@ -345,6 +357,27 @@ public class TimerTaskSyncInfoEditor extends FrameView implements ActionListener } } + /** + * Class to render dates with a readable format + * (dd/MM/yy HH:mm:ss) + */ + protected class DateRenderer extends DefaultTableCellRenderer { + + private Date dateValue; + private SimpleDateFormat dateFormat = new SimpleDateFormat("dd/MM/yy HH:mm:ss"); + private String valueToString = ""; + + @Override + public void setValue(Object value) { + if ((value != null)) { + dateValue = (Date) value; + valueToString = dateFormat.format(dateValue); + value = valueToString; + super.setValue(value); + } + } + } + @Override public void actionPerformed(ActionEvent actionEvent) { @@ -388,6 +421,9 @@ public class TimerTaskSyncInfoEditor extends FrameView implements ActionListener else { errorBox(getResourceMap().getString("testSyncFailureMessage"), getResourceMap().getString("testSyncFailureTitle")); } + if (log.isDebugEnabled()) { + log.debug("Response code : " + responseCode); + } } } } diff --git a/src/main/resources/org/chorem/jtimer/ui/report/resources/TimerTaskSyncInfoEditor.properties b/src/main/resources/org/chorem/jtimer/ui/report/resources/TimerTaskSyncInfoEditor.properties index dc0e956..f311f08 100644 --- a/src/main/resources/org/chorem/jtimer/ui/report/resources/TimerTaskSyncInfoEditor.properties +++ b/src/main/resources/org/chorem/jtimer/ui/report/resources/TimerTaskSyncInfoEditor.properties @@ -42,5 +42,5 @@ testSyncFailureTitle = Synchronization test failure syncURLHeader = URL isActiveHeader = is Active -isWithAnnotationsHeader = With annotations +isWithAnnotationsHeader = Annotations lastSyncHeader = Last Synchronization \ No newline at end of file diff --git a/src/main/resources/org/chorem/jtimer/ui/report/resources/TimerTaskSyncInfoEditor_fr.properties b/src/main/resources/org/chorem/jtimer/ui/report/resources/TimerTaskSyncInfoEditor_fr.properties index cd69cce..3c5ee10 100644 --- a/src/main/resources/org/chorem/jtimer/ui/report/resources/TimerTaskSyncInfoEditor_fr.properties +++ b/src/main/resources/org/chorem/jtimer/ui/report/resources/TimerTaskSyncInfoEditor_fr.properties @@ -43,5 +43,5 @@ isActiveSync.Action.text = Synchronisation Active syncURLHeader = URL isActiveHeader = Active -isWithAnnotationsHeader = Avec annotations +isWithAnnotationsHeader = Annotations lastSyncHeader = Derni\u00E8re synchronisation \ No newline at end of file -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.