Index: /trunk/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java (revision 2643)
+++ /trunk/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java (revision 2644)
@@ -9,9 +9,9 @@
import java.awt.Dimension;
import java.awt.FlowLayout;
-import java.awt.GridBagConstraints;
-import java.awt.GridBagLayout;
+import java.awt.Font;
import java.awt.event.ActionEvent;
import java.awt.event.WindowAdapter;
import java.awt.event.WindowEvent;
+import java.text.MessageFormat;
import java.util.ArrayList;
import java.util.Collection;
@@ -23,11 +23,11 @@
import javax.swing.AbstractAction;
import javax.swing.BorderFactory;
-import javax.swing.JComponent;
import javax.swing.JDialog;
-import javax.swing.JLabel;
+import javax.swing.JEditorPane;
import javax.swing.JOptionPane;
import javax.swing.JPanel;
import javax.swing.JScrollPane;
import javax.swing.JTable;
+import javax.swing.UIManager;
import javax.swing.event.TableModelEvent;
import javax.swing.event.TableModelListener;
@@ -35,4 +35,6 @@
import javax.swing.table.DefaultTableModel;
import javax.swing.table.TableColumn;
+import javax.swing.text.html.HTMLEditorKit;
+import javax.swing.text.html.StyleSheet;
import org.openstreetmap.josm.Main;
@@ -71,16 +73,39 @@
/** the data model */
private RelationMemberTableModel model;
- private JLabel lblMessage;
+ private JEditorPane jepMessage;
private boolean canceled;
private SideButton btnOK;
protected JPanel buildMessagePanel() {
- JPanel pnl = new JPanel();
- pnl.setLayout(new GridBagLayout());
- GridBagConstraints gc = new GridBagConstraints();
- gc.anchor = GridBagConstraints.NORTHWEST;
- gc.fill = GridBagConstraints.BOTH;
- pnl.add(lblMessage = new JLabel(), gc);
- lblMessage.setAlignmentX(JComponent.LEFT_ALIGNMENT);
+ JPanel pnl = new JPanel(new BorderLayout());
+ jepMessage = new JEditorPane("text/html", "");
+ jepMessage.setOpaque(false);
+ jepMessage.setEditable(false);
+ Font f = UIManager.getFont("Label.font");
+ StyleSheet ss = new StyleSheet();
+ String rule = MessageFormat.format(
+ "font-family: ''{0}'';font-size: {1,number}pt; font-weight: {2}; font-style: {3}",
+ f.getName(),
+ f.getSize(),
+ f.isBold() ? "bold" : "normal",
+ f.isItalic() ? "italic" : "normal"
+ );
+ rule = "body {" + rule + "}";
+ rule = MessageFormat.format(
+ "font-family: ''{0}'';font-size: {1,number}pt; font-weight: {2}; font-style: {3}",
+ f.getName(),
+ f.getSize(),
+ "bold",
+ f.isItalic() ? "italic" : "normal"
+ );
+ rule = "strong {" + rule + "}";
+ ss.addRule(rule);
+ ss.addRule("a {text-decoration: underline; color: blue}");
+ HTMLEditorKit kit = new HTMLEditorKit();
+ kit.setStyleSheet(ss);
+ jepMessage.setEditorKit(kit);
+
+ pnl.setLayout(new BorderLayout());
+ pnl.add(jepMessage, BorderLayout.CENTER);
pnl.setBorder(BorderFactory.createEmptyBorder(5,5,5,5));
return pnl;
@@ -131,5 +156,5 @@
msg = tr("Please confirm to remove {0} objects from {1} relations.", numObjectsToDelete,numParentRelations);
}
- lblMessage.setText(msg);
+ jepMessage.setText(msg);
invalidate();
}