Changeset 188 in josm

Timestamp:

2007-01-04T23:56:44+01:00 (18 years ago)

Author:

imi

Message:

• changed the merge conflict bug report to some message about the special problem.

File:

• src/org/openstreetmap/josm/gui/ConflictResolver.java (modified) (4 diffs)

src/org/openstreetmap/josm/gui/ConflictResolver.java

@@ -12 +12 @@
 import java.awt.event.MouseEvent;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collection;
 import java.util.Iterator;
@@ -23 +22 @@
 import javax.swing.JButton;
 import javax.swing.JLabel;
+import javax.swing.JOptionPane;
 import javax.swing.JPanel;
 import javax.swing.JScrollPane;
@@ -34 +34 @@
 import javax.swing.table.TableModel;
 
+import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.conflict.ConflictItem;
 import org.openstreetmap.josm.data.conflict.DeleteConflict;
@@ -160 +161 @@
                 }
                 
-                if (this.conflicts.isEmpty())
-                        throw new RuntimeException("No conflicts but in conflict list:\n"+Arrays.toString(conflicts.entrySet().toArray()));
+                if (this.conflicts.isEmpty()) {
+                        JOptionPane.showMessageDialog(Main.parent,
+                                        "The ConflictResolver and the Merger disagree about conflicts in your dataset.\n"+
+                                        "Of course, this is a bug.\n"+
+                                        "The bug is very old, but unfortunatly, Imi (programmer) was not able to catch it.\n"+
+                                        "If you know exactly what bounding boxes you downloaded (bookmarks?) and/or what\n"+
+                                        "files you opened (have them ready?) to display this message again, pretty please\n"+
+                                        "inform Imi at josm@eigenheimstrasse.de about the details.\n"+
+                                        "Thanks.");
+                        //throw new RuntimeException("No conflicts but in conflict list:\n"+Arrays.toString(conflicts.entrySet().toArray()));
+                }
 
                 // have to initialize the JTables here and not in the declaration, because its constructor