Index: /applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/PublicTransportAStar.java =================================================================== --- /applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/PublicTransportAStar.java (revision 34652) +++ /applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/PublicTransportAStar.java (revision 34653) @@ -29,5 +29,5 @@ @Override public boolean equals(Object o) { - if ((NodeVertex) o == null) + if (!(o instanceof NodeVertex)) return false; return node.equals(((NodeVertex) o).node); Index: /applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/actions/GTFSImporterAction.java =================================================================== --- /applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/actions/GTFSImporterAction.java (revision 34652) +++ /applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/actions/GTFSImporterAction.java (revision 34653) @@ -296,5 +296,5 @@ for (int i = 0; i < table.getRowCount(); ++i) { - if ((nodes.elementAt(i) != null) && (ds.isSelected(nodes.elementAt(i)))) + if (nodes.elementAt(i) != null && ds.isSelected(nodes.elementAt(i))) table.addRowSelectionInterval(i, i); } Index: /applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/actions/RoutePatternAction.java =================================================================== --- /applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/actions/RoutePatternAction.java (revision 34652) +++ /applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/actions/RoutePatternAction.java (revision 34653) @@ -88,5 +88,5 @@ @Override public boolean isCellEditable(int row, int column) { - if ((column == 0) && (hasFixedKeys)) + if (column == 0 && hasFixedKeys) return false; return true; @@ -136,5 +136,5 @@ if (key == null) return; - if ((blacklist == null) || (!blacklist.contains(key))) { + if (blacklist == null || !blacklist.contains(key)) { relation.setModified(true); if ("".equals(getValueAt(e.getFirstRow(), 1))) @@ -212,5 +212,5 @@ buf[0] = curName; } else { - buf[0] = tr("[ID] {0}", (Long.valueOf(node.getId())).toString()); + buf[0] = tr("[ID] {0}", Long.valueOf(node.getId()).toString()); } String curRef = node.get("ref"); @@ -1082,6 +1082,6 @@ for (int i = 0; i < itineraryData.getRowCount(); ++i) { - if ((itineraryData.ways.elementAt(i) != null) - && (mainDataSet.isSelected(itineraryData.ways.elementAt(i)))) + if (itineraryData.ways.elementAt(i) != null + && mainDataSet.isSelected(itineraryData.ways.elementAt(i))) itineraryTable.addRowSelectionInterval(i, i); } @@ -1090,6 +1090,6 @@ if (itineraryTable.getSelectedRowCount() > 0) { for (int i = 0; i < itineraryData.getRowCount(); ++i) { - if ((itineraryTable.isRowSelected(i)) - && (itineraryData.ways.elementAt(i) != null)) { + if (itineraryTable.isRowSelected(i) + && itineraryData.ways.elementAt(i) != null) { itineraryData.ways.elementAt(i).accept((PrimitiveVisitor) box); } @@ -1112,10 +1112,10 @@ if (itineraryTable.getSelectedRowCount() > 0) { for (int i = 0; i < itineraryData.getRowCount(); ++i) { - if ((itineraryTable.isRowSelected(i)) - && (itineraryData.ways.elementAt(i) != null)) { + if (itineraryTable.isRowSelected(i) + && itineraryData.ways.elementAt(i) != null) { mainDataSet.addSelected(itineraryData.ways.elementAt(i)); RelationMember markedWay = new RelationMember( - (String) (itineraryData.getValueAt(i, 1)), + (String) itineraryData.getValueAt(i, 1), itineraryData.ways.elementAt(i)); markedWays.addElement(markedWay); @@ -1128,5 +1128,5 @@ RelationMember markedWay = new RelationMember( - (String) (itineraryData.getValueAt(i, 1)), + (String) itineraryData.getValueAt(i, 1), itineraryData.ways.elementAt(i)); markedWays.addElement(markedWay); @@ -1143,5 +1143,5 @@ while (relIter.hasNext()) { RelationMember curMember = relIter.next(); - if ((curMember.isWay()) && (mainDataSet.isSelected(curMember.getWay()))) { + if (curMember.isWay() && mainDataSet.isSelected(curMember.getWay())) { itineraryData.insertRow(insPos, curMember.getWay(), curMember.getRole()); if (insPos >= 0) @@ -1157,5 +1157,5 @@ while (wayIter.hasNext()) { Way curMember = wayIter.next(); - if (!(addedWays.contains(curMember))) { + if (!addedWays.contains(curMember)) { itineraryData.insertRow(insPos, curMember, ""); if (insPos >= 0) @@ -1179,6 +1179,6 @@ } else if ("routePattern.itineraryDelete".equals(event.getActionCommand())) { for (int i = itineraryData.getRowCount() - 1; i >= 0; --i) { - if ((itineraryTable.isRowSelected(i)) - && (itineraryData.ways.elementAt(i) != null)) { + if (itineraryTable.isRowSelected(i) + && itineraryData.ways.elementAt(i) != null) { itineraryData.ways.removeElementAt(i); itineraryData.removeRow(i); @@ -1198,7 +1198,7 @@ if (itineraryTable.getSelectedRowCount() > 0) { for (int i = itineraryData.getRowCount() - 1; i >= 0; --i) { - if ((itineraryTable.isRowSelected(i)) - && (itineraryData.ways.elementAt(i) != null)) { - if (!(usedWays.contains(itineraryData.ways.elementAt(i)))) { + if (itineraryTable.isRowSelected(i) + && itineraryData.ways.elementAt(i) != null) { + if (!usedWays.contains(itineraryData.ways.elementAt(i))) { addWayToSortingData(itineraryData.ways.elementAt(i), frontNodes, backNodes, loops); @@ -1213,5 +1213,5 @@ for (int i = itineraryData.getRowCount() - 1; i >= 0; --i) { if (itineraryData.ways.elementAt(i) != null) { - if (!(usedWays.contains(itineraryData.ways.elementAt(i)))) { + if (!usedWays.contains(itineraryData.ways.elementAt(i))) { addWayToSortingData(itineraryData.ways.elementAt(i), frontNodes, backNodes, loops); @@ -1256,7 +1256,7 @@ if (itineraryTable.getSelectedRowCount() > 0) { for (int i = itineraryData.getRowCount() - 1; i >= 0; --i) { - if ((itineraryTable.isRowSelected(i)) - && (itineraryData.ways.elementAt(i) != null)) { - String role = (String) (itineraryData.getValueAt(i, 1)); + if (itineraryTable.isRowSelected(i) + && itineraryData.ways.elementAt(i) != null) { + String role = (String) itineraryData.getValueAt(i, 1); if ("backward".equals(role)) role = "forward"; @@ -1276,5 +1276,5 @@ for (int i = itineraryData.getRowCount() - 1; i >= 0; --i) { if (itineraryData.ways.elementAt(i) != null) { - String role = (String) (itineraryData.getValueAt(i, 1)); + String role = (String) itineraryData.getValueAt(i, 1); if ("backward".equals(role)) role = "forward"; @@ -1315,6 +1315,6 @@ for (int i = 0; i < stoplistData.getRowCount(); ++i) { - if ((stoplistData.nodes.elementAt(i) != null) - && (mainDataSet.isSelected(stoplistData.nodes.elementAt(i)))) + if (stoplistData.nodes.elementAt(i) != null + && mainDataSet.isSelected(stoplistData.nodes.elementAt(i))) stoplistTable.addRowSelectionInterval(i, i); } @@ -1346,5 +1346,5 @@ RelationMember markedNode = new RelationMember( - (String) (stoplistData.getValueAt(i, 1)), + (String) stoplistData.getValueAt(i, 1), stoplistData.nodes.elementAt(i)); markedNodes.addElement(markedNode); @@ -1356,5 +1356,5 @@ RelationMember markedNode = new RelationMember( - (String) (stoplistData.getValueAt(i, 1)), + (String) stoplistData.getValueAt(i, 1), stoplistData.nodes.elementAt(i)); markedNodes.addElement(markedNode); @@ -1370,5 +1370,5 @@ while (relIter.hasNext()) { RelationMember curMember = relIter.next(); - if ((curMember.isNode()) && (mainDataSet.isSelected(curMember.getNode()))) { + if (curMember.isNode() && mainDataSet.isSelected(curMember.getNode())) { StopReference sr = detectMinDistance(curMember.getNode(), segmentMetrics, cbRight.isSelected(), cbLeft.isSelected()); @@ -1387,5 +1387,5 @@ while (nodeIter.hasNext()) { Node curMember = nodeIter.next(); - if (!(addedNodes.contains(curMember))) { + if (!addedNodes.contains(curMember)) { StopReference sr = detectMinDistance(curMember, segmentMetrics, cbRight.isSelected(), cbLeft.isSelected()); @@ -1487,5 +1487,5 @@ for (int i = stoplistData.getRowCount() - 1; i >= 0; --i) { if (stoplistTable.isRowSelected(i)) { - String role = (String) (stoplistData.getValueAt(i, STOPLIST_ROLE_COLUMN)); + String role = (String) stoplistData.getValueAt(i, STOPLIST_ROLE_COLUMN); RelationMember markedNode = new RelationMember(role, stoplistData.nodes.elementAt(i)); @@ -1498,5 +1498,5 @@ } else { for (int i = stoplistData.getRowCount() - 1; i >= 0; --i) { - String role = (String) (stoplistData.getValueAt(i, STOPLIST_ROLE_COLUMN)); + String role = (String) stoplistData.getValueAt(i, STOPLIST_ROLE_COLUMN); RelationMember markedNode = new RelationMember(role, stoplistData.nodes.elementAt(i)); @@ -1651,5 +1651,5 @@ if (itineraryData.ways.elementAt(i) != null) { RelationMember member = new RelationMember( - (String) (itineraryData.getValueAt(i, 1)), itineraryData.ways.elementAt(i)); + (String) itineraryData.getValueAt(i, 1), itineraryData.ways.elementAt(i)); members.add(member); } @@ -1668,5 +1668,5 @@ for (int i = 0; i < stoplistData.getRowCount(); ++i) { RelationMember member = new RelationMember( - (String) (stoplistData.getValueAt(i, STOPLIST_ROLE_COLUMN)), + (String) stoplistData.getValueAt(i, STOPLIST_ROLE_COLUMN), stoplistData.nodes.elementAt(i)); currentRoute.addMember(member); @@ -1865,6 +1865,6 @@ if (itineraryData.ways.elementAt(i) != null) { Way way = itineraryData.ways.elementAt(i); - if (!(way.isIncomplete())) { - if ("backward".equals((itineraryData.getValueAt(i, 1)))) { + if (!way.isIncomplete()) { + if ("backward".equals(itineraryData.getValueAt(i, 1))) { for (int j = way.getNodesCount() - 2; j >= 0; --j) { SegmentMetric sm = new SegmentMetric(way.getNode(j + 1).getCoor().lat(), @@ -1928,5 +1928,5 @@ boolean vertexOnSeg = (vertexAngle == segAngle) || (vertexAngle == lastSegAngle); - boolean vertexOnTheLeft = (!vertexOnSeg) + boolean vertexOnTheLeft = !vertexOnSeg && (((lastSegAngle > vertexAngle) && (vertexAngle > segAngle)) || ((vertexAngle > segAngle) && (segAngle > lastSegAngle)) @@ -1943,6 +1943,6 @@ curPosition += 2 * Math.PI; if ((Math.abs(currentDistance) < distance) - && (((!vertexOnTheLeft) && (rhsPossible)) - || ((vertexOnTheLeft) && (lhsPossible)) || (vertexOnSeg))) { + && ((!vertexOnTheLeft && rhsPossible) + || (vertexOnTheLeft && lhsPossible) || vertexOnSeg)) { distance = Math.abs(currentDistance); minIndex = curIndex - 1; @@ -1958,6 +1958,6 @@ double currentDistance = (lat - sm.aLat) * sm.o1 + (lon - sm.aLon) * sm.o2; if ((Math.abs(currentDistance) < distance) - && (((currentDistance >= 0) && (rhsPossible)) - || ((currentDistance <= 0) && (lhsPossible)))) { + && ((currentDistance >= 0 && rhsPossible) + || (currentDistance <= 0 && lhsPossible))) { distance = Math.abs(currentDistance); minIndex = curIndex; Index: /applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/actions/StopImporterAction.java =================================================================== --- /applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/actions/StopImporterAction.java (revision 34652) +++ /applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/actions/StopImporterAction.java (revision 34653) @@ -124,8 +124,8 @@ refreshData(); } else if ("stopImporter.settingsGPSTimeStart".equals(event.getActionCommand())) { - if ((!inEvent) && (dialog.gpsTimeStartValid()) && (currentTrack != null)) + if (!inEvent && dialog.gpsTimeStartValid() && currentTrack != null) UndoRedoHandler.getInstance().add(new TrackStoplistRelocateCommand(this)); } else if ("stopImporter.settingsStopwatchStart".equals(event.getActionCommand())) { - if ((!inEvent) && (dialog.stopwatchStartValid()) && (currentTrack != null)) + if (!inEvent && dialog.stopwatchStartValid() && currentTrack != null) UndoRedoHandler.getInstance().add(new TrackStoplistRelocateCommand(this)); } else if ("stopImporter.settingsTimeWindow".equals(event.getActionCommand())) { @@ -239,5 +239,5 @@ public void tracksSelectionChanged(int selectedPos) { if (selectedPos >= 0) { - currentTrack = (tracksListModel.elementAt(selectedPos)); + currentTrack = tracksListModel.elementAt(selectedPos); dialog.setTrackValid(true); @@ -328,5 +328,5 @@ for (int i = 0; i < table.getRowCount(); ++i) { - if ((nodes.elementAt(i) != null) && (ds.isSelected(nodes.elementAt(i)))) + if (nodes.elementAt(i) != null && ds.isSelected(nodes.elementAt(i))) table.addRowSelectionInterval(i, i); } Index: /applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/commands/AbstractGTFSCatchJoinCommand.java =================================================================== --- /applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/commands/AbstractGTFSCatchJoinCommand.java (revision 34652) +++ /applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/commands/AbstractGTFSCatchJoinCommand.java (revision 34653) @@ -53,5 +53,5 @@ while (iter.hasNext()) { Node n = iter.next(); - if ((n != null) && (n.equals(gtfsStopTM.nodes.elementAt(j)))) + if (n != null && n.equals(gtfsStopTM.nodes.elementAt(j))) continue; if (dest != null) Index: /applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/models/GTFSStopTableModel.java =================================================================== --- /applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/models/GTFSStopTableModel.java (revision 34652) +++ /applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/models/GTFSStopTableModel.java (revision 34653) @@ -112,5 +112,5 @@ if ('"' == s.charAt(pos)) insideDoubleQuoted = !insideDoubleQuoted; - else if ((separator == s.charAt(pos)) && (!insideDoubleQuoted)) + else if (separator == s.charAt(pos) && !insideDoubleQuoted) break; ++pos; @@ -187,5 +187,5 @@ if (insPos == -1) { - if ((nearBusStop) || !(tr("pending").equals(buf[2]))) + if (nearBusStop || !tr("pending").equals(buf[2])) nodes.addElement(null); else { @@ -197,5 +197,5 @@ super.addRow(buf); } else { - if ((nearBusStop) || !(tr("pending").equals(buf[2]))) + if (nearBusStop || !tr("pending").equals(buf[2])) nodes.insertElementAt(null, insPos); else { Index: /applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/models/ItineraryTableModel.java =================================================================== --- /applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/models/ItineraryTableModel.java (revision 34652) +++ /applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/models/ItineraryTableModel.java (revision 34653) @@ -59,5 +59,5 @@ buf[0] = curName; else - buf[0] = tr("[ID] {0}", (Long.valueOf(way.getId())).toString()); + buf[0] = tr("[ID] {0}", Long.valueOf(way.getId())); buf[1] = role; if (insPos == -1) { @@ -94,11 +94,11 @@ break; - boolean gapRequired = gapNecessary(ways.elementAt(i), (String) (getValueAt(i, 1)), + boolean gapRequired = gapNecessary(ways.elementAt(i), (String) getValueAt(i, 1), lastNode); - if ((i > 0) && (!gapRequired) && (ways.elementAt(i - 1) == null)) { + if (i > 0 && !gapRequired && ways.elementAt(i - 1) == null) { ways.removeElementAt(i - 1); removeRow(i - 1); --i; - } else if ((i > 0) && gapRequired && (ways.elementAt(i - 1) != null)) { + } else if (i > 0 && gapRequired && ways.elementAt(i - 1) != null) { String[] buf = {"", ""}; buf[0] = tr("[gap]"); @@ -106,7 +106,7 @@ ++i; } - lastNode = getLastNode(ways.elementAt(i), (String) (getValueAt(i, 1))); + lastNode = getLastNode(ways.elementAt(i), (String) getValueAt(i, 1)); } - while ((getRowCount() > 0) && (ways.elementAt(getRowCount() - 1) == null)) { + while (getRowCount() > 0 && ways.elementAt(getRowCount() - 1) == null) { ways.removeElementAt(getRowCount() - 1); removeRow(getRowCount() - 1); @@ -126,5 +126,5 @@ private Node getLastNode(Way way, String role) { - if ((way == null) || (way.isIncomplete()) || (way.getNodesCount() < 1)) + if (way == null || way.isIncomplete() || way.getNodesCount() < 1) return null; else { @@ -137,5 +137,5 @@ private boolean gapNecessary(Way way, String role, Node lastNode) { - if ((way != null) && (!(way.isIncomplete())) && (way.getNodesCount() >= 1)) { + if (way != null && !way.isIncomplete() && way.getNodesCount() >= 1) { Node firstNode = null; if ("backward".equals(role)) @@ -143,5 +143,5 @@ else firstNode = way.getNode(0); - if ((lastNode != null) && (!lastNode.equals(firstNode))) + if (lastNode != null && !lastNode.equals(firstNode)) return true; } Index: /applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/refs/TrackReference.java =================================================================== --- /applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/refs/TrackReference.java (revision 34652) +++ /applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/refs/TrackReference.java (revision 34653) @@ -51,5 +51,5 @@ if (track != null) { Iterator siter = track.getSegments().iterator(); - while ((siter.hasNext()) && (this.gpsSyncTime == null)) { + while (siter.hasNext() && this.gpsSyncTime == null) { Iterator witer = siter.next().getWayPoints().iterator(); if (witer.hasNext()) {