Changeset 9135 in josm


Ignore:
Timestamp:
2015-12-15T23:14:37+01:00 (4 years ago)
Author:
Don-vip
Message:

checkstyle

Location:
trunk/src/org/openstreetmap/josm
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/org/openstreetmap/josm/data/imagery/ImageryInfo.java

    r9134 r9135  
    202202    private boolean isGeoreferenceValid = false;
    203203    private boolean isEpsg4326To3857Supported = false;
    204     // when adding a field, also adapt the ImageryInfo(ImageryInfo) and ImageryInfo(ImageryPreferenceEntry) constructor, equals method, and ImageryPreferenceEntry
     204    // when adding a field, also adapt the ImageryInfo(ImageryInfo)
     205    // and ImageryInfo(ImageryPreferenceEntry) constructor, equals method, and ImageryPreferenceEntry
    205206
    206207    /**
  • trunk/src/org/openstreetmap/josm/data/projection/AbstractProjection.java

    r9121 r9135  
    126126                    double dLon = (b.getMaxLon() - b.getMinLon()) / 1000;
    127127                    double dLat = (b.getMaxLat() - b.getMinLat()) / 1000;
    128                     for (double lon=b.getMinLon(); lon<b.getMaxLon(); lon += dLon) {
     128                    for (double lon = b.getMinLon(); lon < b.getMaxLon(); lon += dLon) {
    129129                        result.extend(latlon2eastNorth(new LatLon(b.getMinLat(), lon)));
    130130                        result.extend(latlon2eastNorth(new LatLon(b.getMaxLat(), lon)));
    131131                    }
    132                     for (double lat=b.getMinLat(); lat<b.getMaxLat(); lat += dLat) {
     132                    for (double lat = b.getMinLat(); lat < b.getMaxLat(); lat += dLat) {
    133133                        result.extend(latlon2eastNorth(new LatLon(lat, b.getMinLon())));
    134134                        result.extend(latlon2eastNorth(new LatLon(lat, b.getMaxLon())));
  • trunk/src/org/openstreetmap/josm/data/projection/CustomProjection.java

    r9128 r9135  
    274274     * @param ignoreUnknownParameter true, if unknown parameter should not raise exception
    275275     * @return parameters map
    276      * @throws ProjectionConfigurationException
     276     * @throws ProjectionConfigurationException in case of invalid parameter
    277277     */
    278278    public static Map<String, String> parseParameterList(String pref, boolean ignoreUnknownParameter) throws ProjectionConfigurationException {
     
    324324     * @param ignoreUnknownParameter true, if unknown parameter should not raise exception
    325325     * @return parameters map with +init includes resolved
    326      * @throws ProjectionConfigurationException
    327      */
    328     public static Map<String, String> resolveInits(Map<String, String> parameters , boolean ignoreUnknownParameter) throws ProjectionConfigurationException {
     326     * @throws ProjectionConfigurationException in case of invalid parameter
     327     */
     328    public static Map<String, String> resolveInits(Map<String, String> parameters, boolean ignoreUnknownParameter)
     329            throws ProjectionConfigurationException {
    329330        // recursive resolution of +init includes
    330331        String initKey = parameters.get(Param.init.key);
  • trunk/src/org/openstreetmap/josm/data/projection/Projections.java

    r9133 r9135  
    1919import java.util.regex.Matcher;
    2020import java.util.regex.Pattern;
     21
    2122import org.openstreetmap.josm.Main;
    2223import org.openstreetmap.josm.data.coor.EastNorth;
     
    218219     * @param path the path
    219220     * @return projection definitions
    220      * @throws java.io.IOException
     221     * @throws IOException in case of I/O error
    221222     */
    222223    public static List<ProjectionDefinition> loadProjectionDefinitions(String path) throws IOException {
     
    234235     * @param r the reader
    235236     * @return projection definitions
    236      * @throws java.io.IOException
     237     * @throws IOException in case of I/O error
    237238     */
    238239    public static List<ProjectionDefinition> loadProjectionDefinitions(BufferedReader r) throws IOException {
  • trunk/src/org/openstreetmap/josm/gui/layer/AlignImageryPanel.java

    r9134 r9135  
    4040    public AlignImageryPanel(boolean oneLine, final BooleanProperty showAgain, ImageryInfo infoToAdd) {
    4141        Font font = getFont().deriveFont(Font.PLAIN, 14.0f);
    42         JLabel nagLabel = new JLabel(tr("Aerial imagery \"{0}\" might be misaligned. Please check its offset using GPS tracks!", infoToAdd.getName()));
     42        JLabel nagLabel = new JLabel(
     43                tr("Aerial imagery \"{0}\" might be misaligned. Please check its offset using GPS tracks!", infoToAdd.getName()));
    4344        UrlLabel detailsList = new UrlLabel(tr("http://wiki.openstreetmap.org/wiki/Using_Imagery"), tr("Details..."));
    4445        nagLabel.setLabelFor(detailsList);
     
    8687    public static void addNagPanelIfNeeded(ImageryInfo infoToAdd) {
    8788        BooleanProperty showAgain = new BooleanProperty("message.imagery.nagPanel." + infoToAdd.getUrl(), true);
    88         if (Main.isDisplayingMapView() && showAgain.get() && !infoToAdd.isGeoreferenceValid() ) {
     89        if (Main.isDisplayingMapView() && showAgain.get() && !infoToAdd.isGeoreferenceValid()) {
    8990            if (Main.map.getTopPanel(AlignImageryPanel.class) == null) {
    9091                double w = Toolkit.getDefaultToolkit().getScreenSize().getWidth();
  • trunk/src/org/openstreetmap/josm/gui/layer/WMSLayer.java

    r9134 r9135  
    116116    public boolean isProjectionSupported(Projection proj) {
    117117        return supportedProjections == null || supportedProjections.isEmpty() || supportedProjections.contains(proj.toCode()) ||
    118                 (info.isEpsg4326To3857Supported() && supportedProjections.contains("EPSG:4326") &&  "EPSG:3857".equals(Main.getProjection().toCode()));
     118                (info.isEpsg4326To3857Supported() && supportedProjections.contains("EPSG:4326")
     119                        &&  "EPSG:3857".equals(Main.getProjection().toCode()));
    119120    }
    120121
Note: See TracChangeset for help on using the changeset viewer.