Changeset 12962 in josm
- Timestamp:
- 2017-10-09T03:08:01+02:00 (6 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/gui/bbox/SourceButton.java
r12955 r12962 5 5 6 6 import java.awt.Dimension; 7 import java.awt.event.ActionEvent; 7 8 import java.awt.event.ActionListener; 8 import java.awt.event.ActionEvent;9 9 import java.util.ArrayList; 10 10 import java.util.Collection; … … 12 12 import java.util.Enumeration; 13 13 import java.util.List; 14 import java.util.Objects; 14 15 15 16 import javax.swing.AbstractButton; … … 23 24 import org.openstreetmap.gui.jmapviewer.interfaces.TileSource; 24 25 import org.openstreetmap.josm.gui.widgets.PopupMenuButton; 25 import org.openstreetmap.josm.tools.CheckParameterUtil;26 26 import org.openstreetmap.josm.tools.ImageProvider; 27 27 … … 34 34 protected final TileSource tileSource; 35 35 36 public TileSourceButtonModel(TileSource tileSource_) { 37 super(); 38 this.tileSource = tileSource_; 36 public TileSourceButtonModel(TileSource tileSource) { 37 this.tileSource = tileSource; 39 38 this.addActionListener(this); 40 39 } … … 57 56 * @param slippyMapBBoxChooser parent slippy map 58 57 * @param sources list of imagery sources to display 58 * @param showDownloadAreaButtonModel model for the "Show downloaded area" button 59 * @since 12955 59 60 */ 60 61 public SourceButton( 61 SlippyMapBBoxChooser slippyMapBBoxChooser _,62 Collection<TileSource> sources _,63 ButtonModel showDownloadAreaButtonModel _62 SlippyMapBBoxChooser slippyMapBBoxChooser, 63 Collection<TileSource> sources, 64 ButtonModel showDownloadAreaButtonModel 64 65 ) { 65 66 super(new ImageProvider("dialogs/layerlist").getResource().getImageIcon(new Dimension(16, 16))); 66 this.showDownloadAreaButtonModel = showDownloadAreaButtonModel _;67 this.slippyMapBBoxChooser = slippyMapBBoxChooser _;67 this.showDownloadAreaButtonModel = showDownloadAreaButtonModel; 68 this.slippyMapBBoxChooser = slippyMapBBoxChooser; 68 69 this.setPreferredSize(new Dimension(24, 24)); 69 this.setSources(sources _);70 this.setSources(sources); 70 71 } 71 72 … … 105 106 * @since 6364 106 107 */ 107 public final void setSources(Collection<TileSource> sources_) { 108 CheckParameterUtil.ensureParameterNotNull(sources_, "sources_"); 109 this.sources = new ArrayList<TileSource>(sources_); 108 public final void setSources(Collection<TileSource> sources) { 109 this.sources = new ArrayList<>(Objects.requireNonNull(sources, "sources")); 110 110 this.generatePopupMenu(); 111 111 if (this.sourceButtonGroup.getSelection() == null) { … … 124 124 /** 125 125 * Get the currently-selected tile source. 126 * @return currently-selected tile source 126 127 */ 127 128 public final TileSource getCurrentSource() {
Note:
See TracChangeset
for help on using the changeset viewer.