[Thaw-dev] r9620 - trunk/apps/Thaw/src/thaw/plugins/queueWatcher

[jfle...@freenetproject.org]

Author: jflesch
Date: 2006-07-15 00:16:52 +0000 (Sat, 15 Jul 2006)
New Revision: 9620

Modified:
   trunk/apps/Thaw/src/thaw/plugins/queueWatcher/QueuePanel.java
   trunk/apps/Thaw/src/thaw/plugins/queueWatcher/QueueTableModel.java
Log:
Put JProgressBar in JTable to display progressions

Modified: trunk/apps/Thaw/src/thaw/plugins/queueWatcher/QueuePanel.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/queueWatcher/QueuePanel.java       
2006-07-14 23:58:21 UTC (rev 9619)
+++ trunk/apps/Thaw/src/thaw/plugins/queueWatcher/QueuePanel.java       
2006-07-15 00:16:52 UTC (rev 9620)
@@ -91,7 +91,7 @@
                scrollPane = new JScrollPane(table);
                panel.add(scrollPane, BorderLayout.CENTER);

-               table.setDefaultRenderer( table.getColumnClass(0), new 
ProgressRenderer(table, tableModel) );
+               table.setDefaultRenderer( table.getColumnClass(0), new 
ProgressRenderer(table, tableModel, isForInsertionQueue) );

                tableModel.addTableModelListener(table);

@@ -147,18 +147,35 @@
                private final Color RUNNING = Color.ORANGE;
                private final Color PENDING = Color.WHITE;

-               QueueTableModel model = null;
-               JTable tabl = null;
+               private QueueTableModel model = null;
+               private JTable tabl = null;
+               private boolean insertionQueue;

-               public ProgressRenderer(JTable table, QueueTableModel model) {
+               public ProgressRenderer(JTable table, QueueTableModel model, 
boolean isForInsertion) {
                        this.model = model;
                        this.tabl = table;
+                       this.insertionQueue = isForInsertion;
                }

                public Component getTableCellRendererComponent(JTable table, 
Object value,
                                                               boolean 
isSelected, boolean hasFocus,
                                                               int row, int 
column) {

+                       
+                       if( (insertionQueue && column == 3)
+                           || (!insertionQueue && column == 4) ) {
+                               Integer progress = (Integer)value;
+                               JProgressBar bar = new JProgressBar(0, 100);
+
+                               bar.setStringPainted(true);
+                               bar.setValue(progress.intValue());
+                               bar.setString(progress.toString() + "%");
+                               bar.setBorderPainted(false);
+
+                               return bar;
+                       }
+
+
                        Component cell = 
super.getTableCellRendererComponent(table, value,
                                                                             
isSelected, hasFocus,
                                                                             
row, column);

Modified: trunk/apps/Thaw/src/thaw/plugins/queueWatcher/QueueTableModel.java
===================================================================
--- trunk/apps/Thaw/src/thaw/plugins/queueWatcher/QueueTableModel.java  
2006-07-14 23:58:21 UTC (rev 9619)
+++ trunk/apps/Thaw/src/thaw/plugins/queueWatcher/QueueTableModel.java  
2006-07-15 00:16:52 UTC (rev 9620)
@@ -85,7 +85,7 @@

                if( (isForInsertions && column == 3
                     || (!isForInsertions && column == 4) ) ) {
-                       return ((new 
Integer(query.getProgression())).toString() + " %");
+                       return (new Integer(query.getProgression()));
                }

                return null;