Changeset 8533 in josm
- Timestamp:
- 2015-06-25T01:20:24+02:00 (9 years ago)
- Location:
- trunk/src/org/openstreetmap/josm
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/org/openstreetmap/josm/actions/CreateMultipolygonAction.java
r8513 r8533 332 332 } 333 333 334 p ublicstatic final List<String> DEFAULT_LINEAR_TAGS = Arrays.asList("barrier", "fence_type", "source");334 private static final List<String> DEFAULT_LINEAR_TAGS = Arrays.asList("barrier", "fence_type", "source"); 335 335 336 336 /** -
trunk/src/org/openstreetmap/josm/data/osm/event/DatasetEventManager.java
r8510 r8533 33 33 public void run() { 34 34 while (!eventsInEDT.isEmpty()) { 35 List<AbstractDatasetChangedEvent> events = new ArrayList<>(eventsInEDT);36 37 35 DataSet dataSet = null; 38 36 AbstractDatasetChangedEvent consolidatedEvent = null; … … 126 124 } 127 125 126 /** 127 * Replies the unique instance. 128 * @return the unique instance 129 */ 128 130 public static DatasetEventManager getInstance() { 129 131 return instance; -
trunk/src/org/openstreetmap/josm/data/projection/CustomProjection.java
r8510 r8533 103 103 104 104 /** Map of all parameters by key */ 105 publicstatic final Map<String, Param> paramsByKey = new HashMap<>();105 static final Map<String, Param> paramsByKey = new HashMap<>(); 106 106 static { 107 107 for (Param p : Param.values()) { -
trunk/src/org/openstreetmap/josm/data/projection/Projections.java
r8451 r8533 7 7 import java.io.InputStreamReader; 8 8 import java.nio.charset.StandardCharsets; 9 import java.util.ArrayList; 9 10 import java.util.Collection; 10 11 import java.util.Collections; 11 12 import java.util.HashMap; 12 13 import java.util.HashSet; 14 import java.util.List; 13 15 import java.util.Locale; 14 16 import java.util.Map; … … 36 38 import org.openstreetmap.josm.io.CachedFile; 37 39 import org.openstreetmap.josm.tools.Pair; 40 import org.openstreetmap.josm.tools.Utils; 38 41 39 42 /** … … 62 65 * should be compatible to PROJ.4 63 66 */ 64 publicstatic final Map<String, ProjFactory> projs = new HashMap<>();65 publicstatic final Map<String, Ellipsoid> ellipsoids = new HashMap<>();66 publicstatic final Map<String, Datum> datums = new HashMap<>();67 publicstatic final Map<String, NTV2GridShiftFileWrapper> nadgrids = new HashMap<>();68 publicstatic final Map<String, Pair<String, String>> inits = new HashMap<>();67 static final Map<String, ProjFactory> projs = new HashMap<>(); 68 static final Map<String, Ellipsoid> ellipsoids = new HashMap<>(); 69 static final Map<String, Datum> datums = new HashMap<>(); 70 static final Map<String, NTV2GridShiftFileWrapper> nadgrids = new HashMap<>(); 71 static final Map<String, Pair<String, String>> inits = new HashMap<>(); 69 72 70 73 static { … … 216 219 return Collections.unmodifiableCollection(allCodes); 217 220 } 221 222 private static String listKeys(Map<String, ?> map) { 223 List<String> keys = new ArrayList<>(map.keySet()); 224 Collections.sort(keys); 225 return Utils.join(", ", keys); 226 } 227 228 /** 229 * Replies the list of projections as string (comma separated). 230 * @return the list of projections as string (comma separated) 231 * @since 8533 232 */ 233 public static String listProjs() { 234 return listKeys(projs); 235 } 236 237 /** 238 * Replies the list of ellipsoids as string (comma separated). 239 * @return the list of ellipsoids as string (comma separated) 240 * @since 8533 241 */ 242 public static String listEllipsoids() { 243 return listKeys(ellipsoids); 244 } 245 246 /** 247 * Replies the list of datums as string (comma separated). 248 * @return the list of datums as string (comma separated) 249 * @since 8533 250 */ 251 public static String listDatums() { 252 return listKeys(datums); 253 } 254 255 /** 256 * Replies the list of nadgrids as string (comma separated). 257 * @return the list of nadgrids as string (comma separated) 258 * @since 8533 259 */ 260 public static String listNadgrids() { 261 return listKeys(nadgrids); 262 } 218 263 } -
trunk/src/org/openstreetmap/josm/gui/preferences/projection/CustomProjectionChoice.java
r8512 r8533 9 9 import java.awt.event.ActionEvent; 10 10 import java.awt.event.ActionListener; 11 import java.util.ArrayList;12 11 import java.util.Arrays; 13 12 import java.util.Collection; … … 15 14 import java.util.LinkedList; 16 15 import java.util.List; 17 import java.util.Map;18 16 19 17 import javax.swing.JButton; … … 36 34 import org.openstreetmap.josm.tools.GBC; 37 35 import org.openstreetmap.josm.tools.ImageProvider; 38 import org.openstreetmap.josm.tools.Utils;39 36 40 37 public class CustomProjectionChoice extends AbstractProjectionChoice implements SubPrefsOptions { … … 171 168 s.append("<b>+proj=...</b> - <i>").append(tr("Projection name")) 172 169 .append("</i><br> ").append(tr("Supported values:")).append(' ') 173 .append( listKeys(Projections.projs))170 .append(Projections.listProjs()) 174 171 .append("<br><b>+lat_0=..., +lat_1=..., +lat_2=...</b> - <i>").append(tr("Projection parameters")) 175 172 .append("</i><br><b>+x_0=..., +y_0=...</b> - <i>").append(tr("False easting and false northing")) … … 178 175 .append("</i><br><b>+ellps=...</b> - <i>").append(tr("Ellipsoid name")) 179 176 .append("</i><br> ").append(tr("Supported values:")).append(' ') 180 .append( listKeys(Projections.ellipsoids))177 .append(Projections.listEllipsoids()) 181 178 .append("<br><b>+a=..., +b=..., +rf=..., +f=..., +es=...</b> - <i>").append(tr("Ellipsoid parameters")) 182 179 .append("</i><br><b>+datum=...</b> - <i>").append(tr("Datum name")) 183 180 .append("</i><br> ").append(tr("Supported values:")).append(' ') 184 .append( listKeys(Projections.datums))181 .append(Projections.listDatums()) 185 182 .append("<br><b>+towgs84=...</b> - <i>").append(tr("3 or 7 term datum transform parameters")) 186 183 .append("</i><br><b>+nadgrids=...</b> - <i>").append(tr("NTv2 grid file")) 187 184 .append("</i><br> ").append(tr("Built-in:")).append(' ') 188 .append( listKeys(Projections.nadgrids))185 .append(Projections.listNadgrids()) 189 186 .append("<br><b>+bounds=</b>minlon,minlat,maxlon,maxlat - <i>").append(tr("Projection bounds (in degrees)")) 190 187 .append("</i><br><b>+wmssrs=</b>EPSG:123456 - <i>").append(tr("Sets the SRS=... parameter in the WMS request")) … … 192 189 193 190 return new HtmlPanel(s.toString()); 194 }195 196 private String listKeys(Map<String, ?> map) {197 List<String> keys = new ArrayList<>(map.keySet());198 Collections.sort(keys);199 return Utils.join(", ", keys);200 191 } 201 192 }
Note:
See TracChangeset
for help on using the changeset viewer.