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 9e7d6d2779c08b0e63d5e1bb05c9b5962a3afdaf Author: servantie <servantie.c@gmail.com> Date: Mon Jul 25 13:53:36 2016 +0200 changed component into scrollpane --- .../jtimer/ui/report/TimerTaskSyncInfoEditor.java | 33 ++++++++++++++-------- 1 file changed, 21 insertions(+), 12 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 e2f7e29..175c2c7 100644 --- a/src/main/java/org/chorem/jtimer/ui/report/TimerTaskSyncInfoEditor.java +++ b/src/main/java/org/chorem/jtimer/ui/report/TimerTaskSyncInfoEditor.java @@ -35,7 +35,10 @@ import javax.swing.JButton; import javax.swing.JComponent; import javax.swing.JOptionPane; import javax.swing.JPanel; +import javax.swing.JScrollPane; import javax.swing.JTable; +import javax.swing.ScrollPaneConstants; +import javax.swing.ScrollPaneLayout; import javax.swing.table.AbstractTableModel; import javax.swing.table.DefaultTableCellRenderer; import javax.swing.table.TableColumnModel; @@ -124,11 +127,11 @@ public class TimerTaskSyncInfoEditor extends FrameView implements ActionListener */ protected JComponent getMainComponent() { - JPanel configComponent = new JPanel(); - configComponent.setLayout(new BorderLayout(5, 5)); + JScrollPane mainScrollPane = new JScrollPane(); + + JPanel mainPanel = new JPanel(); + mainPanel.setLayout(new BorderLayout(5, 5)); - JPanel urlPanel = new JPanel(); - urlPanel.setLayout(new BorderLayout(5, 5)); urlJTable = new JTable(new SyncInfoTableModel()); //try to have coherent width of columns @@ -136,13 +139,15 @@ public class TimerTaskSyncInfoEditor extends FrameView implements ActionListener tableColModel.getColumn(0).setPreferredWidth(200); tableColModel.getColumn(1).setPreferredWidth(40); tableColModel.getColumn(2).setPreferredWidth(60); - tableColModel.getColumn(3).setPreferredWidth(200); + tableColModel.getColumn(3).setPreferredWidth(100); + //render the date properly tableColModel.getColumn(3).setCellRenderer(new DateRenderer()); //add the headers and the table + JPanel urlPanel = new JPanel(new BorderLayout()); urlPanel.add(urlJTable.getTableHeader(), BorderLayout.NORTH); - urlPanel.add(urlJTable, BorderLayout.CENTER); + urlPanel.add(urlJTable, BorderLayout.SOUTH); //panel to hold the buttons JPanel buttonPane = new JPanel(); @@ -163,21 +168,25 @@ public class TimerTaskSyncInfoEditor extends FrameView implements ActionListener buttonPane.add(addButton); buttonPane.add(testSyncUrlButton); buttonPane.add(deleteButton); + // button to close JButton closeButton = new JButton(); closeButton.setAction(getContext().getActionMap(this).get("closeView")); //adding components to the main one - configComponent.add(urlPanel, BorderLayout.NORTH); - configComponent.add(buttonPane, BorderLayout.CENTER); - configComponent.add(closeButton, BorderLayout.SOUTH); + mainPanel.add(urlPanel, BorderLayout.NORTH); + mainPanel.add(buttonPane, BorderLayout.CENTER); + mainPanel.add(closeButton, BorderLayout.SOUTH); // color fix on linux ? - configComponent.setBackground(urlPanel.getBackground()); + mainPanel.setBackground(urlPanel.getBackground()); // set minimum size to prevent "packed size" (too big) - configComponent.setMinimumSize(new Dimension(100, 100)); + mainPanel.setMinimumSize(new Dimension(100, 100)); + + //adding the component to the viewport of the scrollpane + mainScrollPane.setViewportView(mainPanel); - return configComponent; + return mainScrollPane; } /** -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.