Changeset 10632 in josm for trunk/src/org/openstreetmap

Timestamp:

2016-07-24T23:50:15+02:00 (8 years ago)

Author:

Don-vip

Message:

sonar - squid:RedundantThrowsDeclarationCheck - Throws declarations should not be superfluous

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/osm/MultipolygonBuilder.java (modified) (1 diff)
• data/osm/Relation.java (modified) (2 diffs)
• data/osm/Way.java (modified) (1 diff)
• data/osm/history/HistoryRelation.java (modified) (1 diff)
• data/osm/history/HistoryWay.java (modified) (1 diff)
• data/validation/tests/ConditionalKeys.java (modified) (1 diff)
• data/validation/tests/TagChecker.java (modified) (2 diffs)
• gui/layer/geoimage/CorrelateGpxWithImages.java (modified) (1 diff)
• io/BoundingBoxDownloader.java (modified) (1 diff)
• io/Capabilities.java (modified) (1 diff)
• io/NmeaReader.java (modified) (1 diff)
• io/OsmExporter.java (modified) (3 diffs)
• io/remotecontrol/RemoteControlHttpsServer.java (modified) (1 diff)
• io/session/SessionReader.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/data/osm/MultipolygonBuilder.java

@@ -170 +170 @@
      * @throws JoinedPolygonCreationException if the creation fails.
      */
-    public static List<JoinedPolygon> joinWays(Collection<Way> ways) throws JoinedPolygonCreationException {
+    public static List<JoinedPolygon> joinWays(Collection<Way> ways) {
         List<JoinedPolygon> joinedWays = new ArrayList<>();
 

trunk/src/org/openstreetmap/josm/data/osm/Relation.java

@@ -484 +484 @@
     }
 
-    private void checkMembers() throws DataIntegrityProblemException {
+    /**
+     * Checks that members are part of the same dataset, and that they're not deleted.
+     * @throws DataIntegrityProblemException if one the above conditions is not met
+     */
+    private void checkMembers() {
         DataSet dataSet = getDataSet();
         if (dataSet != null) {
@@ -503 +507 @@
     }
 
-    private void fireMembersChanged() throws DataIntegrityProblemException {
+    /**
+     * Fires the {@code RelationMembersChangedEvent} to listeners.
+     * @throws DataIntegrityProblemException if members are not valid
+     * @see #checkMembers
+     */
+    private void fireMembersChanged() {
         checkMembers();
         if (getDataSet() != null) {

trunk/src/org/openstreetmap/josm/data/osm/Way.java

@@ -448 +448 @@
      * @since 1313
      */
-    public void addNode(int offs, Node n) throws IndexOutOfBoundsException {
+    public void addNode(int offs, Node n) {
         if (n == null) return;
 

trunk/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java

@@ -111 +111 @@
      * @throws IndexOutOfBoundsException if idx is out of bounds
      */
-    public RelationMemberData getRelationMember(int idx) throws IndexOutOfBoundsException {
+    public RelationMemberData getRelationMember(int idx) {
         if (idx < 0 || idx >= members.size())
             throw new IndexOutOfBoundsException(

trunk/src/org/openstreetmap/josm/data/osm/history/HistoryWay.java

@@ -97 +97 @@
      * @throws IndexOutOfBoundsException if  idx < 0 || idx >= {#see {@link #getNumNodes()}
      */
-    public long getNodeId(int idx) throws IndexOutOfBoundsException {
+    public long getNodeId(int idx) {
         if (idx < 0 || idx >= nodeIds.size())
             throw new IndexOutOfBoundsException(tr("Parameter {0} not in range 0..{1}. Got ''{2}''.", "idx", nodeIds.size(), idx));

trunk/src/org/openstreetmap/josm/data/validation/tests/ConditionalKeys.java

@@ -102 +102 @@
         }
 
-        public static List<ConditionalValue> parse(String value) throws ConditionalParsingException {
+        /**
+         * Parses the condition values as string.
+         * @param value value, must match {@code <restriction-value> @ <condition>[;<restriction-value> @ <condition>]} pattern
+         * @return list of {@code ConditionalValue}s
+         * @throws ConditionalParsingException if {@code value} does not match expected pattern
+         */
+        public static List<ConditionalValue> parse(String value) {
             // <restriction-value> @ <condition>[;<restriction-value> @ <condition>]
             final List<ConditionalValue> r = new ArrayList<>();

trunk/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java

@@ -718 +718 @@
             public boolean valueBool;
 
-            private static Pattern getPattern(String str) throws PatternSyntaxException {
+            private static Pattern getPattern(String str) {
                 if (str.endsWith("/i"))
                     return Pattern.compile(str.substring(1, str.length()-2), Pattern.CASE_INSENSITIVE);
@@ -727 +727 @@
             }
 
-            public CheckerElement(String exp) throws PatternSyntaxException {
+            public CheckerElement(String exp) {
                 Matcher m = Pattern.compile("(.+)([!=]=)(.+)").matcher(exp);
                 m.matches();

trunk/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java

@@ -980 +980 @@
      * @throws NoGpxTimestamps when the gpx track does not contain a timestamp
      */
-    static Pair<Timezone, Offset> autoGuess(List<ImageEntry> imgs, GpxData gpx) throws IndexOutOfBoundsException, NoGpxTimestamps {
+    static Pair<Timezone, Offset> autoGuess(List<ImageEntry> imgs, GpxData gpx) throws NoGpxTimestamps {
 
         // Init variables

trunk/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java

@@ -203 +203 @@
 
     @Override
-    public List<Note> parseNotes(int noteLimit, int daysClosed, ProgressMonitor progressMonitor)
-            throws OsmTransferException, MoreNotesException {
+    public List<Note> parseNotes(int noteLimit, int daysClosed, ProgressMonitor progressMonitor) throws OsmTransferException {
         progressMonitor.beginTask(tr("Downloading notes"));
         CheckParameterUtil.ensureThat(noteLimit > 0, "Requested note limit is less than 1.");

trunk/src/org/openstreetmap/josm/io/Capabilities.java

@@ -98 +98 @@
      * @throws NumberFormatException if the value is not a valid double
      */
-    public Double getDouble(String element, String attribute) throws NumberFormatException {
+    public Double getDouble(String element, String attribute) {
         String s = get(element, attribute);
         if (s == null) return null;

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

@@ -447 +447 @@
     }
 
-    private static LatLon parseLatLon(String ns, String ew, String dlat, String dlon)
-    throws NumberFormatException {
+    private static LatLon parseLatLon(String ns, String ew, String dlat, String dlon) {
         String widthNorth = dlat.trim();
         String lengthEast = dlon.trim();

trunk/src/org/openstreetmap/josm/io/OsmExporter.java

@@ -5 +5 @@
 
 import java.io.File;
-import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.OutputStream;
@@ -76 +75 @@
     }
 
-    protected static OutputStream getOutputStream(File file) throws FileNotFoundException, IOException {
+    protected static OutputStream getOutputStream(File file) throws IOException {
         return Compression.getCompressedFileOutputStream(file);
     }
@@ -125 +124 @@
     }
 
-    protected void doSave(File file, OsmDataLayer layer) throws IOException, FileNotFoundException {
+    protected void doSave(File file, OsmDataLayer layer) throws IOException {
         // create outputstream and wrap it with gzip or bzip, if necessary
         try (

trunk/src/org/openstreetmap/josm/io/remotecontrol/RemoteControlHttpsServer.java

@@ -363 +363 @@
      * @param ipv6 Whether IPv6 or IPv4 server should be started
      * @throws IOException when connection errors
-     * @throws NoSuchAlgorithmException if the JVM does not support TLS (can not happen)
      * @throws GeneralSecurityException in case of SSL setup errors
      * @since 8339
      */
-    public RemoteControlHttpsServer(int port, boolean ipv6) throws IOException, NoSuchAlgorithmException, GeneralSecurityException {
+    public RemoteControlHttpsServer(int port, boolean ipv6) throws IOException, GeneralSecurityException {
         super("RemoteControl HTTPS Server");
         this.setDaemon(true);

trunk/src/org/openstreetmap/josm/io/session/SessionReader.java

@@ -606 +606 @@
     }
 
-    private static InputStream getZipInputStream(ZipFile zipFile) throws ZipException, IOException, IllegalDataException {
+    private static InputStream getZipInputStream(ZipFile zipFile) throws IOException, IllegalDataException {
         ZipEntry josEntry = null;
         Enumeration<? extends ZipEntry> entries = zipFile.entries();