Changeset 11381 in josm

Timestamp:

2016-12-12T02:28:14+01:00 (7 years ago)

Author:

Don-vip

Message:

findbugs - RCN_REDUNDANT_NULLCHECK_OF_NONNULL_VALUE

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/CopyCoordinatesAction.java (modified) (1 diff)
• actions/ZoomToAction.java (modified) (1 diff)
• actions/mapmode/ImproveWayAccuracyAction.java (modified) (1 diff)
• actions/mapmode/PlayHeadDragMode.java (modified) (1 diff)
• data/CustomConfigurator.java (modified) (4 diffs)
• data/cache/HostLimitQueue.java (modified) (2 diffs)
• data/validation/tests/TagChecker.java (modified) (1 diff)
• gui/conflict/pair/tags/TagMerger.java (modified) (3 diffs)
• gui/datatransfer/importers/TextTagPaster.java (modified) (2 diffs)
• gui/dialogs/UserListDialog.java (modified) (2 diffs)
• gui/dialogs/properties/PresetListPanel.java (modified) (1 diff)
• gui/dialogs/validator/ValidatorTreePanel.java (modified) (1 diff)
• gui/layer/AbstractTileSourceLayer.java (modified) (1 diff)
• gui/layer/markerlayer/MarkerLayer.java (modified) (2 diffs)
• gui/layer/markerlayer/PlayHeadMarker.java (modified) (1 diff)
• gui/oauth/OsmOAuthAuthorizationClient.java (modified) (2 diffs)
• gui/tagging/presets/items/ComboMultiSelect.java (modified) (2 diffs)
• gui/util/GuiHelper.java (modified) (1 diff)
• io/ChangesetQuery.java (modified) (1 diff)
• io/OsmApi.java (modified) (2 diffs)
• io/imagery/WMSImagery.java (modified) (1 diff)
• io/session/SessionReader.java (modified) (3 diffs)
• plugins/PluginListParser.java (modified) (1 diff)
• tools/HttpClient.java (modified) (2 diffs)
• tools/WindowGeometry.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/actions/CopyCoordinatesAction.java

@@ -51 +51 @@
     private Collection<Node> getSelectedNodes() {
         DataSet ds = getLayerManager().getEditDataSet();
-        if (ds == null || ds.getSelected() == null) {
+        if (ds == null) {
             return Collections.emptyList();
         } else {

trunk/src/org/openstreetmap/josm/actions/ZoomToAction.java

@@ -70 +70 @@
             return;
         int[] rows = this.table.getSelectedRows();
-        if (rows == null || rows.length == 0)
+        if (rows.length == 0)
             return;
         int row = rows[0];

trunk/src/org/openstreetmap/josm/actions/mapmode/ImproveWayAccuracyAction.java

@@ -401 +401 @@
                 updateStateByCurrentSelection();
             }
-        } else if (state == State.IMPROVING && mousePos != null) {
+        } else if (state == State.IMPROVING) {
             // Checking if the new coordinate is outside of the world
             if (mv.getLatLon(mousePos.x, mousePos.y).isOutSideWorld()) {

trunk/src/org/openstreetmap/josm/actions/mapmode/PlayHeadDragMode.java

@@ -66 +66 @@
 
     @Override public void mouseReleased(MouseEvent ev) {
-        Point p = ev.getPoint();
         mouseStart = null;
-        if (ev.getButton() != MouseEvent.BUTTON1 || p == null || !dragging)
+        if (ev.getButton() != MouseEvent.BUTTON1 || !dragging)
             return;
 

trunk/src/org/openstreetmap/josm/data/CustomConfigurator.java

@@ -566 +566 @@
                 String pattern = evalVars(item.getAttribute("pattern"));
                 String key = evalVars(item.getAttribute("key"));
-                if (key != null) {
-                    PreferencesUtils.deletePreferenceKey(key, mainPrefs);
-                }
-                if (pattern != null) {
-                    PreferencesUtils.deletePreferenceKeyByPattern(pattern, mainPrefs);
-                }
+                PreferencesUtils.deletePreferenceKey(key, mainPrefs);
+                PreferencesUtils.deletePreferenceKeyByPattern(pattern, mainPrefs);
                 return;
             }
@@ -609 +605 @@
 
         private void processDownloadElement(Element item) {
-            String address = evalVars(item.getAttribute("url"));
-            String path = evalVars(item.getAttribute("path"));
-            String unzip = evalVars(item.getAttribute("unzip"));
-            String mkdir = evalVars(item.getAttribute("mkdir"));
-
             String base = evalVars(item.getAttribute("base"));
             String dir = getDirectoryByAbbr(base);
@@ -621 +612 @@
             }
 
+            String path = evalVars(item.getAttribute("path"));
             if (path.contains("..") || path.startsWith("/") || path.contains(":")) {
                 return; // some basic protection
             }
-            if (address == null || path == null || address.isEmpty() || path.isEmpty()) {
+
+            String address = evalVars(item.getAttribute("url"));
+            if (address.isEmpty() || path.isEmpty()) {
                 log("Error: Please specify url=\"where to get file\" and path=\"where to place it\"");
                 return;
             }
+
+            String unzip = evalVars(item.getAttribute("unzip"));
+            String mkdir = evalVars(item.getAttribute("mkdir"));
             processDownloadOperation(address, path, dir, "true".equals(mkdir), "true".equals(unzip));
         }
@@ -641 +638 @@
             String text = evalVars(elem.getAttribute("text"));
             String locText = evalVars(elem.getAttribute(LanguageInfo.getJOSMLocaleCode()+".text"));
-            if (locText != null && !locText.isEmpty()) text = locText;
+            if (!locText.isEmpty()) text = locText;
 
             String type = evalVars(elem.getAttribute("type"));

trunk/src/org/openstreetmap/josm/data/cache/HostLimitQueue.java

@@ -89 +89 @@
         }
         job = takeFirst();
-        if (job != null) {
-            acquireSemaphore(job);
-        }
+        acquireSemaphore(job);
         return job;
     }
@@ -119 +117 @@
         if (job instanceof JCSCachedTileLoaderJob) {
             final JCSCachedTileLoaderJob<?, ?> jcsJob = (JCSCachedTileLoaderJob<?, ?>) job;
-            Semaphore limit = getSemaphore(jcsJob);
-            if (limit != null) {
-                limit.acquire();
-                jcsJob.setFinishedTask(() -> releaseSemaphore(jcsJob));
-            }
+            getSemaphore(jcsJob).acquire();
+            jcsJob.setFinishedTask(() -> releaseSemaphore(jcsJob));
         }
     }

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

@@ -669 +669 @@
         for (OsmPrimitive p : primitives) {
             Map<String, String> tags = p.getKeys();
-            if (tags == null || tags.isEmpty()) {
+            if (tags.isEmpty()) {
                 continue;
             }

trunk/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java

@@ -273 +273 @@
         public void actionPerformed(ActionEvent arg0) {
             int[] rows = mineTable.getSelectedRows();
-            if (rows == null || rows.length == 0)
+            if (rows.length == 0)
                 return;
             model.decide(rows, MergeDecisionType.KEEP_MINE);
@@ -305 +305 @@
         public void actionPerformed(ActionEvent arg0) {
             int[] rows = theirTable.getSelectedRows();
-            if (rows == null || rows.length == 0)
+            if (rows.length == 0)
                 return;
             model.decide(rows, MergeDecisionType.KEEP_THEIR);
@@ -403 +403 @@
         public void actionPerformed(ActionEvent arg0) {
             int[] rows = mergedTable.getSelectedRows();
-            if (rows == null || rows.length == 0)
+            if (rows.length == 0)
                 return;
             model.decide(rows, MergeDecisionType.UNDECIDED);

trunk/src/org/openstreetmap/josm/gui/datatransfer/importers/TextTagPaster.java

@@ -40 +40 @@
 
     private boolean containsValidTags(TransferSupport support) throws UnsupportedFlavorException, IOException {
-        Map<String, String> tags = getTagsImpl(support);
-        return tags != null && !tags.isEmpty();
+        return !getTagsImpl(support).isEmpty();
     }
 
@@ -47 +46 @@
     protected Map<String, String> getTags(TransferSupport support) throws UnsupportedFlavorException, IOException {
         Map<String, String> tags = getTagsImpl(support);
-        if (tags == null || tags.isEmpty()) {
+        if (tags.isEmpty()) {
             TextTagParser.showBadBufferMessage(help);
             throw new IOException("Invalid tags to paste.");

trunk/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java

@@ -160 +160 @@
         public void select() {
             int[] indexes = userTable.getSelectedRows();
-            if (indexes == null || indexes.length == 0)
+            if (indexes.length == 0)
                 return;
             model.selectPrimitivesOwnedBy(userTable.getSelectedRows());
@@ -196 +196 @@
         public void actionPerformed(ActionEvent e) {
             int[] rows = userTable.getSelectedRows();
-            if (rows == null || rows.length == 0)
+            if (rows.length == 0)
                 return;
             List<User> users = model.getSelectedUsers(rows);

trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PresetListPanel.java

@@ -37 +37 @@
         public void mouseClicked(MouseEvent e) {
             Collection<OsmPrimitive> selection = t.createSelection(presetHandler.getSelection());
-            if (selection == null || selection.isEmpty())
+            if (selection.isEmpty())
                 return;
             int answer = t.showDialog(selection, false);

trunk/src/org/openstreetmap/josm/gui/dialogs/validator/ValidatorTreePanel.java

@@ -354 +354 @@
                     && ((DefaultMutableTreeNode) child).getUserObject() instanceof TestError) {
                 final TestError error = (TestError) ((DefaultMutableTreeNode) child).getUserObject();
-                if (error.getPrimitives() != null) {
-                    if (error.getPrimitives().stream().anyMatch(isRelevant)) {
-                        paths.add(p.pathByAddingChild(child));
-                    }
+                if (error.getPrimitives().stream().anyMatch(isRelevant)) {
+                    paths.add(p.pathByAddingChild(child));
                 }
             } else {

trunk/src/org/openstreetmap/josm/gui/layer/AbstractTileSourceLayer.java

@@ -1167 +1167 @@
 
             Rectangle2D sourceRect = coordinateConverter.getRectangleForTile(tile);
-            if (borderRect != null && !sourceRect.intersects(borderRect)) {
+            if (!sourceRect.intersects(borderRect)) {
                 continue;
             }

trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java

@@ -147 +147 @@
                     return;
                 boolean mousePressedInButton = false;
-                if (e.getPoint() != null) {
-                    for (Marker mkr : data) {
-                        if (mkr.containsPoint(e.getPoint())) {
-                            mousePressedInButton = true;
-                            break;
-                        }
+                for (Marker mkr : data) {
+                    if (mkr.containsPoint(e.getPoint())) {
+                        mousePressedInButton = true;
+                        break;
                     }
                 }
@@ -170 +168 @@
                 if (!isVisible())
                     return;
-                if (ev.getPoint() != null) {
-                    for (Marker mkr : data) {
-                        if (mkr.containsPoint(ev.getPoint())) {
-                            mkr.actionPerformed(new ActionEvent(this, 0, null));
-                        }
+                for (Marker mkr : data) {
+                    if (mkr.containsPoint(ev.getPoint())) {
+                        mkr.actionPerformed(new ActionEvent(this, 0, null));
                     }
                 }

trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/PlayHeadMarker.java

@@ -64 +64 @@
             Main.map.mapView.addMouseListener(new MouseAdapter() {
                 @Override public void mousePressed(MouseEvent ev) {
-                    Point p = ev.getPoint();
-                    if (ev.getButton() != MouseEvent.BUTTON1 || p == null)
-                        return;
-                    if (playHead.containsPoint(p)) {
+                    if (ev.getButton() == MouseEvent.BUTTON1 && playHead.containsPoint(ev.getPoint())) {
                         /* when we get a click on the marker, we need to switch mode to avoid
                          * getting confused with other drag operations (like select) */

trunk/src/org/openstreetmap/josm/gui/oauth/OsmOAuthAuthorizationClient.java

@@ -213 +213 @@
         for (String setCookie: setCookies) {
             String[] kvPairs = setCookie.split(";");
-            if (kvPairs == null || kvPairs.length == 0) {
+            if (kvPairs.length == 0) {
                 continue;
             }
@@ -219 +219 @@
                 kvPair = kvPair.trim();
                 String[] kv = kvPair.split("=");
-                if (kv == null || kv.length != 2) {
+                if (kv.length != 2) {
                     continue;
                 }

trunk/src/org/openstreetmap/josm/gui/tagging/presets/items/ComboMultiSelect.java

@@ -430 +430 @@
         if (values_from != null) {
             String[] classMethod = values_from.split("#");
-            if (classMethod != null && classMethod.length == 2) {
+            if (classMethod.length == 2) {
                 try {
                     Method method = Class.forName(classMethod[0]).getMethod(classMethod[1]);
@@ -517 +517 @@
             for (Entry<String, PresetListEntry> entry : lhm.entrySet()) {
                 String k = entry.getValue().toString();
-                if (k != null && k.equals(display)) {
+                if (k.equals(display)) {
                     value = entry.getKey();
                     break;

trunk/src/org/openstreetmap/josm/gui/util/GuiHelper.java

@@ -439 +439 @@
         for (GraphicsDevice gd: GraphicsEnvironment.getLocalGraphicsEnvironment().getScreenDevices()) {
             DisplayMode dm = gd.getDisplayMode();
-            if (dm != null) {
-                height = Math.max(height, dm.getHeight());
-                width = Math.max(width, dm.getWidth());
-            }
+            height = Math.max(height, dm.getHeight());
+            width = Math.max(width, dm.getWidth());
         }
         if (height == 0 || width == 0) {

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

@@ -393 +393 @@
         protected Date[] parseTime(String value) throws ChangesetQueryUrlException {
             String[] dates = value.split(",");
-            if (dates == null || dates.length == 0 || dates.length > 2)
+            if (dates.length == 0 || dates.length > 2)
                 throw new ChangesetQueryUrlException(
                         tr("Unexpected value for ''{0}'' in changeset query url, got {1}", "time", value));

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

@@ -827 +827 @@
         StringBuilder urlBuilder = noteStringBuilder(note)
             .append("/close");
-        if (encodedMessage != null && !encodedMessage.trim().isEmpty()) {
+        if (!encodedMessage.trim().isEmpty()) {
             urlBuilder.append("?text=");
             urlBuilder.append(encodedMessage);
@@ -849 +849 @@
         StringBuilder urlBuilder = noteStringBuilder(note)
             .append("/reopen");
-        if (encodedMessage != null && !encodedMessage.trim().isEmpty()) {
+        if (!encodedMessage.trim().isEmpty()) {
             urlBuilder.append("?text=");
             urlBuilder.append(encodedMessage);

trunk/src/org/openstreetmap/josm/io/imagery/WMSImagery.java

@@ -243 +243 @@
             if (child != null) {
                 String baseURL = child.getAttribute("xlink:href");
-                if (baseURL != null && !baseURL.equals(serviceUrlStr)) {
+                if (!baseURL.equals(serviceUrlStr)) {
                     Main.info("GetCapabilities specifies a different service URL: " + baseURL);
                     serviceUrl = new URL(baseURL);

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

@@ -380 +380 @@
         String activeAtt = layersEl.getAttribute("active");
         try {
-            active = (activeAtt != null && !activeAtt.isEmpty()) ? Integer.parseInt(activeAtt)-1 : -1;
+            active = !activeAtt.isEmpty() ? (Integer.parseInt(activeAtt)-1) : -1;
         } catch (NumberFormatException e) {
             Main.warn("Unsupported value for 'active' layer attribute. Ignoring it. Error was: "+e.getMessage());
@@ -407 +407 @@
                     if (idx == null) {
                         error(tr("unexpected format of attribute ''index'' for element ''layer''"));
-                    }
-                    if (elems.containsKey(idx)) {
+                    } else if (elems.containsKey(idx)) {
                         error(tr("attribute ''index'' ({0}) for element ''layer'' must be unique", Integer.toString(idx)));
                     }
@@ -415 +414 @@
                     deps.putVoid(idx);
                     String depStr = e.getAttribute("depends");
-                    if (depStr != null && !depStr.isEmpty()) {
+                    if (!depStr.isEmpty()) {
                         for (String sd : depStr.split(",")) {
                             Integer d = null;

trunk/src/org/openstreetmap/josm/plugins/PluginListParser.java

@@ -95 +95 @@
             if (name != null) {
                 PluginInformation info = createInfo(name, url, manifest);
-                if (info != null) {
-                    for (PluginProxy plugin : PluginHandler.pluginList) {
-                        if (plugin.getPluginInformation().name.equals(info.getName())) {
-                            info.localversion = plugin.getPluginInformation().localversion;
-                        }
+                for (PluginProxy plugin : PluginHandler.pluginList) {
+                    if (plugin.getPluginInformation().name.equals(info.getName())) {
+                        info.localversion = plugin.getPluginInformation().localversion;
                     }
-                    ret.add(info);
                 }
+                ret.add(info);
             }
         } catch (PluginListParseException ex) {

trunk/src/org/openstreetmap/josm/tools/HttpClient.java

@@ -209 +209 @@
                         ) {
                     String content = this.fetchContent();
-                    if (content == null || content.isEmpty()) {
+                    if (content.isEmpty()) {
                         Main.debug("Server did not return any body");
                     } else {
@@ -289 +289 @@
                 }
             }
-            if (in != null) {
-                in = new ProgressInputStream(in, getContentLength(), monitor);
-                in = "gzip".equalsIgnoreCase(getContentEncoding()) ? new GZIPInputStream(in) : in;
-                Compression compression = Compression.NONE;
-                if (uncompress) {
-                    final String contentType = getContentType();
-                    Main.debug("Uncompressing input stream according to Content-Type header: {0}", contentType);
-                    compression = Compression.forContentType(contentType);
-                }
-                if (uncompressAccordingToContentDisposition && Compression.NONE.equals(compression)) {
-                    final String contentDisposition = getHeaderField("Content-Disposition");
-                    final Matcher matcher = Pattern.compile("filename=\"([^\"]+)\"").matcher(
-                            contentDisposition != null ? contentDisposition : "");
-                    if (matcher.find()) {
-                        Main.debug("Uncompressing input stream according to Content-Disposition header: {0}", contentDisposition);
-                        compression = Compression.byExtension(matcher.group(1));
-                    }
-                }
-                in = compression.getUncompressedInputStream(in);
-            }
+            in = new ProgressInputStream(in, getContentLength(), monitor);
+            in = "gzip".equalsIgnoreCase(getContentEncoding()) ? new GZIPInputStream(in) : in;
+            Compression compression = Compression.NONE;
+            if (uncompress) {
+                final String contentType = getContentType();
+                Main.debug("Uncompressing input stream according to Content-Type header: {0}", contentType);
+                compression = Compression.forContentType(contentType);
+            }
+            if (uncompressAccordingToContentDisposition && Compression.NONE.equals(compression)) {
+                final String contentDisposition = getHeaderField("Content-Disposition");
+                final Matcher matcher = Pattern.compile("filename=\"([^\"]+)\"").matcher(
+                        contentDisposition != null ? contentDisposition : "");
+                if (matcher.find()) {
+                    Main.debug("Uncompressing input stream according to Content-Disposition header: {0}", contentDisposition);
+                    compression = Compression.byExtension(matcher.group(1));
+                }
+            }
+            in = compression.getUncompressedInputStream(in);
             return in;
         }

trunk/src/org/openstreetmap/josm/tools/WindowGeometry.java

@@ -204 +204 @@
     protected final void initFromPreferences(String preferenceKey) throws WindowGeometryException {
         String value = Main.pref.get(preferenceKey);
-        if (value == null || value.isEmpty())
+        if (value.isEmpty())
             throw new WindowGeometryException(
                     tr("Preference with key ''{0}'' does not exist. Cannot restore window geometry from preferences.", preferenceKey));