Changeset 7730 in josm for trunk/src/org

Timestamp:

2014-11-18T22:14:26+01:00 (10 years ago)

Author:

Don-vip

Message:

see #10701 - automatic download of changeset discussion comments + change font

Location:

trunk/src/org/openstreetmap/josm/gui/dialogs/changeset

Files:

• AbstractCellRenderer.java (modified) (2 diffs)
• ChangesetDiscussionPanel.java (modified) (2 diffs)
• ChangesetDiscussionTableCellRenderer.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/AbstractCellRenderer.java

@@ -22 +22 @@
 public abstract class AbstractCellRenderer extends JLabel implements TableCellRenderer {
 
-    protected void reset(JComponent c) {
+    protected void reset(JComponent c, boolean tableFont) {
         c.setBackground(UIManager.getColor("Table.background"));
         c.setForeground(UIManager.getColor("Table.foreground"));
-        c.setFont(UIManager.getFont("Table.font"));
+        if (tableFont) {
+            c.setFont(UIManager.getFont("Table.font"));
+        }
         c.setToolTipText(null);
         c.setOpaque(true);
@@ -31 +33 @@
 
     protected void reset() {
-        reset(this);
+        reset(this, true);
     }
 

trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDiscussionPanel.java

@@ -97 +97 @@
         }
         actUpdateChangesets.initProperties(current);
+        if (cs != null && cs.getDiscussion().size() < cs.getCommentsCount()) {
+            actUpdateChangesets.actionPerformed(null);
+        }
     }
 
@@ -109 +112 @@
         JPanel pnl = new JPanel(new BorderLayout());
         table = new JTable(model, new ChangesetDiscussionTableColumnModel());
-        //tblContent.addMouseListener(new PopupMenuLauncher(new ChangesetContentTablePopupMenu()));
         pnl.add(new JScrollPane(table), BorderLayout.CENTER);
         return pnl;

trunk/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetDiscussionTableCellRenderer.java

@@ -23 +23 @@
             return this;
         JComponent comp = this;
-        reset(comp);
+        reset(comp, true);
         renderColors(comp, isSelected);
         switch(column) {
@@ -34 +34 @@
         case 2:
             comp = new JosmTextArea((String) value);
-            reset(comp);
+            reset(comp, false);
             renderColors(comp, isSelected);
         }