Index: trunk/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java (revision 5887)
+++ trunk/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java (revision 5888)
@@ -9,9 +9,7 @@
import java.awt.Dimension;
import java.awt.FlowLayout;
-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;
@@ -22,5 +20,4 @@
import javax.swing.AbstractAction;
-import javax.swing.BorderFactory;
import javax.swing.JDialog;
import javax.swing.JOptionPane;
@@ -28,5 +25,4 @@
import javax.swing.JScrollPane;
import javax.swing.JTable;
-import javax.swing.UIManager;
import javax.swing.event.TableModelEvent;
import javax.swing.event.TableModelListener;
@@ -34,6 +30,4 @@
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;
@@ -46,5 +40,5 @@
import org.openstreetmap.josm.gui.help.ContextSensitiveHelpAction;
import org.openstreetmap.josm.gui.help.HelpUtil;
-import org.openstreetmap.josm.gui.widgets.JosmEditorPane;
+import org.openstreetmap.josm.gui.widgets.HtmlPanel;
import org.openstreetmap.josm.tools.ImageProvider;
import org.openstreetmap.josm.tools.WindowGeometry;
@@ -73,42 +67,7 @@
/** the data model */
private RelationMemberTableModel model;
- private JosmEditorPane jepMessage;
+ private HtmlPanel htmlPanel;
private boolean canceled;
private SideButton btnOK;
-
- protected JPanel buildMessagePanel() {
- JPanel pnl = new JPanel(new BorderLayout());
- jepMessage = new JosmEditorPane("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;
- }
protected JPanel buildRelationMemberTablePanel() {
@@ -134,5 +93,5 @@
model.addTableModelListener(this);
getContentPane().setLayout(new BorderLayout());
- getContentPane().add(buildMessagePanel(), BorderLayout.NORTH);
+ getContentPane().add(htmlPanel = new HtmlPanel(), BorderLayout.NORTH);
getContentPane().add(buildRelationMemberTablePanel(), BorderLayout.CENTER);
getContentPane().add(buildButtonPanel(), BorderLayout.SOUTH);
@@ -156,5 +115,5 @@
msg = tr("Please confirm to remove {0} objects from {1} relations.", numObjectsToDelete,numParentRelations);
}
- jepMessage.setText(msg);
+ htmlPanel.getEditorPane().setText(msg);
invalidate();
}