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

Timestamp:

2015-01-09T22:18:53+01:00 (9 years ago)

Author:

Don-vip

Message:

fix #10939 - handle line wrapping in changeset discussion comments

Location:

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

Files:

• ChangesetDiscussionPanel.java (modified) (4 diffs)
• ChangesetDiscussionTableCellRenderer.java (modified) (1 diff)

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

@@ -7 +7 @@
 import java.awt.Component;
 import java.awt.FlowLayout;
+import java.awt.Rectangle;
 import java.awt.event.ActionEvent;
 import java.beans.PropertyChangeEvent;
@@ -112 +113 @@
         JPanel pnl = new JPanel(new BorderLayout());
         table = new JTable(model, new ChangesetDiscussionTableColumnModel());
+        table.getColumnModel().getColumn(2).addPropertyChangeListener(new PropertyChangeListener() {
+            @Override
+            public void propertyChange(PropertyChangeEvent evt) {
+                if ("width".equals(evt.getPropertyName())) {
+                    updateRowHeights();
+                }
+            }
+        });
         pnl.add(new JScrollPane(table), BorderLayout.CENTER);
         return pnl;
@@ -122 +131 @@
     protected void updateView(Changeset cs) {
         model.populate(cs.getDiscussion());
+        updateRowHeights();
+    }
+
+    protected void updateRowHeights() {
+        int intercellWidth = table.getIntercellSpacing().width;
+        int colWidth = table.getColumnModel().getColumn(2).getWidth();
         // Update row heights
         for (int row = 0; row < table.getRowCount(); row++) {
@@ -127 +142 @@
 
             Component comp = table.prepareRenderer(table.getCellRenderer(row, 2), row, 2);
+            // constrain width of component
+            comp.setBounds(new Rectangle(0, 0, colWidth - intercellWidth, Integer.MAX_VALUE));
             rowHeight = Math.max(rowHeight, comp.getPreferredSize().height);
 

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

@@ -34 +34 @@
         case 2:
             comp = new JosmTextArea((String) value);
+            ((JosmTextArea)comp).setLineWrap(true);
+            ((JosmTextArea)comp).setWrapStyleWord(true);
             reset(comp, false);
             renderColors(comp, isSelected);