Index: /trunk/src/org/openstreetmap/josm/gui/SplashScreen.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/SplashScreen.java (revision 8515)
+++ /trunk/src/org/openstreetmap/josm/gui/SplashScreen.java (revision 8516)
@@ -6,5 +6,5 @@
import java.awt.Color;
import java.awt.Component;
-import java.awt.Graphics;
+import java.awt.Dimension;
import java.awt.GridBagConstraints;
import java.awt.GridBagLayout;
@@ -18,4 +18,5 @@
import java.util.Objects;
+import javax.swing.BorderFactory;
import javax.swing.ImageIcon;
import javax.swing.JFrame;
@@ -23,5 +24,7 @@
import javax.swing.JPanel;
import javax.swing.JProgressBar;
+import javax.swing.JScrollPane;
import javax.swing.JSeparator;
+import javax.swing.ScrollPaneConstants;
import javax.swing.border.Border;
import javax.swing.border.EmptyBorder;
@@ -35,4 +38,6 @@
import org.openstreetmap.josm.gui.progress.ProgressTaskId;
import org.openstreetmap.josm.gui.util.GuiHelper;
+import org.openstreetmap.josm.gui.widgets.JosmEditorPane;
+import org.openstreetmap.josm.tools.GBC;
import org.openstreetmap.josm.tools.ImageProvider;
import org.openstreetmap.josm.tools.Predicates;
@@ -118,5 +123,10 @@
@Override
public void stateChanged(ChangeEvent ignore) {
- progressRenderer.setTasks(progressMonitor.toString());
+ GuiHelper.runInEDT(new Runnable() {
+ @Override
+ public void run() {
+ progressRenderer.setTasks(progressMonitor.toString());
+ }
+ });
}
@@ -129,9 +139,9 @@
* Returns a HTML representation for this task.
*/
- public abstract String toHtml();
+ public abstract StringBuilder toHtml(StringBuilder sb);
@Override
public final String toString() {
- return toHtml();
+ return toHtml(new StringBuilder(1024)).toString();
}
}
@@ -159,6 +169,6 @@
@Override
- public String toHtml() {
- return name + "" + duration + "";
+ public StringBuilder toHtml(StringBuilder sb) {
+ return sb.append(name).append("").append(duration).append("");
}
@@ -193,7 +203,17 @@
@Override
- public String toHtml() {
+ public StringBuilder toHtml(StringBuilder sb) {
synchronized (tasks) {
- return Utils.firstNonNull(name, "") + (tasks.isEmpty() ? "" : Utils.joinAsHtmlUnorderedList(tasks));
+ sb.append(Utils.firstNonNull(name, ""));
+ if (!tasks.isEmpty()) {
+ sb.append("");
+ for (Task i : tasks) {
+ sb.append("- ");
+ i.toHtml(sb);
+ sb.append("
");
+ }
+ sb.append("
");
+ }
+ return sb;
}
}
@@ -328,25 +348,22 @@
private static class SplashScreenProgressRenderer extends JPanel {
- private JLabel lblTaskTitle;
- private JProgressBar progressBar;
+ private final JosmEditorPane lblTaskTitle = new JosmEditorPane();
+ private final JProgressBar progressBar = new JProgressBar(JProgressBar.HORIZONTAL);
private static final String labelHtml = ""
- + ""
- + "";
+ + "";
protected void build() {
setLayout(new GridBagLayout());
- GridBagConstraints gc = new GridBagConstraints();
- gc.gridx = 0;
- gc.gridy = 0;
- gc.fill = GridBagConstraints.HORIZONTAL;
- gc.weightx = 1.0;
- gc.weighty = 0.0;
- gc.insets = new Insets(5, 0, 0, 0);
- add(lblTaskTitle = new JLabel(labelHtml), gc);
-
- gc.gridy = 1;
- gc.insets = new Insets(15, 0, 0, 0);
- add(progressBar = new JProgressBar(JProgressBar.HORIZONTAL), gc);
+
+ JosmEditorPane.makeJLabelLike(lblTaskTitle, false);
+ lblTaskTitle.setText(labelHtml);
+ final JScrollPane scrollPane = new JScrollPane(lblTaskTitle,
+ ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
+ scrollPane.setPreferredSize(new Dimension(0, 320));
+ scrollPane.setBorder(BorderFactory.createEmptyBorder());
+ add(scrollPane, GBC.eol().insets(5, 5, 0, 0).fill(GridBagConstraints.HORIZONTAL));
+
progressBar.setIndeterminate(true);
+ add(progressBar, GBC.eol().insets(5, 15, 0, 0).fill(GridBagConstraints.HORIZONTAL));
}
@@ -355,18 +372,9 @@
}
- @Override
- public void paint(Graphics g) {
- try {
- super.paint(g);
- } catch (NullPointerException ignore) {
- // NullPointerException at javax.swing.text.html.StyleSheet$ListPainter.paint
- if (Main.isTraceEnabled()) {
- Main.trace(ignore.getMessage());
- }
- }
- }
-
public void setTasks(String tasks) {
- lblTaskTitle.setText(labelHtml + tasks);
+ synchronized (lblTaskTitle) {
+ lblTaskTitle.setText(labelHtml + tasks);
+ lblTaskTitle.setCaretPosition(lblTaskTitle.getDocument().getLength());
+ }
repaint();
}