Changeset 7715 in josm for trunk/src/org/openstreetmap

Timestamp:

2014-11-08T02:10:18+01:00 (10 years ago)

Author:

Don-vip

Message:

see #10701 - display discussion comments in changeset dialog

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/osm/Changeset.java (modified) (1 diff)
• gui/dialogs/changeset/AbstractCellRenderer.java (added)
• gui/dialogs/changeset/ChangesetCacheTableCellRenderer.java (modified) (4 diffs)
• gui/dialogs/changeset/ChangesetContentTableCellRenderer.java (modified) (3 diffs)
• gui/dialogs/changeset/ChangesetContentTableColumnModel.java (modified) (1 diff)
• gui/dialogs/changeset/ChangesetContentTableModel.java (modified) (1 diff)
• gui/dialogs/changeset/ChangesetDiscussionPanel.java (modified) (4 diffs)
• gui/dialogs/changeset/ChangesetDiscussionTableCellRenderer.java (added)
• gui/dialogs/changeset/ChangesetDiscussionTableColumnModel.java (added)
• gui/dialogs/changeset/ChangesetDiscussionTableModel.java (added)

trunk/src/org/openstreetmap/josm/data/osm/Changeset.java

@@ -315 +315 @@
         this.tags = new HashMap<>(other.tags);
         this.incomplete = other.incomplete;
+        this.discussion = other.discussion != null ? new ArrayList<>(other.discussion) : null;
 
         // FIXME: merging of content required?

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

@@ -2 +2 @@
 package org.openstreetmap.josm.gui.dialogs.changeset;
 
-import static org.openstreetmap.josm.tools.I18n.tr;
 import static org.openstreetmap.josm.tools.I18n.trc;
 
 import java.awt.Component;
 import java.awt.Font;
-import java.text.DateFormat;
-import java.util.Date;
 
-import javax.swing.JLabel;
 import javax.swing.JTable;
 import javax.swing.UIManager;
-import javax.swing.table.TableCellRenderer;
 
 import org.openstreetmap.josm.data.osm.Changeset;
-import org.openstreetmap.josm.data.osm.User;
-import org.openstreetmap.josm.tools.date.DateUtils;
 
 /**
@@ -23 +16 @@
  * @since 2689
  */
-public class ChangesetCacheTableCellRenderer extends JLabel implements TableCellRenderer{
-
-    /**
-     * Constructs a new {@code ChangesetCacheTableCellRenderer}.
-     */
-    public ChangesetCacheTableCellRenderer() {
-        setOpaque(true);
-    }
-
-    protected void reset() {
-        setBackground(UIManager.getColor("Table.background"));
-        setForeground(UIManager.getColor("Table.foreground"));
-        setFont(UIManager.getFont("Table.font"));
-        setToolTipText(null);
-    }
-
-    protected void renderColors(boolean isSelected) {
-        if (isSelected) {
-            setBackground(UIManager.getColor("Table.selectionBackground"));
-            setForeground(UIManager.getColor("Table.selectionForeground"));
-        } else {
-            setBackground(UIManager.getColor("Table.background"));
-            setForeground(UIManager.getColor("Table.foreground"));
-        }
-    }
-
-    protected void renderId(Changeset cs) {
-        setText(Integer.toString(cs.getId()));
-        setToolTipText(null);
-    }
+public class ChangesetCacheTableCellRenderer extends AbstractCellRenderer {
 
     protected void renderUploadComment(Changeset cs) {
@@ -75 +39 @@
     }
 
-    protected void renderUser(Changeset cs) {
-        User user = cs.getUser();
-        if (user == null || user.getName().trim().isEmpty()) {
-            setFont(UIManager.getFont("Table.font").deriveFont(Font.ITALIC));
-            setText(tr("anonymous"));
-        } else {
-            setFont(UIManager.getFont("Table.font"));
-            setText(user.getName());
-            setToolTipText(user.getName());
-        }
-    }
-
-    protected void renderDate(Date d) {
-        if (d == null) {
-            setText("");
-        } else {
-            setText(DateUtils.formatDateTime(d, DateFormat.SHORT, DateFormat.SHORT));
-        }
-        setToolTipText(null);
-    }
-
     protected void renderDiscussions(Changeset cs) {
         setText(Integer.toString(cs.getCommentsCount()));
@@ -110 +53 @@
         Changeset cs = (Changeset)value;
         switch(column) {
-        case 0: /* id */ renderId(cs); break;
+        case 0: /* id */ renderId(cs.getId()); break;
         case 1: /* upload comment */ renderUploadComment(cs); break;
         case 2: /* open/closed */ renderOpen(cs); break;
-        case 3: /* user */ renderUser(cs); break;
+        case 3: /* user */ renderUser(cs.getUser()); break;
         case 4: /* created at */ renderDate(cs.getCreatedAt()); break;
         case 5: /* closed at */ renderDate(cs.getClosedAt()); break;

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

@@ -6 +6 @@
 import java.awt.Component;
 
-import javax.swing.JLabel;
 import javax.swing.JTable;
-import javax.swing.UIManager;
-import javax.swing.table.TableCellRenderer;
 
 import org.openstreetmap.josm.data.osm.ChangesetDataSet.ChangesetModificationType;
@@ -17 +14 @@
  * The table cell renderer used in the changeset content table, except for the "name"
  * column in which we use a {@link org.openstreetmap.josm.gui.OsmPrimitivRenderer}.
- *
  */
-public class ChangesetContentTableCellRenderer extends JLabel implements TableCellRenderer{
-
-    public ChangesetContentTableCellRenderer() {
-        setOpaque(true);
-    }
-
-    protected void reset() {
-        setBackground(UIManager.getColor("Table.background"));
-        setForeground(UIManager.getColor("Table.foreground"));
-        setFont(UIManager.getFont("Table.font"));
-    }
-
-    protected void renderColors(boolean isSelected) {
-        if (isSelected) {
-            setBackground(UIManager.getColor("Table.selectionBackground"));
-            setForeground(UIManager.getColor("Table.selectionForeground"));
-        } else {
-            setBackground(UIManager.getColor("Table.background"));
-            setForeground(UIManager.getColor("Table.foreground"));
-        }
-    }
-
-    protected void renderId(HistoryOsmPrimitive primitive) {
-        setText(Long.toString(primitive.getId()));
-        setToolTipText(null);
-    }
+public class ChangesetContentTableCellRenderer extends AbstractCellRenderer {
 
     protected void renderModificationType(ChangesetModificationType type) {
@@ -69 +40 @@
         case 1:
             HistoryOsmPrimitive primitive = (HistoryOsmPrimitive)value;
-            renderId(primitive);
+            renderId(primitive.getId());
             break;
         default:

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

@@ -46 +46 @@
     }
 
+    /**
+     * Constructs a new {@code ChangesetContentTableColumnModel}.
+     */
     public ChangesetContentTableColumnModel() {
         createColumns();

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

@@ -63 +63 @@
 
     /**
-     * Populates the model with the content of a model. If ds is null, the
-     * table is cleared.
+     * Populates the model with the content of a changeset. If ds is null, the table is cleared.
      *
      * @param ds the changeset content.

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

@@ -5 +5 @@
 
 import java.awt.BorderLayout;
+import java.awt.Component;
 import java.awt.FlowLayout;
 import java.awt.event.ActionEvent;
@@ -14 +15 @@
 import javax.swing.BorderFactory;
 import javax.swing.JPanel;
+import javax.swing.JScrollPane;
+import javax.swing.JTable;
 import javax.swing.JToolBar;
 
@@ -31 +34 @@
 
     private final UpdateChangesetDiscussionAction actUpdateChangesets = new UpdateChangesetDiscussionAction();
+
+    private final ChangesetDiscussionTableModel model = new ChangesetDiscussionTableModel();
+
+    private JTable table;
 
     private Changeset current = null;
@@ -95 +102 @@
         setLayout(new BorderLayout());
         setBorder(BorderFactory.createEmptyBorder(3,3,3,3));
-        //add(buildDetailViewPanel(), BorderLayout.CENTER);
         add(buildActionButtonPanel(), BorderLayout.WEST);
+        add(buildDiscussionPanel(), BorderLayout.CENTER);
+    }
+
+    private Component buildDiscussionPanel() {
+        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;
     }
 
     protected void clearView() {
-        // TODO
+        model.populate(null);
     }
 
     protected void updateView(Changeset cs) {
-        // TODO
+        model.populate(cs.getDiscussion());
+        // Update row heights
+        for (int row = 0; row < table.getRowCount(); row++) {
+            int rowHeight = table.getRowHeight();
+
+            Component comp = table.prepareRenderer(table.getCellRenderer(row, 2), row, 2);
+            rowHeight = Math.max(rowHeight, comp.getPreferredSize().height);
+
+            table.setRowHeight(row, rowHeight);
+        }
     }