Changeset 15121 in josm for trunk/src/org/openstreetmap/josm/gui/io

Timestamp:

2019-05-27T12:37:31+02:00 (5 years ago)

Author:

Don-vip

Message:

sonarqube, javadoc

Location:

trunk/src/org/openstreetmap/josm/gui/io

Files:

• SaveLayerInfo.java (modified) (2 diffs)
• UploadDialog.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/io/SaveLayerInfo.java

@@ -99 +99 @@
      */
     public void setDoSaveToFile(boolean doSaveToFile) {
-        this.doSaveToFile = isSavable() ? doSaveToFile : false;
+        this.doSaveToFile = isSavable() && doSaveToFile;
     }
 
@@ -117 +117 @@
      */
     public void setDoUploadToServer(boolean doUploadToServer) {
-        this.doUploadToServer = isUploadable() ? doUploadToServer : false;
+        this.doUploadToServer = isUploadable() && doUploadToServer;
     }
 

trunk/src/org/openstreetmap/josm/gui/io/UploadDialog.java

@@ -604 +604 @@
             List<String> forbiddenTerms = Config.getPref().getList(preferencePrefix+".forbidden-terms", defForbidden)
                     .stream().map(UploadAction::lower)
-                    .filter(x -> uploadValueLc.contains(x) && !exceptions.stream().anyMatch(uploadValueLc::contains))
+                    .filter(x -> uploadValueLc.contains(x) && exceptions.stream().noneMatch(uploadValueLc::contains))
                     .collect(Collectors.toList());
             if (!forbiddenTerms.isEmpty()) {