Ignore:
Timestamp:
2016-07-29T00:02:17+02:00 (3 years ago)
Author:
Don-vip
Message:

see #12472 - fix "OperatorPrecedence" warnings

Location:
trunk/src/org/openstreetmap/josm/gui/history
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java

    r10637 r10670  
    3636            boolean isValue) {
    3737        Color bgColor = UIManager.getColor("Table.background");
    38         if (!model.hasTag(key) && model.isCurrentPointInTime()
    39                 || !model.oppositeHasTag(key) && model.isReferencePointInTime()) {
     38        if ((!model.hasTag(key) && model.isCurrentPointInTime())
     39                || (!model.oppositeHasTag(key) && model.isReferencePointInTime())) {
    4040            bgColor = TwoColumnDiff.Item.DiffItemType.DELETED.getColor();
    41         } else if (!model.oppositeHasTag(key) && model.isCurrentPointInTime()
    42                 || !model.hasTag(key) && model.isReferencePointInTime()) {
     41        } else if ((!model.oppositeHasTag(key) && model.isCurrentPointInTime())
     42                || (!model.hasTag(key) && model.isReferencePointInTime())) {
    4343            bgColor = TwoColumnDiff.Item.DiffItemType.INSERTED.getColor();
    4444        } else if (isValue && model.hasTag(key) && model.oppositeHasTag(key) && !model.hasSameValueAsOpposite(key)) {
  • trunk/src/org/openstreetmap/josm/gui/history/TwoColumnDiff.java

    r9246 r10670  
    7979        Diff.Change scriptReversed = new Diff(referenceReversed, current).diff_2(false);
    8080        if (scriptReversed == null /* reference and current are identical */
    81                 || script != null && scriptReversed.getTotalNumberOfChanges() < script.getTotalNumberOfChanges()) {
     81                || (script != null && scriptReversed.getTotalNumberOfChanges() < script.getTotalNumberOfChanges())) {
    8282            this.referenceReversed = true;
    8383            twoColumnDiffFromScript(scriptReversed, referenceReversed, current, true);
Note: See TracChangeset for help on using the changeset viewer.