Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/actions/AddImageryLayerAction.java
r11626 r11635 67 67 putValue("toolbar", "imagery_" + info.getToolbarName()); 68 68 putValue("help", ht("/Preferences/Imagery")); 69 String tooltip = info.getToolTipText(); 70 if (tooltip != null) { 71 setTooltip(tooltip.replaceAll("</?html>", "")); 72 } 69 setTooltip(info.getToolTipText().replaceAll("</?html>", "")); 73 70 this.info = info; 74 71 installAdapters(); -
trunk/test/unit/org/openstreetmap/josm/actions/AddImageryLayerActionTest.java
r11185 r11635 35 35 @Test 36 36 public void testEnabledState() { 37 assertTrue(new AddImageryLayerAction(new ImageryInfo( )).isEnabled());37 assertTrue(new AddImageryLayerAction(new ImageryInfo("foo")).isEnabled()); 38 38 assertTrue(new AddImageryLayerAction(new ImageryInfo("foo_tms", "http://bar", "tms", null, null)).isEnabled()); 39 39 assertTrue(new AddImageryLayerAction(new ImageryInfo("foo_bing", "http://bar", "bing", null, null)).isEnabled()); … … 71 71 assertTrue(Main.getLayerManager().getLayersOfType(TMSLayer.class).isEmpty()); 72 72 try { 73 new AddImageryLayerAction(new ImageryInfo( )).actionPerformed(null);73 new AddImageryLayerAction(new ImageryInfo("foo")).actionPerformed(null); 74 74 } catch (IllegalArgumentException expected) { 75 75 assertEquals("Parameter 'info.url' must not be null", expected.getMessage());
Note:
See TracChangeset
for help on using the changeset viewer.