Index: /trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialogManager.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialogManager.java (revision 16463)
+++ /trunk/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialogManager.java (revision 16464)
@@ -228,15 +228,4 @@
*/
public void showHistory(Component parent, final Collection primitives) {
- if (primitives.size() > Config.getPref().getInt("warn.open.maxhistory", 5) &&
- /* I18N english text for value 1 makes no real sense, never called for values <= maxhistory (usually 5) */
- JOptionPane.OK_OPTION != JOptionPane.showConfirmDialog(MainApplication.getMainFrame(),
- "" + trn(
- "You are about to open {0} history dialog.
Do you want to continue?",
- "You are about to open {0} different history dialogs simultaneously.
Do you want to continue?",
- primitives.size(), primitives.size()) + "",
- tr("Confirmation"), JOptionPane.OK_CANCEL_OPTION, JOptionPane.WARNING_MESSAGE)) {
- return;
- }
-
final List realPrimitives = new ArrayList<>(primitives);
hooks.forEach(h -> h.modifyRequestedIds(realPrimitives));
@@ -248,4 +237,14 @@
tr("Warning"),
JOptionPane.WARNING_MESSAGE);
+ return;
+ }
+ if (notNewPrimitives.size() > Config.getPref().getInt("warn.open.maxhistory", 5) &&
+ /* I18N english text for value 1 makes no real sense, never called for values <= maxhistory (usually 5) */
+ JOptionPane.OK_OPTION != JOptionPane.showConfirmDialog(MainApplication.getMainFrame(),
+ "" + trn(
+ "You are about to open {0} history dialog.
Do you want to continue?",
+ "You are about to open {0} different history dialogs simultaneously.
Do you want to continue?",
+ notNewPrimitives.size(), notNewPrimitives.size()) + "",
+ tr("Confirmation"), JOptionPane.OK_CANCEL_OPTION, JOptionPane.WARNING_MESSAGE)) {
return;
}