Index: trunk/src/org/openstreetmap/josm/actions/AbstractMergeAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/actions/AbstractMergeAction.java (revision 14331)
+++ trunk/src/org/openstreetmap/josm/actions/AbstractMergeAction.java (revision 14332)
@@ -110,8 +110,5 @@
pnl.add(new JLabel(label), GBC.eol());
pnl.add(layerList, GBC.eol().fill(GBC.HORIZONTAL));
- if (GraphicsEnvironment.isHeadless()) {
- // return first layer in headless mode, for unit tests
- return targetLayers[0];
- }
+
ExtendedDialog ed = new ExtendedDialog(MainApplication.getMainFrame(), title, buttonText, tr("Cancel"));
ed.setButtonIcons(buttonIcon, "cancel");
@@ -131,7 +128,5 @@
String message = tr("There are no layers the source layer
''{0}''
could be merged to.",
Utils.escapeReservedCharactersHTML(sourceLayer.getName()));
- if (!GraphicsEnvironment.isHeadless()) {
- JOptionPane.showMessageDialog(MainApplication.getMainFrame(), message, tr("No target layers"), JOptionPane.WARNING_MESSAGE);
- }
+ JOptionPane.showMessageDialog(MainApplication.getMainFrame(), message, tr("No target layers"), JOptionPane.WARNING_MESSAGE);
}
}
Index: trunk/src/org/openstreetmap/josm/gui/layer/gpx/DownloadWmsAlongTrackAction.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/layer/gpx/DownloadWmsAlongTrackAction.java (revision 14331)
+++ trunk/src/org/openstreetmap/josm/gui/layer/gpx/DownloadWmsAlongTrackAction.java (revision 14332)
@@ -118,7 +118,5 @@
List targetLayers = MainApplication.getLayerManager().getLayersOfType(AbstractTileSourceLayer.class);
if (targetLayers.isEmpty()) {
- if (!GraphicsEnvironment.isHeadless()) {
- warnNoImageryLayers();
- }
+ warnNoImageryLayers();
return null;
}