From 692e63f25c256fb6bd2af3b45d2c8adea4f0848b Mon Sep 17 00:00:00 2001 From: Wesley Date: Tue, 24 Feb 2015 22:19:19 +0100 Subject: [PATCH 1/3] Updated the table with the filter buttons there is a sprites folder, add it to the root of the project --- Main.java | 1 + PanelTable.java | 32 ++++++++++++++++++++++++++------ sprites/sprite0.png | Bin 0 -> 197 bytes 3 files changed, 27 insertions(+), 6 deletions(-) create mode 100644 sprites/sprite0.png diff --git a/Main.java b/Main.java index e3164e4..767d583 100644 --- a/Main.java +++ b/Main.java @@ -1,5 +1,6 @@ + public class Main { public static void main(String[] args) { diff --git a/PanelTable.java b/PanelTable.java index 35cf06c..63fc694 100644 --- a/PanelTable.java +++ b/PanelTable.java @@ -1,10 +1,19 @@ +import java.awt.BorderLayout; import java.awt.Dimension; +import java.awt.FlowLayout; import java.awt.Graphics; +import java.awt.Image; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; +import java.io.IOException; import java.text.SimpleDateFormat; import java.util.ArrayList; +import javax.imageio.ImageIO; +import javax.swing.ImageIcon; +import javax.swing.JButton; import javax.swing.JFrame; import javax.swing.JOptionPane; import javax.swing.JPanel; @@ -15,7 +24,7 @@ import javax.swing.table.AbstractTableModel; /** * Constructs a JTable in a ScrolPane. * @author Wesley - * @version 1.0 + * @version 1.2 */ public class PanelTable extends JPanel implements Panel{ @@ -37,24 +46,35 @@ public class PanelTable extends JPanel implements Panel{ * @param events */ public PanelTable() { - + super.setLayout(new BorderLayout()); table= new JTable(); - table.setAutoResizeMode(JTable.AUTO_RESIZE_OFF); table.setAutoCreateRowSorter(true); table.setAutoResizeMode(table.AUTO_RESIZE_ALL_COLUMNS); table.addMouseListener(new MouseAdapter() { public void mouseClicked(MouseEvent e) { if(e.getClickCount() > 1 ) cellClicked(e); else selectedCell = (JTable) e.getSource(); } }); scrollPane = new JScrollPane(table,JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED, JScrollPane.HORIZONTAL_SCROLLBAR_AS_NEEDED); - scrollPane.setBorder(null); - add(scrollPane); + add(scrollPane,BorderLayout.SOUTH); + JPanel buttonPanel = new JPanel(new FlowLayout(FlowLayout.LEFT)); + JButton button; + button = new JButton("Filter"); + button.addActionListener(new ActionListener() { + public void actionPerformed(ActionEvent e) { filter(); } + }); + buttonPanel.add(button); + button = new JButton(new ImageIcon("sprites/sprite0.png")); + button.addActionListener(new ActionListener() { + public void actionPerformed(ActionEvent e) { update(fullEvents, true); } + }); + buttonPanel.add(button); + add(buttonPanel,BorderLayout.NORTH); } /** * Sets the size of the scrollPane, in which the table is placed to fill out its container panel (not sure if this is needed?) */ public void paintComponent(Graphics g) { - scrollPane.setPreferredSize(new Dimension(getWidth(),getHeight())); + scrollPane.setPreferredSize(new Dimension(getWidth(),getHeight()-35)); } /** diff --git a/sprites/sprite0.png b/sprites/sprite0.png new file mode 100644 index 0000000000000000000000000000000000000000..50e6440c38ac429ea537b642d06d496db64d0656 GIT binary patch literal 197 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`J)SO(Ar*6y6Beiy6l}T8pWNNm zX_fIZ!}NebAX`ft`+s&xrbQbQQ@9JH7!JQEQV>7L!@iMIs^PTR1PjOM0!#|r0f$(h zsN|eG#_BLDFosb`;VOg3SLS>Mjt9MRCJf#w8cjbIvD=0|@@4<=NPe1Ifm-g9D{VQ- uI=48a7?@v3CCo|?6PUZRfbod|0|WoDQpG8oR4jq+V(@hJb6Mw<&;$Sr06)|K literal 0 HcmV?d00001 From 0e5a2ccb613203680a62c396fb170a533408f2a9 Mon Sep 17 00:00:00 2001 From: xrgman Date: Tue, 24 Feb 2015 22:22:02 +0100 Subject: [PATCH 2/3] Update README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 40b140f..1511798 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,3 @@ # BELANGRIJK De .jar file moet als externe Library toegevoegd worden. +De sprites folder moet in de root van het project. From 2a10e0846dee2bfefa775d4a573e544ec9ac7277 Mon Sep 17 00:00:00 2001 From: xrgman Date: Tue, 24 Feb 2015 22:22:22 +0100 Subject: [PATCH 3/3] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 1511798..4c947db 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,3 @@ # BELANGRIJK -De .jar file moet als externe Library toegevoegd worden. +De .jar file moet als externe Library toegevoegd worden. De sprites folder moet in de root van het project.