Changeset 7596 in josm for trunk/src/org


Ignore:
Timestamp:
2014-10-04T17:41:26+02:00 (10 years ago)
Author:
Don-vip
Message:

fix various warnings

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

Legend:

Unmodified
Added
Removed

  • trunk/src/org/openstreetmap/josm/gui/layer/WMSLayer.java

    r7509 r7596  
    9898
    9999    // Fake reference to keep build scripts from removing ObjectFactory class. This class is not used directly but it's necessary for jaxb to work
     100    @SuppressWarnings("unused")
    100101    private static final ObjectFactory OBJECT_FACTORY = null;
    101102

  • trunk/src/org/openstreetmap/josm/gui/mappaint/ElemStyles.java

    r7568 r7596  
    66import java.util.Collection;
    77import java.util.Collections;
    8 import java.util.Iterator;
    98import java.util.List;
    109import java.util.Map.Entry;

  • trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/ExpressionFactory.java

    r7530 r7596  
    2828import org.openstreetmap.josm.data.osm.Node;
    2929import org.openstreetmap.josm.data.osm.OsmPrimitive;
    30 import org.openstreetmap.josm.data.osm.Way;
    3130import org.openstreetmap.josm.gui.mappaint.Cascade;
    3231import org.openstreetmap.josm.gui.mappaint.Environment;

  • trunk/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java

    r7563 r7596  
    1414import java.util.List;
    1515import java.util.Map;
    16 import java.util.Objects;
    1716
    1817import org.openstreetmap.josm.Main;

  • trunk/src/org/openstreetmap/josm/io/FileImporter.java

    r7392 r7596  
    4848    /**
    4949     * A batch importer is a file importer that prefers to read multiple files at the same time.
     50     * @return {@code true} if this importer is a batch importer
    5051     */
    5152    public boolean isBatchImporter() {
    … …  
    5556    /**
    5657     * Needs to be implemented if isBatchImporter() returns false.
     58     * @param file file to import
     59     * @param progressMonitor progress monitor
     60     * @throws IOException if any I/O error occurs
     61     * @throws IllegalDataException if invalid data is read
    5762     */
    5863    public void importData(File file, ProgressMonitor progressMonitor) throws IOException, IllegalDataException {
    … …  
    6267    /**
    6368     * Needs to be implemented if isBatchImporter() returns true.
     69     * @param files files to import
     70     * @param progressMonitor progress monitor
     71     * @throws IOException if any I/O error occurs
     72     * @throws IllegalDataException if invalid data is read
    6473     */
    6574    public void importData(List<File> files, ProgressMonitor progressMonitor) throws IOException, IllegalDataException {

  • trunk/src/org/openstreetmap/josm/io/NmeaReader.java

    r7518 r7596  
    33
    44import java.io.BufferedReader;
     5import java.io.IOException;
    56import java.io.InputStream;
    67import java.io.InputStreamReader;
    … …  
    165166    }
    166167
    167     public NmeaReader(InputStream source) {
     168    public NmeaReader(InputStream source) throws IOException {
    168169
    169170        // create the data tree
    … …  
    201202            data.tracks.add(new ImmutableGpxTrack(currentTrack, Collections.<String, Object>emptyMap()));
    202203
    203         } catch (Exception e) {
     204        } catch (IllegalDataException e) {
    204205            Main.warn(e);
    205206        }

  • trunk/src/org/openstreetmap/josm/plugins/PluginDownloadTask.java

    r7509 r7596  
    4444    private final Collection<PluginInformation> failed = new LinkedList<>();
    4545    private final Collection<PluginInformation> downloaded = new LinkedList<>();
    46     private Exception lastException;
     46    //private Exception lastException;
    4747    private boolean canceled;
    4848    private HttpURLConnection downloadConnection;
    … …  
    155155        File pluginDir = Main.pref.getPluginsDirectory();
    156156        if (!pluginDir.exists() && !pluginDir.mkdirs()) {
    157             lastException = new PluginDownloadException(tr("Failed to create plugin directory ''{0}''", pluginDir.toString()));
     157            //lastException = new PluginDownloadException(tr("Failed to create plugin directory ''{0}''", pluginDir.toString()));
    158158            failed.addAll(toUpdate);
    159159            return;

  • trunk/src/org/openstreetmap/josm/plugins/ReadLocalPluginInformationTask.java

    r7033 r7596  
    1919import org.openstreetmap.josm.io.OsmTransferException;
    2020import org.openstreetmap.josm.tools.ImageProvider;
    21 import org.openstreetmap.josm.tools.Utils;
    2221import org.xml.sax.SAXException;
    2322

  • trunk/src/org/openstreetmap/josm/tools/ExceptionUtil.java

    r7434 r7596  
    3636import org.openstreetmap.josm.tools.date.DateUtils;
    3737
    38 @SuppressWarnings("CallToThreadDumpStack")
    3938public final class ExceptionUtil {
    4039

  • trunk/src/org/openstreetmap/josm/tools/GeoPropertyIndex.java

    r7592 r7596  
    120120            if (children == null) {
    121121                @SuppressWarnings("unchecked")
    122                 GPLevel<T>[] tmp = (GPLevel<T>[]) new GPLevel[4];
     122                GPLevel<T>[] tmp = new GPLevel[4];
    123123                this.children = tmp;
    124124            }
Note: See TracChangeset for help on using the changeset viewer.